investing-algorithm-framework 3.5.0__tar.gz → 3.5.2__tar.gz

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investing-algorithm-framework
-Version: 3.5.0
+Version: 3.5.2
 Summary: A framework for creating trading bots
 Author: MDUYN
 Requires-Python: >=3.8.1,<4.0.0

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/app/app.py

@@ -239,8 +239,8 @@ class App:
         self,
         backtest_start_date,
         backtest_end_date,
-        pending_order_check_interval,
         market_data_sources,
+        pending_order_check_interval=None,
     ) -> None:
         """
         Initialize the app for backtesting by setting the configuration
@@ -261,9 +261,11 @@ class App:
         configuration_service.config[BACKTESTING_START_DATE] = \
             backtest_start_date
         configuration_service.config[BACKTESTING_END_DATE] = backtest_end_date
-        configuration_service.config[
-            BACKTESTING_PENDING_ORDER_CHECK_INTERVAL
-        ] = pending_order_check_interval
+
+        if pending_order_check_interval is not None:
+            configuration_service.config[
+                BACKTESTING_PENDING_ORDER_CHECK_INTERVAL
+            ] = pending_order_check_interval
 
         # Create resource dir if not exits
         self._create_resource_directory_if_not_exists()
@@ -498,7 +500,6 @@ class App:
             while self.algorithm.running:
                 if number_of_iterations_since_last_orders_check == 30:
                     logger.info("Checking pending orders")
-                    self.algorithm.check_pending_orders()
                     number_of_iterations_since_last_orders_check = 1
 
                 self.algorithm.run_jobs()
@@ -675,7 +676,7 @@ class App:
         algorithm,
         start_date,
         end_date,
-        pending_order_check_interval='1h',
+        pending_order_check_interval=None,
         output_directory=None
     ) -> BacktestReport:
         """
@@ -740,7 +741,7 @@ class App:
         start_date: Optional[datetime] = None,
         end_date: Optional[datetime] = None,
         date_ranges: Optional[Tuple[datetime, datetime]] = None,
-        pending_order_check_interval='1h',
+        pending_order_check_interval=None,
         output_directory=None
     ) -> List[BacktestReport]:
         """

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/app/strategy.py

@@ -60,6 +60,10 @@ class TradingStrategy:
             )
 
     def run_strategy(self, algorithm, market_data):
+        # Check pending orders before running the strategy
+        algorithm.check_pending_orders()
+
+        # Run user defined strategy
         self.apply_strategy(algorithm=algorithm, market_data=market_data)
 
     def apply_strategy(self, algorithm, market_data):

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/infrastructure/models/market_data_sources/ccxt.py

@@ -237,7 +237,7 @@ class CCXTTickerBacktestMarketDataSource(
     backtest_data_directory = None
     backtest_data_start_date = None
     backtest_data_end_date = None
-    timeframe = "15m"
+    timeframe = None
     column_names = ["Datetime", "Open", "High", "Low", "Close", "Volume"]
 
     def __init__(
@@ -245,16 +245,23 @@ class CCXTTickerBacktestMarketDataSource(
         identifier,
         market,
         symbol=None,
-        timeframe="15m",
+        timeframe=None,
     ):
         super().__init__(
             identifier=identifier,
             market=market,
             symbol=symbol,
         )
+
         if timeframe is not None:
             self.timeframe = timeframe
 
+        if self.timeframe is None:
+            raise OperationalException(
+                "timeframe should be set for "
+                "CCXTTickerBacktestMarketDataSource"
+            )
+
     def prepare_data(
         self,
         config,

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/services/backtesting/backtest_service.py

@@ -150,7 +150,7 @@ class BacktestService:
                     market_data[data_id] = \
                         self._market_data_source_service.get_data(data_id)
 
-        self._order_service.check_pending_orders()
+        # self._order_service.check_pending_orders()
         strategy.run_strategy(algorithm=algorithm, market_data=market_data)
 
     def generate_schedule(

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/services/market_data_source_service/backtest_market_data_source_service.py

@@ -109,7 +109,12 @@ class BacktestMarketDataSourceService(MarketDataSourceService):
         )
 
     def get_ohlcv(
-        self, symbol, from_timestamp, market, time_frame, to_timestamp=None
+        self,
+        symbol,
+        from_timestamp,
+        time_frame=None,
+        market=None,
+        to_timestamp=None
     ):
         market_data_source = self.get_ohlcv_market_data_source(
             symbol=symbol, market=market, time_frame=time_frame

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/services/market_data_source_service/market_data_source_service.py

@@ -60,8 +60,8 @@ class MarketDataSourceService:
     def get_ohlcv(
         self,
         symbol,
-        time_frame,
         from_timestamp,
+        time_frame,
         market=None,
         to_timestamp=None
     ):
@@ -85,7 +85,6 @@ class MarketDataSourceService:
         )
 
     def get_data(self, identifier):
-        print(self._market_data_sources)
         for market_data_source in self._market_data_sources:
             if market_data_source.get_identifier() == identifier:
                 return market_data_source.get_data(
@@ -110,24 +109,36 @@ class MarketDataSourceService:
 
         return None
 
-    def get_ohlcv_market_data_source(self, symbol, time_frame, market=None):
+    def get_ohlcv_market_data_source(
+        self, symbol, time_frame=None, market=None
+    ):
 
         if self.market_data_sources is not None:
+
             for market_data_source in self._market_data_sources:
                 if isinstance(market_data_source, OHLCVMarketDataSource):
 
-                    if market is not None:
+                    if market is not None and time_frame is not None:
 
                         if market_data_source.market.lower() == market.lower()\
                                 and market_data_source.symbol.lower() \
                                 == symbol.lower() and \
                                 market_data_source.timeframe == time_frame:
                             return market_data_source
-                    else:
+                    elif market is not None:
+                        if market_data_source.market.lower() == market.lower()\
+                                and market_data_source.symbol.lower() \
+                                == symbol.lower():
+                            return market_data_source
+                    elif time_frame is not None:
                         if market_data_source.symbol.lower() \
                                 == symbol.lower() and \
                                 market_data_source.timeframe == time_frame:
                             return market_data_source
+                    else:
+                        if market_data_source.symbol.lower() \
+                                == symbol.lower():
+                            return market_data_source
 
         return None
 

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/investing_algorithm_framework/services/order_service/order_backtest_service.py

@@ -67,13 +67,18 @@ class OrderBacktestService(OrderService):
                      f"/{order.trading_symbol.upper()}"
             position = self.position_repository.get(order.position_id)
             portfolio = self.portfolio_repository.get(position.portfolio_id)
+            timeframe = None
+
+            if BACKTESTING_PENDING_ORDER_CHECK_INTERVAL in \
+                    self.configuration_service.config:
+                timeframe = self.configuration_service\
+                    .config[BACKTESTING_PENDING_ORDER_CHECK_INTERVAL]
 
             if not self._market_data_source_service\
                     .is_ohlcv_data_source_present(
                         symbol=symbol,
                         market=portfolio.market,
-                        time_frame=self.configuration_service
-                        .config[BACKTESTING_PENDING_ORDER_CHECK_INTERVAL]
+                        time_frame=timeframe
                     ):
                 raise OperationalException(
                     f"OHLCV data source not found for {symbol} "
@@ -90,12 +95,11 @@ class OrderBacktestService(OrderService):
             df = self._market_data_source_service.get_ohlcv(
                 symbol=symbol,
                 market=portfolio.market,
+                time_frame=timeframe,
                 to_timestamp=self.configuration_service.config.get(
                     BACKTESTING_INDEX_DATETIME
                 ),
                 from_timestamp=order.get_created_at(),
-                time_frame=self.configuration_service
-                .config[BACKTESTING_PENDING_ORDER_CHECK_INTERVAL]
             )
 
             if self.has_executed(order, df):

{investing_algorithm_framework-3.5.0 → investing_algorithm_framework-3.5.2}/pyproject.toml

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