diff --git a/chatbot_core/v2/__init__.py b/chatbot_core/v2/__init__.py index 1928635..635490f 100644 --- a/chatbot_core/v2/__init__.py +++ b/chatbot_core/v2/__init__.py @@ -82,13 +82,16 @@ def get_conversation_state(self, cid) -> ConversationState: return self.current_conversations.get(cid, {}).get('state', ConversationState.IDLE) def set_conversation_state(self, cid, state): - self.log.debug(f'State was: {self.current_conversations.setdefault(cid, {}).get("state", ConversationState.IDLE)}') + old_state = self.current_conversations.setdefault(cid, {}).get( + "state", ConversationState.IDLE) + self.log.debug(f'State was: {old_state}') self.current_conversations.setdefault(cid, {})['state'] = state - self.log.debug( - f'State become: {self.current_conversations.setdefault(cid, {}).get("state", ConversationState.IDLE)}') + new_state = self.current_conversations.setdefault(cid, {}).get( + "state", ConversationState.IDLE) + self.log.debug(f'State become: {new_state}') def _setup_listeners(self): - super()._setup_listeners() + KlatAPIMQ._setup_listeners(self) self.register_consumer('invitation', self.vhost, f'{self.nick}_invite', @@ -260,7 +263,7 @@ def handle_shout(self, message_data: dict, skip_callback: bool = False): shout=shout, message_sender=message_sender, is_message_from_proctor=is_message_from_proctor, conversation_state=conversation_state) - shout = response.get('shout', None) + shout = response.get('shout', "") if shout and not skip_callback: self.log.info(f'Sending response: {response}') prompt_id = response.get('context', {}).get('prompt_id') @@ -268,7 +271,7 @@ def handle_shout(self, message_data: dict, skip_callback: bool = False): responded_message=message_data.get('messageID', ''), cid=cid, to_discussion=response.get('to_discussion', '0'), - queue_name=response.get('queue', None), + queue_name=response.get('queue', ""), context=response.get('context', None), is_announcement=response.get('is_announcement', False), prompt_id=prompt_id, @@ -442,9 +445,6 @@ def _handle_next_shout(self): def _pause_responses(self, duration: int = 5): pass - def pre_run(self, **kwargs): - self._setup_listeners() - def shutdown(self): self.shout_thread.cancel() self.shout_thread.join() diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 440a1de..547fe7f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,6 @@ click~=8.0 -klat-connector~=0.6,>=0.6.2a15 +klat-connector~=0.6,>=0.6.2a21 neon-mq-connector>=0.7.2a9 -neon_utils[network,sentry] >= 1.11.1a6 +neon-utils[network,sentry]~=1.12 ovos-bus-client~=0.0,>=0.0.5 psutil~=5.7