bbstrader 0.3.0__tar.gz → 0.3.1__tar.gz

{bbstrader-0.3.0/bbstrader.egg-info → bbstrader-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bbstrader
-Version: 0.3.0
+Version: 0.3.1
 Summary: Simplified Investment & Trading Toolkit
 Home-page: https://github.com/bbalouki/bbstrader
 Download-URL: https://pypi.org/project/bbstrader/
@@ -172,10 +172,7 @@ To begin using `bbstrader`, please ensure your system meets the following prereq
         *   [Admirals Group AS](https://cabinet.a-partnership.com/visit/?bta=35537&brand=admiralmarkets) (for Stocks, ETFs, Indices, Commodities, Futures, Forex)
         *   [Just Global Markets Ltd.](https://one.justmarkets.link/a/tufvj0xugm/registration/trader) (for Stocks, Crypto, Indices, Commodities, Forex)
         *   [FTMO](https://trader.ftmo.com/?affiliates=JGmeuQqepAZLMcdOEQRp) (Proprietary Firm)
-*   **Interactive Brokers (IBKR)** (Optional, for IBKR integration):
-    *   Interactive Brokers Trader Workstation (TWS) or IB Gateway must be installed and running.
-    *   An active account with Interactive Brokers.
-    *   The Python client library for the IBKR API: `ibapi`.
+
 
 ### Installation
 

{bbstrader-0.3.0 → bbstrader-0.3.1}/README.md

@@ -88,10 +88,7 @@ To begin using `bbstrader`, please ensure your system meets the following prereq
         *   [Admirals Group AS](https://cabinet.a-partnership.com/visit/?bta=35537&brand=admiralmarkets) (for Stocks, ETFs, Indices, Commodities, Futures, Forex)
         *   [Just Global Markets Ltd.](https://one.justmarkets.link/a/tufvj0xugm/registration/trader) (for Stocks, Crypto, Indices, Commodities, Forex)
         *   [FTMO](https://trader.ftmo.com/?affiliates=JGmeuQqepAZLMcdOEQRp) (Proprietary Firm)
-*   **Interactive Brokers (IBKR)** (Optional, for IBKR integration):
-    *   Interactive Brokers Trader Workstation (TWS) or IB Gateway must be installed and running.
-    *   An active account with Interactive Brokers.
-    *   The Python client library for the IBKR API: `ibapi`.
+
 
 ### Installation
 

{bbstrader-0.3.0 → bbstrader-0.3.1}/bbstrader/__init__.py

@@ -7,7 +7,7 @@ __author__ = "Bertin Balouki SIMYELI"
 __copyright__ = "2023-2025 Bertin Balouki SIMYELI"
 __email__ = "bertin@bbstrader.com"
 __license__ = "MIT"
-__version__ = "0.2.0"
+__version__ = "0.3.1"
 
 from bbstrader import compat  # noqa: F401
 from bbstrader import core  # noqa: F401

{bbstrader-0.3.0 → bbstrader-0.3.1}/bbstrader/__main__.py

@@ -49,19 +49,23 @@ def main():
     if ("-h" in sys.argv or "--help" in sys.argv) and args.run is None:
         print(Fore.WHITE + USAGE_TEXT)
         sys.exit(0)
-
-    match args.run:
-        case Module.COPIER.value:
-            copy_trades(unknown)
-        case Module.BACKTEST.value:
-            backtest(unknown)
-        case Module.EXECUTION.value:
-            execute_strategy(unknown)
-        case Module.NEWS_FEED.value:
-            send_news_feed(unknown)
-        case _:
-            print(Fore.RED + f"Unknown module: {args.run}")
-            sys.exit(1)
+    try:
+        match args.run:
+            case Module.COPIER.value:
+                copy_trades(unknown)
+            case Module.BACKTEST.value:
+                backtest(unknown)
+            case Module.EXECUTION.value:
+                execute_strategy(unknown)
+            case Module.NEWS_FEED.value:
+                send_news_feed(unknown)
+            case _:
+                print(Fore.RED + f"Unknown module: {args.run}")
+                sys.exit(1)
+    except KeyboardInterrupt:
+        sys.exit(0)
+    except Exception:
+        sys.exit(1)
 
 
 if __name__ == "__main__":

{bbstrader-0.3.0 → bbstrader-0.3.1}/bbstrader/core/data.py

@@ -149,7 +149,7 @@ class FmpNews(object):
             try:
                 articles = pd.read_csv("latest_fmp_articles.csv")
                 articles = articles.to_dict(orient="records")
-                if self._last_date(articles[0]["date"]) < end_date:
+                if self._last_date(articles[0]["date"]).hour < end_date.hour:
                     articles = self.get_articles(**kwargs)
                 else:
                     return articles
@@ -161,7 +161,9 @@ class FmpNews(object):
             df.to_csv("latest_fmp_articles.csv", index=False)
         return articles
 
-    def get_news(self, query, source="articles", articles=None, symbol=None, **kwargs):
+    def get_news(
+        self, query, source="articles", articles=None, symbol: str = None, **kwargs
+    ):
         """
         Retrieves relevant financial news based on the specified source.
 
@@ -183,6 +185,10 @@ class FmpNews(object):
                         Returns an empty list if no relevant news is found.
         """
         query = _get_search_query(query)
+        if symbol is not None:
+            symbol = symbol.replace("-", "").split("=")[
+                0
+            ]  # if symbol is a yahoo finance ticker
         source_methods = {
             "articles": lambda: self.get_latest_articles(articles=articles, save=True),
             "releases": lambda: self.get_releases(symbol=symbol, **kwargs),
@@ -191,6 +197,8 @@ class FmpNews(object):
             "forex": lambda: self.get_forex_news(symbol=symbol, **kwargs),
         }
         news_source = source_methods.get(source, lambda: [])()
+        if source == "articles":
+            symbol = None  # Articles do not require a symbol filter
         news = self.parse_news(news_source, symbol=symbol)
         return _filter_news(news, query)
 
@@ -203,7 +211,7 @@ class FinancialNews(object):
 
     """
 
-    def _fetch_news(self, url, query, asset_type, n_news, headline_tag) -> List[str]:
+    def _fetch_news(self, url, query, n_news, headline_tag) -> List[str]:
         headers = {"User-Agent": "Mozilla/5.0"}
         try:
             response = requests.get(url, headers=headers)
@@ -224,32 +232,60 @@ class FinancialNews(object):
         ]
         return headlines[:n_news]
 
-    def get_yahoo_finance_news(self, query, asset_type="stock", n_news=10):
+    def get_yahoo_finance_news(self, query: str, asset_type="stock", n_news=10):
         """
         Fetches recent Yahoo Finance news headlines for a given financial asset.
 
         Args:
             query (str): The asset symbol or name (e.g., "AAPL").
-            asset_type (str, optional): The type of asset (e.g., "stock", "etf"). Defaults to "stock".
+            asset_type (str, optional): The type of asset (e.g., "stock", "etf"). Defaults to "stock",
+                supported types include:
+                - "stock": Stock symbols (e.g., AAPL, MSFT)
+                - "etf": Exchange-traded funds (e.g., SPY, QQQ)
+                - "future": Futures contracts (e.g., CL=F for crude oil)
+                - "forex": Forex pairs (e.g., EURUSD=X, USDJPY=X)
+                - "crypto": Cryptocurrency pairs (e.g., BTC-USD, ETH-USD)
+                - "index": Stock market indices (e.g., ^GSPC for S&P 500)
             n_news (int, optional): The number of news headlines to return. Defaults to 10.
 
+        Note:
+            For commotities and bonds, use the "Future" asset type.
+
         Returns:
             list[str]: A list of Yahoo Finance news headlines relevant to the query.
         """
+        if asset_type == "forex" or asset_type == "future":
+            assert (
+                "=" in query
+            ), "Forex query must contain '=' for currency pairs (e.g., EURUSD=X, CL=F)"
+        if asset_type == "crypto":
+            assert (
+                "-" in query
+            ), "Crypto query must contain '-' for crypto pairs (e.g., BTC-USD, ETH-USD)"
+        if asset_type == "index":
+            assert query.startswith(
+                "^"
+            ), "Index query must start with '^' (e.g., ^GSPC for S&P 500)"
         url = (
             f"https://finance.yahoo.com/quote/{query}/news"
-            if asset_type in ["stock", "etf"]
+            if asset_type in ["stock", "etf", "index", "future", "forex"]
             else "https://finance.yahoo.com/news"
         )
-        return self._fetch_news(url, query, asset_type, n_news, "h3")
+        return self._fetch_news(url, query, n_news, "h3")
 
-    def get_google_finance_news(self, query, asset_type="stock", n_news=10):
+    def get_google_finance_news(self, query: str, asset_type="stock", n_news=10):
         """
         Fetches recent Google Finance news headlines for a given financial asset.
 
         Args:
             query (str): The asset symbol or name (e.g., "AAPL").
             asset_type (str, optional): The type of asset (e.g., "stock", "crypto"). Defaults to "stock".
+                Supported types include:
+                - "stock": Stock symbols (e.g., AAPL, MSFT)
+                - "etf": Exchange-traded funds (e.g., SPY, QQQ)
+                - "future": Futures contracts (e.g., CL=F or crude oil)
+                - "forex": Forex pairs (e.g., EURUSD, USDJPY)
+                - "crypto": Cryptocurrency pairs (e.g., BTCUSD, ETHUSD)
             n_news (int, optional): The number of news headlines to return. Defaults to 10.
 
         Returns:
@@ -258,20 +294,18 @@ class FinancialNews(object):
         search_terms = {
             "stock": f"{query} stock OR {query} shares OR {query} market",
             "etf": f"{query} ETF OR {query} fund OR {query} exchange-traded fund",
-            "futures": f"{query} futures OR {query} price OR {query} market",
-            "commodity": f"{query} price OR {query} futures OR {query} market",
+            "future": f"{query} futures OR {query} price OR {query} market",
             "forex": f"{query} forex OR {query} exchange rate OR {query} market",
             "crypto": f"{query} cryptocurrency OR {query} price OR {query} market",
-            "bond": f"{query} bond OR {query} yield OR {query} interest rate",
             "index": f"{query} index OR {query} stock market OR {query} performance",
         }
         search_query = search_terms.get(asset_type, query)
         url = f"https://news.google.com/search?q={search_query.replace(' ', '+')}"
-        return self._fetch_news(url, query, asset_type, n_news, "a")
+        return self._fetch_news(url, query, n_news, "a")
 
     def get_reddit_posts(
         self,
-        symbol,
+        symbol: str,
         client_id=None,
         client_secret=None,
         user_agent=None,
@@ -294,8 +328,8 @@ class FinancialNews(object):
                 - "stock": Searches in stock-related subreddits (e.g., wallstreetbets, stocks).
                 - "forex": Searches in forex-related subreddits.
                 - "commodities": Searches in commodity-related subreddits (e.g., gold, oil).
-                - "etfs": Searches in ETF-related subreddits.
-                - "futures": Searches in futures and options trading subreddits.
+                - "etf": Searches in ETF-related subreddits.
+                - "future": Searches in futures and options trading subreddits.
                 - "crypto": Searches in cryptocurrency-related subreddits.
                 - If an unrecognized asset class is provided, defaults to stock-related subreddits.
             n_posts (int, optional): The number of posts to return per subreddit. Defaults to 10.
@@ -317,15 +351,36 @@ class FinancialNews(object):
         """
 
         reddit = praw.Reddit(
-            client_id=client_id, client_secret=client_secret, user_agent=user_agent
+            client_id=client_id,
+            client_secret=client_secret,
+            user_agent=user_agent,
+            check_for_updates=False,
+            comment_kind="t1",
+            message_kind="t4",
+            redditor_kind="t2",
+            submission_kind="t3",
+            subreddit_kind="t5",
+            trophy_kind="t6",
+            oauth_url="https://oauth.reddit.com",
+            reddit_url="https://www.reddit.com",
+            short_url="https://redd.it",
+            timeout=16,
+            ratelimit_seconds=5,
         )
-
+        assert reddit.read_only
         subreddit_mapping = {
             "stock": ["wallstreetbets", "stocks", "investing", "StockMarket"],
             "forex": ["Forex", "ForexTrading", "DayTrading"],
-            "commodities": ["Commodities", "Gold", "Silverbugs", "oil"],
             "etfs": ["ETFs", "investing"],
-            "futures": ["FuturesTrading", "OptionsTrading", "DayTrading"],
+            "futures": [
+                "FuturesTrading",
+                "OptionsTrading",
+                "DayTrading",
+                "Commodities",
+                "Gold",
+                "Silverbugs",
+                "oil",
+            ],
             "crypto": ["CryptoCurrency", "Bitcoin", "ethereum", "altcoin"],
         }
         try:
@@ -473,16 +528,23 @@ class FinancialNews(object):
         maximum = 100
         if limit > maximum:
             raise ValueError(f"Number of total news articles allowed is {maximum}")
-
-        response = requests.get(
-            "https://data-api.coindesk.com/news/v1/article/list",
-            params={"lang": lang, "limit": limit},
-            headers={"Content-type": "application/json; charset=UTF-8"},
-        )
-        json_response = response.json()
-        articles = json_response["Data"]
-        if len(articles) == 0:
+        try:
+            response = requests.get(
+                "https://data-api.coindesk.com/news/v1/article/list",
+                params={"lang": lang, "limit": limit},
+                headers={"Content-type": "application/json; charset=UTF-8"},
+            )
+            response.raise_for_status()
+            json_response = response.json()
+        except requests.exceptions.RequestException:
             return []
+        if (
+            response.status_code != 200
+            or "Data" not in json_response
+            or len(json_response["Data"]) == 0
+        ):
+            return []
+        articles = json_response["Data"]
         to_keep = [
             "PUBLISHED_ON",
             "TITLE",
@@ -495,10 +557,11 @@ class FinancialNews(object):
         ]
         filtered_articles = []
         for article in articles:
+            keys = article.keys()
             filtered_articles.append(
                 {
                     k.lower(): article[k]
-                    if k in article and k != "PUBLISHED_ON"
+                    if k in keys and k != "PUBLISHED_ON"
                     else datetime.fromtimestamp(article[k])
                     for k in to_keep
                     if article[k] is not None and "sponsored" not in str(article[k])

{bbstrader-0.3.0 → bbstrader-0.3.1}/bbstrader/metatrader/account.py

@@ -760,10 +760,7 @@ class Account(object):
             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()
-            or self.broker != PepperstoneGroupLimited()
-        ):
+        if self.broker not in [AdmiralMarktsGroup(), PepperstoneGroupLimited()]:
             return self.get_symbols(symbol_type=SymbolType.FOREX)
         else:
             fx_categories = {
@@ -816,11 +813,8 @@ class Account(object):
             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()
-            or self.broker != PepperstoneGroupLimited()
-        ):
+
+        if self.broker not in [AdmiralMarktsGroup(), PepperstoneGroupLimited()]:
             return self.get_symbols(symbol_type=SymbolType.STOCKS)
         else:
             stocks, etfs = [], []
@@ -883,7 +877,7 @@ class Account(object):
                 SymbolType.STOCKS, exchange_code, exchange_map
             )
             etfs = self._get_symbols_by_category(
-                    SymbolType.ETFs, exchange_code, exchange_map
+                SymbolType.ETFs, exchange_code, exchange_map
             )
             return stocks + etfs if etf else stocks
 

{bbstrader-0.3.0 → bbstrader-0.3.1}/bbstrader/metatrader/copier.py

@@ -1,10 +1,11 @@
 import multiprocessing
+import threading
 import time
 from datetime import datetime
 from pathlib import Path
 from typing import Dict, List, Literal, Tuple
 
-from loguru import logger
+from loguru import logger as log
 
 from bbstrader.config import BBSTRADER_DIR
 from bbstrader.metatrader.account import Account, check_mt5_connection
@@ -20,12 +21,14 @@ except ImportError:
 __all__ = ["TradeCopier", "RunCopier", "RunMultipleCopier", "config_copier"]
 
 
-logger.add(
+log.add(
     f"{BBSTRADER_DIR}/logs/copier.log",
     enqueue=True,
     level="INFO",
     format="{time:YYYY-MM-DD HH:mm:ss} | {level} | {name} | {message}",
 )
+global logger
+logger = log
 
 
 def fix_lot(fixed):
@@ -113,11 +116,21 @@ def calculate_copy_lot(
         raise ValueError("Invalid mode selected")
 
 
-def get_copy_symbols(destination: dict = None):
+def get_copy_symbols(destination: dict, source: dict):
     symbols = destination.get("symbols", "all")
-    account = Account(**destination)
+    src_account = Account(**source)
+    dest_account = Account(**destination)
     if symbols == "all" or symbols == "*":
-        return account.get_symbols()
+        src_symbols = src_account.get_symbols()
+        dest_symbols = dest_account.get_symbols()
+        for s in src_symbols:
+            if s not in dest_symbols:
+                err_msg = (
+                    f"To use 'all' or '*', Source account@{src_account.number} "
+                    f"and destination account@{dest_account.number} "
+                    f"must be the same type and have the same symbols"
+                )
+                raise ValueError(err_msg)
     elif isinstance(symbols, (list, dict)):
         return symbols
     elif isinstance(symbols, str):
@@ -127,22 +140,6 @@ def get_copy_symbols(destination: dict = None):
             return symbols.split()
 
 
-def get_copy_symbol(symbol, destination: dict = None, type="destination"):
-    symbols = get_copy_symbols(destination)
-    if isinstance(symbols, list):
-        if symbol in symbols:
-            return symbol
-    if isinstance(symbols, dict):
-        if type == "destination":
-            if symbol in symbols.keys():
-                return symbols[symbol]
-        if type == "source":
-            for k, v in symbols.items():
-                if v == symbol:
-                    return k
-    raise ValueError(f"Symbol {symbol} not found in {type} account")
-
-
 class TradeCopier(object):
     """
     ``TradeCopier`` responsible for copying trading orders and positions from a source account to multiple destination accounts.
@@ -159,7 +156,10 @@ class TradeCopier(object):
         "sleeptime",
         "start_time",
         "end_time",
+        "shutdown_event",
+        "custom_logger",
     )
+    shutdown_event: threading.Event
 
     def __init__(
         self,
@@ -168,6 +168,8 @@ class TradeCopier(object):
         sleeptime: float = 0.1,
         start_time: str = None,
         end_time: str = None,
+        shutdown_event=None,
+        custom_logger=None,
     ):
         """
         Initializes the ``TradeCopier`` instance, setting up the source and destination trading accounts for trade copying.
@@ -245,8 +247,15 @@ class TradeCopier(object):
         self.sleeptime = sleeptime
         self.start_time = start_time
         self.end_time = end_time
-        self.errors = set()
+        self.shutdown_event = shutdown_event
+        self._add_logger(custom_logger)
         self._add_copy()
+        self.errors = set()
+
+    def _add_logger(self, custom_logger):
+        if custom_logger:
+            global logger
+            logger = custom_logger
 
     def _add_copy(self):
         self.source["copy"] = True
@@ -269,6 +278,21 @@ class TradeCopier(object):
         check_mt5_connection(**destination)
         return Account(**destination).get_positions(symbol=symbol)
 
+    def get_copy_symbol(self, symbol, destination: dict = None, type="destination"):
+        symbols = get_copy_symbols(destination, self.source)
+        if isinstance(symbols, list):
+            if symbol in symbols:
+                return symbol
+        if isinstance(symbols, dict):
+            if type == "destination":
+                if symbol in symbols.keys():
+                    return symbols[symbol]
+            if type == "source":
+                for k, v in symbols.items():
+                    if v == symbol:
+                        return k
+        raise ValueError(f"Symbol {symbol} not found in {type} account")
+
     def isorder_modified(self, source: TradeOrder, dest: TradeOrder):
         if source.type == dest.type and source.ticket == dest.magic:
             return (
@@ -315,7 +339,7 @@ class TradeCopier(object):
             return
         check_mt5_connection(**destination)
         volume = trade.volume if hasattr(trade, "volume") else trade.volume_initial
-        symbol = get_copy_symbol(trade.symbol, destination)
+        symbol = self.get_copy_symbol(trade.symbol, destination)
         lot = calculate_copy_lot(
             volume,
             symbol,
@@ -326,7 +350,9 @@ class TradeCopier(object):
             dest_eqty=Account(**destination).get_account_info().margin_free,
         )
 
-        trade_instance = Trade(symbol=symbol, **destination, max_risk=100.0, logger=None)
+        trade_instance = Trade(
+            symbol=symbol, **destination, max_risk=100.0, logger=None
+        )
         try:
             action = action_type[trade.type]
         except KeyError:
@@ -463,7 +489,7 @@ class TradeCopier(object):
 
     def get_positions(self, destination: dict):
         source_positions = self.source_positions() or []
-        dest_symbols = get_copy_symbols(destination)
+        dest_symbols = get_copy_symbols(destination, self.source)
         dest_positions = self.destination_positions(destination) or []
         source_positions = self.filter_positions_and_orders(
             source_positions, symbols=dest_symbols
@@ -475,7 +501,7 @@ class TradeCopier(object):
 
     def get_orders(self, destination: dict):
         source_orders = self.source_orders() or []
-        dest_symbols = get_copy_symbols(destination)
+        dest_symbols = get_copy_symbols(destination, self.source)
         dest_orders = self.destination_orders(destination) or []
         source_orders = self.filter_positions_and_orders(
             source_orders, symbols=dest_symbols
@@ -511,7 +537,7 @@ class TradeCopier(object):
         source_ids = [order.ticket for order in source_orders]
         for destination_order in destination_orders:
             if destination_order.magic not in source_ids:
-                src_symbol = get_copy_symbol(
+                src_symbol = self.get_copy_symbol(
                     destination_order.symbol, destination, type="source"
                 )
                 self.remove_order(src_symbol, destination_order, destination)
@@ -547,7 +573,7 @@ class TradeCopier(object):
         if not destination.get("copy", False):
             raise ValueError("Destination account not set to copy mode")
         return destination.get("copy_what", "all")
-    
+
     def copy_orders(self, destination: dict):
         what = self._copy_what(destination)
         if what not in ["all", "orders"]:
@@ -587,7 +613,7 @@ class TradeCopier(object):
         source_ids = [pos.ticket for pos in source_positions]
         for destination_position in destination_positions:
             if destination_position.magic not in source_ids:
-                src_symbol = get_copy_symbol(
+                src_symbol = self.get_copy_symbol(
                     destination_position.symbol, destination, type="source"
                 )
                 self.remove_position(src_symbol, destination_position, destination)
@@ -612,8 +638,15 @@ class TradeCopier(object):
         logger.info("Trade Copier Running ...")
         logger.info(f"Source Account: {self.source.get('login')}")
         while True:
+            if self.shutdown_event and self.shutdown_event.is_set():
+                logger.info(
+                    "Shutdown event received, stopping Trade Copier gracefully."
+                )
+                break
             try:
                 for destination in self.destinations:
+                    if self.shutdown_event and self.shutdown_event.is_set():
+                        break
                     if destination.get("path") == self.source.get("path"):
                         err_msg = "Source and destination accounts are on the same \
                             MetaTrader 5 installation which is not allowed."
@@ -623,18 +656,52 @@ class TradeCopier(object):
                     self.copy_positions(destination)
                     Mt5.shutdown()
                     time.sleep(0.1)
+
+                if self.shutdown_event and self.shutdown_event.is_set():
+                    logger.info(
+                        "Shutdown event received during destination processing, exiting."
+                    )
+                    break
+
             except KeyboardInterrupt:
-                logger.info("Stopping the Trade Copier ...")
-                exit(0)
+                logger.info("KeyboardInterrupt received, stopping the Trade Copier ...")
+                if self.shutdown_event:
+                    self.shutdown_event.set()
+                break
             except Exception as e:
                 self.log_error(e)
+                if self.shutdown_event and self.shutdown_event.is_set():
+                    logger.error(
+                        "Error occurred after shutdown signaled, exiting loop."
+                    )
+                    break
+
+            # Check shutdown event before sleeping
+            if self.shutdown_event and self.shutdown_event.is_set():
+                logger.info("Shutdown event checked before sleep, exiting.")
+                break
             time.sleep(self.sleeptime)
+        logger.info("Trade Copier has shut down.")
 
 
 def RunCopier(
-    source: dict, destinations: list, sleeptime: float, start_time: str, end_time: str
+    source: dict,
+    destinations: list,
+    sleeptime: float,
+    start_time: str,
+    end_time: str,
+    shutdown_event=None,
+    custom_logger=None,
 ):
-    copier = TradeCopier(source, destinations, sleeptime, start_time, end_time)
+    copier = TradeCopier(
+        source,
+        destinations,
+        sleeptime,
+        start_time,
+        end_time,
+        shutdown_event,
+        custom_logger,
+    )
     copier.run()
 
 
@@ -644,6 +711,8 @@ def RunMultipleCopier(
     start_delay: float = 1.0,
     start_time: str = None,
     end_time: str = None,
+    shutdown_event=None,
+    custom_logger=None,
 ):
     processes = []
 
@@ -661,10 +730,16 @@ def RunMultipleCopier(
             )
             continue
         logger.info(f"Starting process for source account @{source.get('login')}")
-
         process = multiprocessing.Process(
             target=RunCopier,
-            args=(source, destinations, sleeptime, start_time, end_time),
+            args=(
+                source,
+                destinations,
+                sleeptime,
+                start_time,
+                end_time,
+            ),
+            kwargs=dict(shutdown_event=shutdown_event, custom_logger=custom_logger),
         )
         processes.append(process)
         process.start()
@@ -672,13 +747,14 @@ def RunMultipleCopier(
         if start_delay:
             time.sleep(start_delay)
 
-    # Wait for all processes to complete
     for process in processes:
         process.join()
 
 
 def _strtodict(string: str) -> dict:
     string = string.strip().replace("\n", "").replace(" ", "").replace('"""', "")
+    if string.endswith(","):
+        string = string[:-1]
     return dict(item.split(":") for item in string.split(","))