Fixed sync issues

Author: iilunin

Bot/Strategy/TradingStrategy.py

@@ -44,12 +44,14 @@ def __init__(self,
 
     def update_trade(self, trade: Trade):
         self.trade = trade
-        self.init()
+        self.init(True)
 
-    def init(self):
+    def init(self, force_cancel_open_orders=False):
         #TODO: make one call for each symbols
-        self.exchange_info = self.fx.get_exchange_info(self.symbol())
-        self.validate_target_orders()
+        if not force_cancel_open_orders:
+            self.exchange_info = self.fx.get_exchange_info(self.symbol())
+
+        self.validate_target_orders(force_cancel_open_orders)
 
     def is_completed(self):
         return self.trade.is_completed()
@@ -94,7 +96,7 @@ def order_status_changed(self, t: Target, data):
     #     self.balance.locked = float(data['l'])
 
     # TODO: schedule validation once in some time
-    def validate_target_orders(self):
+    def validate_target_orders(self, force_cancel_open_orders=False):
         try:
             orders_dict = self.fx.get_all_orders(self.symbol())
         except BinanceAPIException as bae:
@@ -104,7 +106,7 @@ def validate_target_orders(self):
         tgts = self.trade.get_all_active_placed_targets()
 
         update_required = False
-        if len(tgts) == 0:
+        if force_cancel_open_orders or len(tgts) == 0:
             self.fx.cancel_open_orders(self.symbol())
         else:
             for t in tgts:

Cloud/S3Sync.py

@@ -47,7 +47,7 @@ def await(self):
         if self.thread and self.thread.is_alive():
             self.thread.join()
 
-    def check_s3_events(self):
+    def check_s3_events(self, file_watch_list):
         del_set, upd_set = set(), set()
         ret_val = (del_set, upd_set)
 
@@ -73,6 +73,7 @@ def check_s3_events(self):
 
                 if os.path.exists(full_path):
                     os.remove(full_path)
+                    file_watch_list.pop(full_path, None)
 
             if updated_files:
                 bucket = session.resource('s3').Bucket(self.bucket)
@@ -84,6 +85,7 @@ def check_s3_events(self):
                     if not os.path.exists(full_path) or self.get_md5(full_path) != etag:
                         bucket.download_file(k, full_path)
                         upd_set.add(full_path)
+                        file_watch_list[full_path] = os.stat(full_path).st_mtime
 
         except Exception:
             self.logger.error(traceback.format_exc())

ConsoleLauncher.py

@@ -114,7 +114,7 @@ def check_files_changed(self):
         try:
             deleted_by_s3, updated_by_s3 = set(), set()
             if self.enable_cloud:
-                deleted_by_s3, updated_by_s3 = self.s3pers.check_s3_events()
+                deleted_by_s3, updated_by_s3 = self.s3pers.check_s3_events(self.file_watch_list)
 
             with self.lock:
                 target_path_dict = {join(self.trades_path, f): os.stat(join(self.trades_path, f)).st_mtime for f in