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

bbstrader/metatrader/trade.py

@@ -1250,7 +1250,7 @@ class Trade(RiskManagement):
     def sleep_time(self, weekend=False):
         if weekend:
             # claculate number of minute from the friday and to monday start
-            friday_time = datetime.strptime(self.end, '%H:%M')
+            friday_time = datetime.strptime(self.current_time(), '%H:%M')
             monday_time = datetime.strptime(self.start, '%H:%M')
             intra_day_diff = (monday_time - friday_time).total_seconds() // 60
             inter_day_diff = 3 * 24 * 60
@@ -1259,14 +1259,18 @@ class Trade(RiskManagement):
         else:
             # claculate number of minute from the end to the start
             start = datetime.strptime(self.start, '%H:%M')
-            end = datetime.strptime(self.end, '%H:%M')
+            end =  datetime.strptime(self.current_time(), '%H:%M')
             minutes = (end - start).total_seconds() // 60
             sleep_time = (24*60) - minutes
             return sleep_time
 
-    def get_current_time(self):
+    def current_datetime(self):
         return datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
+    
+    def current_time(self, seconds=False):
+        if seconds:
+            return datetime.now().strftime("%H:%M:%S")
+        return datetime.now().strftime("%H:%M")
 
 def create_trade_instance(
         symbols: List[str],

bbstrader/metatrader/utils.py

@@ -130,7 +130,7 @@ class TimeFrame(Enum):
     H3 = "3h"
     H4 = "4h"
     H6 = "6h"
-    H = "8h"
+    H8 = "8h"
     H12 = "12h"
     D1 = "D1"
     W1 = "W1"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bbstrader
-Version: 0.1.3
+Version: 0.1.4
 Summary: Simplified Investment & Trading Toolkit
 Home-page: https://github.com/bbalouki/bbstrader
 Author: Bertin Balouki SIMYELI

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

@@ -13,16 +13,16 @@ bbstrader/metatrader/__init__.py,sha256=y4JLz05esm3PKerHMgtd3dmRpa7yUvWVuj_xOnlh
 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
-bbstrader/metatrader/utils.py,sha256=3bLL6A0Mp8HVofnsgSfuI11esA4v5O2618fMuJ_AiVs,18921
+bbstrader/metatrader/trade.py,sha256=szLRhWKM7Vh0pxPXNi0mRq0bSoHpETRXOwWGPVdbW28,57296
+bbstrader/metatrader/utils.py,sha256=Tw98T4iBqlMtm9jVnwsf9mjKxZkD_rA0u8xJLqoHl0Q,18922
 bbstrader/models/__init__.py,sha256=6tAj9V9vgwesgPVMKznwRB3k8-Ec8Q73Di5p2UO0qlA,274
 bbstrader/models/risk.py,sha256=2fFBqsY2v8Kd6oU8t8h2h-Sp8joVqetA-t21rjkT9U4,13593
 bbstrader/trading/__init__.py,sha256=yZ85EALV2sSCzCPxaeFYlk1JJhYQq2C-xSd5EEQYvI8,82
 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.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.4.dist-info/LICENSE,sha256=1EudjwwP2oTJy8Vh0e-Kzv8VZZU95y-t6c3DYhR51uc,1115
+bbstrader-0.1.4.dist-info/METADATA,sha256=L-rGeXHa2gllmmh4q8OHkmD514Lb6zpwkVn35YTX5NM,9029
+bbstrader-0.1.4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+bbstrader-0.1.4.dist-info/top_level.txt,sha256=Wwj322jZmxGZ6gD_TdaPiPLjED5ReObm5omerwlmZIg,10
+bbstrader-0.1.4.dist-info/RECORD,,