Merge pull request #184 from bbalouki/bbs-dev

updates

Author: juniorep

VERSION.txt

@@ -1 +1 @@
-2.0.6
+2.0.7

src/bbstrader/metatrader/account.py

@@ -621,7 +621,11 @@ def _fetch_history(
         drop_cols: List[str],
         time_cols: List[str],
     ) -> Any:
-        date_to = date_to or datetime.now()
+        from zoneinfo import ZoneInfo
+
+        tz = self.broker.get_terminal_timezone()
+        date_to = date_to or datetime.now(tz=ZoneInfo(tz))
+        date_from = date_from.astimezone(tz=ZoneInfo(tz))
 
         filters = [group, ticket, position]
         if sum(f is not None for f in filters) > 1:
@@ -734,7 +738,6 @@ def get_trades_history(
             >>> account = Account()
             >>> history = account.get_trades_history(from_date, to_date)
         """
-
         return self._fetch_history(
             fetch_type="deals",
             drop_cols=["time_msc", "external_id"],
@@ -853,7 +856,13 @@ def get_today_deals(self, id, group=None) -> List[TradeDeal]:
         Returns:
             List[TradeDeal]: List of today deals
         """
-        history = self.get_trades_history(group=group, to_df=False) or []
+
+        from datetime import timedelta
+
+        from_date = datetime.now() - timedelta(days=3)
+        history = (
+            self.get_trades_history(date_from=from_date, group=group, to_df=False) or []
+        )
         positions_ids = set([deal.position_id for deal in history if deal.magic == id])
         today_deals = []
         for position in positions_ids:

src/bbstrader/metatrader/copier.py

@@ -416,7 +416,6 @@ def _add_logger(self, custom_logger):
     def log_message(
         self, message, type: Literal["info", "error", "debug", "warning"] = "info"
     ):
-        logger.trace
         if self.log_queue:
             try:
                 now = datetime.now()
@@ -904,7 +903,7 @@ def process_all_orders(self, destination, max_workers=10):
 
         if not orders_actions:
             return
-        with cf.ThreadPoolExecutor(max_workers=max_workers) as executor:
+        with cf.ProcessPoolExecutor(max_workers=max_workers) as executor:
             list(executor.map(self._execute_order_action, orders_actions))
 
     def _get_new_positions(
@@ -1031,7 +1030,7 @@ def process_all_positions(self, destination, max_workers=20):
 
         if not positions_actions:
             return
-        with cf.ThreadPoolExecutor(max_workers=max_workers) as executor:
+        with cf.ProcessPoolExecutor(max_workers=max_workers) as executor:
             list(executor.map(self._execute_position_action, positions_actions))
 
     def copy_orders(self, destination: dict):

src/bbstrader/metatrader/trade.py

@@ -626,7 +626,7 @@ def request_result(self, price: float, request: Dict[str, Any], type: Buys | Sel
         except Exception as e:
             msg = trade_retcode_message(result.retcode) if result else "N/A"
             LOGGER.error(f"Trade Order Request, {msg}{addtionnal}, {e}")
-            return
+            return False
         if result and result.retcode != Mt5.TRADE_RETCODE_DONE:
             if result.retcode == Mt5.TRADE_RETCODE_INVALID_FILL:  # 10030
                 for fill in FILLING_TYPE:
@@ -658,7 +658,7 @@ def request_result(self, price: float, request: Dict[str, Any], type: Buys | Sel
                     except Exception as e:
                         msg = trade_retcode_message(result.retcode) if result else "N/A"
                         LOGGER.error(f"Trade Order Request, {msg}{addtionnal}, {e}")
-                        return
+                        return False
                     if result and result.retcode == Mt5.TRADE_RETCODE_DONE:
                         break
                     tries += 1
@@ -1078,7 +1078,7 @@ def break_even_request(self, tiket, price, request):
         except Exception as e:
             msg = trade_retcode_message(result.retcode) if result else "N/A"
             LOGGER.error(f"Break-Even Order Request, {msg}{addtionnal}, Error: {e}")
-            return
+            return False
         if result and result.retcode != Mt5.TRADE_RETCODE_DONE:
             msg = trade_retcode_message(result.retcode)
             if result.retcode != Mt5.TRADE_RETCODE_NO_CHANGES:
@@ -1098,7 +1098,7 @@ def break_even_request(self, tiket, price, request):
                         LOGGER.error(
                             f"Break-Even Order Request, {msg}{addtionnal}, Error: {e}"
                         )
-                        return
+                        return False
                     if result and result.retcode == Mt5.TRADE_RETCODE_DONE:
                         break
                 tries += 1
@@ -1183,7 +1183,7 @@ def close_request(self, request: dict, type: str):
             LOGGER.error(
                 f"Closing {type.capitalize()} Request, RETCODE={msg}{addtionnal}, Error: {e}"
             )
-            return
+            return False
 
         if result and result.retcode != Mt5.TRADE_RETCODE_DONE:
             if result.retcode == Mt5.TRADE_RETCODE_INVALID_FILL:  # 10030
@@ -1210,7 +1210,7 @@ def close_request(self, request: dict, type: str):
                         LOGGER.error(
                             f"Closing {type.capitalize()} Request, {msg}{addtionnal}, Error: {e}"
                         )
-                        return
+                        return False
                     if result and result.retcode == Mt5.TRADE_RETCODE_DONE:
                         break
                     tries += 1
@@ -1269,7 +1269,7 @@ def modify_order(
             LOGGER.error(
                 f"Unable to modify Order #{ticket}, RETCODE={msg}, Error: {e}"
             )
-            return
+            return False
         if result and result.retcode == Mt5.TRADE_RETCODE_DONE:
             LOGGER.info(
                 f"Order #{ticket} modified, SYMBOL={self.symbol}, PRICE={round(request['price'], 5)},"
@@ -1374,9 +1374,6 @@ def bulk_close(
             order_type = "open"
 
         if not tickets:
-            LOGGER.info(
-                f"No {order_type.upper()} {tikets_type.upper()} to close, SYMBOL={self.symbol}."
-            )
             return
         failed_tickets = []
         with ThreadPoolExecutor(max_workers=min(len(tickets), 20)) as executor:
@@ -1481,15 +1478,10 @@ def is_max_trades_reached(self) -> bool:
 
         :return: bool
         """
-        negative_deals = 0
         max_trades = self.rm.max_trade()
         today_deals = self.get_today_deals(group=self.symbol)
-        for deal in today_deals:
-            if deal.profit < 0:
-                negative_deals += 1
-        if negative_deals >= max_trades:
-            return True
-        return False
+        negative_deals = [deal for deal in today_deals if deal.profit < 0]
+        return len(negative_deals) >= max_trades
 
     def get_stats(self) -> Tuple[Dict[str, Any], Dict[str, Any]]:
         """Retrieves aggregated session and historical trading performance."""

tests/metatrader/test_account.py

@@ -14,6 +14,7 @@ def mock_mt5_client():
             "bbstrader.metatrader.account.check_mt5_connection"
         ) as mock_check_connection,
         patch("bbstrader.metatrader.account.client") as mock_client,
+        patch("bbstrader.metatrader.broker.client") as mock_broker_client,
     ):
         mock_check_connection.return_value = True
         mock_account_info = MagicMock()
@@ -30,6 +31,16 @@ def mock_mt5_client():
         mock_terminal_info.company = "Test Broker"
         mock_client.terminal_info.return_value = mock_terminal_info
 
+        mock_symbol = MagicMock()
+        mock_symbol.name = "EURUSD"
+        mock_client.symbols_get.return_value = [mock_symbol]
+        mock_broker_client.symbols_get.return_value = [mock_symbol]
+
+        mock_tick = MagicMock()
+        mock_tick.time = 0
+        mock_client.symbol_info_tick.return_value = mock_tick
+        mock_broker_client.symbol_info_tick.return_value = mock_tick
+
         yield mock_client