bbstrader 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

bbstrader/metatrader/account.py

@@ -28,10 +28,10 @@ _FTMO_URL_ = "https://trader.ftmo.com/?affiliates=JGmeuQqepAZLMcdOEQRp"
 INIT_MSG = (
     f"\n* Ensure you have a good and stable internet connexion\n"
     f"* Ensure you have an activete MT5 terminal install on your machine\n"
-    f"* Ensure you have an active MT5 Account with {'or '.join(__BROKERS__.values())}\n"
-    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"* Ensure you have an active MT5 Account with {' or '.join(__BROKERS__.values())}\n"
+    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"
 )
 
 amg_url = _ADMIRAL_MARKETS_URL_
@@ -96,9 +96,9 @@ class Account(object):
             raise ValueError(
                 f"{broker} is not currently supported broker for the Account() class\n"
                 f"Currently Supported brokers are: {', '.join(supported.values())}\n"
-                f"For {supported['AMG']}, See {amg_url}\n"
-                f"For {supported['JGM']}, See {jgm_url}\n"
-                f"For {supported['FTMO']}, See {ftmo_url}\n"
+                f"For {supported['AMG']}, See [{amg_url}]\n"
+                f"For {supported['JGM']}, See [{jgm_url}]\n"
+                f"For {supported['FTMO']}, See [{ftmo_url}]\n"
             )
 
     def get_account_info(
@@ -189,8 +189,11 @@ class Account(object):
 
             # Construct the print message based on whether a symbol is provided
             if symbol:
-                print(
-                    f"\n{info_name.upper()} INFO FOR {symbol} ({info.description})")
+                if hasattr(info, 'description'):
+                    print(
+                        f"\n{info_name.upper()} INFO FOR {symbol} ({info.description})")
+                else:
+                    print(f"\n{info_name.upper()} INFO FOR {symbol}")
             else:
                 print(f"\n{info_name.upper()} INFORMATIONS:")
 
@@ -735,7 +738,7 @@ class Account(object):
         else:
             positions = mt5.positions_get()
 
-        if len(positions) == 0:
+        if positions is None:
             return None
         if to_df:
             df = pd.DataFrame(list(positions), columns=positions[0]._asdict())
@@ -838,7 +841,7 @@ class Account(object):
         else:
             position_deals = mt5.history_deals_get(date_from, date_to)
 
-        if len(position_deals) == 0:
+        if position_deals is None:
             return None
 
         df = pd.DataFrame(list(position_deals),
@@ -914,7 +917,7 @@ class Account(object):
         else:
             orders = mt5.orders_get()
 
-        if len(orders) == 0:
+        if orders is None:
             return None
 
         if to_df:
@@ -1017,7 +1020,7 @@ class Account(object):
         else:
             history_orders = mt5.history_orders_get(date_from, date_to)
 
-        if len(history_orders) == 0:
+        if history_orders is None:
             return None
 
         df = pd.DataFrame(list(history_orders),

{bbstrader-0.1.1.dist-info → bbstrader-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bbstrader
-Version: 0.1.1
+Version: 0.1.3
 Summary: Simplified Investment & Trading Toolkit
 Home-page: https://github.com/bbalouki/bbstrader
 Author: Bertin Balouki SIMYELI
@@ -38,6 +38,7 @@ Requires-Dist: Metatrader5
 # Simplified Investment & Trading Toolkit
 ![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)
 
 ## Overview
 

{bbstrader-0.1.1.dist-info → bbstrader-0.1.3.dist-info}/RECORD

@@ -10,7 +10,7 @@ bbstrader/btengine/performance.py,sha256=Pz-qZb7EglPt8TMKs5ZCgo-af54UCOfqWKpEH8B
 bbstrader/btengine/portfolio.py,sha256=RXGJTmg1NIq0MSkMB6v6hmCG4xfdwLo9rO1_UCAX7As,14008
 bbstrader/btengine/strategy.py,sha256=tY5ek37NxLrYftgzJ4CqMGDFv5oMkvMsBbOkkOGghKw,1384
 bbstrader/metatrader/__init__.py,sha256=y4JLz05esm3PKerHMgtd3dmRpa7yUvWVuj_xOnlhXSA,261
-bbstrader/metatrader/account.py,sha256=jTfDJgHjFdzXlMkPJd1t3yOk_SPdQKnVFIKjML45eCs,42494
+bbstrader/metatrader/account.py,sha256=V5VbkUP2OawEuvRSGAAr_L0gXXdiwiACBD5hDXm-cbE,42651
 bbstrader/metatrader/rates.py,sha256=tGcWh2t9Yilik8YDMN2_VBeWV4VNa4zHABmOT98rW8g,8286
 bbstrader/metatrader/risk.py,sha256=tGpmP6pOtbn4iWtX4P6Gl2Z5YuP2jRI5g7Z8pybsO58,25134
 bbstrader/metatrader/trade.py,sha256=KKJ1nM7dsK0CYBQXN9OU0X0KRd3Ywh9ztgXWnwhfv8M,57099
@@ -21,8 +21,8 @@ bbstrader/trading/__init__.py,sha256=yZ85EALV2sSCzCPxaeFYlk1JJhYQq2C-xSd5EEQYvI8
 bbstrader/trading/execution.py,sha256=geiIiR9ldTJvM6rapa66Xug-gRcA_YqfA6kCr54lnRw,46708
 bbstrader/trading/run.py,sha256=UA5Sn5nWOqsezZVGCM_kjOPPsu_IxMdSABUBnBAJA-k,3474
 bbstrader/trading/utils.py,sha256=Eu_cBnfPcOGel4Lj6Dc-UCl-h7NqR8Rfv9RZtaxNRos,7711
-bbstrader-0.1.1.dist-info/LICENSE,sha256=1EudjwwP2oTJy8Vh0e-Kzv8VZZU95y-t6c3DYhR51uc,1115
-bbstrader-0.1.1.dist-info/METADATA,sha256=w1h6GuPYqZzuMdVjYy0qoXqXuZNIe_2A5Pb_4xX52IY,8878
-bbstrader-0.1.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-bbstrader-0.1.1.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
-bbstrader-0.1.1.dist-info/RECORD,,
+bbstrader-0.1.3.dist-info/LICENSE,sha256=1EudjwwP2oTJy8Vh0e-Kzv8VZZU95y-t6c3DYhR51uc,1115
+bbstrader-0.1.3.dist-info/METADATA,sha256=Bkx_7tWwzJeyz2kEO5lOQzcYwEbz33U7dt2nvvq2w4c,9029
+bbstrader-0.1.3.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+bbstrader-0.1.3.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
+bbstrader-0.1.3.dist-info/RECORD,,

{bbstrader-0.1.1.dist-info → bbstrader-0.1.3.dist-info}/WHEEL

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