investing-algorithm-framework 1.5__tar.gz → 1.5.1__tar.gz

{investing_algorithm_framework-1.5 → investing_algorithm_framework-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investing_algorithm_framework
-Version: 1.5
+Version: 1.5.1
 Summary: A framework for creating an investment algorithm
 Home-page: https://github.com/coding-kitties/investing-algorithm-framework.git
 Download-URL: https://github.com/coding-kitties/investing-algorithm-framework/archive/v0.1.1.tar.gz

{investing_algorithm_framework-1.5 → investing_algorithm_framework-1.5.1}/investing_algorithm_framework/app/algorithm.py

@@ -90,7 +90,7 @@ class Algorithm:
         amount=None,
         percentage_of_portfolio=None,
         percentage_of_position=None,
-        precision=3,
+        precision=None,
         market=None,
         execute=True,
         validate=True,
@@ -108,7 +108,6 @@ class Algorithm:
             net_size = portfolio.get_net_size()
             size = net_size * percentage_of_portfolio / 100
             amount = size / price
-            amount = self.round_down(amount, precision)
 
         elif percentage_of_position is not None:
 
@@ -125,6 +124,9 @@ class Algorithm:
             )
             amount = position.get_amount() * (percentage_of_position / 100)
 
+        if precision is not None:
+            amount = self.round_down(amount, precision)
+
         order_data = {
             "target_symbol": target_symbol,
             "price": price,
@@ -182,7 +184,7 @@ class Algorithm:
 
         return self.portfolio_service.find({{"market": market}})
 
-    def get_unallocated(self, market=None) -> Position:
+    def get_unallocated(self, market=None) -> float:
 
         if market:
             portfolio = self.portfolio_service.find({{"market": market}})

{investing_algorithm_framework-1.5 → investing_algorithm_framework-1.5.1}/investing_algorithm_framework/domain/models/order/order.py

@@ -115,6 +115,10 @@ class Order(BaseModel):
         self.external_id = external_id
 
     def get_net_gain(self):
+
+        if self.net_gain is None:
+            return 0
+
         return self.net_gain
 
     def set_net_gain(self, net_gain):
@@ -133,6 +137,10 @@ class Order(BaseModel):
         self.trade_closed_price = trade_closed_price
 
     def get_trade_closed_amount(self):
+
+        if self.trade_closed_amount is None:
+            return 0
+
         return self.trade_closed_amount
 
     def set_trade_closed_amount(self, trade_closed_amount):
@@ -163,7 +171,7 @@ class Order(BaseModel):
     def get_remaining(self):
 
         if self.remaining is None:
-            return '0'
+            return self.amount
 
         return self.remaining
 
@@ -171,6 +179,10 @@ class Order(BaseModel):
         self.remaining = remaining
 
     def get_cost(self):
+
+        if self.cost is None:
+            return 0
+
         return self.cost
 
     def set_cost(self, cost):

{investing_algorithm_framework-1.5 → investing_algorithm_framework-1.5.1}/investing_algorithm_framework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investing-algorithm-framework
-Version: 1.5
+Version: 1.5.1
 Summary: A framework for creating an investment algorithm
 Home-page: https://github.com/coding-kitties/investing-algorithm-framework.git
 Download-URL: https://github.com/coding-kitties/investing-algorithm-framework/archive/v0.1.1.tar.gz