investing-algorithm-framework 7.16.11__py3-none-any.whl → 7.16.13__py3-none-any.whl

investing_algorithm_framework/__init__.py

@@ -14,7 +14,7 @@ from .domain import ApiException, combine_backtests, PositionSize, \
     Position, TimeFrame, INDEX_DATETIME, MarketCredential, \
     PortfolioConfiguration, RESOURCE_DIRECTORY, AWS_LAMBDA_LOGGING_CONFIG, \
     Trade, SYMBOLS, RESERVED_BALANCES, APP_MODE, AppMode, DATETIME_FORMAT, \
-    BacktestDateRange, convert_polars_to_pandas, \
+    BacktestDateRange, convert_polars_to_pandas, BacktestRun, \
     DEFAULT_LOGGING_CONFIG, DataType, DataProvider, \
     TradeStatus, TradeRiskType, generate_backtest_summary_metrics, \
     APPLICATION_DIRECTORY, DataSource, OrderExecutor, PortfolioProvider, \
@@ -189,4 +189,5 @@ __all__ = [
     "get_negative_trades",
     "get_positive_trades",
     "get_number_of_trades",
+    "BacktestRun"
 ]

investing_algorithm_framework/domain/models/portfolio/portfolio_snapshot.py

@@ -150,23 +150,24 @@ class PortfolioSnapshot(BaseModel):
         if datetime_format is not None:
             created_at = self.created_at.strftime(datetime_format) \
                 if self.created_at else None
-
         else:
             created_at = self.created_at.strftime(DEFAULT_DATETIME_FORMAT)
 
         return {
-            "metadata": self.metadata,
-            "portfolio_id": self.portfolio_id,
-            "trading_symbol": self.trading_symbol,
-            "pending_value": self.pending_value,
-            "unallocated": self.unallocated,
-            "total_net_gain": self.total_net_gain,
-            "total_revenue": self.total_revenue,
-            "total_cost": self.total_cost,
-            "cash_flow": self.cash_flow,
-            "net_size": self.net_size,
-            "created_at": created_at,
-            "total_value": self.total_value,
+            "metadata": self.metadata if self.metadata else {},
+            "portfolio_id": self.portfolio_id if self.portfolio_id else "",
+            "trading_symbol": self.trading_symbol
+            if self.trading_symbol else "",
+            "pending_value": self.pending_value if self.pending_value else 0.0,
+            "unallocated": self.unallocated if self.unallocated else 0.0,
+            "total_net_gain": self.total_net_gain
+            if self.total_net_gain else 0.0,
+            "total_revenue": self.total_revenue if self.total_revenue else 0.0,
+            "total_cost": self.total_cost if self.total_cost else 0.0,
+            "cash_flow": self.cash_flow if self.cash_flow else 0.0,
+            "net_size": self.net_size if self.net_size else 0.0,
+            "created_at": created_at if created_at else "",
+            "total_value": self.total_value if self.total_value else 0.0,
         }
 
     @staticmethod

investing_algorithm_framework/domain/models/trade/trade.py

@@ -283,14 +283,14 @@ class Trade(BaseModel):
             "trading_symbol": self.trading_symbol,
             "status": self.status,
             "amount": self.amount,
-            "remaining": self.remaining,
+            "remaining": self.remaining if self.remaining is not None else 0,
             "open_price": self.open_price,
             "last_reported_price": self.last_reported_price,
             "opened_at": opened_at,
             "closed_at": closed_at,
             "updated_at": updated_at,
-            "net_gain": self.net_gain,
-            "cost": self.cost,
+            "net_gain": self.net_gain if self.net_gain is not None else 0,
+            "cost": self.cost if self.cost is not None else 0,
             "stop_losses": [
                 stop_loss.to_dict(datetime_format=datetime_format)
                 for stop_loss in self.stop_losses

investing_algorithm_framework/services/backtesting/backtest_service.py

@@ -165,13 +165,19 @@ class BacktestService:
             portfolio_configurations = []
             portfolio_configurations.append(
                 PortfolioConfiguration(
+                    identifier="vector_backtest",
                     market=market,
                     trading_symbol=trading_symbol,
                     initial_balance=initial_amount
                 )
             )
 
+        portfolio_configuration = portfolio_configurations[0]
+
         trading_symbol = portfolio_configurations[0].trading_symbol
+        portfolio = Portfolio.from_portfolio_configuration(
+            portfolio_configuration
+        )
 
         # Load vectorized backtest data
         data = self._data_provider_service.get_vectorized_backtest_data(
@@ -188,7 +194,9 @@ class BacktestService:
         index = pd.Index([])
 
         most_granular_ohlcv_data_source = \
-            self._get_most_granular_ohlcv_data_source(strategy.data_sources)
+            BacktestService.get_most_granular_ohlcv_data_source(
+                strategy.data_sources
+            )
         most_granular_ohlcv_data = self._data_provider_service.get_ohlcv_data(
                 symbol=most_granular_ohlcv_data_source.symbol,
                 start_date=backtest_date_range.start_date,
@@ -212,6 +220,8 @@ class BacktestService:
         granular_ohlcv_data_order_by_symbol = {}
         snapshots = [
             PortfolioSnapshot(
+                trading_symbol=trading_symbol,
+                portfolio_id=portfolio.identifier,
                 created_at=backtest_date_range.start_date,
                 unallocated=initial_amount,
                 total_value=initial_amount,
@@ -346,7 +356,7 @@ class BacktestService:
                         {
                             "orders": trade_orders,
                             "closed_at": current_date,
-                            "trade_status": TradeStatus.CLOSED,
+                            "status": TradeStatus.CLOSED,
                             "updated_at": current_date,
                             "net_gain": net_gain_val
                         }
@@ -392,6 +402,7 @@ class BacktestService:
             # total_net_gain = total_value - initial_amount
             snapshots.append(
                 PortfolioSnapshot(
+                    portfolio_id=portfolio.identifier,
                     created_at=interval_datetime,
                     unallocated=unallocated,
                     total_value=unallocated + allocated,
@@ -580,7 +591,7 @@ class BacktestService:
         )
 
     @staticmethod
-    def _get_most_granular_ohlcv_data_source(data_sources):
+    def get_most_granular_ohlcv_data_source(data_sources):
         """
         Get the most granular data source from a list of data sources.
 

{investing_algorithm_framework-7.16.11.dist-info → investing_algorithm_framework-7.16.13.dist-info}/METADATA

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

{investing_algorithm_framework-7.16.11.dist-info → investing_algorithm_framework-7.16.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-investing_algorithm_framework/__init__.py,sha256=UwHvSZuc4UnjRY7MD4LqaZQFhMl1uiTJXqI8kkvikug,6826
+investing_algorithm_framework/__init__.py,sha256=rYv3eJDD0QbOPXCvK-Ye8oml63MYM_QLqXrt6vFpHk8,6857
 investing_algorithm_framework/app/__init__.py,sha256=x683g8hvp5yERywt0CFWLavMcTDnCwVVUW_g3o5kyOc,1539
 investing_algorithm_framework/app/algorithm/__init__.py,sha256=-a9o9bTfAhW9qSW-bKvlLQuMCf-YXxIztudo2TxMjCI,136
 investing_algorithm_framework/app/algorithm/algorithm.py,sha256=v8AZZ7hr5ZKJbavk242xCUpGHv3mKZ4sqfGV7BwPgdU,6854
@@ -115,7 +115,7 @@ investing_algorithm_framework/domain/models/order/order_type.py,sha256=d0TkR5hjZ
 investing_algorithm_framework/domain/models/portfolio/__init__.py,sha256=gMMZG6Owvbsq7jL9PhhRbqV8tM9oebGUY8Yc6zedHj4,230
 investing_algorithm_framework/domain/models/portfolio/portfolio.py,sha256=xUUk9mEwuJLhDPpA6nVmY6AZtFjA1bHrye0mTbAmgUs,5503
 investing_algorithm_framework/domain/models/portfolio/portfolio_configuration.py,sha256=EX3RXeAEGqwZj5oXVCsaYSP7TysRTqLL_9iu5ViW8gE,2737
-investing_algorithm_framework/domain/models/portfolio/portfolio_snapshot.py,sha256=MubaXZrLvIBF82vStYe1VOs5E1Bmde3CzmvGmT1Tow0,6538
+investing_algorithm_framework/domain/models/portfolio/portfolio_snapshot.py,sha256=w8-nyhGC4ZZzvNv31MkuGGcRQhVsKD2uSknGxVpNSP0,6901
 investing_algorithm_framework/domain/models/position/__init__.py,sha256=Iv4-DUwgwf521P5qCu6R3WSVZxPeEtGoHP8WsS3qNUU,123
 investing_algorithm_framework/domain/models/position/position.py,sha256=MSE1hHowJEUF9ljjSeUnvMLU0eLy1gdL6P7cwExzwZM,1575
 investing_algorithm_framework/domain/models/position/position_snapshot.py,sha256=BpMhUTn--oUVXQHi62uOb4Ac7yuBwHW3iUCFpBPOtW0,1131
@@ -127,7 +127,7 @@ investing_algorithm_framework/domain/models/time_unit.py,sha256=dCi1lcVK-QGlOt6y
 investing_algorithm_framework/domain/models/tracing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investing_algorithm_framework/domain/models/tracing/trace.py,sha256=iAVEN102-y_7Wj9Qg7kdti8-2I63Y8UG0SF3V2pkHj8,699
 investing_algorithm_framework/domain/models/trade/__init__.py,sha256=2hX5zmAodsEuFeFghsQhinNobXVuc4oYcMeczY2sbsc,308
-investing_algorithm_framework/domain/models/trade/trade.py,sha256=lsiBYs_cJKrSCoprag6hhhL9uGmgi--hBycIPXMLGHM,12855
+investing_algorithm_framework/domain/models/trade/trade.py,sha256=CAOhDEdX6Ot3PlpFWm8kJP47G4t1ceY9hNWhZK-s1D0,12960
 investing_algorithm_framework/domain/models/trade/trade_risk_type.py,sha256=f-1bOc2GkdphPL3ewPzgsZ5OLX2_fc2e1DVARDl1RRc,839
 investing_algorithm_framework/domain/models/trade/trade_status.py,sha256=9b5QDwg8vsu_iRtGWatJ1rJFubjIWslKHTG3cK0zVQ4,1004
 investing_algorithm_framework/domain/models/trade/trade_stop_loss.py,sha256=B9mBALaqOu2VI9v_PTv6C2ZrP6afTEi7seBD8kZi7bw,10366
@@ -202,7 +202,7 @@ investing_algorithm_framework/infrastructure/services/azure/__init__.py,sha256=P
 investing_algorithm_framework/infrastructure/services/azure/state_handler.py,sha256=EUk4PdVl6RQ19DuWdrC4DzgOhGcL3qiZKWgWh_obT4E,5240
 investing_algorithm_framework/services/__init__.py,sha256=9p0Y2enp6UMOlU4qJgVoojHBRARLGefNzbPxgSCN0wI,4999
 investing_algorithm_framework/services/backtesting/__init__.py,sha256=sD6JMQVuUT8NRKV77VC9jyGnHcGox0W2n9eA-4ydeHY,84
-investing_algorithm_framework/services/backtesting/backtest_service.py,sha256=jNd3s0qc9_PGMZAKnW0PB8kQ8Mub05n7UMcq2eB1s-8,23707
+investing_algorithm_framework/services/backtesting/backtest_service.py,sha256=cH_LOvDxkPI9rp8ic1eqGqtWYo7EW60nZEfBYwJ50jI,24112
 investing_algorithm_framework/services/configuration_service.py,sha256=BCgiBlrLjMjfU4afmjYaHu9gOWNmgaxhf6RBN2XJkw0,2853
 investing_algorithm_framework/services/data_providers/__init__.py,sha256=OHVccpIYGc-1B2AkCI_2Nhsb9KMaAUrng4DHhIbFD8Y,96
 investing_algorithm_framework/services/data_providers/data_provider_service.py,sha256=Tv5W38rshK7sG7XEhp7L-McdiNWAAlvU_1ScSdt1NCE,28420
@@ -252,8 +252,8 @@ investing_algorithm_framework/services/trade_order_evaluator/default_trade_order
 investing_algorithm_framework/services/trade_order_evaluator/trade_order_evaluator.py,sha256=pNnmgaKMR9RY6Kxq7xS0nURKoaQDe2ehrP5GfElkkcI,1328
 investing_algorithm_framework/services/trade_service/__init__.py,sha256=AcwPyJjDRdiREnl_MWMkDSc-V-ZjXtvpHD6eQT9mc1o,68
 investing_algorithm_framework/services/trade_service/trade_service.py,sha256=OtzIS5EebByGcqDvV2AFeBjXSarvrgubMXDaVKg6Rbw,41193
-investing_algorithm_framework-7.16.11.dist-info/LICENSE,sha256=wbVEDvoZiMPHufRY3sLEffvAr7GH5hOIngHF8y4HFQg,11343
-investing_algorithm_framework-7.16.11.dist-info/METADATA,sha256=2zYYO7C5y7OYuUwcIVSOdmJVGIanjNbIohwd7c9cl4M,19636
-investing_algorithm_framework-7.16.11.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-investing_algorithm_framework-7.16.11.dist-info/entry_points.txt,sha256=jrPF0YksDs27vYzEvj3tXLe3OGWU24EJA05z5xHqmq8,91
-investing_algorithm_framework-7.16.11.dist-info/RECORD,,
+investing_algorithm_framework-7.16.13.dist-info/LICENSE,sha256=wbVEDvoZiMPHufRY3sLEffvAr7GH5hOIngHF8y4HFQg,11343
+investing_algorithm_framework-7.16.13.dist-info/METADATA,sha256=z5XVhd9gCbPlf5UC7xXtwybpMRh6o_hM7dOHw4_q2o8,19636
+investing_algorithm_framework-7.16.13.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+investing_algorithm_framework-7.16.13.dist-info/entry_points.txt,sha256=jrPF0YksDs27vYzEvj3tXLe3OGWU24EJA05z5xHqmq8,91
+investing_algorithm_framework-7.16.13.dist-info/RECORD,,