nicolas
/
DCAv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed variable

This commit is contained in:
Nicolás Sánchez 2025-03-02 15:57:14 -03:00
parent f6dba9a098
commit 3f8424415e
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
exchange_wrapper.py
View File

@ -7,22 +7,22 @@ from copy import deepcopy
class Broker: class Broker:
def __init__(self,exchange,read_config,config_filename): def __init__(self,exchange,broker_config,config_filename):
self.config_filename = config_filename self.config_filename = config_filename
self.read_config = read_config self.broker_config = broker_config
self.exchange = exchange self.exchange = exchange
self.last_price = 0 self.last_price = 0
self.wait_time = 1 #Default wait time for API breathing room self.wait_time = 1 #Default wait time for API breathing room
self.cooldown_multiplier = 2 #Default cooldown multiplier value self.cooldown_multiplier = 2 #Default cooldown multiplier value
if "cooldown_multiplier" in self.read_config: if "cooldown_multiplier" in self.broker_config:
self.cooldown_multiplier = self.read_config["cooldown_multiplier"] self.cooldown_multiplier = self.broker_config["cooldown_multiplier"]
self.wait_before_new_safety_order = 1 self.wait_before_new_safety_order = 1
if "wait_before_new_safety_order" in self.read_config: if "wait_before_new_safety_order" in self.broker_config:
self.wait_before_new_safety_order = self.read_config["wait_before_new_safety_order"] 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.empty_order = {"id": "", "status": "", "filled": 0, "remaining": 0, "price": 0, "cost": 0, "fees": [], "symbol": ""}
self.retries = read_config["retries"] if "retries" in self.read_config else 10 self.retries = self.broker_config["retries"] if "retries" in self.broker_config else 10
self.slippage_default_threshold = self.read_config["slippage_default_threshold"] if "slippage_default_threshold" in read_config else .03 self.slippage_default_threshold = self.broker_config["slippage_default_threshold"] if "slippage_default_threshold" in self.broker_config else .03
self.logger = Logger(self.read_config) self.logger = Logger(self.broker_config)
self.write_order_history = True #This should be a toggle in config_file self.write_order_history = True #This should be a toggle in config_file
#Initialize database #Initialize database
@ -196,11 +196,11 @@ class Broker:
return 0 return 0
def get_default_order_size(self): def get_default_order_size(self):
return self.read_config["default_order_size"] return self.broker_config["default_order_size"]
def set_default_order_size(self,size): def set_default_order_size(self,size):
try: try:
self.read_config["default_order_size"] = float(size) self.broker_config["default_order_size"] = float(size)
except Exception as e: except Exception as e:
self.logger.log_this(f"Exception in set_default_order_size: {e}",1) self.logger.log_this(f"Exception in set_default_order_size: {e}",1)
return 1 return 1
@ -238,7 +238,7 @@ class Broker:
def get_exchange_name(self): def get_exchange_name(self):
return self.read_config["exchange"] return self.broker_config["exchange"]
def set_wait_time(self,sec): def set_wait_time(self,sec):
@ -262,33 +262,33 @@ class Broker:
def get_config(self): def get_config(self):
return deepcopy(self.read_config) return deepcopy(self.broker_config)
def set_config(self,new_config): def set_config(self,new_config):
self.read_config = deepcopy(new_config) self.broker_config = deepcopy(new_config)
return 0 return 0
def reload_config_file(self): def reload_config_file(self):
try: try:
with open(self.config_filename) as f: with open(self.config_filename) as f:
self.read_config = json.load(f) self.broker_config = json.load(f)
except Exception as e: except Exception as e:
self.logger.log_this(f"Exception while reading the config file: {e}",1) self.logger.log_this(f"Exception while reading the config file: {e}",1)
def add_pair_to_config(self,pair): def add_pair_to_config(self,pair):
if pair not in self.read_config["pairs"]: if pair not in self.broker_config["pairs"]:
self.read_config["pairs"].append(pair) self.broker_config["pairs"].append(pair)
return 0 return 0
return 1 return 1
def remove_pair_from_config(self,pair): def remove_pair_from_config(self,pair):
try: try:
if pair in self.read_config["pairs"]: if pair in self.broker_config["pairs"]:
self.read_config["pairs"].remove(pair) self.broker_config["pairs"].remove(pair)
return 0 return 0
self.logger.log_this("Pair does not exist - Can't remove from read_config",1,pair) self.logger.log_this("Pair does not exist - Can't remove from read_config",1,pair)
return 2 return 2
@ -298,21 +298,21 @@ class Broker:
def get_pairs(self): def get_pairs(self):
return self.read_config["pairs"] return self.broker_config["pairs"]
def clear_pairs(self): def clear_pairs(self):
self.read_config["pairs"].clear() self.broker_config["pairs"].clear()
return 0 return 0
def get_lap_time(self): def get_lap_time(self):
return self.read_config["lap_time"] return self.broker_config["lap_time"]
def set_lap_time(self,new_lap_time): def set_lap_time(self,new_lap_time):
try: try:
self.read_config["lap_time"]=float(new_lap_time) self.broker_config["lap_time"]=float(new_lap_time)
return 0 return 0
except Exception as e: except Exception as e:
self.logger.log_this(f"Can't set new lap time. {new_lap_time} is an invalid entry. Exception: {e}",1) self.logger.log_this(f"Can't set new lap time. {new_lap_time} is an invalid entry. Exception: {e}",1)
@ -322,7 +322,7 @@ class Broker:
def rewrite_config_file(self): def rewrite_config_file(self):
try: try:
with open(f"{self.config_filename}","w") as f: with open(f"{self.config_filename}","w") as f:
f.write(json.dumps(self.read_config, indent=4)) f.write(json.dumps(self.broker_config, indent=4))
return 0 return 0
except Exception as e: except Exception as e:
self.logger.log_this(f"Problems writing the config file. Exception: {e}",1) self.logger.log_this(f"Problems writing the config file. Exception: {e}",1)
@ -573,7 +573,7 @@ class Broker:
''' '''
try: try:
if "unified_order_query" in self.read_config and self.read_config["unified_order_query"] is True: if "unified_order_query" in self.broker_config and self.broker_config["unified_order_query"] is True:
return self.exchange.fetch_open_orders() return self.exchange.fetch_open_orders()
result = [] result = []
for pair in pairs: for pair in pairs:
@ -740,7 +740,7 @@ class Broker:
:param no_retries: If True, the function will not try to fetch the order again if it fails :param no_retries: If True, the function will not try to fetch the order again if it fails
''' '''
if self.read_config["simulate_market_orders"]: if self.broker_config["simulate_market_orders"]:
return self.new_simulated_market_order(symbol,size,side,amount_in_base=amount_in_base) return self.new_simulated_market_order(symbol,size,side,amount_in_base=amount_in_base)
retries = self.retries retries = self.retries
pair = symbol pair = symbol