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

Author: rob

sysdata/production/TEMP_old_capital_objects.py

@@ -2,6 +2,7 @@
 import datetime
 import pandas as pd
 
+from syscore.exceptions import missingData
 from syscore.objects import arg_not_supplied, failure, missing_data
 from syscore.pandas.pdutils import uniquets
 
@@ -81,8 +82,9 @@ 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:
-        current_capital_entry = self.get_last_entry_for_strategy(strategy_name)
-        if current_capital_entry is missing_data:
+        try:
+            current_capital_entry = self.get_last_entry_for_strategy(strategy_name)
+        except missingData:
             return missing_data
 
         capital_value = current_capital_entry.capital_value
@@ -92,8 +94,9 @@ def get_current_capital_for_strategy(self, strategy_name: str) -> float:
     def get_date_of_last_entry_for_strategy(
         self, strategy_name: str
     ) -> datetime.datetime:
-        current_capital_entry = self.get_last_entry_for_strategy(strategy_name)
-        if current_capital_entry is missing_data:
+        try:
+            current_capital_entry = self.get_last_entry_for_strategy(strategy_name)
+        except missingData:
             return missing_data
 
         entry_date = current_capital_entry.date

sysdata/production/historic_positions.py

@@ -1,7 +1,7 @@
 import pandas as pd
 
 from syscore.exceptions import missingData
-from syscore.objects import arg_not_supplied, missing_data
+from syscore.objects import arg_not_supplied
 from sysobjects.contracts import futuresContract, listOfFuturesContracts
 
 from sysdata.production.timed_storage import (
@@ -71,10 +71,13 @@ def get_current_position_for_instrument_strategy_object(
         self, instrument_strategy: instrumentStrategy
     ) -> int:
 
-        position_entry = self.get_current_position_entry_for_instrument_strategy_object(
-            instrument_strategy
-        )
-        if position_entry is missing_data:
+        try:
+            position_entry = (
+                self.get_current_position_entry_for_instrument_strategy_object(
+                    instrument_strategy
+                )
+            )
+        except missingData:
             return 0
         else:
             # ignore warning it's because we dynamically assign attributes
@@ -275,10 +278,11 @@ def get_position_as_df_for_contract_object(self, contract_object: futuresContrac
         return df_object
 
     def get_current_position_for_contract_object(self, contract_object):
-        position_entry = self.get_current_position_entry_for_contract_object(
-            contract_object
-        )
-        if position_entry is missing_data:
+        try:
+            position_entry = self.get_current_position_entry_for_contract_object(
+                contract_object
+            )
+        except missingData:
             return 0.0
 
         return position_entry.position

sysobjects/production/timed_storage.py

@@ -4,7 +4,7 @@
 import pandas as pd
 
 from syscore.exceptions import missingData
-from syscore.objects import success, arg_not_supplied, missing_data
+from syscore.objects import success, arg_not_supplied
 
 DATE_KEY_NAME = "date"
 
@@ -221,13 +221,13 @@ def sort(self):
 
     def final_entry(self):
         if len(self) == 0:
-            return missing_data
+            raise missingData
         self.sort()
         return self[-1]
 
     def append(self, item):
-        previous_final_entry = self.final_entry()
         if len(self) > 0:
+            previous_final_entry = self.final_entry()
             try:
                 previous_final_entry.check_args_match(item)
             except Exception as e: