fix:better_stop

.github/workflows/build_tests.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/coverage.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@master
       with:
-        python-version: 3.9
+        python-version: "3.10"
     - name: Install System Dependencies
       run: |
         sudo apt-get update

.github/workflows/pipaudit.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ]
+        python-version: [3.9, "3.10", "3.11"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/sync_tx.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Run script if merged by gitlocalize-app[bot]
         if: github.event_name == 'push' && github.event.head_commit.author.username == 'gitlocalize-app[bot]'

ovos_core/intent_services/__init__.py

@@ -276,7 +276,7 @@ def _emit_match_message(self, match: Union[IntentHandlerMatch, PipelineMatch], m
             message (Message): The messagebus data.
         """
         reply = None
-        sess = SessionManager.get(message)
+        sess = match.updated_session or SessionManager.get(message)
 
         # utterance fully handled by pipeline matcher
         if isinstance(match, PipelineMatch):
@@ -303,10 +303,13 @@ def _emit_match_message(self, match: Union[IntentHandlerMatch, PipelineMatch], m
                 was_deactivated = match.skill_id in self._deactivations[sess.session_id]
                 if not was_deactivated:
                     sess.activate_skill(match.skill_id)
-                    reply.context["session"] = sess.serialize()
                     # emit event for skills callback -> self.handle_activate
                     self.bus.emit(reply.forward(f"{match.skill_id}.activate"))
 
+            # update Session if modified by pipeline
+            reply.context["session"] = sess.serialize()
+
+            # finally emit reply message
             self.bus.emit(reply)
 
     def send_cancel_event(self, message):

ovos_core/intent_services/converse_service.py

@@ -342,6 +342,7 @@ def converse_with_skills(self, utterances: List[str], lang: str, message: Messag
                                      # handled == True -> emit "ovos.utterance.handled"
                                      match_data={},
                                      skill_id=skill_id,
+                                     updated_session=session,
                                      utterance=utterances[0])
         return None
 

ovos_core/intent_services/stop_service.py

@@ -52,19 +52,21 @@ def get_active_skills(message: Optional[Message] = None) -> List[str]:
     def _collect_stop_skills(self, message: Message) -> List[str]:
         """use the messagebus api to determine which skills can stop
         This includes all skills and external applications"""
+        sess = SessionManager.get(message)
 
         want_stop = []
         skill_ids = []
 
-        active_skills = self.get_active_skills(message)
+        active_skills = [s for s in self.get_active_skills(message)
+                         if s not in sess.blacklisted_skills]
 
         if not active_skills:
             return want_stop
 
         event = Event()
 
         def handle_ack(msg):
-            nonlocal event
+            nonlocal event, skill_ids
             skill_id = msg.data["skill_id"]
 
             # validate the stop pong
@@ -111,7 +113,24 @@ def stop_skill(self, skill_id: str, message: Message) -> bool:
             LOG.error(f"{skill_id}: {error_msg}")
             return False
         elif result is not None:
-            return result.data.get('result', False)
+            stopped = result.data.get('result', False)
+        else:
+            stopped = False
+
+        if stopped:
+            sess = SessionManager.get(message)
+            state = sess.utterance_states.get(skill_id, "intent")
+            LOG.debug(f"skill response status: {state}")
+            if state == "response":  # TODO this is never happening and it should...
+                LOG.debug(f"stopping {skill_id} in middle of get_response!")
+
+            # force-kill any ongoing get_response/converse/TTS - see @killable_event decorator
+            self.bus.emit(message.forward("mycroft.skills.abort_question", {"skill_id": skill_id}))
+            self.bus.emit(message.forward("ovos.skills.converse.force_timeout", {"skill_id": skill_id}))
+            # TODO - track if speech is coming from this skill! not currently tracked
+            self.bus.emit(message.reply("mycroft.audio.speech.stop",{"skill_id": skill_id}))
+
+        return stopped
 
     def match_stop_high(self, utterances: List[str], lang: str, message: Message) -> Optional[PipelineMatch]:
         """If utterance is an exact match for "stop" , run before intent stage
@@ -140,6 +159,7 @@ def match_stop_high(self, utterances: List[str], lang: str, message: Message) ->
         conf = 1.0
 
         if is_global_stop:
+            LOG.info(f"Emitting global stop, {len(self.get_active_skills(message))} active skills")
             # emit a global stop, full stop anything OVOS is doing
             self.bus.emit(message.reply("mycroft.stop", {}))
             return PipelineMatch(handled=True,
@@ -150,15 +170,15 @@ def match_stop_high(self, utterances: List[str], lang: str, message: Message) ->
         if is_stop:
             # check if any skill can stop
             for skill_id in self._collect_stop_skills(message):
-                if skill_id in sess.blacklisted_skills:
-                    LOG.debug(f"ignoring match, skill_id '{skill_id}' blacklisted by Session '{sess.session_id}'")
-                    continue
-
+                LOG.debug(f"Checking if skill wants to stop: {skill_id}")
                 if self.stop_skill(skill_id, message):
+                    LOG.info(f"Skill stopped: {skill_id}")
+                    sess.disable_response_mode(skill_id)
                     return PipelineMatch(handled=True,
                                          match_data={"conf": conf},
                                          skill_id=skill_id,
-                                         utterance=utterance)
+                                         utterance=utterance,
+                                         updated_session=sess)
         return None
 
     def match_stop_medium(self, utterances: List[str], lang: str, message: Message) -> Optional[PipelineMatch]:
@@ -229,17 +249,17 @@ def match_stop_low(self, utterances: List[str], lang: str, message: Message) ->
 
         # check if any skill can stop
         for skill_id in self._collect_stop_skills(message):
-            if skill_id in sess.blacklisted_skills:
-                LOG.debug(f"ignoring match, skill_id '{skill_id}' blacklisted by Session '{sess.session_id}'")
-                continue
-
+            LOG.debug(f"Checking if skill wants to stop: {skill_id}")
             if self.stop_skill(skill_id, message):
+                sess.disable_response_mode(skill_id)
                 return PipelineMatch(handled=True,
-                                     # emit instead of intent message
                                      match_data={"conf": conf},
-                                     skill_id=skill_id, utterance=utterance)
+                                     skill_id=skill_id,
+                                     utterance=utterance,
+                                     updated_session=sess)
 
         # emit a global stop, full stop anything OVOS is doing
+        LOG.debug(f"Emitting global stop signal, {len(self.get_active_skills(message))} active skills")
         self.bus.emit(message.reply("mycroft.stop", {}))
         return PipelineMatch(handled=True,
                              # emit instead of intent message {"conf": conf},

requirements/requirements.txt

@@ -10,6 +10,6 @@ ovos-common-query-pipeline-plugin>=1.0.5, <2.0.0
 
 ovos-utils[extras]>=0.6.0,<1.0.0
 ovos_bus_client>=0.1.4,<2.0.0
-ovos-plugin-manager>=0.5.6,<1.0.0
+ovos-plugin-manager>=0.8.0,<1.0.0
 ovos-config>=0.0.13,<2.0.0
 ovos-workshop>=3.1.2,<4.0.0