Use constant for times
This commit is contained in:
parent
0daf77f313
commit
1156f5e686
@ -281,7 +281,7 @@ class Trade(_DECL_BASE):
|
|||||||
'fee_close_currency': self.fee_close_currency,
|
'fee_close_currency': self.fee_close_currency,
|
||||||
|
|
||||||
'open_date_hum': arrow.get(self.open_date).humanize(),
|
'open_date_hum': arrow.get(self.open_date).humanize(),
|
||||||
'open_date': self.open_date.strftime("%Y-%m-%d %H:%M:%S"),
|
'open_date': self.open_date.strftime(DATETIME_PRINT_FORMAT),
|
||||||
'open_timestamp': int(self.open_date.replace(tzinfo=timezone.utc).timestamp() * 1000),
|
'open_timestamp': int(self.open_date.replace(tzinfo=timezone.utc).timestamp() * 1000),
|
||||||
'open_rate': self.open_rate,
|
'open_rate': self.open_rate,
|
||||||
'open_rate_requested': self.open_rate_requested,
|
'open_rate_requested': self.open_rate_requested,
|
||||||
@ -289,7 +289,7 @@ class Trade(_DECL_BASE):
|
|||||||
|
|
||||||
'close_date_hum': (arrow.get(self.close_date).humanize()
|
'close_date_hum': (arrow.get(self.close_date).humanize()
|
||||||
if self.close_date else None),
|
if self.close_date else None),
|
||||||
'close_date': (self.close_date.strftime("%Y-%m-%d %H:%M:%S")
|
'close_date': (self.close_date.strftime(DATETIME_PRINT_FORMAT)
|
||||||
if self.close_date else None),
|
if self.close_date else None),
|
||||||
'close_timestamp': int(self.close_date.replace(
|
'close_timestamp': int(self.close_date.replace(
|
||||||
tzinfo=timezone.utc).timestamp() * 1000) if self.close_date else None,
|
tzinfo=timezone.utc).timestamp() * 1000) if self.close_date else None,
|
||||||
@ -305,7 +305,7 @@ class Trade(_DECL_BASE):
|
|||||||
'stop_loss_ratio': self.stop_loss_pct if self.stop_loss_pct else None,
|
'stop_loss_ratio': self.stop_loss_pct if self.stop_loss_pct else None,
|
||||||
'stop_loss_pct': (self.stop_loss_pct * 100) if self.stop_loss_pct else None,
|
'stop_loss_pct': (self.stop_loss_pct * 100) if self.stop_loss_pct else None,
|
||||||
'stoploss_order_id': self.stoploss_order_id,
|
'stoploss_order_id': self.stoploss_order_id,
|
||||||
'stoploss_last_update': (self.stoploss_last_update.strftime("%Y-%m-%d %H:%M:%S")
|
'stoploss_last_update': (self.stoploss_last_update.strftime(DATETIME_PRINT_FORMAT)
|
||||||
if self.stoploss_last_update else None),
|
if self.stoploss_last_update else None),
|
||||||
'stoploss_last_update_timestamp': int(self.stoploss_last_update.replace(
|
'stoploss_last_update_timestamp': int(self.stoploss_last_update.replace(
|
||||||
tzinfo=timezone.utc).timestamp() * 1000) if self.stoploss_last_update else None,
|
tzinfo=timezone.utc).timestamp() * 1000) if self.stoploss_last_update else None,
|
||||||
@ -749,9 +749,9 @@ class PairLock(_DECL_BASE):
|
|||||||
def to_json(self) -> Dict[str, Any]:
|
def to_json(self) -> Dict[str, Any]:
|
||||||
return {
|
return {
|
||||||
'pair': self.pair,
|
'pair': self.pair,
|
||||||
'lock_time': self.lock_time.strftime("%Y-%m-%d %H:%M:%S"),
|
'lock_time': self.lock_time.strftime(DATETIME_PRINT_FORMAT),
|
||||||
'lock_timestamp': int(self.lock_time.replace(tzinfo=timezone.utc).timestamp() * 1000),
|
'lock_timestamp': int(self.lock_time.replace(tzinfo=timezone.utc).timestamp() * 1000),
|
||||||
'lock_end_time': self.lock_end_time.strftime("%Y-%m-%d %H:%M:%S"),
|
'lock_end_time': self.lock_end_time.strftime(DATETIME_PRINT_FORMAT),
|
||||||
'lock_end_timestamp': int(self.lock_end_time.replace(tzinfo=timezone.utc
|
'lock_end_timestamp': int(self.lock_end_time.replace(tzinfo=timezone.utc
|
||||||
).timestamp() * 1000),
|
).timestamp() * 1000),
|
||||||
'reason': self.reason,
|
'reason': self.reason,
|
||||||
|
@ -13,7 +13,7 @@ from numpy import NAN, int64, mean
|
|||||||
from pandas import DataFrame
|
from pandas import DataFrame
|
||||||
|
|
||||||
from freqtrade.configuration.timerange import TimeRange
|
from freqtrade.configuration.timerange import TimeRange
|
||||||
from freqtrade.constants import CANCEL_REASON
|
from freqtrade.constants import CANCEL_REASON, DATETIME_PRINT_FORMAT
|
||||||
from freqtrade.data.history import load_data
|
from freqtrade.data.history import load_data
|
||||||
from freqtrade.exceptions import ExchangeError, PricingError
|
from freqtrade.exceptions import ExchangeError, PricingError
|
||||||
from freqtrade.exchange import timeframe_to_minutes, timeframe_to_msecs
|
from freqtrade.exchange import timeframe_to_minutes, timeframe_to_msecs
|
||||||
@ -649,7 +649,7 @@ class RPC:
|
|||||||
buffer = bufferHandler.buffer[-limit:]
|
buffer = bufferHandler.buffer[-limit:]
|
||||||
else:
|
else:
|
||||||
buffer = bufferHandler.buffer
|
buffer = bufferHandler.buffer
|
||||||
records = [[datetime.fromtimestamp(r.created).strftime("%Y-%m-%d %H:%M:%S"),
|
records = [[datetime.fromtimestamp(r.created).strftime(DATETIME_PRINT_FORMAT),
|
||||||
r.created * 1000, r.name, r.levelname,
|
r.created * 1000, r.name, r.levelname,
|
||||||
r.message + ('\n' + r.exc_text if r.exc_text else '')]
|
r.message + ('\n' + r.exc_text if r.exc_text else '')]
|
||||||
for r in buffer]
|
for r in buffer]
|
||||||
|
@ -102,7 +102,6 @@ class Telegram(RPC):
|
|||||||
CommandHandler('daily', self._daily),
|
CommandHandler('daily', self._daily),
|
||||||
CommandHandler('count', self._count),
|
CommandHandler('count', self._count),
|
||||||
CommandHandler('locks', self._locks),
|
CommandHandler('locks', self._locks),
|
||||||
|
|
||||||
CommandHandler(['reload_config', 'reload_conf'], self._reload_config),
|
CommandHandler(['reload_config', 'reload_conf'], self._reload_config),
|
||||||
CommandHandler(['show_config', 'show_conf'], self._show_config),
|
CommandHandler(['show_config', 'show_conf'], self._show_config),
|
||||||
CommandHandler('stopbuy', self._stopbuy),
|
CommandHandler('stopbuy', self._stopbuy),
|
||||||
@ -624,7 +623,7 @@ class Telegram(RPC):
|
|||||||
locks = self._rpc_locks()
|
locks = self._rpc_locks()
|
||||||
message = tabulate([[
|
message = tabulate([[
|
||||||
lock['pair'],
|
lock['pair'],
|
||||||
lock['lock_end_time'].strftime(DATETIME_PRINT_FORMAT),
|
lock['lock_end_time'],
|
||||||
lock['reason']] for lock in locks['locks']],
|
lock['reason']] for lock in locks['locks']],
|
||||||
headers=['Pair', 'Until', 'Reason'],
|
headers=['Pair', 'Until', 'Reason'],
|
||||||
tablefmt='simple')
|
tablefmt='simple')
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
# pragma pylint: disable=protected-access, unused-argument, invalid-name
|
# pragma pylint: disable=protected-access, unused-argument, invalid-name
|
||||||
# pragma pylint: disable=too-many-lines, too-many-arguments
|
# pragma pylint: disable=too-many-lines, too-many-arguments
|
||||||
|
|
||||||
from freqtrade.persistence.models import PairLock
|
|
||||||
import re
|
import re
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from random import choice, randint
|
from random import choice, randint
|
||||||
@ -19,7 +18,7 @@ from freqtrade.constants import CANCEL_REASON
|
|||||||
from freqtrade.edge import PairInfo
|
from freqtrade.edge import PairInfo
|
||||||
from freqtrade.freqtradebot import FreqtradeBot
|
from freqtrade.freqtradebot import FreqtradeBot
|
||||||
from freqtrade.loggers import setup_logging
|
from freqtrade.loggers import setup_logging
|
||||||
from freqtrade.persistence import Trade
|
from freqtrade.persistence import PairLock, Trade
|
||||||
from freqtrade.rpc import RPCMessageType
|
from freqtrade.rpc import RPCMessageType
|
||||||
from freqtrade.rpc.telegram import Telegram, authorized_only
|
from freqtrade.rpc.telegram import Telegram, authorized_only
|
||||||
from freqtrade.state import State
|
from freqtrade.state import State
|
||||||
|
Loading…
Reference in New Issue
Block a user