X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=portfolio.py;h=1067b0b0e50084283efe3c7d61477312ae9336d8;hb=18de421e455ab4b125a6684d703a296562097e6b;hp=535aaa843c22789dacc50d9eaf3a2371e6766297;hpb=7ba831c52bc08032a37b576e3fa1098fed0b7635;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git diff --git a/portfolio.py b/portfolio.py index 535aaa8..1067b0b 100644 --- a/portfolio.py +++ b/portfolio.py @@ -1,4 +1,4 @@ -from datetime import datetime +import datetime from retry import retry from decimal import Decimal as D, ROUND_DOWN from ccxt import ExchangeError, InsufficientFunds, ExchangeNotAvailable, InvalidOrder, OrderNotCached, OrderNotFound, RequestTimeout, InvalidNonce @@ -311,6 +311,10 @@ class Trade: if self.action is None: return None ticker = self.market.get_ticker(self.currency, self.base_currency) + if ticker is None: + self.market.report.log_error("prepare_order", + message="Unknown ticker {}/{}".format(self.currency, self.base_currency)) + return None self.inverted = ticker["inverted"] if self.inverted: ticker = ticker["original"] @@ -492,7 +496,7 @@ class Order: self.market.report.log_debug_action(action) self.results.append({"debug": True, "id": -1}) else: - self.start_date = datetime.now() + self.start_date = datetime.datetime.now() try: self.results.append(self.market.ccxt.create_order(symbol, 'limit', self.action, amount, price=self.rate, account=self.account)) except InvalidOrder: @@ -677,7 +681,7 @@ class Mouvement: self.action = hash_.get("type") self.fee_rate = D(hash_.get("fee", -1)) try: - self.date = datetime.strptime(hash_.get("date", ""), '%Y-%m-%d %H:%M:%S') + self.date = datetime.datetime.strptime(hash_.get("date", ""), '%Y-%m-%d %H:%M:%S') except ValueError: self.date = None self.rate = D(hash_.get("rate", 0))