.gitignore

@@ -17,7 +17,6 @@ logs/gateio.log
 logs/kucoin.log
 upload_testnet.sh
 upload_mainnet.sh
-upload_local_testnet.sh
 utils/data/binance.db
 utils/data/okx.db
 utils/data/gateio.db

changelog.txt

@@ -1,116 +1,3 @@
-2025.12.01:
-. Modified log output of new_market_order.
-. Modified Kucoin's case in min_amount_of_base.
-
-2025.11.11:
-. deals_cache and log_list cache are now 20 items long.
-. Less log spam.
-
-2025.11.08:
-. broker.set_default_order_size() now saves the config file to disk after changing the value.
-. Variable renaming and other small stuff.
-
-2025.10.24:
-. Toggling liquidate_after_switch now writes the config file to disk so the setting persists between trades.
-. Manually switching to long now sets double_check_price to false.
-. Added a few comments to switch_to_long.
-
-2025.10.12:
-. do_cleanup relocated after generating the safety orders' prices.
-
-2025.10.11:
-. Minor simplification in do_cleanup.
-. Removed a couple of (no longer needed?) pauses.
-
-2025.10.10:
-. New endpoint: /refresh_log_cache.
-. Fixed an error in /add_so endpoint that incremented the config setting but not the status setting.
-
-2025.10.09:
-. Cleanup is done as soon as the trader starts, rather than after sending the take profit and safety orders.
-
-2025.10.07:
-. In short traders, if there are too few safety orders (less than 67% of the max amount), safety_order_deviance is increased from 2% to 3%.
-
-2025.10.04:
-. Fixed error while logging orders in new_simulated_market_order.
-. renew_tp_and_so_routine now send the take profit order first, and then the safety orders.
-
-2025.10.03:
-. New broker config option: log_orders. If set to True, the orders will be logged in orders.log under logs directory.
-. New API endpoint: /toggle_log_orders.
-
-2025.10.01:
-. Fixed base fees not being taken into account.
-
-2025.09.27:
-. Added notes in every entry of deal_order_history.
-. Minor refactor in renew_tp_and_so_routine.
-. Added another cooldown before sending a take profit order (To give the exchange a bit more time to reflect correctly the amount of base present in the account)
-. Updated cleanup routine to leave some change in the account.
-
-2025.09.25:
-. Added a pause after getting filled orders in check_status.
-. Added an extra logging line in take_profit_routine.
-
-2025.09.24:
-. Added a new config option: wait_after_initial_market_order. If specifies in seconds the amount of wait time after sending the initial market order.
- It should help the exchanges to report correctly the recently filled market order.
-. Removed the "PAUSED" notice in the screen output that was unused.
-
-2025.09.21:
-. Fixed a bug that caused short traders to have an incorrect order size.
-
-2025.09.20:
-. Fixed bug that caused short traders to initialize using the same workflow as a long one.
-
-2025.09.19:
-. Added pageSize parameter to the open order requests when querying Kucoin.
-
-2025.09.18:
-. do_cleanup now uses get_min_quote_size.
-. Added an extra price check to switch_to_long.
-. Removed old check_old_long_price method.
-
-2025.09.14:
-. Refactored full order list fetching.
-. Minor refactor of restart_pair_no_json.
-. Pausing the trader is now done via set_pause() method.
-. Reverted modification of wait time after initial market order.
-. wait_time now present in broker config file.
-. Minor refactorings.
-
-2025.09.13:
-. Increased wait time after initial market order.
-
-2025.09.12:
-. No retries when sending a cleanup order.
-. Removed redundant try...except blocks in switch_to_long.
-
-2025.09.11:
-. Fixed bug in start_trader that called amount_to_precision with very low amounts and spammed logs.
-
-2025.09.10:
-. Deal order history now stores only the id of each order instead of the full order object.
-
-2025.09.08:
-. Re-enabled long to short autoswitch.
-
-2025.09.07:
-. Increased wait time after sending market orders.
-
-2025.09.05:
-. Now the trader supports multiple safety orders at the same time.
-. Removed forcing orders when importing a trader. Maybe it will be reinstated at a later date.
-. Removed endpoint /reload_safety_orders.
-. New endpoints: /mod_concurrent_safety orders, /mod_boosted_concurrent_safety_orders and /force_trader_close.
-. Modified cleanup routine.
-. Default wait_time back to 0.5 seconds.
-. General optimizations.
-
-2025.08.19:
-. Improved log trimming.
-
 2025.08.18:
 . Database handling optimization.
 

config_handler.py

@@ -14,8 +14,6 @@ class ConfigHandler:
             "order_size": self.broker.get_default_order_size(),
             "no_of_safety_orders": 30,
             "max_short_safety_orders": 45,
-            "concurrent_safety_orders": 3,
-            "boosted_concurrent_safety_orders": 5,
             "safety_order_deviance": 2,
             "safety_order_scale": 0.0105,
             "dynamic_so_deviance": True,
@@ -37,9 +35,6 @@ class ConfigHandler:
             "force_restart_if_retries_exhausted": False,
             "check_old_long_price": False      #switch_to_short should flip this to True unless stated
         }
-        # if self.broker.get_exchange_name()=="kucoin":
-        #     self.default_config_dictionary["concurrent_safety_orders"]=1
-        #     self.default_config_dictionary["boosted_concurrent_safety_orders"]=1
         self.config_file_path = f"configs/{pair.split('/')[0]}{pair.split('/')[1]}.json"
         self.config_dictionary = self.default_config_dictionary.copy()        
         
@@ -49,7 +44,7 @@ class ConfigHandler:
             self.config_dictionary["generated_at"] = int(time())
             self.save_to_file()
         if config_dict is not None:
-            self.config_dictionary.update(config_dict)
+            self.config_dictionary = {**self.config_dictionary, **config_dict}
             self.save_to_file()
         
 
@@ -73,12 +68,6 @@ class ConfigHandler:
     def get_max_short_safety_orders(self):
         return self.config_dictionary["max_short_safety_orders"]
     
-    def get_concurrent_safety_orders(self):       
-        return self.config_dictionary["concurrent_safety_orders"]
-    
-    def get_boosted_concurrent_safety_orders(self):        
-        return self.config_dictionary["boosted_concurrent_safety_orders"]
-    
     def get_safety_order_deviance(self):
         return self.config_dictionary["safety_order_deviance"]
     
@@ -184,20 +173,6 @@ class ConfigHandler:
         self.config_dictionary["max_short_safety_orders"] = max_short_safety_orders
         return 0
     
-    def set_concurrent_safety_orders(self, concurrent_safety_orders: int):
-        # if not isinstance(concurrent_safety_orders, int):
-        #     self.broker.logger.log_this(f"Max concurrent safety orders provided is not an integer",1,self.get_pair())
-        #     return 1
-        self.config_dictionary["concurrent_safety_orders"] = concurrent_safety_orders
-        return 0
-    
-    def set_boosted_concurrent_safety_orders(self, boosted_concurrent_safety_orders: int):
-        # if not isinstance(concurrent_safety_orders, int):
-        #     self.broker.logger.log_this(f"Max concurrent safety orders provided is not an integer",1,self.get_pair())
-        #     return 1
-        self.config_dictionary["boosted_concurrent_safety_orders"] = boosted_concurrent_safety_orders
-        return 0
-    
     def set_safety_order_deviance(self, safety_order_deviance: int):
         # if not isinstance(safety_order_deviance, int):
         #     self.broker.logger.log_this(f"Safety order deviance provided is not an integer",1,self.get_pair())
@@ -252,7 +227,6 @@ class ConfigHandler:
         #     self.broker.logger.log_this(f"liquidate_after_switch must be a boolean",1,self.get_pair())
         #     return 1
         self.config_dictionary["liquidate_after_switch"] = liquidate_after_switch
-        self.save_to_file()
         return 0
     
     def set_tp_mode(self, tp_mode: int):

exchange_wrapper.py

@@ -1,4 +1,3 @@
-import collections
 import time
 import credentials
 import sqlite3
@@ -14,19 +13,19 @@ class Broker:
         self.broker_config = broker_config
         self.exchange = exchange
         self.last_price = 0
+        self.wait_time = 1                  #Default wait time for API breathing room
+        self.cooldown_multiplier = 2        #Default cooldown multiplier value
+        if "cooldown_multiplier" in self.broker_config:
+            self.cooldown_multiplier = self.broker_config["cooldown_multiplier"]
+        self.wait_before_new_safety_order = 1
+        if "wait_before_new_safety_order" in self.broker_config:
+            self.wait_before_new_safety_order = self.broker_config["wait_before_new_safety_order"]
         self.empty_order = {"id": "", "status": "", "filled": 0, "remaining": 0, "price": 0, "cost": 0, "fees": [], "symbol": ""}
-
+        self.retries = self.broker_config["retries"] if "retries" in self.broker_config else 5
-        #Default values
+        self.slippage_default_threshold = self.broker_config["slippage_default_threshold"] if "slippage_default_threshold" in self.broker_config else .03
-        self.wait_time = self.broker_config.get("wait_time",.5)
-        self.cooldown_multiplier = self.broker_config.get("cooldown_multiplier",2)
-        self.wait_after_initial_market_order = self.broker_config.get("wait_after_initial_market_order",1)
-        self.wait_before_new_safety_order = self.broker_config.get("wait_before_new_safety_order",1)
-        self.retries = self.broker_config.get("retries",5)
-        self.slippage_default_threshold = self.broker_config.get("slippage_default_threshold",.03)
-        self.follow_order_history = self.broker_config.get("follow_order_history",False)
-        self.write_order_history = self.broker_config.get("write_order_history", False)
         self.logger = Logger(self.broker_config)
-        self.log_orders = self.broker_config.get("log_orders",False)
+        self.follow_order_history = False   #This should be a toggle in config_file
+        self.write_order_history = False    #This should be a toggle in config_file
 
         #Initialize database
         self.profits_database_filename = "profits/profits_database.db"
@@ -51,7 +50,7 @@ class Broker:
         self.markets = self.exchange.load_markets()
         
         #Populates deals cache
-        self.deals_cache_length = 20
+        self.deals_cache_length = 10
         self.deals_list = self.preload_deals(amount_to_preload=self.deals_cache_length)
 
 
@@ -82,16 +81,6 @@ class Broker:
     def get_deals_cache(self):
         return self.deals_list
     
-    
-    def get_log_orders(self):
-        return self.log_orders
-    
-    
-    def set_log_orders(self,log_orders:bool):
-        self.log_orders = log_orders
-        return 0
-
-
     def get_symbol(self,pair):
         if "/" in pair:
             return pair
@@ -184,7 +173,7 @@ class Broker:
         
         query = f"SELECT * FROM profits_table WHERE pair = ? ORDER BY timestamp DESC LIMIT 1;"
         with self._cur() as cur:
-            cur.execute(query, (order["symbol"],))
+            cur.execute(query, (order['symbol'],))
             result = cur.fetchone()
             if result is None:
                 return False
@@ -204,13 +193,6 @@ class Broker:
         self.cooldown_multiplier = value
         return 0
     
-    def get_wait_after_initial_market_order(self):
-        return self.wait_after_initial_market_order
-    
-    def set_wait_after_initial_market_order(self, value:float):
-        self.wait_after_initial_market_order = value
-        return 0
-    
     def get_wait_before_new_safety_order(self):
         return self.wait_before_new_safety_order
     
@@ -224,7 +206,6 @@ class Broker:
     def set_default_order_size(self,size):
         try:
             self.broker_config["default_order_size"] = float(size)
-            self.rewrite_config_file()
         except Exception as e:
             self.logger.log_this(f"Exception in set_default_order_size: {e}",1)
             return 1
@@ -397,11 +378,6 @@ class Broker:
                 if self.get_exchange_name()=="binance":
                     a = self.exchange.fetch_last_prices(pair_list)
                     return {x: a[x]["price"] for x in a.keys()}
-                elif self.get_exchange_name()=="kucoin":
-                    a = self.exchange.fetch_tickers(pair_list)
-                    if pair_list is None:
-                        return {x: a[x]["close"] for x in a.keys()}
-                    return {x: a[x]["close"] for x in a.keys() if x in pair_list}                    
                 else:
                     a = self.exchange.fetch_tickers()
                     if pair_list is None:
@@ -427,7 +403,7 @@ class Broker:
         retries = self.retries
         while retries>0:
             try:
-                self.last_price = self.exchange.fetch_ticker(symbol)["close"]
+                self.last_price = self.exchange.fetch_ticker(symbol)
                 return self.last_price
             except Exception as e:
                 self.logger.log_this(f"Exception in get_ticker_price: {e}",1)
@@ -478,7 +454,7 @@ class Broker:
         try:
             return orderbook["bids"][0][0]
         except Exception as e:
-            self.logger.log_this(f"Exception getting top bid price: {e}",1,symbol)
+            self.logger.log_this(f"Exception getting top mid price: {e}",1,symbol)
         return self.get_ticker_price(symbol)
 
 
@@ -523,6 +499,28 @@ class Broker:
         return []
 
 
+    def fetch_full_orders(self,pairs=None) -> list:
+        '''
+        Returns a list of all orders on the exchange
+        
+        :param pairs: list of pairs to get orders for
+        :return: list of orders
+        '''
+        
+        if pairs is None:
+            pairs = []
+        try:
+            orders = []
+            if self.get_exchange_name()=="binance":
+                orders = self.get_opened_orders_binance(pairs)
+            else:
+                orders = self.get_opened_orders()
+            return [] if orders is None else orders
+        except Exception as e:
+            self.logger.log_this(f"Exception in fetch_full_orders: {e}",2)
+            return []
+
+
     def fetch_open_orders(self,pairs=None) -> list:
         '''
         Returns a list of all open orders on the exchange
@@ -535,17 +533,8 @@ class Broker:
             pairs = []
         try:
             if self.get_exchange_name()=="binance":
-                if self.broker_config.get("unified_order_query"):
+                return self.get_opened_orders_binance(pairs)
-                    return self.exchange.fetch_open_orders()
+            return self.get_opened_orders()
-                result = []
-                for pair in pairs:
-                    a = self.exchange.fetch_open_orders(pair)
-                    result.extend(iter(a))
-                return result
-            elif self.get_exchange_name()=="kucoin":
-                return self.exchange.fetch_open_orders(params={"pageSize": "500"})
-            else:
-                return self.exchange.fetch_open_orders()
         except Exception as e:
             self.logger.log_this(f"Exception in fetch_open_orders: {e}",2)
             return []
@@ -566,11 +555,11 @@ class Broker:
                 return self.get_closed_orders_binance(pairs)
             return self.get_closed_orders()
         except Exception as e:
-            self.logger.log_this(f"Exception in fetch_closed_orders: {e}",2)
+            self.logger.log_this(f"Exception in fetch_open_orders: {e}",2)
             return []
 
 
-    def get_closed_orders(self,pair=None,no_retries=False):    #It should return a list of all opened orders
+    def get_opened_orders(self,no_retries=False):    #It should return a list of all opened orders
         '''
         Returns a list of all the open orders on the exchange
         
@@ -581,7 +570,28 @@ class Broker:
         retries = self.retries
         while retries>0:
             try:
-                return self.exchange.fetch_closed_orders(pair)
+                return self.exchange.fetch_open_orders()
+            except Exception as e:
+                self.logger.log_this(f"Exception in get_opened_orders: {e}",1)
+                if no_retries:
+                    break
+                time.sleep(self.wait_time)
+                retries-=1
+        return []
+
+
+    def get_closed_orders(self,no_retries=False):    #It should return a list of all opened orders
+        '''
+        Returns a list of all the open orders on the exchange
+        
+        :param pairs: list of pairs
+        :return: list of all the open orders on the exchange
+        '''
+        
+        retries = self.retries
+        while retries>0:
+            try:
+                return self.exchange.fetch_closed_orders()
             except Exception as e:
                 self.logger.log_this(f"Exception in get_closed_orders: {e}",1)
                 if no_retries:
@@ -591,6 +601,27 @@ class Broker:
         return []
 
 
+    def get_opened_orders_binance(self,pairs):
+        '''
+        Returns a list of all the open orders on the exchange
+        
+        :param pairs: list of pairs
+        :return: list of all the open orders on the exchange
+        '''
+        
+        try:
+            if "unified_order_query" in self.broker_config and self.broker_config["unified_order_query"] is True:
+                return self.exchange.fetch_open_orders()
+            result = []
+            for pair in pairs:
+                a = self.exchange.fetch_open_orders(pair)
+                result.extend(iter(a))
+            return result
+        except Exception as e:
+            self.logger.log_this(f"Exception in get_opened_orders_binance: {e}",1)
+            return []
+
+
     def get_closed_orders_binance(self,pairs):
         '''
         Returns a list of all the closed orders on the exchange
@@ -600,7 +631,7 @@ class Broker:
         '''
         
         try:
-            if self.broker_config.get("unified_order_query"):
+            if "unified_order_query" in self.broker_config and self.broker_config["unified_order_query"] is True:
                 return self.exchange.fetch_closed_orders()
             result = []
             for pair in pairs:
@@ -622,15 +653,16 @@ class Broker:
         :return: 0 if order was succesfully canceled, 1 if not
         '''
         
+        pair = symbol
         tries = self.retries//2
         while tries>0:
             try:
-                while self.get_order(id,symbol)["status"]=="open":
+                while self.get_order(id,pair)["status"]=="open":
-                    self.exchange.cancel_order(id,symbol)
+                    self.exchange.cancel_order(id,symbol=pair)
                     time.sleep(self.wait_time)
                 return 0
             except Exception as e:
-                if self.get_order(id,symbol)["status"]=="canceled":
+                if self.get_order(id,pair)["status"]=="canceled":
                     return 0
                 self.logger.log_this(f"Exception in cancel_order: id {id} - exception: {e}",1)
                 if no_retries:
@@ -664,7 +696,7 @@ class Broker:
             return amount        
 
 
-    def new_simulated_market_order(self,symbol,size,side,amount_in_base=False,no_retries=False,log=""):
+    def new_simulated_market_order(self,symbol,size,side,amount_in_base=False,no_retries=False):
         '''
         TODO: Emulating Market Orders With Limit Orders
 
@@ -691,29 +723,26 @@ class Broker:
         '''
         
         retries = self.retries//2
+        pair = symbol
         while retries>0:
             try:
                 if self.get_exchange_name()=="gateio" and side=="buy" and not amount_in_base:
-                    new_order = self.exchange.create_market_buy_order_with_cost(symbol, size)
+                    new_order = self.exchange.create_market_buy_order_with_cost(pair, size) 
-                    if self.log_orders:
-                        self.logger.log_order(f"New simulated market order: Symbol: {symbol} - Side: {side} - Size: {size} - ID: {new_order['id']} - Origin: {log}")                     
                 else:
                     order_book = self.get_order_book(symbol)
                     if order_book=={}:
                         self.logger.log_this(f"new_simulated_market_order. Order book returned an empty dictionary",1,symbol)
                         return self.empty_order
                     if amount_in_base or side!="buy":
-                        base_amount = self.amount_to_precision(symbol,size)
+                        base_amount = self.amount_to_precision(pair,size)
                     else:
                         avg_price = self.average_price_depth(order_book,size,"sell")
                         base_amount = size/avg_price if avg_price is not None else size/self.get_ticker_price(symbol)
                     price = self.find_minimum_viable_price(order_book,base_amount,side)
                     #Maybe check for slippage here instead of within the trader itself? idk
-                    new_order = self.exchange.create_order(symbol,"limit",side,base_amount,price)
+                    new_order = self.exchange.create_order(pair,"limit",side,base_amount,price)
-                    if self.log_orders:
-                        self.logger.log_order(f"New simulated market order: Symbol: {symbol} - Side: {side} - Size: {size} - Price: {price} - ID: {new_order['id']} - Origin: {log}")                    
                 time.sleep(self.wait_time)     
-                return self.get_order(new_order["id"],symbol)
+                return self.get_order(new_order["id"],pair)
             except Exception as e:
                 self.logger.log_this(f"new_simulated_market_order exception: {e}",1,symbol)
                 if no_retries:
@@ -758,7 +787,7 @@ class Broker:
         return None
 
 
-    def new_market_order(self,symbol,size,side,amount_in_base=False,no_retries=False, log=""):     #It should send a new market order to the exchange
+    def new_market_order(self,symbol,size,side,amount_in_base=False,no_retries=False):     #It should send a new market order to the exchange
         '''
         Sends a new market order to the exchange.
         
@@ -772,24 +801,24 @@ class Broker:
         if self.broker_config["simulate_market_orders"]:
             return self.new_simulated_market_order(symbol,size,side,amount_in_base=amount_in_base)
         retries = self.retries
+        pair = symbol
         while retries>0:
             try:
                 if side=="buy":
                     to_buy = float(size)
                     if not amount_in_base:
-                        to_buy = float(size)/self.get_top_ask_price(symbol)
+                        to_buy = float(size)/self.get_top_ask_price(pair)
-                    amount = self.amount_to_precision(symbol,to_buy)
+                    amount = self.amount_to_precision(pair,to_buy)
                 else:
-                    amount = self.amount_to_precision(symbol,size)       #Market sell orders are always nominated in base currency
+                    amount = self.amount_to_precision(pair,size)       #Market sell orders are always nominated in base currency
 
-                order_to_send = self.exchange.create_order(symbol,"market",side,amount)
+                order_to_send = self.exchange.create_order(pair,"market",side,amount)
-                if self.log_orders:
-                    self.logger.log_order(f"New market order: Symbol: {symbol} - Side: {side} - Size: {size} - ID: {order_to_send['id']} - Origin: {log}")
                 time.sleep(self.wait_time)
+                # Wait a bit more when dealing with Kucoin
                 
-                return self.get_order(order_to_send["id"],symbol)
+                return self.get_order(order_to_send["id"],pair)
             except Exception as e:
-                self.logger.log_this(f"Exception in new_market_order: {e} - Side: {side} - Size: {size}",1,symbol)
+                self.logger.log_this(f"Exception in new_market_order: {e}",1,pair)
                 if no_retries:
                     break
                 time.sleep(self.wait_time)
@@ -837,41 +866,7 @@ class Broker:
         return "the lowest price limit for sell orders is" in str(error_object).lower()
 
 
-    # def new_limit_orders(self, orders: list) -> list:
+    def new_limit_order(self,symbol,size,side,price,no_retries=False):
-    #     sent_orders = []
-    #     #Send the orders
-    #     tries = self.retries
-    #     while tries>=0:
-    #         try:
-    #             sent_orders = self.exchange.create_orders(orders)
-    #         except Exception as e:
-    #             self.logger.log_this(f"Exception while sending safety orders: {e}",1)
-    #             tries-=1
-    #             time.sleep(self.wait_time)
-    #             if tries==0:
-    #                 return []
-                
-    #     #Retrieve the orders from the exchange by id to confirm that they were sent
-    #     #Specially for OKX, since the orders that create_orders return are empty (only id is present)
-    #     returned_orders = []
-    #     for order in sent_orders:
-    #         tries = self.retries
-    #         while tries>=0:
-    #             try:
-    #                 returned_orders.append(self.get_order(order["id"],order["symbol"]))
-    #                 time.sleep(self.wait_time)
-    #             except Exception as e:
-    #                 self.logger.log_this(f"Exception while retrieving safety orders: {e}",1)
-    #                 tries-=1
-    #                 if tries==0:
-    #                     if self.get_exchange_name()=="okex":
-    #                         return returned_orders
-    #                     returned_orders.append(order)   #In the case of the other exchanges, we just assume that the order was sent and append it.
-    #                 time.sleep(self.wait_time)
-    #     return returned_orders
-    
-
-    def new_limit_order(self,symbol,size,side,price,no_retries=False,log=""):
         '''
         Sends a new limit order.
         
@@ -883,15 +878,20 @@ class Broker:
         '''
         
         tries = self.retries
+        pair = symbol
         while tries>=0:        
             try:
-                order_to_send = self.exchange.create_order(symbol,"limit",side,self.amount_to_precision(symbol,size),price)
+                order_to_send = self.exchange.create_order(pair,"limit",side,self.amount_to_precision(pair,size),price)
                 time.sleep(self.wait_time)
-                if self.log_orders:
+                return self.get_order(order_to_send["id"],pair)
-                    self.logger.log_order(f"New limit order: Symbol: {symbol} - Side: {side} - Size: {size} - Price: {price} - ID: {order_to_send['id']} - Notes: {log}")
+                #if order_to_send["amount"] is not None:                                     # Because Kucoin etc etc
-                return self.get_order(order_to_send["id"],symbol)
+                #    return self.get_order(order_to_send["id"],pair)                                                    #
+                #self.logger.log_this(f"Error sending order: Null order returned",2,pair)    #
+                #self.cancel_order(order_to_send["id"],symbol,no_retries=True)               #
+                #retries-=1                                                                  
+                                
             except Exception as e:
-                self.logger.log_this(f"Exception in new_limit_order - Side: {side} - Size: {size} - {self.amount_to_precision(symbol,size)} - Exception: {e}",1,symbol)
+                self.logger.log_this(f"Exception in new_limit_order - Side: {side} - Size: {size} - {self.amount_to_precision(pair,size)} - Exception: {e}",1,symbol)
                 if self.not_enough_balance_error(e):
                     if tries<=self.retries//2:  #Halves the amount of retries if there is a balance error.
                         return 1
@@ -922,9 +922,10 @@ class Broker:
         if id=="":
             return self.empty_order
         tries = self.retries
+        pair = symbol
         while tries>0:
             try:
-                return self.exchange.fetch_order(id,symbol)
+                return self.exchange.fetch_order(id,symbol=pair)
             except Exception as e:
                 self.logger.log_this(f"Exception in get_order: {e}",1,symbol)
                 if no_retries:
@@ -942,9 +943,10 @@ class Broker:
         :return: The market information.
         '''
         tries = self.retries
+        pair = symbol
         while tries>0:
             try:
-                return self.exchange.market(symbol)
+                return self.exchange.market(pair)
             except Exception as e:
                 self.logger.log_this(f"Exception in fetch_market: {e}",1,symbol)
                 if no_retries:
@@ -962,9 +964,10 @@ class Broker:
         :return: The ticker information.
         '''
         tries = self.retries
+        pair = symbol
         while tries>0:
             try:
-                return self.exchange.fetch_ticker(symbol)
+                return self.exchange.fetch_ticker(pair)
             except Exception as e:
                 self.logger.log_this(f"Exception in get_ticker: {e}")
                 if no_retries:
@@ -988,9 +991,9 @@ class Broker:
         if self.get_exchange_name() in ["okex","bybit"]:
             return float(market["limits"]["amount"]["min"])
         elif self.get_exchange_name() in ["kucoin"]:
-            return max(float(market["limits"]["amount"]["min"]),(float(market["limits"]["cost"]["min"])+.25)/self.get_ticker_price(pair))
-        elif self.get_exchange_name() in ["gateio"]:
             return (float(market["limits"]["cost"]["min"])+.1)/self.get_ticker_price(pair)
+        elif self.get_exchange_name() in ["gateio"]:
+            return (float(market["limits"]["cost"]["min"])+.25)/self.get_ticker_price(pair)
         elif self.get_exchange_name()=="binance":
             for line in market["info"]["filters"]:
                 if line["filterType"] == "NOTIONAL":
@@ -1028,8 +1031,8 @@ class Broker:
         
         :param pair: pair
         :return: step size
-        '''
         
+        '''
         market = self.fetch_market(pair)
         if market is None:
             return None
@@ -1052,30 +1055,18 @@ class Logger:
         self.broker_config = broker_config
         self.exchange_name = self.broker_config["exchange"]
         self.tg_credentials = credentials.get_credentials("telegram")
-        self.log_list_max_length = 20   # log cache
+        self.log_list_max_length = 10
-        self.log_list = collections.deque(maxlen=self.log_list_max_length)
+        self.log_list = self.preload_logs()
-        self.preload_logs()
 
     
     def preload_logs(self):
         try:
             with open(f"logs/{self.exchange_name}.log","r") as f:
-                for line in f:
+                self.log_list = f.readlines()
-                    self.log_list.append(line.rstrip("\n"))
+            return self.log_list[-self.log_list_max_length:]
-            return 0
         except Exception as e:
             print(e)
-            return 1
+            return []
-    
-    
-    def refresh_logs(self):
-        try:
-            self.log_list.clear()
-            self.preload_logs()
-            return 0
-        except Exception as e:
-            print(e)
-            return 1
     
     
     def set_log_list_max_length(self, amount):
@@ -1084,7 +1075,7 @@ class Logger:
     
     
     def get_log_list(self):
-        return list(self.log_list)
+        return self.log_list
     
     
     def set_telegram_notifications(self, toggle):
@@ -1114,9 +1105,6 @@ class Logger:
             self.log_this(f"Error in send_tg_message: {e}",1)
             return 1
     
-    def log_order(self,message):
-        with open(f"logs/orders.log","a") as log_file:
-            log_file.write(time.strftime(f"[%Y/%m/%d %H:%M:%S] | {message}\n"))
     
     def log_this(self,message,level=2,pair=None):
         '''
@@ -1138,16 +1126,26 @@ class Logger:
                 #Write to log file
                 with open(f"logs/{self.exchange_name}.log","a") as log_file:
                     log_file.write(text+"\n")
+                log_file.close()
+                
                 #Append to log list
                 self.log_list.append(text)
+                
+                #Trim log list
+                self.log_list = self.log_list[-self.log_list_max_length:]
+                
             except Exception as e:
                 print("Can't write log file")
                 print(e)
+        
         if level<1:
             self.send_tg_message(f"{self.broker_config['exchange'].capitalize()} | {pair_data}{message}",ignore_config=level==-1)
             
         return 0
 
 
+class Order:
+    def __init__(self, order: dict = {}):
+        pass
     
     

status_handler.py

@@ -12,8 +12,7 @@ class StatusHandler:
             "pair": f"{base}/{quote}",
             "take_profit_order": broker.get_empty_order(),
             "take_profit_price": 0.0,
-            "safety_orders": [],
+            "safety_order": broker.get_empty_order(),
-            "safety_orders_filled": 0,
             "next_so_price": 0.0,
             "order_size": 0.0,
             "partial_profit": 0.0,
@@ -24,7 +23,8 @@ class StatusHandler:
             "quote_spent": 0.0,
             "base_bought": 0.0,
             "so_amount": 0,
-            "no_of_safety_orders": 0,
+            "no_of_safety_orders": "",
+            "take_profit_price": "",
             "safety_price_table": [],
             "deal_uptime": 0.0,
             "total_uptime": 0.0,
@@ -44,10 +44,10 @@ class StatusHandler:
             "deal_order_history": []
         }
         self.status_file_path = f"status/{base}{quote}.status"
+        self.status_dictionary = self.default_status_dictionary.copy()        
         
-        self.status_dictionary = {k: v for k, v in self.default_status_dictionary.items()}
+        if status_dict is not None:
-        if status_dict:
+            self.status_dictionary = {**self.status_dictionary, **status_dict}
-            self.status_dictionary.update(status_dict)
             self.save_to_file()  
 
     def get_pair(self):
@@ -59,14 +59,8 @@ class StatusHandler:
     def get_take_profit_price(self):
         return self.status_dictionary["take_profit_price"]
 
-    def get_safety_orders(self):
+    def get_safety_order(self):
-        """
+        return self.status_dictionary["safety_order"]
-        Returns the list of open safety orders
-        """
-        return self.status_dictionary["safety_orders"]
-    
-    def get_safety_orders_filled(self):
-        return self.status_dictionary["safety_orders_filled"]
     
     def get_next_so_price(self):
         return self.status_dictionary["next_so_price"]
@@ -155,10 +149,6 @@ class StatusHandler:
     def get_status_file_path(self):
         return self.status_file_path
     
-    def set_pair(self, trading_pair):
-        self.pair = trading_pair
-        return 0
-    
     def set_status_file_path(self, new_file_path: str):
         # if not isinstance(new_file_path, str):
         #     self.broker.logger.log_this(f"File path provided is not a string",1,self.get_pair())
@@ -192,15 +182,8 @@ class StatusHandler:
         self.status_dictionary["so_order_id"] = order_id
         return 0
     
-    def set_safety_orders(self, orders: list):
+    def set_safety_order(self, order):
-        """
+        self.status_dictionary["safety_order"] = order
-        Replaces the whole safety orders list
-        """
-        self.status_dictionary["safety_orders"] = orders
-        return 0
-    
-    def set_safety_orders_filled(self, amount: int):
-        self.status_dictionary["safety_orders_filled"] = amount
         return 0
     
     def set_next_so_price(self, price: float):
@@ -399,32 +382,35 @@ class StatusHandler:
         self.status_dictionary["deal_order_history"] = deal_history
         return 0
     
-    def add_safety_order(self, order):
-        """
-        Appends a newly-created safety order to the internal list
-        """
-        self.status_dictionary["safety_orders"].append(order)
-        return 0
-    
-    def remove_safety_order_by_id(self, order_id: str):
-        """
-        Removes an order from the list (mostly used when that order is filled or canceled)
-        """
-        orders = self.get_safety_orders()
-        self.status_dictionary["safety_orders"] = [order for order in orders if order["id"] != order_id]
-        return 0
-    
     def clear_deal_order_history(self):
         self.status_dictionary["deal_order_history"] = []
         return 0
     
-    def update_deal_order_history(self, new_deal: dict, note: str = ""):
+    def update_deal_order_history(self, new_deal: dict):
         # if not isinstance(new_deal, dict):
         #     self.broker.logger.log_this(f"value provided is not a dict",1,self.get_pair())
-        id = new_deal["id"] if "id" in new_deal else None
+        self.status_dictionary["deal_order_history"].append(self.strip_order(new_deal))
-        self.status_dictionary["deal_order_history"].append(f"{note} - {id}")
         return 0
     
+    def strip_order(self, order):
+        try:
+            stripped_order =  {"id": order["id"],
+                            "symbol": order["symbol"],
+                            "type": order["type"],
+                            "side": order["side"],
+                            "price": float(order["price"]),
+                            "amount": float(order["amount"]),
+                            "filled": float(order["filled"]),
+                            "cost": float(order["cost"]),
+                            "remaining": float(order["remaining"]),
+                            "timestamp": order["timestamp"],
+                            "fees": order["fees"]}
+            return stripped_order
+        except Exception as e:
+            self.broker.logger.log_this(f"Error stripping order: {e}",2)
+            return order
+        
+    
     def save_to_file(self, file_path = None, is_backup = False):
         if file_path is None:
             file_path = self.status_file_path

todo.txt

@@ -1,25 +1,32 @@
 Mandatory:
 =========
-0. Stats webpage.
+1. Stats webpage.
-1. Maintain local orderbooks for each trading pair, which enables:
+2. Maintain local orderbooks for each trading pair, which enables:
     2a. Smart order pricing: Prioritization of fill speed over instant profit or vice versa
-2. Proper handling of order price too high/low in OKX (rare, it happens when under heavy volatility).
+3. Proper handling of order price too high/low in OKX (rare, it happens when under heavy volatility).
-3. API documentation.
+4. Multiple safety orders open at the same time (to catch big volatility spikes more effectively)
-4. Implement api key hashing.
+5. Things that should be objects (it's not 1994):
-5. Dockerize.
+    * Orders.
-6. Earn should be integrated into the instance, in order to be able to invest the idle funds from the short traders.
+    * Config (Mostly done).
+    * Status (Mostly done).
+6. API documentation.
+7. Implement api key hashing.
+8. Dockerize.
+9. Cache generated status strings, only recalculate when prices change.
+10. Inspect orderbook liquidity prior to changing mode from short to long (big sell market order needs to have liquidity).
 
 
 Would be nice to have:
 =====================
 0. Trader order: alphabetical; by uptime; by safety orders, by percentage_to_completion. (Although this may be more suitable for the web and mobile apps)
 1. Local implementation of amount_to_precision, cost_to_precision and price_to_precision. (Unless the plan is to continue to use CCXT forever)
-2. Instead of cancelling and resending the take profit order, edit it (Kucoin only supports editing on high frequency orders)
+2. Instead of cancelling and resending the take profit order, you could just edit it (Kucoin only supports editing on high frequency orders)
-3. When autoswitching to long, instead of using a big market order, the last safety order should be a sell order of all the available funds.
+3. Round-robin trading pairs: Instead of a fixed list of trading pairs, after n closed deals the trader is terminated and a new one spawns, picking the trading pair
-4. Round-robin trading pairs: Instead of a fixed list of trading pairs, after n closed deals the trader is terminated and a new one spawns, picking the trading pair
     from a pre-populated list (the trading pairs can be selected by using Yang-Zhang, Parkinson or another volatility indicator)
     This could be very benefitial, since it limits the long time commitment to a small list of trading pairs, enabling the instance to react to market trends very 
     rapidly.
+4. Earn should also use funds from short traders.
+    4b. Should Earn be integrated to the instance?
 
 
 Maybe it's a good idea?:

utils/commander.py

@@ -11,12 +11,6 @@ try:
         api_key = credentials.get_credentials("testnet_api_key")["key"]
         base_url = credentials.get_url("testnet") #type: ignore
         exchanges = {"Binance":"/binance"}
-    elif sys.argv[1]=="--local_testnet":
-        is_testnet = True
-        string_to_add = "LOCAL TESTNET "
-        api_key = credentials.get_credentials("local_testnet_api_key")["key"]
-        base_url = credentials.get_url("local_testnet") #type: ignore
-        exchanges = {"Binance":":5001"}        
     elif sys.argv[1]=="--mainnet":
         is_testnet = False
         string_to_add = "MAINNET "
@@ -43,8 +37,7 @@ INSTANCE
 10) edit_call_wait_time 11) reload_markets      12) fetch_full_log
 13) paused_traders      14) fetch_log           15) edit_cooldown_multiplier
 16) get_balance         17) cancel_global_last_call
-18) mod_default_order_size                      19) toggle_log_orders
+18) mod_default_order_size
-20) refresh_log_cache
 
 EARN
 31) toggle_pause        32) get_step_size       33) set_step_size
@@ -63,10 +56,9 @@ TRADERS
 62) mod_tp_level        63) last_call           64) deferred_last_call
 65) toggle_pause        66) toggle_cleanup      67) toggle_autoswitch
 68) toggle_check_old_long_price                 69) switch_quote_currency
-70) view_old_long       71) switch_price        72) reload_trader_config                        
+70) reload_safety_order 71) view_old_long       72) switch_price
-73) toggle_liquidate_after_switch               74) base_add_calculation
+73) reload_trader_config                        74) toggle_liquidate_after_switch
-75) mod_concurrent_safety_orders                76) force_trader_close
+75) base_add_calculation
-77) mod_order_size
 
 98) Change broker       99) Exit
 '''
@@ -342,19 +334,6 @@ if __name__=="__main__":
                 print(json.loads(requests.post(url, headers=headers, json=parameters).content))
                 input("Press ENTER to continue ")        
         
-        elif command==19:
-            print("toggle_log_orders turns on or off the logging of orders")
-            if input("Proceed? (Y/n) ") in ["Y","y",""]:
-                url = f"{base_url}{port}/toggle_log_orders"            
-                print(json.loads(requests.post(url, headers=headers).content))
-                input("Press ENTER to continue ")        
-       
-        elif command==20:
-            print("refresh_log_cache refreshes the log cache")
-            if input("Proceed? (Y/n) ") in ["Y","y",""]:
-                url = f"{base_url}{port}/refresh_log_cache"            
-                print(json.loads(requests.post(url, headers=headers).content))
-                input("Press ENTER to continue ")           
         
         ######################
         ######## EARN ########
@@ -582,6 +561,10 @@ if __name__=="__main__":
             print("In order for the importing to be successful, a status file must exist in the status directory ")
             print("and the take profit order must be open.")
             trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
+            tp_id_input = input("Input take profit order id to use (if any)")
+            forced_tp_id = None if tp_id_input=="" else tp_id_input
+            so_id_input = input("Input safety order id to use (if any)")
+            forced_so_id = None if so_id_input=="" else so_id_input
             
             if not validate_pair(trading_pair):
                 print("The input is invalid")
@@ -590,7 +573,9 @@ if __name__=="__main__":
                 url = f"{base_url}{port}/import_pair"
                 base,quote = trading_pair.split("/")
                 parameters = {"base": base,
-                            "quote": quote}
+                            "quote": quote,
+                            "forced_tp_id": forced_tp_id,
+                            "forced_so_id": forced_so_id}
                 print(json.loads(requests.post(url, headers=headers, json=parameters).content))
                 input("Press ENTER to continue ")
 
@@ -813,6 +798,20 @@ if __name__=="__main__":
                 input("Press ENTER to continue ")
         
         elif command==70:
+            print("reload_safety_order reloads the safety order to the reader using the order id present in the status dictionary")
+            trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
+            if not validate_pair(trading_pair):
+                print("The input is invalid")
+                break
+            if input("Proceed? (Y/n) ") in ["Y","y",""]:
+                url = f"{base_url}{port}/reload_safety_order"
+                base,quote = trading_pair.split("/")
+                parameters = {"base": base,
+                            "quote": quote}
+                print(json.loads(requests.post(url, headers=headers, json=parameters).content))
+                input("Press ENTER to continue ")
+
+        elif command==71:
             print("Views the old_long information")
             trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
             if not validate_pair(trading_pair):
@@ -825,7 +824,7 @@ if __name__=="__main__":
                 print(json.loads(requests.get(url,headers=headers).content))               
                 input("Press ENTER to continue ")
 
-        elif command==71:
+        elif command==72:
             print("Returns the price target to reach to switch to long mode")
             trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
             if not validate_pair(trading_pair):
@@ -837,7 +836,7 @@ if __name__=="__main__":
                 print(json.loads(requests.get(url,headers=headers).content))               
                 input("Press ENTER to continue ")
 
-        elif command==72:
+        elif command==73:
             print("Reloads from disk the configuration file of a trader")
             trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
             if not validate_pair(trading_pair):
@@ -851,7 +850,7 @@ if __name__=="__main__":
                 print(json.loads(requests.post(url, headers=headers, json=parameters).content))
                 input("Press ENTER to continue ")          
 
-        elif command==73:
+        elif command==74:
             print("toggle_liquidate_after_switch enables or disables the liquidation after an automatic switch to long of a short trader")
             print("This is only valid in a short trader, of course.")        
             trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
@@ -866,7 +865,7 @@ if __name__=="__main__":
                 print(json.loads(requests.post(url, headers=headers, json=parameters).content))
                 input("Press ENTER to continue ")        
 
-        elif command==74:
+        elif command==75:
             print("Returns the amount of safety orders that can be added to a short trader with the available funds")
             trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
             if not validate_pair(trading_pair):
@@ -877,56 +876,3 @@ if __name__=="__main__":
                 url = f"{base_url}{port}/base_add_so_calculation?base={base}&quote={quote}"
                 print(json.loads(requests.get(url,headers=headers).content))               
                 input("Press ENTER to continue ")                        
-
-        elif command==75:
-            print("mod_concurrent_safety_orders modifies the amount of safety orders opened at the same time")
-            trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
-            new_amount = input("Desired amount of orders: ")
-            if not validate_pair(trading_pair):
-                print("The input is invalid")
-                break
-            if not validate_int(new_amount):
-                print("The amount entered is invalid")
-                break
-            if input("Proceed? (Y/n) ") in ["Y","y",""]:
-                url = f"{base_url}{port}/mod_concurrent_safety_orders"
-                base,quote = trading_pair.split("/")
-                parameters = {"base": base,
-                            "quote": quote,
-                            "amount": new_amount}
-                print(json.loads(requests.post(url, headers=headers, json=parameters).content))       
-                input("Press ENTER to continue ")                                
-
-        elif command==76:
-            print("force_trader_close forces a trader to close the current position")
-            trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
-            if not validate_pair(trading_pair):
-                print("The input is invalid")
-                break
-            if input("Proceed? (Y/n) ") in ["Y","y",""]:
-                url = f"{base_url}{port}/force_trader_close"
-                base,quote = trading_pair.split("/")
-                parameters = {"base": base,
-                            "quote": quote}
-                print(json.loads(requests.post(url, headers=headers, json=parameters).content))       
-                input("Press ENTER to continue ")                  
-
-        elif command==77:
-            print("mod_order_size modifies the initial order size of a trader")
-            print("The change impacts as soon as the trader starts a new deal")
-            trading_pair = input("Input trader in the format BASE/QUOTE: ").upper()
-            amount = input("Desired order size: ")
-            if not validate_pair(trading_pair):
-                print("The input is invalid")
-                break
-            if not validate_float_or_int(amount):
-                print("The amount entered is invalid")
-                break
-            if input("Proceed? (Y/n) ") in ["Y","y",""]:
-                url = f"{base_url}{port}/mod_order_size"
-                base,quote = trading_pair.split("/")
-                parameters = {"base": base,
-                            "quote": quote,
-                            "amount": amount}
-                print(json.loads(requests.post(url, headers=headers, json=parameters).content))                                                     
-                input("Press ENTER to continue ")                

utils/statistics_server_v3.py

@@ -11,6 +11,7 @@ from waitress import serve
 
 
 profits_database = "../profits/profits_database.db"
+
 _local_storage = threading.local()
 
 def get_db_connection():
@@ -39,6 +40,8 @@ def db_cursor():
         raise
 
 def load_keys_from_db(file_name):
+    #valid_keys = []
+    
     connection = sqlite3.connect(file_name) 
     cursor = connection.cursor()
     cursor.execute("SELECT * FROM credentials_table")
@@ -46,10 +49,11 @@ def load_keys_from_db(file_name):
     connection.close()    
     
     valid_keys = [line[1] for line in data]
+    #for line in data:
+    #    valid_keys.append(line[1])    
     
     return valid_keys
 
-
 def get_valid_keys():
     if not hasattr(get_valid_keys, '_keys'):
         get_valid_keys._keys = load_keys_from_db("api_credentials.db")
@@ -68,6 +72,7 @@ def profit_report():
                 ORDER BY day_utc3;""")
         last_60_days_rows = cursor.fetchall()
     #Last 30 days query
+    #cursor.execute("""SELECT strftime('%Y-%m-%d', timestamp, 'unixepoch', '-3 hours') AS day_utc3,
     with db_cursor() as cursor:    
         cursor.execute("""SELECT strftime('%Y-%m-%d', timestamp, 'unixepoch', '-3 hours') AS day_utc3,
                 SUM(amount) AS total_amount
@@ -118,6 +123,9 @@ def profit_report():
                 exchange_name, month_group;""") 
         per_exchange = cursor.fetchall()
 
+    #Close db
+    #cursor.close()    
+    
 
     #Projection calculation
     days_in_month = calendar.monthrange(datetime.date.today().year, datetime.date.today().month)[1]
@@ -174,6 +182,7 @@ def profit_report():
             "Total profit": total_amount}
     
    
+    
 def query_total_profit(pair=None):
     '''
     Returns total profit of the trading pair.
@@ -199,11 +208,12 @@ def query_total_profit(pair=None):
     return 0
 
 
-def daily_and_monthly_totals() -> tuple[float, float]:
+def daily_and_monthly_totals():
     '''
     Returns a tuple with the current day and the current month's total profit.
     '''
 
+
     now = datetime.datetime.now()
 
     # Create a datetime object for the start of the day
@@ -214,16 +224,15 @@ def daily_and_monthly_totals() -> tuple[float, float]:
     start_of_day_unix = int(time.mktime(start_of_day.timetuple()))
     start_of_month_unix = int(time.mktime(start_of_month.timetuple()))
     
-    query = """SELECT
+    query = """SELECT * FROM profits_table 
-                COALESCE(SUM(CASE WHEN timestamp >= :day   THEN amount END),0) AS daily_total,
+                WHERE timestamp >= ?
-                COALESCE(SUM(CASE WHEN timestamp >= :month THEN amount END),0) AS monthly_total
+                ORDER BY timestamp DESC;"""
-                FROM profits_table;
+    with db_cursor() as cursor:                
-            """
+        cursor.execute(query, (start_of_month_unix,))
-    with db_cursor() as cur:
+        query_result = cursor.fetchall()
-        cur.execute(query, {"day": start_of_day_unix, "month": start_of_month_unix})
+    
-        row = cur.fetchone()
+    monthly_total = sum([item[2] for item in query_result])
-        daily_total   = float(row["daily_total"])
+    daily_total = sum([item[2] for item in query_result if item[0]>=start_of_day_unix])
-        monthly_total = float(row["monthly_total"])        
     
     return (daily_total, monthly_total)
 
@@ -368,15 +377,37 @@ def fetch_profit_report():
     Returns: JSON object with profit report data
     '''    
     
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():          
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            return jsonify(profit_report())
-        return jsonify(profit_report())
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return jsonify({"Error": f"{e}"})
-        return jsonify({"Error": f"{e}"})
+    return jsonify({'Error': 'API key invalid'}), 401    
 
 
+@stats_api.route("/clear_caches")
+def clear_hashes():
+    global hashes_db
+    
+    '''
+    GET request
+    '''
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
+        hashes_db = {"fetch_last_n_deals":0,
+                    "fetch_last_n_deals_without_history":0,
+                    "fetch_full_log":0,
+                    "fetch_log":0,
+                    "daily_totals":0,
+                    "daily_totals_by_pair":0,
+                    "monthly_totals":0,
+                    "monthly_totals_by_pair":0,
+                    "get_averages":0,
+                    "total_profit":0,
+                    "total_profit_by_pair":0}
+        return jsonify({"Done":0})
+    return jsonify({'Error': 'API key invalid'}), 401
+
 
 @stats_api.route("/fetch_last_n_deals")
 def fetch_last_n_deals():
@@ -384,15 +415,15 @@ def fetch_last_n_deals():
     GET request
     Parameter: 'amount_of_deals' -> int
     '''
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            parameter = request.args.get("amount_of_deals")
-        parameter = request.args.get("amount_of_deals")
+            response_value = last_n_deals(parameter)
-        response_value = last_n_deals(parameter)
+            return jsonify({"last_deals": response_value})
-        return jsonify({"last_deals": response_value})
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return jsonify({"last_deals":""})
-        return jsonify({"last_deals":""})
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/fetch_last_n_deals_without_history")
@@ -401,16 +432,16 @@ def fetch_last_n_deals_without_history():
     GET request
     Parameter: 'amount_of_deals' -> int
     '''    
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            parameter = request.args.get("amount_of_deals")
-        parameter = request.args.get("amount_of_deals")
+            #return jsonify({"last_deals": last_n_deals_without_history(parameter)})       
-        #return jsonify({"last_deals": last_n_deals_without_history(parameter)})       
+            response_value = last_n_deals_without_history(parameter)     
-        response_value = last_n_deals_without_history(parameter)     
+            return jsonify({"last_deals": response_value})         
-        return jsonify({"last_deals": response_value})         
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return jsonify({"last_deals":""})
-        return jsonify({"last_deals":""})
+    return jsonify({'Error': 'API key invalid'}), 401        
 
 
 @stats_api.route("/fetch_full_log")
@@ -421,16 +452,17 @@ def fetch_full_log():
     
     It trims the full log to 200 lines, to avoid sending too much data to the client.
     '''
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():        
-        return jsonify({'Error': 'API key invalid'}), 401   
+        try:
-    try:
+            exchange_name = request.args.get("exchange_name")
-        exchange_name = request.args.get("exchange_name")
+            width = 0
-        width = 0
+            #last_lines,amount_of_lines = last_n_lines(f"../logs/{exchange_name}.log",width,0,full_log=True)
-        last_lines, amount_of_lines = tail_log(f"../logs/{exchange_name}.log", 200)
+            last_lines, amount_of_lines = tail_log(f"../logs/{exchange_name}.log", 200)
-        return jsonify({"line": last_lines[-200:], "amount_of_lines": amount_of_lines})
+            return jsonify({"line": last_lines[-200:], "amount_of_lines": amount_of_lines})
-    except Exception as e:
+        except Exception as e:
-        print(e)
+            print(e)
-        return {"line": [""]*width,"amount_of_lines": 0}
+            return {"line": [""]*width,"amount_of_lines": 0}
+    return jsonify({'Error': 'API key invalid'}), 401            
 
 
 @stats_api.route("/fetch_log")
@@ -441,33 +473,33 @@ def fetch_log():
                 'width' -> int
                 'amount' -> int
     '''    
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():          
-        return jsonify({'Error': 'API key invalid'}), 401       
+        try:
-    try:
+            exchange_name = request.args.get("exchange_name")
-        exchange_name = request.args.get("exchange_name")
+            width = int(request.args.get("width")) # type: ignore
-        width = int(request.args.get("width")) # type: ignore
+            amount = int(request.args.get("amount")) # type: ignore
-        amount = int(request.args.get("amount")) # type: ignore
+            last_lines,total_amount_of_lines = last_n_lines(f"../logs/{exchange_name}.log",width,amount)
-        last_lines,total_amount_of_lines = last_n_lines(f"../logs/{exchange_name}.log",width,amount)
+            return jsonify({"line": last_lines, "amount_of_lines": total_amount_of_lines})
-        return jsonify({"line": last_lines, "amount_of_lines": total_amount_of_lines})
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return {"line": [""]*10,"amount_of_lines": 0}
-        return {"line": [""]*10,"amount_of_lines": 0}
+    return jsonify({'Error': 'API key invalid'}), 401           
 
 
 @stats_api.route("/combined_totals")
 def combined_totals():
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():         
-        return jsonify({'Error': 'API key invalid'}), 401     
+        daily_totals = daily_and_monthly_totals()
-    daily_totals = daily_and_monthly_totals()
+        return jsonify({"combined": daily_totals})
-    return jsonify({"combined": daily_totals})
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/daily_totals")
 def get_daily_totals():
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():         
-        return jsonify({'Error': 'API key invalid'}), 401      
+        daily_totals = query_daily_totals()
-    daily_totals = query_daily_totals()
+        return jsonify(daily_totals)
-    return jsonify(daily_totals)
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/daily_totals_by_pair")
@@ -477,24 +509,24 @@ def get_daily_totals_by_pair():
     Parameters: 'base' -> string
                 'quote' -> string
     ''' 
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            base = request.args.get("base")
-        base = request.args.get("base")
+            quote = request.args.get("quote")
-        quote = request.args.get("quote")
+            daily_totals = query_daily_totals(f"{base}{quote}")
-        daily_totals = query_daily_totals(f"{base}{quote}")
+            return jsonify(daily_totals)
-        return jsonify(daily_totals)
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return jsonify({'Error': 'Halp'})
-        return jsonify({'Error': 'Halp'})
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/monthly_totals")
 def get_monthly_totals():
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        monthly_totals = query_monthly_totals()
-    monthly_totals = query_monthly_totals()
+        return jsonify(monthly_totals)
-    return jsonify(monthly_totals)
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/monthly_totals_by_pair")
@@ -504,47 +536,55 @@ def get_monthly_totals_by_pair():
     Parameters: 'base' -> string
                 'quote' -> string
     '''     
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            base = request.args.get("base")
-        base = request.args.get("base")
+            quote = request.args.get("quote")    
-        quote = request.args.get("quote")    
+            monthly_totals = query_monthly_totals(f"{base}{quote}")
-        monthly_totals = query_monthly_totals(f"{base}{quote}")
+            return jsonify(monthly_totals)
-        return jsonify(monthly_totals)
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return jsonify({'Error': 'Halp'})
-        return jsonify({'Error': 'Halp'})
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/get_averages")
 def get_averages():
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            daily_totals = query_daily_totals()
-        daily_totals = query_daily_totals()
+            
-        val_30 = 0
+            val_30 = 0
-        val_7 = 0
+            val_7 = 0
-        recent_days = sorted(daily_totals.keys(), reverse=True)[:30]  
+            #acc_30 = []
-        acc_30 = [daily_totals[date] for date in recent_days[:30]]
+            #acc_7 = []
-        acc_7 = [daily_totals[date] for date in recent_days[:7]]
+            #for x in sorted(daily_totals):
-        length_30 = min(30,len(acc_30))           #Last 30 days
+            #    acc_30.append(daily_totals[x])
-        length_7 = min(7,len(acc_7))             #Last 7 days
+            #    acc_7.append(daily_totals[x])
-        for _ in range(length_30):
+
-            val_30 += acc_30.pop()
+            recent_days = sorted(daily_totals.keys(), reverse=True)[:30]  
-        for _ in range(length_7):
+            acc_30 = [daily_totals[date] for date in recent_days[:30]]
-            val_7 += acc_7.pop()
+            acc_7 = [daily_totals[date] for date in recent_days[:7]]
-        return jsonify({"30_day": val_30/length_30, "7_day": val_7/length_7})
+            
-    except Exception as e:
+            length_30 = min(30,len(acc_30))           #Last 30 days
-        print(e)
+            length_7 = min(7,len(acc_7))             #Last 7 days
-        return jsonify({'Error': 'Halp'})
+            for _ in range(length_30):
+                val_30 += acc_30.pop()
+            for _ in range(length_7):
+                val_7 += acc_7.pop()
+            return jsonify({"30_day": val_30/length_30, "7_day": val_7/length_7})
+        except Exception as e:
+            print(e)
+            return jsonify({'Error': 'Halp'})
+    return jsonify({'Error': 'API key invalid'}), 401
   
   
 @stats_api.route("/total_profit")
 def total_profit():
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        total = query_total_profit()
-    total = query_total_profit()
+        return jsonify({"Total profit": total})
-    return jsonify({"Total profit": total})
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 @stats_api.route("/total_profit_by_pair")
@@ -554,20 +594,22 @@ def total_profit_by_pair():
     Parameters: 'base' -> string
                 'quote' -> string
     '''
-    if not "X-API-KEY" in request.headers or not request.headers.get("X-API-KEY") in get_valid_keys():
+    if "X-API-KEY" in request.headers and request.headers.get("X-API-KEY") in get_valid_keys():
-        return jsonify({'Error': 'API key invalid'}), 401
+        try:
-    try:
+            base = request.args.get("base")
-        base = request.args.get("base")
+            quote = request.args.get("quote")    
-        quote = request.args.get("quote")    
+            total = query_total_profit(f"{base}{quote}")
-        total = query_total_profit(f"{base}{quote}")
+            return jsonify({"Total profit": total})
-        return jsonify({"Total profit": total})
+        except Exception as e:
-    except Exception as e:
+            print(e)
-        print(e)
+            return jsonify({'Error': 'Halp'})
-        return jsonify({'Error': 'Halp'})
+    return jsonify({'Error': 'API key invalid'}), 401
 
 
 
 if __name__=="__main__":
+    # Load valid keys from database
+    #valid_keys = load_keys_from_db("api_credentials.db")
 
     #Waitress
     logger = logging.getLogger('waitress')