investing-algorithm-framework 7.16.4__tar.gz → 7.16.6__tar.gz

{investing_algorithm_framework-7.16.4 → investing_algorithm_framework-7.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investing-algorithm-framework
-Version: 7.16.4
+Version: 7.16.6
 Summary: A framework for creating trading bots
 Author: MDUYN
 Requires-Python: >=3.10

{investing_algorithm_framework-7.16.4 → investing_algorithm_framework-7.16.6}/investing_algorithm_framework/domain/models/trade/trade.py

@@ -208,7 +208,7 @@ class Trade(BaseModel):
 
             if self.last_reported_price is not None:
                 gain = (
-                    self.remaining *
+                    self.available_amount *
                     (self.last_reported_price - self.open_price)
                 )
 
@@ -228,7 +228,7 @@ class Trade(BaseModel):
 
             if self.last_reported_price is not None:
                 gain = (
-                    self.remaining *
+                    self.available_amount *
                     (self.last_reported_price - self.open_price)
                 )
 

{investing_algorithm_framework-7.16.4 → investing_algorithm_framework-7.16.6}/investing_algorithm_framework/services/metrics/trades.py

@@ -298,8 +298,7 @@ def get_average_trade_gain(trades: List[Trade]) -> Tuple[float, float]:
         trades (List[Trade]): List of trades.
 
     Returns:
-        Tuple[float, float]: The average gain
-        percentage of the average loss
+        Tuple[float, float]: The average gain and average gain percentage
     """
     if trades is None or len(trades) == 0:
         raise OperationalException(
@@ -307,19 +306,26 @@ def get_average_trade_gain(trades: List[Trade]) -> Tuple[float, float]:
         )
 
     gains = [t.net_gain_absolute for t in trades if t.net_gain_absolute > 0]
-    cost = sum(t.cost for t in trades if t.net_gain_absolute > 0)
 
     if not gains:
         return 0.0, 0.0
 
     average_gain = sum(gains) / len(gains)
-    percentage = (average_gain / cost) if cost > 0 else 0.0
-    return average_gain, percentage
 
+    # Updated percentage calculation to match other functions
+    percentage_returns = [
+        (t.net_gain_absolute / t.cost) for t in trades
+        if t.net_gain_absolute > 0 and t.cost > 0
+    ]
+    average_gain_percentage = (
+        sum(percentage_returns) / len(percentage_returns)
+        if percentage_returns else 0.0
+    )
 
-def get_current_average_trade_gain(
-    trades: List[Trade]
-) -> Tuple[float, float]:
+    return average_gain, average_gain_percentage
+
+
+def get_current_average_trade_gain(trades: List[Trade]) -> Tuple[float, float]:
     """
     Calculate the average gain from a list of trades,
     including both closed and open trades.
@@ -329,8 +335,7 @@ def get_current_average_trade_gain(
     Args:
         trades (List[Trade]): List of trades.
     Returns:
-        Tuple[float, float]: The average gain
-        percentage of the average loss
+        Tuple[float, float]: The average gain and average gain percentage
     """
     if trades is None or len(trades) == 0:
         raise OperationalException(
@@ -338,14 +343,23 @@ def get_current_average_trade_gain(
         )
 
     gains = [t.net_gain_absolute for t in trades if t.net_gain_absolute > 0]
-    cost = sum(t.cost for t in trades if t.net_gain_absolute > 0)
 
     if not gains:
         return 0.0, 0.0
 
     average_gain = sum(gains) / len(gains)
-    percentage = (average_gain / cost) if cost > 0 else 0.0
-    return average_gain, percentage
+
+    # Updated percentage calculation to match other functions
+    percentage_returns = [
+        (t.net_gain_absolute / t.cost) for t in trades
+        if t.net_gain_absolute > 0 and t.cost > 0
+    ]
+    average_gain_percentage = (
+        sum(percentage_returns) / len(percentage_returns)
+        if percentage_returns else 0.0
+    )
+
+    return average_gain, average_gain_percentage
 
 
 def get_average_trade_loss(trades: List[Trade]) -> Tuple[float, float]:

{investing_algorithm_framework-7.16.4 → investing_algorithm_framework-7.16.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "investing-algorithm-framework"
-version = "v7.16.4"
+version = "v7.16.6"
 description = "A framework for creating trading bots"
 authors = ["MDUYN"]
 readme = "README.md"