bbstrader 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

bbstrader/__ini__.py

@@ -3,11 +3,12 @@ Simplified Investment & Trading Toolkit
 =======================================
 
 """
-__author__      = "Bertin Balouki SIMYELI"
-__copyright__   = "2023-2025 Bertin Balouki SIMYELI"
-__email__       = "bertin@bbstrader.com"
-__license__     = "MIT"
-__version__     = '0.2.0'
+
+__author__ = "Bertin Balouki SIMYELI"
+__copyright__ = "2023-2025 Bertin Balouki SIMYELI"
+__email__ = "bertin@bbstrader.com"
+__license__ = "MIT"
+__version__ = "0.2.0"
 
 
 from bbstrader import btengine  # noqa: F401

bbstrader/btengine/execution.py

@@ -124,7 +124,7 @@ class MT5ExecutionHandler(ExecutionHandler):
         self.events = events
         self.bardata = data
         self.logger = kwargs.get("logger")
-        self.__account = Account()
+        self.__account = Account(**kwargs)
 
     def _calculate_lot(self, symbol, quantity, price):
         symbol_type = self.__account.get_symbol_type(symbol)

bbstrader/btengine/strategy.py

@@ -10,7 +10,11 @@ import pytz
 
 from bbstrader.btengine.data import DataHandler
 from bbstrader.btengine.event import FillEvent, SignalEvent
-from bbstrader.metatrader.account import Account, AdmiralMarktsGroup
+from bbstrader.metatrader.account import (
+    Account,
+    AdmiralMarktsGroup,
+    PepperstoneGroupLimited,
+)
 from bbstrader.metatrader.rates import Rates
 from bbstrader.models.optimization import optimized_weights
 from bbstrader.core.utils import TradeSignal
@@ -122,7 +126,7 @@ class MT5Strategy(Strategy):
             for asset in self.symbols:
                 if asset not in weights:
                     raise ValueError(f"Risk budget for asset {asset} is missing.")
-            total_risk = sum(weights.values())
+            total_risk = float(round(sum(weights.values())))
             if not np.isclose(total_risk, 1.0):
                 raise ValueError(f"Risk budget weights must sum to 1. got {total_risk}")
             return weights
@@ -226,7 +230,7 @@ class MT5Strategy(Strategy):
         prices = prices.dropna(axis=0, how="any")
         try:
             weights = optimized_weights(prices=prices, freq=freq, method=optimer)
-            return {symbol: weight for symbol, weight in weights.items()}
+            return {symbol: abs(weight) for symbol, weight in weights.items()}
         except Exception:
             return {symbol: 0.0 for symbol in symbols}
 
@@ -605,6 +609,7 @@ class MT5Strategy(Strategy):
         bars: DataHandler = None,
         mode: Literal["backtest", "live"] = "backtest",
         tf: str = "D1",
+        error: Literal["ignore", "raise"] = None,
     ) -> Dict[str, np.ndarray | pd.Series] | None:
         """
         Get the historical OHLCV value or returns or custum value
@@ -618,6 +623,7 @@ class MT5Strategy(Strategy):
             mode : Mode of operation for the strategy.
             window : The lookback period for resquesting the data.
             tf : The time frame for the strategy.
+            error : The error handling method for the function.
 
         Returns:
             asset_values : Historical values of the assets in the symbol list.
@@ -651,6 +657,10 @@ class MT5Strategy(Strategy):
         if all(len(values) >= window for values in asset_values.values()):
             return {a: v[-window:] for a, v in asset_values.items()}
         else:
+            if error == "raise":
+                raise ValueError("Not enough data to calculate the values.")
+            elif error == "ignore":
+                return asset_values
             return None
 
     @staticmethod
@@ -763,8 +773,20 @@ class MT5Strategy(Strategy):
         return dt_to
 
     @staticmethod
-    def get_mt5_equivalent(symbols, type="STK", path: str = None) -> List[str]:
-        account = Account(path=path)
+    def get_mt5_equivalent(symbols, type="STK", **kwargs) -> List[str]:
+        """
+        Get the MetaTrader 5 equivalent symbols for the symbols in the list.
+        This method is used to get the symbols that are available on the MetaTrader 5 platform.
+
+        Args:
+            symbols : The list of symbols to get the MetaTrader 5 equivalent symbols for.
+            type : The type of symbols to get (e.g., STK, CFD, etc.).
+            **kwargs : Additional keyword arguments for the `bbstrader.metatrader.Account` object.
+
+        Returns:
+            mt5_equivalent : The MetaTrader 5 equivalent symbols for the symbols in the list.
+        """
+        account = Account(**kwargs)
         mt5_symbols = account.get_symbols(symbol_type=type)
         mt5_equivalent = []
         if account.broker == AdmiralMarktsGroup():
@@ -773,6 +795,11 @@ class MT5Strategy(Strategy):
                 for symbol in symbols:
                     if _s.split(".")[0] == symbol or _s.split("_")[0] == symbol:
                         mt5_equivalent.append(s)
+        elif account.broker == PepperstoneGroupLimited():
+            for s in mt5_symbols:
+                for symbol in symbols:
+                    if s.split(".")[0] == symbol:
+                        mt5_equivalent.append(s)
         return mt5_equivalent
 
 

bbstrader/config.py

@@ -2,16 +2,22 @@ import logging
 from pathlib import Path
 from typing import List
 
-AMG_PATH = "C:\\Program Files\\Admirals Group MT5 Terminal\\terminal64.exe"
-FTMO_PATH = "C:\\Program Files\\FTMO MetaTrader 5\\terminal64.exe"
-XCB_PATH = "C:\\Program Files\\4xCube MT5 Terminal\\terminal64.exe"
-TML_PATH = "C:\\Program Files\\Trinota Markets MetaTrader 5 Terminal\\terminal64.exe"
+
+TERMINAL = "\\terminal64.exe"
+BASE_FOLDER = "C:\\Program Files\\"
+
+AMG_PATH = BASE_FOLDER + "Admirals Group MT5 Terminal" + TERMINAL
+XCB_PATH = BASE_FOLDER + "4xCube MT5 Terminal" + TERMINAL
+TML_PATH = BASE_FOLDER + "Trinota Markets MetaTrader 5 Terminal" + TERMINAL
+PGL_PATH = BASE_FOLDER + "Pepperstone MetaTrader 5" + TERMINAL
+FTMO_PATH = BASE_FOLDER + "FTMO MetaTrader 5" + TERMINAL
 
 BROKERS_PATHS = {
     "AMG": AMG_PATH,
     "FTMO": FTMO_PATH,
     "XCB": XCB_PATH,
     "TML": TML_PATH,
+    "PGL": PGL_PATH,
 }
 
 

bbstrader/metatrader/account.py

@@ -28,6 +28,9 @@ __all__ = [
     "Broker",
     "AdmiralMarktsGroup",
     "JustGlobalMarkets",
+    "TrinotaMarkets",
+    "XCubeLimited",
+    "PepperstoneGroupLimited",
     "FTMO",
 ]
 
@@ -36,7 +39,8 @@ __BROKERS__ = {
     "JGM": "Just Global Markets Ltd.",
     "FTMO": "FTMO S.R.O.",
     "XCB": "4xCube Limited",
-    "TML": "Trinota Markets (Global) Limited"
+    "TML": "Trinota Markets (Global) Limited",
+    "PGL": "Pepperstone Group Limited",
 }
 
 BROKERS_TIMEZONES = {
@@ -45,6 +49,7 @@ BROKERS_TIMEZONES = {
     "FTMO": "Europe/Helsinki",
     "XCB": "Europe/Helsinki",
     "TML": "Europe/Helsinki",
+    "PGL": "Europe/Helsinki",
 }
 
 _ADMIRAL_MARKETS_URL_ = (
@@ -52,8 +57,6 @@ _ADMIRAL_MARKETS_URL_ = (
 )
 _JUST_MARKETS_URL_ = "https://one.justmarkets.link/a/tufvj0xugm/registration/trader"
 _FTMO_URL_ = "https://trader.ftmo.com/?affiliates=JGmeuQqepAZLMcdOEQRp"
-_XCB_URL_ = ""
-_TML_URL_ = ""
 _ADMIRAL_MARKETS_PRODUCTS_ = [
     "Stocks",
     "ETFs",
@@ -72,27 +75,26 @@ INIT_MSG = (
     f"* If you want to trade {', '.join(_ADMIRAL_MARKETS_PRODUCTS_)}, See [{_ADMIRAL_MARKETS_URL_}]\n"
     f"* If you want to trade {', '.join(_JUST_MARKETS_PRODUCTS_)}, See [{_JUST_MARKETS_URL_}]\n"
     f"* If you are looking for a prop firm, See [{_FTMO_URL_}]\n"
-    f"* You can also look at 4xCube Limited [{_XCB_URL_}] \n and Trinota Markets (Global) Limited [{_TML_URL_}]\n"
 )
 
 amg_url = _ADMIRAL_MARKETS_URL_
 jgm_url = _JUST_MARKETS_URL_
 ftmo_url = _FTMO_URL_
-xcb_url = _XCB_URL_
-tml_url = _TML_URL_
+
 
 _SYMBOLS_TYPE_ = {
-    "STK": r"\b(Stocks?|Equities?|Shares?)\b",
     "ETF": r"\b(ETFs?)\b",
-    "IDX": r"\b(?:Indices?|Cash|Index)\b(?!.*\\(?:UKOIL|USOIL))",
+    "BOND": r"\b(Treasuries?)\b",
     "FX": r"\b(Forex|Exotics?)\b",
-    "COMD": r"\b(Metals?|Agricultures?|Energies?|OIL|Oil|USOIL|UKOIL)\b",
-    "FUT": r"\b(Futures?)\b",
+    "FUT": r"\b(Futures?|Forwards)\b",
+    "STK": r"\b(Stocks?|Equities?|Shares?)\b",
+    "IDX": r"\b(?:Indices?|Cash|Index)\b(?!.*\\(?:UKOIL|USOIL))",
+    "COMD": r"\b(Commodity|Commodities?|Metals?|Agricultures?|Energies?|OIL|Oil|USOIL|UKOIL)\b",
     "CRYPTO": r"\b(Cryptos?|Cryptocurrencies|Cryptocurrency)\b",
 }
 
 _COUNTRY_MAP_ = {
-    "USA": r"\b(US)\b",
+    "USA": r"\b(US|USA)\b",
     "AUS": r"\b(Australia)\b",
     "BEL": r"\b(Belgium)\b",
     "DNK": r"\b(Denmark)\b",
@@ -106,6 +108,9 @@ _COUNTRY_MAP_ = {
     "SWE": r"\b(Sweden)\b",
     "GBR": r"\b(UK)\b",
     "CHE": r"\b(Switzerland)\b",
+    "HKG": r"\b(Hong Kong)\b",
+    "IRL": r"\b(Ireland)\b",
+    "AUT": r"\b(Austria)\b",
 }
 
 AMG_EXCHANGES = {
@@ -205,6 +210,9 @@ class Broker(object):
     def __ne__(self, orther) -> bool:
         return self.name != orther.name
 
+    def __repr__(self):
+        return f"{self.__class__.__name__}({self.name})"
+
 
 class AdmiralMarktsGroup(Broker):
     def __init__(self, **kwargs):
@@ -232,6 +240,7 @@ class FTMO(Broker):
     def timezone(self) -> str:
         return BROKERS_TIMEZONES["FTMO"]
 
+
 class XCubeLimited(Broker):
     def __init__(self, **kwargs):
         super().__init__("4xCube Limited", **kwargs)
@@ -239,7 +248,8 @@ class XCubeLimited(Broker):
     @property
     def timezone(self) -> str:
         return BROKERS_TIMEZONES["XCB"]
-    
+
+
 class TrinotaMarkets(Broker):
     def __init__(self, **kwargs):
         super().__init__("Trinota Markets (Global) Limited", **kwargs)
@@ -249,6 +259,15 @@ class TrinotaMarkets(Broker):
         return BROKERS_TIMEZONES["TML"]
 
 
+class PepperstoneGroupLimited(Broker):
+    def __init__(self, **kwargs):
+        super().__init__("Pepperstone Group Limited", **kwargs)
+
+    @property
+    def timezone(self) -> str:
+        return BROKERS_TIMEZONES["PGL"]
+
+
 class AMP(Broker): ...
 
 
@@ -258,6 +277,7 @@ BROKERS: Dict[str, Broker] = {
     "JGM": JustGlobalMarkets(),
     "XCB": XCubeLimited(),
     "TML": TrinotaMarkets(),
+    "PGL": PepperstoneGroupLimited(),
 }
 
 
@@ -316,8 +336,6 @@ class Account(object):
                 f"For {supported['AMG'].name}, See [{amg_url}]\n"
                 f"For {supported['JGM'].name}, See [{jgm_url}]\n"
                 f"For {supported['FTMO'].name}, See [{ftmo_url}]\n"
-                f"For {supported['XCB'].name}, See [{xcb_url}]\n"
-                f"For {supported['TML'].name}, See [{tml_url}]\n"
             )
             raise InvalidBroker(message=msg)
 
@@ -584,6 +602,7 @@ class Account(object):
             - `COMD`: Commodities (e.g., 'CRUDOIL', 'GOLD')
             - `FUT`: Futures (e.g., 'USTNote_U4'),
             - `CRYPTO`: Cryptocurrencies (e.g., 'BTC', 'ETH')
+            - `BOND`: Bonds (e.g., 'USTN10YR')
 
             check_etf (bool): If True and symbol_type is 'etf', check if the
                 ETF description contains 'ETF'.
@@ -669,6 +688,7 @@ class Account(object):
                 "COMD": "Commodities",
                 "FUT": "Futures",
                 "CRYPTO": "Cryptos Assets",
+                "BOND": "Bonds",
             }
             print(f"Total {names[symbol_type]}: {len(symbol_list)}")
 
@@ -684,7 +704,7 @@ class Account(object):
 
     def get_symbol_type(
         self, symbol: str
-    ) -> Literal["STK", "ETF", "IDX", "FX", "COMD", "FUT", "CRYPTO", "unknown"]:
+    ) -> Literal["STK", "ETF", "IDX", "FX", "COMD", "FUT", "CRYPTO", "BOND", "unknown"]:
         """
         Determines the type of a given financial instrument symbol.
 
@@ -692,7 +712,7 @@ class Account(object):
             symbol (str): The symbol of the financial instrument (e.g., `GOOGL`, `EURUSD`).
 
         Returns:
-            Literal["STK", "ETF", "IDX", "FX", "COMD", "FUT", "CRYPTO", "unknown"]:
+            Literal["STK", "ETF", "IDX", "FX", "COMD", "FUT", "CRYPTO", "BOND", "unknown"]:
             The type of the financial instrument, one of the following:
 
             - `STK`: For Stocks (e.g., `GOOGL`)
@@ -702,16 +722,27 @@ class Account(object):
             - `COMD`: For Commodities (e.g., `CRUDOIL`, `GOLD`)
             - `FUT` : For Futures (e.g., `USTNote_U4`)
             - `CRYPTO`: For Cryptocurrencies (e.g., `BTC`, `ETH`)
+            - `BOND`: For Bonds (e.g., `USTN10YR`)
 
             Returns `unknown` if the type cannot be determined.
         """
 
         patterns = _SYMBOLS_TYPE_
         info = self.get_symbol_info(symbol)
+        indices = self.get_symbols(symbol_type="IDX")
+        commodity = self.get_symbols(symbol_type="COMD")
         if info is not None:
             for symbol_type, pattern in patterns.items():
-                match = re.search(pattern, info.path)  # , re.IGNORECASE
-                if match:
+                if (
+                    symbol_type in ["IDX", "COMD"]
+                    and self.broker == PepperstoneGroupLimited()
+                    and info.name.endswith("-F")
+                    and info.name in indices + commodity
+                ):
+                    symbol_type = "FUT"
+                    pattern = r"\b(Forwards?)\b"
+                search = re.compile(pattern)
+                if re.search(search, info.path):
                     return symbol_type
         return "unknown"
 
@@ -733,14 +764,15 @@ class Account(object):
         return symbol_list
 
     def get_fx_symbols(
-        self, category: Literal["majors", "minors", "exotics"] = "majors"
+        self,
+        category: Literal["majors", "minors", "exotics", "crosses", "ndfs"] = "majors",
     ) -> List[str]:
         """
         Retrieves a list of forex symbols belonging to a specific category.
 
         Args:
             category (str, optional): The category of forex symbols to retrieve.
-                                        Possible values are 'majors', 'minors', 'exotics'.
+                                        Possible values are 'majors', 'minors', 'exotics', 'crosses', 'ndfs'.
                                         Defaults to 'majors'.
 
         Returns:
@@ -750,20 +782,22 @@ class Account(object):
             ValueError: If an unsupported category is provided.
 
         Notes:
-            This mthods works primarly with Admirals Group AS products,
+            This mthods works primarly with Admirals Group AS products and Pepperstone Group Limited,
             For other brokers use `get_symbols()` or this method will use it by default.
         """
-        if self.broker != AdmiralMarktsGroup():
+        if self.broker not in [AdmiralMarktsGroup(), PepperstoneGroupLimited()]:
             return self.get_symbols(symbol_type="FX")
         else:
             fx_categories = {
                 "majors": r"\b(Majors?)\b",
                 "minors": r"\b(Minors?)\b",
                 "exotics": r"\b(Exotics?)\b",
+                "crosses": r"\b(Crosses?)\b",
+                "ndfs": r"\b(NDFs?)\b",
             }
             return self._get_symbols_by_category("FX", category, fx_categories)
 
-    def get_stocks_from_country(self, country_code: str = "USA", etf=True) -> List[str]:
+    def get_stocks_from_country(self, country_code: str = "USA", etf=False) -> List[str]:
         """
         Retrieves a list of stock symbols from a specific country.
 
@@ -782,6 +816,9 @@ class Account(object):
             * **United Kingdom:** GBR
             * **United States:** USA
             * **Switzerland:** CHE
+            * **Hong Kong:** HKG
+            * **Ireland:** IRL
+            * **Austria:** AUT
 
         Args:
             country (str, optional): The country code of stocks to retrieve.
@@ -794,11 +831,11 @@ class Account(object):
             ValueError: If an unsupported country is provided.
 
         Notes:
-            This mthods works primarly with Admirals Group AS products,
+            This mthods works primarly with Admirals Group AS products and Pepperstone Group Limited,
             For other brokers use `get_symbols()` or this method will use it by default.
         """
 
-        if self.broker != AdmiralMarktsGroup():
+        if self.broker not in [AdmiralMarktsGroup(), PepperstoneGroupLimited()]:
             stocks = self.get_symbols(symbol_type="STK")
             return stocks
         else:

bbstrader/metatrader/risk.py

@@ -11,7 +11,6 @@ from bbstrader.metatrader.utils import TIMEFRAMES, TimeFrame
 
 _COMMD_SUPPORTED_ = [
     "GOLD",
-    "XAUEUR",
     "SILVER",
     "BRENT",
     "CRUDOIL",
@@ -19,11 +18,17 @@ _COMMD_SUPPORTED_ = [
     "UKOIL",
     "XAGEUR",
     "XAGUSD",
+    "XAGAUD",
+    "XAGGBP",
     "XAUAUD",
     "XAUEUR",
     "XAUUSD",
     "XAUGBP",
     "USOIL",
+    "SpotCrude",
+    "SpotBrent",
+    "NatGas",
+    "Soybeans",
 ]
 
 _ADMIRAL_MARKETS_FUTURES_ = [
@@ -54,6 +59,27 @@ _ADMIRAL_MARKETS_FUTURES_ = [
     "_HSCEI50_",
 ]
 
+__PEPPERSTONE_FUTURES__ = [
+    "AUS200-F",
+    "GER40-F",
+    "HK50-F",
+    "JPN225-F",
+    "UK100-F",
+    "US30-F",
+    "NAS100-F",
+    "US500-F",
+    "Crude-F",
+    "Brent-F",
+    "XAUUSD-F",
+    "XAGUSD-F",
+    "USDX-F",
+    "EUSTX50-F",
+    "FRA40-F",
+    "GERTEC30-F",
+    "SPA35-F",
+    "SWI20-F",
+]
+
 __all__ = ["RiskManagement"]
 
 
@@ -303,7 +329,9 @@ class RiskManagement(Account):
         tf_int = self._convert_time_frame(self._tf)
         interval = round((minutes / tf_int) * 252)
 
-        rate = Rates(self.symbol, self._tf, 0, interval, **self.kwargs)
+        rate = Rates(
+            self.symbol, timeframe=self._tf, start_pos=0, count=interval, **self.kwargs
+        )
         returns = rate.returns * 100
         std = returns.std()
         point = self.get_symbol_info(self.symbol).point
@@ -355,7 +383,9 @@ class RiskManagement(Account):
         tf_int = self._convert_time_frame(tf)
         interval = round((minutes / tf_int) * 252)
 
-        rate = Rates(self.symbol, tf, 0, interval, **self.kwargs)
+        rate = Rates(
+            self.symbol, timeframe=tf, start_pos=0, count=interval, **self.kwargs
+        )
         returns = rate.returns * 100
         p = self.get_account_info().margin_free
         mu = returns.mean()
@@ -461,7 +491,7 @@ class RiskManagement(Account):
                 symbol = self.symbol.split(".")[0]
             elif self.symbol.endswith("xx"):
                 symbol = self.symbol[:-2]
-            elif self.symbol.endswith('-'):
+            elif self.symbol.endswith("-"):
                 symbol = self.symbol[:-1]
             else:
                 symbol = self.symbol
@@ -471,8 +501,12 @@ class RiskManagement(Account):
                     f"Supported commodity symbols are: {', '.join(supported)}"
                 )
         if FUT:
-            supported = _ADMIRAL_MARKETS_FUTURES_
-            if self.symbol[:-2] not in supported:
+            if "_" in self.symbol:
+                symbol = self.symbol[:-2]
+            else:
+                symbol = self.symbol
+            supported = _ADMIRAL_MARKETS_FUTURES_ + __PEPPERSTONE_FUTURES__
+            if str(symbol) not in supported:
                 raise ValueError(
                     f"Currency risk calculation for '{self.symbol}' is not a currently supported. \n"
                     f"Supported future symbols are: {', '.join(supported)}"

bbstrader/metatrader/trade.py

@@ -129,7 +129,7 @@ class Trade(RiskManagement):
             -   sl
             -   tp
             -   be
-        See the RiskManagement class for more details on these parameters.
+        See the ``bbstrader.metatrader.risk.RiskManagement`` class for more details on these parameters.
         See `bbstrader.metatrader.account.check_mt5_connection()` for more details on how to connect to MT5 terminal.
         """
         # Call the parent class constructor first
@@ -604,6 +604,11 @@ class Trade(RiskManagement):
                     result = self.send_order(request)
                     if result.retcode == Mt5.TRADE_RETCODE_DONE:
                         break
+            elif result.retcode == Mt5.TRADE_RETCODE_INVALID_VOLUME: #10014
+                new_volume = int(request["volume"])
+                if new_volume >= 1:
+                    request["volume"] = new_volume
+                    result = self.send_order(request)
             elif result.retcode not in self._retcodes:
                 self._retcodes.append(result.retcode)
                 msg = trade_retcode_message(result.retcode)
@@ -644,25 +649,26 @@ class Trade(RiskManagement):
             if type == "BMKT" or type == "SMKT":
                 self.opened_positions.append(result.order)
                 positions = self.get_positions(symbol=self.symbol)
-                for position in positions:
-                    if position.ticket == result.order:
-                        if position.type == 0:
-                            order_type = "BUY"
-                            self.buy_positions.append(position.ticket)
-                        else:
-                            order_type = "SELL"
-                            self.sell_positions.append(position.ticket)
-                        profit = round(self.get_account_info().profit, 5)
-                        order_info = (
-                            f"2. {order_type} Position Opened, Symbol: {self.symbol}, Price: @{round(position.price_open,5)}, "
-                            f"Sl: @{position.sl} Tp: @{position.tp}"
-                        )
-                        self.logger.info(order_info)
-                        pos_info = (
-                            f"3. [OPEN POSITIONS ON {self.symbol} = {len(positions)}, ACCOUNT OPEN PnL = {profit} "
-                            f"{self.get_account_info().currency}]\n"
-                        )
-                        self.logger.info(pos_info)
+                if positions is not None:
+                    for position in positions:
+                        if position.ticket == result.order:
+                            if position.type == 0:
+                                order_type = "BUY"
+                                self.buy_positions.append(position.ticket)
+                            else:
+                                order_type = "SELL"
+                                self.sell_positions.append(position.ticket)
+                            profit = round(self.get_account_info().profit, 5)
+                            order_info = (
+                                f"2. {order_type} Position Opened, Symbol: {self.symbol}, Price: @{round(position.price_open,5)}, "
+                                f"Sl: @{position.sl} Tp: @{position.tp}"
+                            )
+                            self.logger.info(order_info)
+                            pos_info = (
+                                f"3. [OPEN POSITIONS ON {self.symbol} = {len(positions)}, ACCOUNT OPEN PnL = {profit} "
+                                f"{self.get_account_info().currency}]\n"
+                            )
+                            self.logger.info(pos_info)
         else:
             msg = trade_retcode_message(result.retcode)
             self.logger.error(
@@ -1049,7 +1055,10 @@ class Trade(RiskManagement):
         spread = self.get_symbol_info(self.symbol).spread
         fees = self.get_stats()[0]["average_fee"] * -1
         risk = self.currency_risk()["trade_profit"]
-        fees_points = round((fees / risk), 3)
+        try:
+            fees_points = round((fees / risk), 3)
+        except ZeroDivisionError:
+            fees_points = 0
         # If Buy
         if position.type == 0 and position.price_current > position.price_open:
             # Calculate the break-even level and price
@@ -1156,7 +1165,10 @@ class Trade(RiskManagement):
         point = self.get_symbol_info(self.symbol).point
         fees = self.get_stats()[0]["average_fee"] * -1
         risk = self.currency_risk()["trade_profit"]
-        min_be = round((fees / risk)) + 2
+        try:
+            min_be = round((fees / risk)) + 2
+        except ZeroDivisionError:
+            min_be = self.symbol_info(self.symbol).spread
         be = self.get_break_even()
         if th is not None:
             win_be = th
@@ -1184,7 +1196,7 @@ class Trade(RiskManagement):
                 # The first one is the opening order
                 # The second is the closing order
                 history = self.get_trades_history(position=position, to_df=False)
-                if len(history) == 2:
+                if history is not None and len(history) == 2:
                     profit += history[1].profit
                     commission += history[0].commission
                     swap += history[0].swap
@@ -1455,7 +1467,7 @@ class Trade(RiskManagement):
             for position in self.opened_positions:
                 time.sleep(0.1)
                 history = self.get_trades_history(position=position, to_df=False)
-                if len(history) == 2:
+                if history is not None and len(history) == 2:
                     result = history[1].profit
                     comm = history[0].commission
                     swap = history[0].swap

bbstrader/trading/execution.py

@@ -110,12 +110,13 @@ def _mt5_execution(
         notify = kwargs.get("notify", False)
         signal_tickers = kwargs.get("signal_tickers", symbols)
         debug_mode = kwargs.get("debug_mode", False)
+        delay = kwargs.get("delay", 0)
         if notify:
             telegram = kwargs.get("telegram", False)
             bot_token = kwargs.get("bot_token")
             chat_id = kwargs.get("chat_id")
 
-        expert_ids = kwargs.get("expert_id")
+        expert_ids = kwargs.get("expert_ids")
         if expert_ids is None:
             expert_ids = list(
                 set([trade.expert_id for trade in trades_instances.values()])
@@ -192,8 +193,9 @@ def _mt5_execution(
         symbol_type = account.get_symbol_type(symbol)
         desc = account.get_symbol_info(symbol).description
         sigmsg = (
-            f"SIGNAL = {signal}, SYMBOL={symbol}, TYPE={symbol_type}, DESCRIPTION={desc}, "
-            f"PRICE={price}, STOPLIMIT={stoplimit}, STRATEGY={STRATEGY}, TIMEFRAME={time_frame}"
+            f"SIGNAL = {signal}, \nSYMBOL={symbol}, \nTYPE={symbol_type}, \nDESCRIPTION={desc}, "
+            f"\nPRICE={price}, \nSTOPLIMIT={stoplimit}, \nSTRATEGY={STRATEGY}, \nTIMEFRAME={time_frame}"
+            f"\nBROKER={account.broker.name}, \nTIMESTAMP={datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
         )
         msg = f"Sending {signal} Order ... SYMBOL={symbol}, STRATEGY={STRATEGY}"
         tfmsg = f"Time Frame Not completed !!! SYMBOL={symbol}, STRATEGY={STRATEGY}"
@@ -399,10 +401,11 @@ def _mt5_execution(
         elif trade_time % iter_time == 0:
             time_intervals += iter_time
         else:
-            raise ValueError(
-                f"iter_time must be a multiple of the {time_frame} !!!"
-                f"(e.g., if time_frame is 15m, iter_time must be 1.5, 3, 3, 15 etc)"
-            )
+            if use_trade_time:
+                raise ValueError(
+                    f"iter_time must be a multiple of the {time_frame} !!!"
+                    f"(e.g., if time_frame is 15m, iter_time must be 1.5, 3, 5, 15 etc)"
+                )
         try:
             FRIDAY = "friday"
             check_mt5_connection(**kwargs)
@@ -449,15 +452,15 @@ def _mt5_execution(
                         period_end_action == "sleep" and today != FRIDAY or not closing
                     ):
                         sleep_time = trades_instances[symbols[-1]].sleep_time()
-                        sleepmsg(sleep_time)
-                        time.sleep(60 * sleep_time)
+                        sleepmsg(sleep_time + delay)
+                        time.sleep(60 * sleep_time + delay)
                         logger.info(sessionmsg)
                     elif period_end_action == "sleep" and today == FRIDAY:
                         sleep_time = trades_instances[symbols[-1]].sleep_time(
                             weekend=True
                         )
-                        sleepmsg(sleep_time)
-                        time.sleep(60 * sleep_time)
+                        sleepmsg(sleep_time + delay)
+                        time.sleep(60 * sleep_time + delay)
                         logger.info(sessionmsg)
 
             elif period.lower() == "week":
@@ -476,8 +479,8 @@ def _mt5_execution(
 
                 if day_end and today != FRIDAY:
                     sleep_time = trades_instances[symbols[-1]].sleep_time()
-                    sleepmsg(sleep_time)
-                    time.sleep(60 * sleep_time)
+                    sleepmsg(sleep_time + delay)
+                    time.sleep(60 * sleep_time + delay)
                     logger.info(sessionmsg)
                 elif day_end and today == FRIDAY:
                     strategy.perform_period_end_checks()
@@ -487,8 +490,8 @@ def _mt5_execution(
                         sleep_time = trades_instances[symbols[-1]].sleep_time(
                             weekend=True
                         )
-                        sleepmsg(sleep_time)
-                        time.sleep(60 * sleep_time)
+                        sleepmsg(sleep_time + delay)
+                        time.sleep(60 * sleep_time + delay)
                         logger.info(sessionmsg)
 
             elif period.lower() == "month":
@@ -501,7 +504,7 @@ def _mt5_execution(
                     elif (
                         trade.days_end()
                         and today == FRIDAY
-                        and num_days / len(symbols) >= 20
+                        and num_days >= 20
                     ) and closing:
                         for id in expert_ids:
                             trade.close_positions(
@@ -511,17 +514,17 @@ def _mt5_execution(
                         trade.statistics(save=True)
                 if day_end and today != FRIDAY:
                     sleep_time = trades_instances[symbols[-1]].sleep_time()
-                    sleepmsg(sleep_time)
-                    time.sleep(60 * sleep_time)
+                    sleepmsg(sleep_time + delay)
+                    time.sleep(60 * sleep_time + delay)
                     logger.info(sessionmsg)
                     num_days += 1
                 elif day_end and today == FRIDAY:
                     sleep_time = trades_instances[symbols[-1]].sleep_time(weekend=True)
-                    sleepmsg(sleep_time)
-                    time.sleep(60 * sleep_time)
+                    sleepmsg(sleep_time + delay)
+                    time.sleep(60 * sleep_time + delay)
                     logger.info(sessionmsg)
                     num_days += 1
-                elif day_end and today == FRIDAY and num_days / len(symbols) >= 20:
+                elif day_end and today == FRIDAY and num_days >= 20:
                     strategy.perform_period_end_checks()
                     break
         except Exception:

{bbstrader-0.2.5.dist-info → bbstrader-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bbstrader
-Version: 0.2.5
+Version: 0.2.7
 Summary: Simplified Investment & Trading Toolkit
 Home-page: https://github.com/bbalouki/bbstrader
 Download-URL: https://pypi.org/project/bbstrader/
@@ -24,7 +24,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
 Requires-Dist: pandas_ta
-Requires-Dist: numpy==1.26.4
+Requires-Dist: numpy<2.0.0
 Requires-Dist: yfinance
 Requires-Dist: scipy
 Requires-Dist: hmmlearn
@@ -74,6 +74,13 @@ Dynamic: summary
 ![bbstrader](https://github.com/bbalouki/bbstrader/blob/main/assets/bbstrader_logo.png?raw=true)
 
 [![Documentation Status](https://readthedocs.org/projects/bbstrader/badge/?version=latest)](https://bbstrader.readthedocs.io/en/latest/?badge=latest)
+[![PYPI Version](https://img.shields.io/pypi/v/bbstrader)](https://pypi.org/project/bbstrader/)
+[![PyPi status](https://img.shields.io/pypi/status/bbstrader.svg?maxAge=60)](https://pypi.python.org/pypi/bbstrader)
+[![Supported Python Versions](https://img.shields.io/pypi/pyversions/bbstrader)](https://pypi.org/project/bbstrader/)
+[![PyPI Downloads](https://static.pepy.tech/badge/bbstrader)](https://pepy.tech/projects/bbstrader)
+[![CodeFactor](https://www.codefactor.io/repository/github/bbalouki/bbstrader/badge)](https://www.codefactor.io/repository/github/bbalouki/bbstrader)
+[![LinkedIn](https://img.shields.io/badge/LinkedIn-grey?logo=Linkedin&logoColor=white)](https://www.linkedin.com/in/bertin-balouki-simyeli-15b17a1a6/)
+[![PayPal Me](https://img.shields.io/badge/PayPal%20Me-blue?logo=paypal)](https://paypal.me/bertinbalouki?country.x=SN&locale.x=en_US)
 
 [Dcoumentation](https://bbstrader.readthedocs.io/en/latest/index.html)
 
@@ -86,7 +93,7 @@ BBSTrader is a trading system suite developed for MetaTrader 5 (MT5) and IBKR pl
 - **Backtesting Module (btengine)** : Enables traders to rigorously test their trading strategies using historical data to evaluate performance before live deployment.
 - **Trading Strategies Module**: A collection of predefined trading strategies, including ARIMA+GARCH models, Kalman Filters, and Simple Moving Averages, equipped with risk management through Hidden Markov Models.
 - **MetaTrader5 Module (metatrader)**: Facilitates the direct execution of trading strategies on the MetaTrader 5 platform, supporting real-time trading across multiple financial instruments.
-- **Modles Module**: Serves as a framework for implementing various types of financial models (risk managment models, Machine learing models etc).
+- **Models Module**: Serves as a framework for implementing various types of financial models (risk managment models, Machine learing models etc).
 - **Time serie Module (tseries)** designed for conducting advanced time series analysis in financial markets. 
 It leverages statistical models and algorithms to perform tasks such as cointegration testing, volatility modeling, and filter-based estimation to assist in trading strategy development, market analysis, and financial data exploration.
 

{bbstrader-0.2.5.dist-info → bbstrader-0.2.7.dist-info}/RECORD

@@ -1,24 +1,24 @@
-bbstrader/__ini__.py,sha256=c2TwxnJi0PtvigdAbAS2wsTAd7CnvwRHUrYr-s4wEsI,567
-bbstrader/config.py,sha256=mdzx-xKLnEOpVYkS-0EarEl1BI1Mhcwgp7WgymJUgD0,4086
+bbstrader/__ini__.py,sha256=x9sw2BKGnPi3QF4MwBqJpCpyUgui1StbvBWGNISVAhQ,548
+bbstrader/config.py,sha256=USwdS5qaGbc1Wp5rF0ckP3R1HEZJ8tY0tkZX4CkgNoc,4204
 bbstrader/tseries.py,sha256=GYNDo03dYEnYHwcQYKpclNDGCwvZ_qAPyou0vhQndS0,69851
 bbstrader/btengine/__init__.py,sha256=FL0kC0NcsnlTH-yuTv4lu6AexY1wZKN1AQ9rv9MZagQ,3009
 bbstrader/btengine/backtest.py,sha256=ZzGhoN-_g0cF-OCyk173imze2OXEhykHTUiJ9MowDO8,14582
 bbstrader/btengine/data.py,sha256=qVDk-cIgtWAeBM5eW08j9MFXBzu4yeWChoFIL9WINYI,26899
 bbstrader/btengine/event.py,sha256=38mhZH9d53C4x7bZER2B0O6M18txzS4u7zveKyxeP5Y,8603
-bbstrader/btengine/execution.py,sha256=DTsONYzc6B3wgPVxhCjWCgQhPofMJQmVOycBVkhIdgM,10368
+bbstrader/btengine/execution.py,sha256=6YfErbqJx2DTy6r4cfZLU8F1YsJG-p8jEhNepdb9Sxc,10376
 bbstrader/btengine/performance.py,sha256=0meGbMFYzzI9n_09qf4RFpdyqQmCa6C_iu6PvE2POIE,10787
 bbstrader/btengine/portfolio.py,sha256=M97FONcdZRoSKFFF66LRsO8_KLXr128AI5-LULhMiKk,16167
-bbstrader/btengine/strategy.py,sha256=21LSf3Jn2WBbqj9x0a8voU_xw_Q7_Uja-NLX00FRE9U,31749
+bbstrader/btengine/strategy.py,sha256=EiE1P_V0wlFIsA-2U5POQ7qtRMkr1OTH1pQia4jBcGY,32937
 bbstrader/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bbstrader/core/data.py,sha256=3_odj9jxokyKU15j1aHTlgLQDjW75tKqGpCUfkpYq2Q,452
 bbstrader/core/utils.py,sha256=oB4OC0tQDJ1FIaJCuNWUlTzOccHoACSJsP_f7ELrqXQ,1448
 bbstrader/ibkr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bbstrader/ibkr/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bbstrader/metatrader/__init__.py,sha256=rrL_EtecsOCD2Cwhmpgta5CjSGT0K6vzSBiQoyCLe3M,283
-bbstrader/metatrader/account.py,sha256=uuHZcc_bJOzrCIrXzMoMtkl41EVPep1jqNrOMfYl14E,56895
+bbstrader/metatrader/account.py,sha256=Le46-lFqYm4VGQn3nPl1DUVCuiuxNi3EVf56kF8gA5Y,58221
 bbstrader/metatrader/rates.py,sha256=12hNcjRSKcOSjBAhDvpakqAiLaI0ndU6oBhCTIWDzr0,21089
-bbstrader/metatrader/risk.py,sha256=pflsprtnEG8BgudmV_IiQvxuUty4bKYnnzZ6s1Yplug,26910
-bbstrader/metatrader/trade.py,sha256=zlVzz5-z-1nJe3-BefTEHed6zQj6GOWkjHlALguoov4,72974
+bbstrader/metatrader/risk.py,sha256=H8Iz93g3EVnb9bOdi4RSFF9JN1CY-IutYHs9-epBTpQ,27579
+bbstrader/metatrader/trade.py,sha256=k6IeKaC83sH_th9uNxeEIlNBzVoSzK1J-0jKIDIA7rc,73639
 bbstrader/metatrader/utils.py,sha256=UnwWmmfgY-Cw1V0vL14ehuWr9AhjcJMtVZK8k19b0i4,17672
 bbstrader/models/__init__.py,sha256=SnGBMQ-zcUIpms3oNeqg7EVDFpg-7OPjNAD8kvi_Q84,508
 bbstrader/models/factors.py,sha256=dWuXh83hLkwxUp3XwjgUl-r3_cjVcV_s0aFRlSLIfo8,13332
@@ -27,11 +27,11 @@ bbstrader/models/optimization.py,sha256=gp0n9a9vwbUldaNiZUYry_4RP2NW0VFZ2k5NoOkz
 bbstrader/models/portfolio.py,sha256=-Zq9cmzyOZUlGq9RWfAxClpX0KJZqYZYpc5EGNTcPGI,8302
 bbstrader/models/risk.py,sha256=IFQoHXxpBwJiifANRgwyAUOp7EgTWBAhfJFCO1sGR3g,15405
 bbstrader/trading/__init__.py,sha256=2VoxbzfP1XBLVuxJtjRhjEBCtnv9HqwQzfMV4B5mM7M,468
-bbstrader/trading/execution.py,sha256=3HlsgXcCqG6P4_F3d5uUQPVE-clsX6_frxyo3fiEuRA,30723
+bbstrader/trading/execution.py,sha256=fFywdEJXtVSSxKNGTpRnFHiprTI1jmDNd94Ox1F1aU4,30999
 bbstrader/trading/scripts.py,sha256=pNwHr-3mW87G5fyIMd93wS43NkzOZn4npt4fLNnSUyk,1922
 bbstrader/trading/strategies.py,sha256=rMvLIhX_8MQg7_Lbo127UqdTRxBUof2m3jgRQTm55p0,37019
-bbstrader-0.2.5.dist-info/LICENSE,sha256=P3PBO9RuYPzl6-PkjysTNnwmwMB64ph36Bz9DBj8MS4,1115
-bbstrader-0.2.5.dist-info/METADATA,sha256=vvgqvdWfhKFQcQdWlpHheGbOkGBcegJHmkk2NVyyLsc,10399
-bbstrader-0.2.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-bbstrader-0.2.5.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
-bbstrader-0.2.5.dist-info/RECORD,,
+bbstrader-0.2.7.dist-info/LICENSE,sha256=P3PBO9RuYPzl6-PkjysTNnwmwMB64ph36Bz9DBj8MS4,1115
+bbstrader-0.2.7.dist-info/METADATA,sha256=Ce_IeZ9fc-yb5dGN3pmq60woLrcos_WBi3T_Tras30k,11271
+bbstrader-0.2.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+bbstrader-0.2.7.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
+bbstrader-0.2.7.dist-info/RECORD,,