bbstrader 0.1.3__tar.gz → 0.1.4__tar.gz

{bbstrader-0.1.3 → bbstrader-0.1.4}/PKG-INFO

@@ -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 → bbstrader-0.1.4}/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-0.1.3 → bbstrader-0.1.4}/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 → bbstrader-0.1.4}/bbstrader.egg-info/PKG-INFO

@@ -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 → bbstrader-0.1.4}/setup.py

@@ -7,7 +7,7 @@ if sys.version_info < (3, 10):
 with open("README.md", encoding="utf-8") as fh:
     long_description = fh.read()
 
-VERSION = '0.1.3'
+VERSION = '0.1.04'
 DESCRIPTION = 'Simplified Investment & Trading Toolkit'
 
 KEYWORDS = [