bbstrader 0.2.4__tar.gz → 0.2.6__tar.gz

{bbstrader-0.2.4/bbstrader.egg-info → bbstrader-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bbstrader
-Version: 0.2.4
+Version: 0.2.6
 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.4 → bbstrader-0.2.6}/README.md

@@ -2,6 +2,13 @@
 ![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)
 
@@ -14,7 +21,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.4 → bbstrader-0.2.6}/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-0.2.4 → bbstrader-0.2.6}/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-0.2.4 → bbstrader-0.2.6}/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-0.2.4 → bbstrader-0.2.6}/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-0.2.4 → bbstrader-0.2.6}/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-0.2.4 → bbstrader-0.2.6}/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"]
 
 
@@ -461,18 +487,22 @@ 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
-            if symbol in supported:
+            if str(symbol) not in supported:
                 raise ValueError(
                     f"Currency risk calculation for '{self.symbol}' is not a currently supported. \n"
                     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-0.2.4 → bbstrader-0.2.6}/bbstrader/metatrader/trade.py

@@ -457,7 +457,7 @@ class Trade(RiskManagement):
             request["tp"] = mm_price + take_profit * point
         self.break_even(mm=mm, id=Id)
         if self.check(comment):
-            (self.request_result(_price, request, action),)
+            self.request_result(_price, request, action)
 
     def _order_type(self):
         type = {
@@ -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)

{bbstrader-0.2.4 → bbstrader-0.2.6}/bbstrader/trading/execution.py

@@ -115,7 +115,7 @@ def _mt5_execution(
             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()])

{bbstrader-0.2.4 → bbstrader-0.2.6/bbstrader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bbstrader
-Version: 0.2.4
+Version: 0.2.6
 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.4 → bbstrader-0.2.6}/bbstrader.egg-info/requires.txt

@@ -1,6 +1,6 @@
 pandas
 pandas_ta
-numpy==1.26.4
+numpy<2.0.0
 yfinance
 scipy
 hmmlearn

{bbstrader-0.2.4 → bbstrader-0.2.6}/requirements.txt

@@ -1,6 +1,6 @@
 pandas
 pandas_ta
-numpy==1.26.4
+numpy<2.0.0
 yfinance
 scipy
 hmmlearn

{bbstrader-0.2.4 → bbstrader-0.2.6}/setup.py

@@ -16,7 +16,7 @@ with io.open(path.join(here, "README.md"), encoding="utf-8") as f:
 with io.open(path.join(here, "requirements.txt"), encoding="utf-8") as f:
     REQUIREMENTS = [line.rstrip() for line in f]
 
-VERSION = "0.2.04"
+VERSION = "0.2.06"
 DESCRIPTION = "Simplified Investment & Trading Toolkit"
 
 KEYWORDS = [