self.print_logs = []
self.logs = []
+ self.redis_status = []
self.no_http_dup = no_http_dup
self.last_http = None
self.logs.append(hash_)
return hash_
+ def add_redis_status(self, hash_):
+ self.redis_status.append(hash_)
+ return hash_
+
@staticmethod
def default_json_serial(obj):
if isinstance(obj, (datetime.datetime, datetime.date)):
json.dumps(log, default=self.default_json_serial, indent=" ")
)
+ def to_json_redis(self):
+ for log in (x.copy() for x in self.redis_status):
+ yield (
+ log.pop("type"),
+ json.dumps(log, default=self.default_json_serial)
+ )
+
def set_verbose(self, verbose_print):
self.verbose_print = verbose_print
"args": args,
})
- def log_balances(self, tag=None):
+ def log_balances(self, tag=None, tickers=None,
+ ticker_currency=None, compute_value=None, type=None):
self.print_log("[Balance]")
for currency, balance in self.market.balances.all.items():
self.print_log("\t{}".format(balance))
- self.add_log({
- "type": "balance",
- "tag": tag,
- "balances": self.market.balances.as_json()
- })
+ log = {
+ "type": "balance",
+ "tag": tag,
+ "balances": self.market.balances.as_json()
+ }
+
+ if tickers is not None:
+ log["tickers"] = self._ticker_hash(tickers, ticker_currency,
+ compute_value, type)
+
+ self.add_log(log.copy())
+ self.add_redis_status(log)
def log_tickers(self, amounts, other_currency,
compute_value, type):
+ log = self._ticker_hash(amounts, other_currency, compute_value,
+ type)
+ log["type"] = "tickers"
+
+ self.add_log(log)
+
+ def _ticker_hash(self, amounts, other_currency, compute_value, type):
values = {}
rates = {}
if callable(compute_value):
for currency, amount in amounts.items():
values[currency] = amount.as_json()["value"]
rates[currency] = amount.rate
- self.add_log({
- "type": "tickers",
- "compute_value": compute_value,
- "balance_type": type,
- "currency": other_currency,
- "balances": values,
- "rates": rates,
- "total": sum(amounts.values()).as_json()["value"]
- })
+ return {
+ "compute_value": compute_value,
+ "balance_type": type,
+ "currency": other_currency,
+ "balances": values,
+ "rates": rates,
+ "total": sum(amounts.values()).as_json()["value"]
+ }
def log_dispatch(self, amount, amounts, liquidity, repartition):
self.add_log({
"body": body,
"headers": headers,
"status": response.status_code,
+ "duration": response.elapsed.total_seconds(),
"response": None,
"response_same_as": self.last_http["date"]
})
"body": body,
"headers": headers,
"status": response.status_code,
+ "duration": response.elapsed.total_seconds(),
"response": response.text,
"response_same_as": None,
})
compute_value, type)
return amounts
- def fetch_balances(self, tag=None):
+ def fetch_balances(self, tag=None, log_tickers=False,
+ ticker_currency="BTC", ticker_compute_value="average", ticker_type="total"):
all_balances = self.market.ccxt.fetch_all_balances()
for currency, balance in all_balances.items():
if balance["exchange_total"] != 0 or balance["margin_total"] != 0 or \
currency in self.all:
self.all[currency] = portfolio.Balance(currency, balance)
- self.market.report.log_balances(tag=tag)
+ if log_tickers:
+ tickers = self.in_currency(ticker_currency, compute_value=ticker_compute_value, type=ticker_type)
+ self.market.report.log_balances(tag=tag,
+ tickers=tickers, ticker_currency=ticker_currency,
+ compute_value=ticker_compute_value, type=ticker_type)
+ else:
+ self.market.report.log_balances(tag=tag)
def dispatch_assets(self, amount, liquidity="medium", repartition=None):
if repartition is None: