From 50730d64e4fae97918dd9a8c365112909b6b4dda Mon Sep 17 00:00:00 2001 From: miro Date: Thu, 5 Sep 2024 22:32:15 +0100 Subject: [PATCH] refactor/planned_deprecations --- ovos_workshop/skills/ovos.py | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py index 6ddece8e..1c3614f9 100644 --- a/ovos_workshop/skills/ovos.py +++ b/ovos_workshop/skills/ovos.py @@ -1076,14 +1076,8 @@ def _register_system_event_handlers(self): self.add_event(f"{self.skill_id}.stop", self._handle_session_stop, speak_errors=False) self.add_event(f"{self.skill_id}.stop.ping", self._handle_stop_ack, speak_errors=False) - # TODO: deprecate 0.0.9 - self.add_event("skill.converse.ping", self._handle_converse_ack, - speak_errors=False) self.add_event(f"{self.skill_id}.converse.ping", self._handle_converse_ack, speak_errors=False) - # TODO: deprecate 0.0.9 - self.add_event("skill.converse.request", self._handle_converse_request, - speak_errors=False) self.add_event(f"{self.skill_id}.converse.request", self._handle_converse_request, speak_errors=False) self.add_event(f"{self.skill_id}.activate", self.handle_activate, @@ -1105,8 +1099,6 @@ def _register_system_event_handlers(self): self.add_event('mycroft.skills.settings.changed', self.handle_settings_change, speak_errors=False) - # TODO: deprecate 0.0.9 - self.add_event("skill.converse.get_response", self.__handle_get_response, speak_errors=False) self.add_event(f"{self.skill_id}.converse.get_response", self.__handle_get_response, speak_errors=False) @@ -1189,12 +1181,6 @@ def _handle_converse_ack(self, message: Message): `active` status. @param message: `{self.skill_id}.converse.ping` Message """ - if message.msg_type == "skill.converse.ping": - log_deprecation( - "Support for message type `skill.converse.ping` is deprecated, use `{skill_id}.converse.ping`", "0.0.9") - if message.data.get("skill_id") != self.skill_id: - return # not for us! - self.bus.emit(message.reply( "skill.converse.pong", data={"skill_id": self.skill_id, @@ -1237,13 +1223,6 @@ def _handle_converse_request(self, message: Message): with `converse`. @param message: `{self.skill_id}.converse.request` Message """ - if message.msg_type == "skill.converse.request": - log_deprecation( - "Support for message type `skill.converse.request` is deprecated, use `{skill_id}.converse.request`", - "0.0.9") - if message.data.get("skill_id") != self.skill_id: - return # not for us! - # check if a conversational intent triggered # these are skill specific intents that may trigger instead of converse if self._handle_converse_intents(message): @@ -1847,13 +1826,6 @@ def __handle_get_response(self, message): Handle the response message to a previous get_response / speak call sent from the intent service """ - if message.msg_type == "skill.converse.get_response": - log_deprecation( - "Support for message type `skill.converse.get_response` is deprecated, use `{skill_id}.converse.get_response`", - "0.0.9") - if message.data.get("skill_id") != self.skill_id: - return # not for us! - # validate session_id to ensure this isnt another # user querying the skill at same time sess2 = SessionManager.get(message)