Skip to content

Commit

Permalink
Remove duplicated call to _setup_listeners (#195)
Browse files Browse the repository at this point in the history
Minor logging and default value handling changes to resovle warnings
Update requirements
  • Loading branch information
NeonDaniel authored Jan 29, 2025
1 parent d2ac7f3 commit 233fed8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions chatbot_core/v2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -260,15 +263,15 @@ 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')
self.send_shout(shout=shout,
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,
Expand Down Expand Up @@ -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()
4 changes: 2 additions & 2 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 233fed8

Please sign in to comment.