Merge branch 'master' of https://github.com/robcarver17/pysystemtrade

Author: rob

sysdata/production/TEMP_old_capital_objects.py

@@ -3,7 +3,7 @@
 import pandas as pd
 
 from syscore.exceptions import missingData
-from syscore.constants import missing_data, arg_not_supplied, failure
+from syscore.constants import arg_not_supplied, failure
 from syscore.pandas.pdutils import uniquets
 
 from sysdata.data_blob import dataBlob
@@ -82,10 +82,7 @@ def get_current_pandl_account(self) -> float:
         return self.get_current_capital_for_strategy(ACC_PROFIT_VALUES)
 
     def get_current_capital_for_strategy(self, strategy_name: str) -> float:
-        try:
-            current_capital_entry = self.get_last_entry_for_strategy(strategy_name)
-        except missingData:
-            return missing_data
+        current_capital_entry = self.get_last_entry_for_strategy(strategy_name)
 
         capital_value = current_capital_entry.capital_value
 
@@ -352,14 +349,6 @@ def get_all_capital_calcs(self) -> pd.DataFrame:
         acc_pandl = self.get_profit_and_loss_account()
         broker_acc = self.get_broker_account()
 
-        if (
-            total_capital is missing_data
-            or max_capital is missing_data
-            or acc_pandl is missing_data
-            or broker_acc is missing_data
-        ):
-            return missing_data
-
         all_capital = pd.concat(
             [total_capital, max_capital, acc_pandl, broker_acc], axis=1
         )
@@ -421,8 +410,9 @@ def _init_capital_updater(
     def _get_prev_broker_account_value_create_if_no_data(
         self, new_broker_account_value: float
     ) -> float:
-        prev_broker_account_value = self.capital_data.get_broker_account_value()
-        if prev_broker_account_value is missing_data:
+        try:
+            prev_broker_account_value = self.capital_data.get_broker_account_value()
+        except missingData:
             # No previous capital, need to set everything up
             self.create_initial_capital(
                 new_broker_account_value, are_you_really_sure=True
@@ -469,11 +459,13 @@ def adjust_broker_account_for_delta(self, delta_value: float):
         :return: None
         """
 
-        prev_broker_account_value = self.capital_data.get_broker_account_value()
-        if prev_broker_account_value is missing_data:
+        try:
+            prev_broker_account_value = self.capital_data.get_broker_account_value()
+        except missingData:
             self._capital_data.log.warn(
                 "Can't apply a delta to broker account value, since no value in data"
             )
+            raise
 
         broker_account_value = prev_broker_account_value + delta_value