siglab-py 0.1.30__py3-none-any.whl → 0.1.31__py3-none-any.whl

siglab_py/ordergateway/client.py

@@ -138,7 +138,7 @@ class DivisiblePosition(Order):
 
     def get_filled_amount(self) -> float:
         # filled_amount is in base ccy
-        filled_amount = sum([ self.executions[order_id]['filled'] * self.multiplier for order_id in self.executions ])
+        filled_amount = sum([ self.executions[order_id]['filled'] if 'filled' in self.executions[order_id] else 0 * self.multiplier for order_id in self.executions ])
         if self.side=='sell':
             filled_amount = -1 * filled_amount
         return filled_amount
@@ -189,14 +189,14 @@ class DivisiblePosition(Order):
                 }
         '''
         total_amount : float = sum([ self.executions[order_id]['amount'] for order_id in self.executions ])
-        average_cost = sum([ (self.executions[order_id]['average'] if self.executions[order_id]['average'] else self.executions[order_id]['price']) * self.executions[order_id]['amount'] for order_id in self.executions ])
+        average_cost = sum([ (self.executions[order_id]['average'] if 'average' in self.executions[order_id] else 0 if self.executions[order_id]['average'] else self.executions[order_id]['price']) * self.executions[order_id]['amount'] for order_id in self.executions ])
         average_cost = average_cost / total_amount if total_amount!=0 else 0
         return average_cost
 
     def get_fees(self) -> float:
         fees : float = 0
         if self.fees_ccy:
-            fees = sum([ float(self.executions[order_id]['fee']['cost'])  for order_id in self.executions if self.executions[order_id]['fee'] and self.executions[order_id]['fee']['currency'].strip().upper()==self.fees_ccy.strip().upper() ])
+            fees = sum([ float(self.executions[order_id]['fee']['cost'] if self.executions[order_id]['fee'] else 0)  for order_id in self.executions if self.executions[order_id]['fee'] and self.executions[order_id]['fee']['currency'].strip().upper()==self.fees_ccy.strip().upper() ])
         return fees
 
     def to_dict(self) -> Dict[JSON_SERIALIZABLE_TYPES, JSON_SERIALIZABLE_TYPES]:

{siglab_py-0.1.30.dist-info → siglab_py-0.1.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siglab-py
-Version: 0.1.30
+Version: 0.1.31
 Summary: Market data fetches, TA calculations and generic order gateway.
 Author: r0bbarh00d
 Author-email: r0bbarh00d <r0bbarh00d@gmail.com>

{siglab_py-0.1.30.dist-info → siglab_py-0.1.31.dist-info}/RECORD

@@ -13,7 +13,7 @@ siglab_py/market_data_providers/futu_candles_ta_to_csv.py,sha256=S4GXaJ7AveEh-Cm
 siglab_py/market_data_providers/orderbooks_provider.py,sha256=olt-3LIkoyzQWfNNQRhJtKibLbkTutt_q_rCCTM7i1g,16216
 siglab_py/market_data_providers/test_provider.py,sha256=wBLCgcWjs7FGZJXWsNyn30lkOLa_cgpuvqRakMC0wbA,2221
 siglab_py/ordergateway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-siglab_py/ordergateway/client.py,sha256=qh4vrCJm8iITKAl07lisZxJ3V4JkbsYlmIBMYihfUaU,9575
+siglab_py/ordergateway/client.py,sha256=vpvBacWFRYUDIAtpxkMjylE2zuP9PYpo8_9QdvnC1zg,9715
 siglab_py/ordergateway/encrypt_keys_util.py,sha256=-qi87db8To8Yf1WS1Q_Cp2Ya7ZqgWlRqSHfNXCM7wE4,1339
 siglab_py/ordergateway/gateway.py,sha256=FoE-OUBrHJ2fdKAfvGue1yQ2P67falWoyoEGCV8ScfA,37219
 siglab_py/ordergateway/test_ordergateway.py,sha256=_Gz2U_VqljogGWqGyNDYYls1INqUiig9veyPttfGRpg,3901
@@ -28,7 +28,7 @@ siglab_py/util/analytic_util.py,sha256=w3-ee13q7d6O-w45zafQdWeuKtYO2ycNW9Ek4MJTO
 siglab_py/util/aws_util.py,sha256=KGmjHrr1rpnnxr33nXHNzTul4tvyyxl9p6gpwNv0Ygc,2557
 siglab_py/util/market_data_util.py,sha256=qRKsFKZMYsaC18ImSWug6dRAOo2_GS1NZM-j0EYMViE,19319
 siglab_py/util/retry_util.py,sha256=mxYuRFZRZoaQQjENcwPmxhxixtd1TFvbxIdPx4RwfRc,743
-siglab_py-0.1.30.dist-info/METADATA,sha256=qaTrOuk27oztMUHRGSahl7OwYFme9R7J-xbK6v0KjiE,980
-siglab_py-0.1.30.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-siglab_py-0.1.30.dist-info/top_level.txt,sha256=AbD4VR9OqmMOGlMJLkAVPGQMtUPIQv0t1BF5xmcLJSk,10
-siglab_py-0.1.30.dist-info/RECORD,,
+siglab_py-0.1.31.dist-info/METADATA,sha256=vLf-54Ssp9XJXmEQ7x3Er_kxax2aMYE2ttf30DESUF4,980
+siglab_py-0.1.31.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+siglab_py-0.1.31.dist-info/top_level.txt,sha256=AbD4VR9OqmMOGlMJLkAVPGQMtUPIQv0t1BF5xmcLJSk,10
+siglab_py-0.1.31.dist-info/RECORD,,