bbstrader 0.2.95__py3-none-any.whl → 0.2.97__py3-none-any.whl

bbstrader/models/risk.py

@@ -68,7 +68,7 @@ class RiskModel(metaclass=ABCMeta):
             such as historical returns or volatility, used to
             assess market conditions.
         """
-        raise NotImplementedError("Should implement which_trade_allowed()")
+        pass
 
     @abstractmethod
     def which_quantity_allowed(self):
@@ -76,7 +76,7 @@ class RiskModel(metaclass=ABCMeta):
         Defines the strategy for asset allocation within
         the portfolio to optimize risk-reward ratio.
         """
-        raise NotImplementedError("Should implement which_quantity_allowed()")
+        pass
 
 
 class HMMRiskManager(RiskModel):

bbstrader/trading/execution.py

@@ -8,10 +8,9 @@ from loguru import logger as log
 
 from bbstrader.btengine.strategy import MT5Strategy, Strategy
 from bbstrader.config import BBSTRADER_DIR
-from bbstrader.core.utils import TradeAction
 from bbstrader.metatrader.account import Account, check_mt5_connection
-from bbstrader.metatrader.trade import Trade
-from bbstrader.trading.scripts import send_message
+from bbstrader.metatrader.trade import Trade, TradeAction
+from bbstrader.trading.utils import send_message
 
 try:
     import MetaTrader5 as MT5
@@ -114,6 +113,7 @@ def _mt5_execution(
     comment,
     **kwargs,
 ):
+    global logger
     logger = kwargs.get("logger", log)
 
     def _print_exc(dm, msg):
@@ -168,6 +168,7 @@ def _mt5_execution(
                 if symbol not in weights:
                     continue
                 trade = trades_instances[symbol]
+                assert daily_risk is not None
                 dailydd = round(weights[symbol] * daily_risk, 5)
                 trade.dailydd = dailydd
 
@@ -212,7 +213,9 @@ def _mt5_execution(
         f"Running {STRATEGY} Strategy in {time_frame} Interval ..., ACCOUNT={ACCOUNT}"
     )
 
-    def run_trade_algorithm(signal, symbol, id, trade: Trade, price, stoplimit):
+    def run_trade_algorithm(
+        signal, symbol, id, trade: Trade, price, stoplimit, comment
+    ):
         signal = "BMKT" if signal == "LONG" or signal == "BUY" else signal
         signal = "SMKT" if signal == "SHORT" or signal == "SELL" else signal
         info = f"SIGNAL = {signal}, SYMBOL={symbol}, STRATEGY={STRATEGY}, TIMEFRAME={time_frame} , ACCOUNT={ACCOUNT}"
@@ -242,9 +245,13 @@ def _mt5_execution(
                         if notify:
                             _send_notification(sigmsg, symbol)
                         if position_type in POSITIONS_TYPES:
-                            trade.close_positions(position_type=order_type, id=id)
+                            trade.close_positions(
+                                position_type=order_type, id=id, comment=comment
+                            )
                         else:
-                            trade.close_orders(order_type=order_type, id=id)
+                            trade.close_orders(
+                                order_type=order_type, id=id, comment=comment
+                            )
         elif signal in BUYS and not long_market[symbol]:
             if use_trade_time:
                 if time_intervals % trade_time == 0 or buys[symbol] is None:
@@ -412,6 +419,7 @@ def _mt5_execution(
                                 trade,
                                 signal.price,
                                 signal.stoplimit,
+                                signal.comment or comment,
                             )
                     else:
                         if len(symbols) >= 10:
@@ -592,6 +600,9 @@ def _mt5_execution(
             )
             _print_exc(debug_mode, msg)
             continue
+        except KeyboardInterrupt:
+            logger.info("Stopping the Execution Engine ...")
+            break
 
 
 def _tws_execution(*args, **kwargs):
@@ -819,7 +830,7 @@ def mt5_engine(account_id: str, **kwargs):
 
 def RunMt5Engines(accounts: Dict[str, Dict], start_delay: float = 1.0):
     """Runs multiple MT5 execution engines in parallel using multiprocessing.
-    
+
     Args:
         accounts: Dictionary of accounts to run the execution engines on.
             Keys are the account names or IDs and values are the parameters for the execution engine.

bbstrader/trading/scripts.py

@@ -1,69 +1,155 @@
-import asyncio
+import argparse
+import json
+import multiprocessing as mp
+import os
+import sys
 
-from notifypy import Notify
-from telegram import Bot
-from telegram.error import TelegramError
+from bbstrader.btengine import MT5Strategy, Strategy
+from bbstrader.core.utils import load_class, load_module
+from bbstrader.metatrader.trade import create_trade_instance
+from bbstrader.trading.execution import mt5_engine
 
+EXECUTION_PATH = os.path.expanduser("~/.bbstrader/execution/execution.py")
+CONFIG_PATH = os.path.expanduser("~/.bbstrader/execution/execution.json")
 
-__all__ = ["send_telegram_message", "send_notification", "send_message"]
 
+def load_config(config_path, strategy_name, account=None):
+    if not os.path.exists(config_path):
+        raise FileNotFoundError(f"Configuration file not found at {config_path}")
+    with open(config_path, "r") as f:
+        config = json.load(f)
+    try:
+        config = config[strategy_name]
+    except KeyError:
+        raise ValueError(
+            f"Strategy {strategy_name} not found in the configuration file."
+        )
+    if account is not None:
+        try:
+            config = config[account]
+        except KeyError:
+            raise ValueError(f"Account {account} not found in the configuration file.")
+    if config.get("symbol_list") is None:
+        raise ValueError("symbol_list is required in the configuration file.")
+    if config.get("trades_kwargs") is None:
+        raise ValueError("trades_kwargs is required in the configuration file.")
+    return config
 
-async def send_telegram_message(token, chat_id, text=""):
-    """
-    Send a message to a telegram chat
 
-    Args:
-        token: str: Telegram bot token
-        chat_id: int or str or list: Chat id or list of chat ids
-        text: str: Message to send
-    """
-    try:
-        bot = Bot(token=token)
-        if isinstance(chat_id, (int, str)):
-            chat_id = [chat_id]
-        for id in chat_id:
-            await bot.send_message(chat_id=id, text=text)
-    except TelegramError as e:
-        print(f"Error sending message: {e}")
+def worker_function(account, args):
+    strategy_module = load_module(args.path)
+    strategy_class = load_class(strategy_module, args.strategy, (MT5Strategy, Strategy))
 
+    config = load_config(args.config, args.strategy, account)
+    symbol_list = config.pop("symbol_list")
+    trades_kwargs = config.pop("trades_kwargs")
+    trades = create_trade_instance(symbol_list, trades_kwargs)
 
-def send_notification(title, message=""):
-    """
-    Send a desktop notification
+    kwargs = {
+        "symbol_list": symbol_list,
+        "trades_instances": trades,
+        "strategy_cls": strategy_class,
+        "account": account,
+        **config,
+    }
+    mt5_engine(account, **kwargs)
 
-    Args:
-        title: str: Title of the notification
-        message: str: Message of the notification
-    """
-    notification = Notify(default_notification_application_name="bbstrading")
-    notification.title = title
-    notification.message = message
-    notification.send()
-
-
-def send_message(
-    title="SIGNAL",
-    message="New signal",
-    notify_me=False,
-    telegram=False,
-    token=None,
-    chat_id=None,
-):
-    """
-    Send a message to the user
-
-    Args:
-        title: str: Title of the message
-        message: str: Message of the message
-        notify_me: bool: Send a desktop notification
-        telegram: bool: Send a telegram message
-        token: str: Telegram bot token
-        chat_id: int or str or list: Chat id or list of chat ids
+
+def mt5_terminal(args):
+    if args.parallel:
+        if len(args.account) == 0:
+            raise ValueError(
+                "account or accounts are required when running in parallel"
+            )
+
+        processes = []
+        try:
+            for account in args.account:
+                p = mp.Process(target=worker_function, args=(account, args))
+                p.start()
+                processes.append(p)
+
+            for p in processes:
+                p.join()
+        except Exception as e:
+            print(f"Error in parallel execution: {e}")
+            raise e
+        except KeyboardInterrupt:
+            print("\nTerminating Execution...")
+            for p in processes:
+                p.terminate()
+            for p in processes:
+                p.join()
+            print("Execution terminated")
+    else:
+        worker_function(None, args)
+
+
+def tws_terminal(args):
+    raise NotImplementedError("TWS terminal is not implemented yet")
+
+
+def execute_strategy(unknown):
+    HELP_MSG = """
+    Execute a strategy on one or multiple MT5 accounts.
+
+    Usage:
+        python -m bbstrader --run execution [options]
+
+    Options:
+        -s, --strategy: Strategy class name to run
+        -a, --account: Account(s) name(s) or ID(s) to run the strategy on (must be the same as in the configuration file)
+        -p, --path: Path to the execution file (default: ~/.bbstrader/execution/execution.py)
+        -c, --config: Path to the configuration file (default: ~/.bbstrader/execution/execution.json)
+        -l, --parallel: Run the strategy in parallel (default: False)
+        -t, --terminal: Terminal to use (default: MT5)
+        -h, --help: Show this help message and exit
+    
+    Note:
+        The configuration file must contain all the required parameters 
+        to create trade instances for each account and strategy.
+        The configuration file must be a dictionary with the following structure:
+        If parallel is True:
+        {
+            "strategy_name": {
+                "account_name": {
+                    "symbol_list": ["symbol1", "symbol2"],
+                    "trades_kwargs": {"param1": "value1", "param2": "value2"}
+                    **other_parameters (for the strategy and the execution engine)
+                }
+            }
+        }
+        If parallel is False:
+        {
+            "strategy_name": {
+                "symbol_list": ["symbol1", "symbol2"],
+                "trades_kwargs": {"param1": "value1", "param2": "value2"}
+                **other_parameters (for the strategy and the execution engine)
+            }
+        }
+        See bbstrader.metatrader.trade.create_trade_instance for more details on the trades_kwargs.
+        See bbstrader.trading.execution.MT5ExecutionEngine for more details on the other parameters.
+        
+        All other paramaters must be python built-in types. 
+        If you have custom type you must set them in your strategy class 
+        or run the MT5ExecutionEngine directly, don't run on CLI.
     """
-    if notify_me:
-        send_notification(title, message=message)
-    if telegram:
-        if token is None or chat_id is None:
-            raise ValueError("Token and chat_id must be provided")
-        asyncio.run(send_telegram_message(token, chat_id, text=message))
+    if "-h" in unknown or "--help" in unknown:
+        print(HELP_MSG)
+        sys.exit(0)
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-s", "--strategy", type=str, required=True)
+    parser.add_argument("-a", "--account", type=str, nargs="*", default=[])
+    parser.add_argument("-p", "--path", type=str, default=EXECUTION_PATH)
+    parser.add_argument("-c", "--config", type=str, default=CONFIG_PATH)
+    parser.add_argument("-l", "--parallel", action="store_true")
+    parser.add_argument(
+        "-t", "--terminal", type=str, default="MT5", choices=["MT5", "TWS"]
+    )
+    args = parser.parse_args(unknown)
 
+    if args.terminal == "MT5":
+        mt5_terminal(args)
+    elif args.terminal == "TWS":
+        tws_terminal(args)

bbstrader/trading/strategies.py

@@ -1,5 +1,11 @@
 """
 Strategies module for trading strategies backtesting and execution.
+
+DISCLAIMER: 
+This module is for educational purposes only and should not be
+considered as financial advice. Always consult with a qualified financial advisor before making any investment decisions. 
+The authors and contributors of this module are not responsible for any financial losses or damages incurred as a result of using 
+this module or the information contained herein.
 """
 
 from datetime import datetime

bbstrader/trading/utils.py

@@ -0,0 +1,69 @@
+import asyncio
+
+from notifypy import Notify
+from telegram import Bot
+from telegram.error import TelegramError
+
+
+__all__ = ["send_telegram_message", "send_notification", "send_message"]
+
+
+async def send_telegram_message(token, chat_id, text=""):
+    """
+    Send a message to a telegram chat
+
+    Args:
+        token: str: Telegram bot token
+        chat_id: int or str or list: Chat id or list of chat ids
+        text: str: Message to send
+    """
+    try:
+        bot = Bot(token=token)
+        if isinstance(chat_id, (int, str)):
+            chat_id = [chat_id]
+        for id in chat_id:
+            await bot.send_message(chat_id=id, text=text)
+    except TelegramError as e:
+        print(f"Error sending message: {e}")
+
+
+def send_notification(title, message=""):
+    """
+    Send a desktop notification
+
+    Args:
+        title: str: Title of the notification
+        message: str: Message of the notification
+    """
+    notification = Notify(default_notification_application_name="bbstrading")
+    notification.title = title
+    notification.message = message
+    notification.send()
+
+
+def send_message(
+    title="SIGNAL",
+    message="New signal",
+    notify_me=False,
+    telegram=False,
+    token=None,
+    chat_id=None,
+):
+    """
+    Send a message to the user
+
+    Args:
+        title: str: Title of the message
+        message: str: Message of the message
+        notify_me: bool: Send a desktop notification
+        telegram: bool: Send a telegram message
+        token: str: Telegram bot token
+        chat_id: int or str or list: Chat id or list of chat ids
+    """
+    if notify_me:
+        send_notification(title, message=message)
+    if telegram:
+        if token is None or chat_id is None:
+            raise ValueError("Token and chat_id must be provided")
+        asyncio.run(send_telegram_message(token, chat_id, text=message))
+

{bbstrader-0.2.95.dist-info → bbstrader-0.2.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bbstrader
-Version: 0.2.95
+Version: 0.2.97
 Summary: Simplified Investment & Trading Toolkit
 Home-page: https://github.com/bbalouki/bbstrader
 Download-URL: https://pypi.org/project/bbstrader/
@@ -58,6 +58,14 @@ Requires-Dist: lightgbm
 Requires-Dist: alphalens-reloaded
 Requires-Dist: pyfiglet
 Requires-Dist: colorama
+Requires-Dist: praw
+Requires-Dist: tweepy
+Requires-Dist: beautifulsoup4
+Requires-Dist: dash
+Requires-Dist: nltk
+Requires-Dist: spacy
+Requires-Dist: textblob
+Requires-Dist: vaderSentiment
 Provides-Extra: mt5
 Requires-Dist: MetaTrader5; extra == "mt5"
 Dynamic: author
@@ -69,6 +77,7 @@ Dynamic: download-url
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: maintainer
 Dynamic: project-url
 Dynamic: provides-extra

{bbstrader-0.2.95.dist-info → bbstrader-0.2.97.dist-info}/RECORD

@@ -1,44 +1,45 @@
 bbstrader/__ini__.py,sha256=v6zyJHj5FMRL-_P7AwnTGbCF-riMqhqlTvDgfulj7go,621
-bbstrader/__main__.py,sha256=Fg-Ft1EXKbAn1FzZ94ak6kbVHarhrCEmm0dH9lDPMlA,1484
+bbstrader/__main__.py,sha256=EtfD-TrAphboYxwfe7-WeD-1d4bJceeBputFrV-W-qQ,1525
 bbstrader/compat.py,sha256=djbHMvTvy0HYm1zyZ6Ttp_LMwP2PqTSVw1r7pqbz7So,487
 bbstrader/config.py,sha256=c2nCUw-bYWf5kkyFls5Nqld8HdMczexSilTni7rYUBw,3973
 bbstrader/tseries.py,sha256=H4D_A966HdN8YjBfuCcF8QBQdhjOrTcidR98wP2KN_I,68339
 bbstrader/btengine/__init__.py,sha256=y1btjaEfhWsH8vuE7mBRpP9Tu-Azt9REhuVYsPCAfBU,2955
 bbstrader/btengine/backtest.py,sha256=ZzGhoN-_g0cF-OCyk173imze2OXEhykHTUiJ9MowDO8,14582
-bbstrader/btengine/data.py,sha256=UpHW27o7cb9ibQJ6JYovfG_zyxA9SCwR0-Zv7zUQxSM,27296
+bbstrader/btengine/data.py,sha256=Tuc6M8itbGpPjsfRpZBB8v0FJpPt7-hUkP6I5meP0Sg,26927
 bbstrader/btengine/event.py,sha256=38mhZH9d53C4x7bZER2B0O6M18txzS4u7zveKyxeP5Y,8603
-bbstrader/btengine/execution.py,sha256=Ij5dLc9mGgtWp2dKAH5oURplA3RS_ZtwTwSrp9IYfpk,10644
+bbstrader/btengine/execution.py,sha256=mXY0tyFv6G1XF48R5Kx2-pDnwu1mUyOc0ZeeysQG62A,10587
 bbstrader/btengine/performance.py,sha256=1ecWrTzHBQbk4ORvbTEKxwCzlL1brcXOEUwgbnjAwx4,12470
 bbstrader/btengine/portfolio.py,sha256=mh2_zNJDmKzb0lo55PXhbXYxXMmXRA4YLkgzwxRMuZE,16110
 bbstrader/btengine/scripts.py,sha256=8o66dq4Ex4DsH4s8xvJqUOFjLzZJSnbBvvNBzohtzoE,4837
-bbstrader/btengine/strategy.py,sha256=c-wvotJdhHu5FWAlPkv33LfjoW-7ID2G0Di_hc7CYMM,33217
-bbstrader/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bbstrader/core/data.py,sha256=0EhB-bI3QRjFRyfDfebrNAAmViXtXFPHbEsGpJKI5oM,430
-bbstrader/core/utils.py,sha256=dpP2qPFxo-gEvlzHvhoTH89UkftqiAqUJ6Lz04UDfRs,4079
+bbstrader/btengine/strategy.py,sha256=PFIb9gUWahaXpzCFL-RchpBumlEJsz5Elbz_A2qZ8Jc,31285
+bbstrader/core/__init__.py,sha256=GIFzFSStPfE0XM2j7mDeZZQeMTh_AwPsDOQXwMVJLgw,97
+bbstrader/core/data.py,sha256=VPuynoT0uFYduh7la8gZSnEv_Gq8Xu2vJZJ7TfQMll8,18797
+bbstrader/core/utils.py,sha256=WjuabzBjhY65ku2KL-f7CMalE2x-wrX-6mCA_qhhFPE,2728
 bbstrader/ibkr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bbstrader/ibkr/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bbstrader/metatrader/__init__.py,sha256=A5Ye9tpc2sp9Xk5qjKw-EfYsoRcZtAt8nqvC3tCtZs8,333
 bbstrader/metatrader/account.py,sha256=qAFqCPmoUjiqjY5M9sjbSvh-STjQUGdFCHOEcB7uoDI,56493
-bbstrader/metatrader/copier.py,sha256=AOuoNWafNiQiZ4IIjWBG5b7UhdyYMXK6-myEPDl1O9g,31761
+bbstrader/metatrader/copier.py,sha256=-cFroX4M1q9rlupU4xLP0N6lR8ZbP_izUOQ2sBe_lFc,31797
 bbstrader/metatrader/rates.py,sha256=0bKyjGnafZ19DwC0-IxXUBJzOdAo-cNmhabwhKLxcos,20585
 bbstrader/metatrader/risk.py,sha256=pwG4q1_uPGgPlokDGVNtd04O6p28yIbgT-evvHuo-Qc,27029
 bbstrader/metatrader/scripts.py,sha256=Yjp7Un-wDTInptHS_rPFpXNKWbVM871VEkaHxsO2MPQ,2115
-bbstrader/metatrader/trade.py,sha256=6FbFywRPu0_TlB31lTMb3VjACw1GPQsi7RjQNtJnh6w,76780
+bbstrader/metatrader/trade.py,sha256=Q1cArcpMnovRTED0kwMybcpwPB28rQKXLcJV4jldF0w,81202
 bbstrader/metatrader/utils.py,sha256=lYIvAeiL_ceACmkVNo4-QRopias08KyBUI7THfdj3c0,17103
-bbstrader/models/__init__.py,sha256=du7qdXH0RYF_GHmYGcD78QAOlAHYwhEBc2HPkVdv0IY,498
+bbstrader/models/__init__.py,sha256=s2mJrtKePXQaw_PvcrtPCD2mPCdVXP4Myzg0MlLVipo,547
 bbstrader/models/factors.py,sha256=5kSAOS1MHvTZ-Ti03TtjOxl_EvC-V_9e389xeR_82ak,13020
-bbstrader/models/ml.py,sha256=3jPDSQm_XZda6yClGqm6SrTczvWWdmHIU-UKsMohu5g,47519
+bbstrader/models/ml.py,sha256=tCr7YyODl0CDoOUpYqJ1q12ls86Sc-_Fu3b2Y0Z7TJ8,47551
+bbstrader/models/nlp.py,sha256=P7SYaTIqEBldjwYfS6IrO66Y6-ioDXUrCSf3bZxQrDE,28073
 bbstrader/models/optimization.py,sha256=vnks6uxFZdqXgxaZJNxq8z0IH45KZ8yaXo38JhIVKGc,6399
 bbstrader/models/portfolio.py,sha256=r-47Zrn2r7iKCHm5YVtwkbBJXAZGM3QYy-rXCWY9-Bg,8079
-bbstrader/models/risk.py,sha256=Efr7dKcr37n75TXv5rcgSYNDPu2Plzcn65AOOIh9x_8,15007
+bbstrader/models/risk.py,sha256=JQOXPshMOru6Eb0AMU6oKCNzg6mlGfL6_tN90lWcVBE,14878
 bbstrader/trading/__init__.py,sha256=ycLyuuxN5SujqtzR9X0Q74UQfK93q2va-GGAXdr-KS8,457
-bbstrader/trading/execution.py,sha256=UOdXdQ1IYgCTG1GHwjhyLRIJnBDHuhVMyK_qjzdPlYY,34649
-bbstrader/trading/script.py,sha256=wR5TUrHn-Cd2kzfURXn14VTCEZ-QA8ydwYHayMPK0oI,5720
-bbstrader/trading/scripts.py,sha256=57dKF9dcRu04oU2VRqydRrzW39dCW2wlDWhVt-sZdRw,1857
-bbstrader/trading/strategies.py,sha256=yibrXPa8yw8KCNkJEmNaygjfleCNgA_T58vizGS584I,36159
-bbstrader-0.2.95.dist-info/LICENSE,sha256=ZwC_RqqGmOPBUiMDKqLyJZ5HBeHq53LpL7TMRzrJY8c,1094
-bbstrader-0.2.95.dist-info/METADATA,sha256=NhjLD936Qj-MskepQdXccTqs1M8v1z_K2aT5ylo1MF8,11381
-bbstrader-0.2.95.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-bbstrader-0.2.95.dist-info/entry_points.txt,sha256=0yDCbhbgHswOzJnY5wRSM_FjjyMHGvY7lJpSSVh0xtI,54
-bbstrader-0.2.95.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
-bbstrader-0.2.95.dist-info/RECORD,,
+bbstrader/trading/execution.py,sha256=4-XyRll1x8gfF68cTZXjtRF79csDx_oKNI0F71cv1Bw,35028
+bbstrader/trading/scripts.py,sha256=wR5TUrHn-Cd2kzfURXn14VTCEZ-QA8ydwYHayMPK0oI,5720
+bbstrader/trading/strategies.py,sha256=D_M91UwRiFwZKvKFKmz427TPd-dNyWWbhehaP8RI17c,36539
+bbstrader/trading/utils.py,sha256=57dKF9dcRu04oU2VRqydRrzW39dCW2wlDWhVt-sZdRw,1857
+bbstrader-0.2.97.dist-info/licenses/LICENSE,sha256=ZwC_RqqGmOPBUiMDKqLyJZ5HBeHq53LpL7TMRzrJY8c,1094
+bbstrader-0.2.97.dist-info/METADATA,sha256=mBnvqbUXVjE-dl5A5tkdYRuGd_fh2oKU55K-Ryfm9po,11590
+bbstrader-0.2.97.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+bbstrader-0.2.97.dist-info/entry_points.txt,sha256=0yDCbhbgHswOzJnY5wRSM_FjjyMHGvY7lJpSSVh0xtI,54
+bbstrader-0.2.97.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
+bbstrader-0.2.97.dist-info/RECORD,,

{bbstrader-0.2.95.dist-info → bbstrader-0.2.97.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

bbstrader/trading/script.py

@@ -1,155 +0,0 @@
-import argparse
-import json
-import multiprocessing as mp
-import os
-import sys
-
-from bbstrader.btengine import MT5Strategy, Strategy
-from bbstrader.core.utils import load_class, load_module
-from bbstrader.metatrader.trade import create_trade_instance
-from bbstrader.trading.execution import mt5_engine
-
-EXECUTION_PATH = os.path.expanduser("~/.bbstrader/execution/execution.py")
-CONFIG_PATH = os.path.expanduser("~/.bbstrader/execution/execution.json")
-
-
-def load_config(config_path, strategy_name, account=None):
-    if not os.path.exists(config_path):
-        raise FileNotFoundError(f"Configuration file not found at {config_path}")
-    with open(config_path, "r") as f:
-        config = json.load(f)
-    try:
-        config = config[strategy_name]
-    except KeyError:
-        raise ValueError(
-            f"Strategy {strategy_name} not found in the configuration file."
-        )
-    if account is not None:
-        try:
-            config = config[account]
-        except KeyError:
-            raise ValueError(f"Account {account} not found in the configuration file.")
-    if config.get("symbol_list") is None:
-        raise ValueError("symbol_list is required in the configuration file.")
-    if config.get("trades_kwargs") is None:
-        raise ValueError("trades_kwargs is required in the configuration file.")
-    return config
-
-
-def worker_function(account, args):
-    strategy_module = load_module(args.path)
-    strategy_class = load_class(strategy_module, args.strategy, (MT5Strategy, Strategy))
-
-    config = load_config(args.config, args.strategy, account)
-    symbol_list = config.pop("symbol_list")
-    trades_kwargs = config.pop("trades_kwargs")
-    trades = create_trade_instance(symbol_list, trades_kwargs)
-
-    kwargs = {
-        "symbol_list": symbol_list,
-        "trades_instances": trades,
-        "strategy_cls": strategy_class,
-        "account": account,
-        **config,
-    }
-    mt5_engine(account, **kwargs)
-
-
-def mt5_terminal(args):
-    if args.parallel:
-        if len(args.account) == 0:
-            raise ValueError(
-                "account or accounts are required when running in parallel"
-            )
-
-        processes = []
-        try:
-            for account in args.account:
-                p = mp.Process(target=worker_function, args=(account, args))
-                p.start()
-                processes.append(p)
-
-            for p in processes:
-                p.join()
-        except Exception as e:
-            print(f"Error in parallel execution: {e}")
-            raise e
-        except KeyboardInterrupt:
-            print("\nTerminating Execution...")
-            for p in processes:
-                p.terminate()
-            for p in processes:
-                p.join()
-            print("Execution terminated")
-    else:
-        worker_function(None, args)
-
-
-def tws_terminal(args):
-    raise NotImplementedError("TWS terminal is not implemented yet")
-
-
-def execute_strategy(unknown):
-    HELP_MSG = """
-    Execute a strategy on one or multiple MT5 accounts.
-
-    Usage:
-        python -m bbstrader --run execution [options]
-
-    Options:
-        -s, --strategy: Strategy class name to run
-        -a, --account: Account(s) name(s) or ID(s) to run the strategy on (must be the same as in the configuration file)
-        -p, --path: Path to the execution file (default: ~/.bbstrader/execution/execution.py)
-        -c, --config: Path to the configuration file (default: ~/.bbstrader/execution/execution.json)
-        -l, --parallel: Run the strategy in parallel (default: False)
-        -t, --terminal: Terminal to use (default: MT5)
-        -h, --help: Show this help message and exit
-    
-    Note:
-        The configuration file must contain all the required parameters 
-        to create trade instances for each account and strategy.
-        The configuration file must be a dictionary with the following structure:
-        If parallel is True:
-        {
-            "strategy_name": {
-                "account_name": {
-                    "symbol_list": ["symbol1", "symbol2"],
-                    "trades_kwargs": {"param1": "value1", "param2": "value2"}
-                    **other_parameters (for the strategy and the execution engine)
-                }
-            }
-        }
-        If parallel is False:
-        {
-            "strategy_name": {
-                "symbol_list": ["symbol1", "symbol2"],
-                "trades_kwargs": {"param1": "value1", "param2": "value2"}
-                **other_parameters (for the strategy and the execution engine)
-            }
-        }
-        See bbstrader.metatrader.trade.create_trade_instance for more details on the trades_kwargs.
-        See bbstrader.trading.execution.MT5ExecutionEngine for more details on the other parameters.
-        
-        All other paramaters must be python built-in types. 
-        If you have custom type you must set them in your strategy class 
-        or run the MT5ExecutionEngine directly, don't run on CLI.
-    """
-    if "-h" in unknown or "--help" in unknown:
-        print(HELP_MSG)
-        sys.exit(0)
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-s", "--strategy", type=str, required=True)
-    parser.add_argument("-a", "--account", type=str, nargs="*", default=[])
-    parser.add_argument("-p", "--path", type=str, default=EXECUTION_PATH)
-    parser.add_argument("-c", "--config", type=str, default=CONFIG_PATH)
-    parser.add_argument("-l", "--parallel", action="store_true")
-    parser.add_argument(
-        "-t", "--terminal", type=str, default="MT5", choices=["MT5", "TWS"]
-    )
-    args = parser.parse_args(unknown)
-
-    if args.terminal == "MT5":
-        mt5_terminal(args)
-    elif args.terminal == "TWS":
-        tws_terminal(args)