bbstrader 0.2.91__py3-none-any.whl → 0.2.92__py3-none-any.whl

bbstrader/metatrader/rates.py

@@ -1,17 +1,20 @@
 from datetime import datetime
 from typing import Optional, Union
 
-from bbstrader import compat  # noqa: F401
-import MetaTrader5 as Mt5
 import pandas as pd
 from exchange_calendars import get_calendar, get_calendar_names
 from pandas.tseries.holiday import USFederalHolidayCalendar
 from pandas.tseries.offsets import CustomBusinessDay
 
-
 from bbstrader.metatrader.account import AMG_EXCHANGES, Account, check_mt5_connection
 from bbstrader.metatrader.utils import TIMEFRAMES, TimeFrame, raise_mt5_error
 
+try:
+    import MetaTrader5 as Mt5
+except ImportError:
+    import bbstrader.compat  # noqa: F401
+
+
 __all__ = [
     "Rates",
     "download_historical_data",

bbstrader/metatrader/risk.py

@@ -2,14 +2,18 @@ import random
 from datetime import datetime
 from typing import Any, Dict, Optional, Union
 
-from bbstrader import compat  # noqa: F401
-import MetaTrader5 as Mt5
 from scipy.stats import norm
 
 from bbstrader.metatrader.account import Account
 from bbstrader.metatrader.rates import Rates
 from bbstrader.metatrader.utils import TIMEFRAMES, TimeFrame
 
+try:
+    import MetaTrader5 as Mt5
+except ImportError:
+    import bbstrader.compat  # noqa: F401
+
+
 _COMMD_SUPPORTED_ = [
     "GOLD",
     "SILVER",
@@ -28,8 +32,19 @@ _COMMD_SUPPORTED_ = [
     "USOIL",
     "SpotCrude",
     "SpotBrent",
-    "NatGas",
     "Soybeans",
+    "Wheat",
+    "SoyOil",
+    "LeanHogs",
+    "LDSugar",
+    "Coffee",
+    "OJ",
+    "Cocoa",
+    "Cattle",
+    "Copper",
+    "XCUUSD",
+    "NatGas",
+    "Gasoline",
 ]
 
 _ADMIRAL_MARKETS_FUTURES_ = [
@@ -196,7 +211,7 @@ class RiskManagement(Account):
         self.pchange = pchange_sl
         self.var_level = var_level
         self.var_tf = var_time_frame
-        self.daily_dd = round(daily_risk, 5)
+        self.daily_dd = round(daily_risk, 5) if daily_risk is not None else None
         self.max_risk = max_risk
         self.rr = rr
         self.sl = sl
@@ -490,10 +505,6 @@ class RiskManagement(Account):
             supported = _COMMD_SUPPORTED_
             if "." in self.symbol:
                 symbol = self.symbol.split(".")[0]
-            elif self.symbol.endswith("xx"):
-                symbol = self.symbol[:-2]
-            elif self.symbol.endswith("-"):
-                symbol = self.symbol[:-1]
             else:
                 symbol = self.symbol
             if str(symbol) not in supported:

bbstrader/metatrader/scripts.py

@@ -0,0 +1,81 @@
+import argparse
+import sys
+
+from bbstrader.metatrader.copier import RunCopier, config_copier
+
+
+def copier_args(parser: argparse.ArgumentParser):
+    parser.add_argument(
+        "-S", "--source", type=str, nargs="?", default=None, help="Source section name"
+    )
+    parser.add_argument(
+        "-D",
+        "--destinations",
+        type=str,
+        nargs="*",
+        default=None,
+        help="Destination section names",
+    )
+    parser.add_argument(
+        "-I", "--interval", type=float, default=0.1, help="Update interval in seconds"
+    )
+    parser.add_argument(
+        "-C",
+        "--config",
+        nargs="?",
+        default=None,
+        type=str,
+        help="Config file name or path",
+    )
+    parser.add_argument(
+        "-T",
+        "--start",
+        type=str,
+        nargs="?",
+        default=None,
+        help="Start time in HH:MM format",
+    )
+    parser.add_argument(
+        "-E",
+        "--end",
+        type=str,
+        nargs="?",
+        default=None,
+        help="End time in HH:MM format",
+    )
+    return parser
+
+
+def copy_trades(unknown):
+    HELP_MSG = """
+    Usage:
+        python -m bbstrader --run copier [options]
+
+    Options:
+        -s, --source: Source Account section name
+        -d, --destinations: Destination Account section names (multiple allowed)
+        -i, --interval: Update interval in seconds
+        -c, --config: .ini file or path (default: ~/.bbstrader/copier/copier.ini)
+        -t, --start: Start time in HH:MM format
+        -e, --end: End time in HH:MM format
+    """
+    if "-h" in unknown or "--help" in unknown:
+        print(HELP_MSG)
+        sys.exit(0)
+
+    copy_parser = argparse.ArgumentParser("Trades Copier", add_help=False)
+    copy_parser = copier_args(copy_parser)
+    copy_args = copy_parser.parse_args(unknown)
+
+    source, destinations = config_copier(
+        source_section=copy_args.source,
+        dest_sections=copy_args.destinations,
+        inifile=copy_args.config,
+    )
+    RunCopier(
+        source,
+        destinations,
+        copy_args.interval,
+        copy_args.start,
+        copy_args.end,
+    )