adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

copy data being transferred, remove debug messages in emc

Browse Source
This commit is contained in:
Timothy Pogue 2022-09-12 13:57:29 -06:00
parent b6434040de
commit c19a5fbe06
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/data/dataprovider.py
View File

@ -184,7 +184,8 @@ class DataProvider:
return (DataFrame(), datetime.fromtimestamp(0, tz=timezone.utc)) return (DataFrame(), datetime.fromtimestamp(0, tz=timezone.utc))
# We have it, return this data # We have it, return this data
return self.__producer_pairs_df[producer_name][pair_key] df, la = self.__producer_pairs_df[producer_name][pair_key]
return (df.copy(), la)
def add_pairlisthandler(self, pairlists) -> None: def add_pairlisthandler(self, pairlists) -> None:
""" """

19
freqtrade/rpc/external_message_consumer.py
View File

@ -269,6 +269,10 @@ class ExternalMessageConsumer:
logger.error(f"Invalid message from `{producer_name}`: {e}") logger.error(f"Invalid message from `{producer_name}`: {e}")
return return
if not producer_message.data:
logger.error(f"Empty message received from `{producer_name}`")
return
logger.info(f"Received message of type `{producer_message.type}` from `{producer_name}`") logger.info(f"Received message of type `{producer_message.type}` from `{producer_name}`")
message_handler = self._message_handlers.get(producer_message.type) message_handler = self._message_handlers.get(producer_message.type)
@ -282,32 +286,29 @@ class ExternalMessageConsumer:
def _consume_whitelist_message(self, producer_name: str, message: WSMessageSchema): def _consume_whitelist_message(self, producer_name: str, message: WSMessageSchema):
try: try:
# Validate the message # Validate the message
message = WSWhitelistMessage.parse_obj(message) whitelist_message = WSWhitelistMessage.parse_obj(message)
except ValidationError as e: except ValidationError as e:
logger.error(f"Invalid message from `{producer_name}`: {e}") logger.error(f"Invalid message from `{producer_name}`: {e}")
return return
# Add the pairlist data to the DataProvider # Add the pairlist data to the DataProvider
self._dp._set_producer_pairs(message.data, producer_name=producer_name) self._dp._set_producer_pairs(whitelist_message.data.copy(), producer_name=producer_name)
logger.debug(f"Consumed message from `{producer_name}` of type `RPCMessageType.WHITELIST`") logger.debug(f"Consumed message from `{producer_name}` of type `RPCMessageType.WHITELIST`")
def _consume_analyzed_df_message(self, producer_name: str, message: WSMessageSchema): def _consume_analyzed_df_message(self, producer_name: str, message: WSMessageSchema):
try: try:
message = WSAnalyzedDFMessage.parse_obj(message) df_message = WSAnalyzedDFMessage.parse_obj(message)
except ValidationError as e: except ValidationError as e:
logger.error(f"Invalid message from `{producer_name}`: {e}") logger.error(f"Invalid message from `{producer_name}`: {e}")
return return
key = message.data.key key = df_message.data.key
df = message.data.df df = df_message.data.df
la = message.data.la la = df_message.data.la
pair, timeframe, candle_type = key pair, timeframe, candle_type = key
logger.debug(message.data.key)
logger.debug(message.data)
# If set, remove the Entry and Exit signals from the Producer # If set, remove the Entry and Exit signals from the Producer
if self._emc_config.get('remove_entry_exit_signals', False): if self._emc_config.get('remove_entry_exit_signals', False):
df = remove_entry_exit_signals(df) df = remove_entry_exit_signals(df)