Fix order executor priority queue

MDUYN · MDUYN · commit 3723ec8c4fe4 · 2025-05-18T00:07:01.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -153,4 +153,5 @@ bumpversion.egg-info/
 **/databases/
 .vscode/
 .logs
-venv
+venv
+**/app_logs.log
diff --git a/investing_algorithm_framework/app/app.py b/investing_algorithm_framework/app/app.py
diff --git a/investing_algorithm_framework/app/context.py b/investing_algorithm_framework/app/context.py
@@ -1205,7 +1205,7 @@ def add_stop_loss(
         self,
         trade,
         percentage: float,
-        trade_risk_type: TradeRiskType = TradeRiskType.FIXED,
+        trade_risk_type = TradeRiskType.FIXED,
         sell_percentage: float = 100,
     ):
         """
@@ -1248,7 +1248,7 @@ def add_take_profit(
         self,
         trade,
         percentage: float,
-        trade_risk_type: TradeRiskType = TradeRiskType.FIXED,
+        trade_risk_type = TradeRiskType.FIXED,
         sell_percentage: float = 100,
     ) -> None:
         """
diff --git a/investing_algorithm_framework/cli/cli.py b/investing_algorithm_framework/cli/cli.py
@@ -23,7 +23,7 @@ def cli():
     '--type',
     default="default",
     help="Type of app to create. "
-    "Options are: 'default', 'default-web', 'azure-function'."
+    "Options are: 'default', 'default_web', 'azure_function'."
 )
 @click.option(
     '--path', default=None, help="Path to directory to initialize the app in"
@@ -43,6 +43,8 @@ def init(type, path, replace):
         type (str): Type of app to create. Options are: 'default',
             'default-web', 'azure-function'.
         path (str): Path to directory to initialize the app in
+        replace (bool): If True, existing files will be replaced.
+            If False, existing files will not be replaced.
 
     Returns:
         None
diff --git a/investing_algorithm_framework/cli/templates/app-web.py.template b/investing_algorithm_framework/cli/templates/app-web.py.template
@@ -9,6 +9,7 @@ load_dotenv()
 logging.config.dictConfig(DEFAULT_LOGGING_CONFIG)
 
 app = create_app(web=True)
+app.add_market(market="binance", initial_balance=1000, trading_symbol="EUR")
 algorithm = Algorithm(name="MyTradingBot")
 algorithm.add_strategy(MyTradingStrategy)
 app.add_algorithm(algorithm)
diff --git a/investing_algorithm_framework/cli/templates/app.py.template b/investing_algorithm_framework/cli/templates/app.py.template
@@ -9,13 +9,7 @@ load_dotenv()
 logging.config.dictConfig(DEFAULT_LOGGING_CONFIG)
 
 app = create_app()
-app.add_portfolio_configuration(
-    PortfolioConfiguration(
-        initial_balance=1000,
-        trading_symbol="EUR",
-        market="bitvavo"
-    )
-)
+app.add_market(market="binance", initial_balance=1000, trading_symbol="EUR")
 algorithm = Algorithm(name="MyTradingBot")
 algorithm.add_strategy(MyTradingStrategy)
 app.add_algorithm(algorithm)
diff --git a/investing_algorithm_framework/cli/templates/app_azure_function.py.template b/investing_algorithm_framework/cli/templates/app_azure_function.py.template
@@ -8,13 +8,7 @@ from strategies.strategy import MyTradingStrategy
 load_dotenv()
 
 app = create_app()
-app.add_portfolio_configuration(
-    PortfolioConfiguration(
-        initial_balance=1000,
-        trading_symbol="EUR",
-        market="bitvavo"
-    )
-)
+app.add_market(market="binance", initial_balance=1000, trading_symbol="EUR")
 algorithm = Algorithm(name="MyTradingBot")
 algorithm.add_strategy(MyTradingStrategy)
 app.add_algorithm(algorithm)
diff --git a/investing_algorithm_framework/cli/templates/app_web.py.template b/investing_algorithm_framework/cli/templates/app_web.py.template
@@ -9,13 +9,7 @@ load_dotenv()
 logging.config.dictConfig(DEFAULT_LOGGING_CONFIG)
 
 app = create_app(web=True)
-app.add_portfolio_configuration(
-    PortfolioConfiguration(
-        initial_balance=1000,
-        trading_symbol="EUR",
-        market="bitvavo"
-    )
-)
+app.add_market(market="binance", initial_balance=1000, trading_symbol="EUR")
 algorithm = Algorithm(name="MyTradingBot")
 algorithm.add_strategy(MyTradingStrategy)
 app.add_algorithm(algorithm)
diff --git a/investing_algorithm_framework/domain/order_executor.py b/investing_algorithm_framework/domain/order_executor.py
@@ -85,3 +85,9 @@ def supports_market(self, market):
         raise NotImplementedError(
             "Subclasses must implement this method."
         )
+
+    def __repr__(self):
+        """
+        Returns a string representation of the order executor.
+        """
+        return f"{self.__class__.__name__}(priority={self._priority})"
diff --git a/investing_algorithm_framework/domain/portfolio_provider.py b/investing_algorithm_framework/domain/portfolio_provider.py
@@ -26,6 +26,13 @@ def priority(self):
         """
         return self._priority
 
+    @priority.setter
+    def priority(self, value: int):
+        """
+        Sets the priority of the portfolio provider.
+        """
+        self._priority = value
+
     @abstractmethod
     def get_order(
         self, portfolio, order, market_credential
@@ -87,3 +94,6 @@ def supports_market(self, market) -> bool:
             bool: True if the market is supported, False otherwise
         """
         raise NotImplementedError("Subclasses must implement this method.")
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}(priority={self.priority})"
diff --git a/investing_algorithm_framework/services/market_data_source_service/market_data_source_service.py b/investing_algorithm_framework/services/market_data_source_service/market_data_source_service.py
@@ -20,6 +20,19 @@ class MarketDataSourceService:
     source that matches the symbol, market and time frame provided by the user.
     If there is, it will use that market data source to get the data. If there
     is not, it will use the MarketService to get the data.
+
+    Attributes:
+        market_service: MarketService - The market service to use to get
+          the data if there is no market data source that matches the
+          symbol, market and time frame provided by the user.
+        market_credential_service: MarketCredentialService - The market
+          credential service to use to get the credentials for the market
+          data sources.
+        configuration_service: ConfigurationService - The configuration
+          service to use to get the configuration for the market data
+          sources.
+        market_data_sources: List[MarketDataSource] - The list of market
+          data sources to use to get the data.
     """
     _market_data_sources: List[MarketDataSource] = []
 
diff --git a/investing_algorithm_framework/services/portfolios/portfolio_sync_service.py b/investing_algorithm_framework/services/portfolios/portfolio_sync_service.py
@@ -87,7 +87,6 @@ def sync_unallocated(self, portfolio):
 
         portfolio_provider = self.portfolio_provider_lookup\
             .get_portfolio_provider(portfolio.market)
-
         position = portfolio_provider.get_position(
             portfolio, portfolio.trading_symbol, market_credential
         )
diff --git a/tests/resources/stubs/order_executor.py b/tests/resources/stubs/order_executor.py
@@ -15,7 +15,7 @@ def __init__(self):
         self.order_status = None
 
     def execute_order(self, portfolio, order, market_credential) -> Order:
-        order.external_id = random_string(10)
+        order.external_id = random_string(10)  
         order.status = OrderStatus.OPEN
 
         if self.order_amount is not None:
diff --git a/tests/resources/test_base.py b/tests/resources/test_base.py
@@ -198,15 +198,15 @@ def create_app(self):
                 self.iaf_app.add_market_credential(market_credential)
 
         if len(self.portfolio_configurations) > 0:
-                for portfolio_configuration in self.portfolio_configurations:
-                    self.iaf_app.add_portfolio_configuration(
-                        portfolio_configuration
-                    )
+            for portfolio_configuration in self.portfolio_configurations:
+                self.iaf_app.add_portfolio_configuration(
+                    portfolio_configuration
+                )
 
-                # Add all market credentials
-                if len(self.market_credentials) > 0:
-                    for market_credential in self.market_credentials:
-                        self.iaf_app.add_market_credential(market_credential)
+            # Add all market credentials
+            if len(self.market_credentials) > 0:
+                for market_credential in self.market_credentials:
+                    self.iaf_app.add_market_credential(market_credential)
 
         if self.initialize:
             self.iaf_app.initialize_config()
diff --git a/tests/services/test_trade_service.py b/tests/services/test_trade_service.py
@@ -3238,7 +3238,6 @@ def test_add_stop_loss_100_percent_and_take_profit_sell(self):
         )
 
         sell_order_data = trade_service.get_triggered_take_profit_orders()
-        print(sell_order_data)
         self.assertEqual(2, len(sell_order_data[0]['take_profits']))
 
         for order_data in sell_order_data:
