Merge pull request #359 from OpenVoiceOS/release-7.0.5a1

Release 7.0.5a1

Author: JarbasAl

CHANGELOG.md

@@ -1,20 +1,12 @@
 # Changelog
 
-## [7.0.4a1](https://github.com/OpenVoiceOS/ovos-workshop/tree/7.0.4a1) (2025-06-16)
+## [7.0.5a1](https://github.com/OpenVoiceOS/ovos-workshop/tree/7.0.5a1) (2025-06-16)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-workshop/compare/7.0.3a1...7.0.4a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-workshop/compare/7.0.4...7.0.5a1)
 
 **Merged pull requests:**
 
-- fix: converse\_routing [\#356](https://github.com/OpenVoiceOS/ovos-workshop/pull/356) ([JarbasAl](https://github.com/JarbasAl))
-
-## [7.0.3a1](https://github.com/OpenVoiceOS/ovos-workshop/tree/7.0.3a1) (2025-06-16)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-workshop/compare/7.0.2...7.0.3a1)
-
-**Merged pull requests:**
-
-- Update ovos-config requirement from \<2.0.0,\>=0.0.12 to \>=0.0.12,\<3.0.0 in /requirements [\#354](https://github.com/OpenVoiceOS/ovos-workshop/pull/354) ([dependabot[bot]](https://github.com/apps/dependabot))
+- fix: shutdown [\#358](https://github.com/OpenVoiceOS/ovos-workshop/pull/358) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

ovos_workshop/skill_launcher.py

@@ -316,13 +316,16 @@ def _execute_instance_shutdown(self):
         """
         Call the shutdown method of the skill being reloaded.
         """
-        try:
-            self.instance.default_shutdown()
-        except Exception as e:
-            LOG.exception(f'An error occurred while shutting down '
-                          f'{self.skill_id}: {e}')
-        else:
-            LOG.info(f'Skill {self.skill_id} shut down successfully')
+        if self.instance:
+            try:
+                self.instance.shutdown()
+            except Exception:
+                LOG.exception(f"Error while running skill shutdown() for {self.skill_id}")
+            try:
+                self.instance.default_shutdown()
+            except Exception as e:
+                LOG.exception(f'An error occurred while running skill default_shutdown '
+                              f'{self.skill_id}: {e}')
         del self.instance
         self.instance = None
 

ovos_workshop/skills/ovos.py

@@ -1216,16 +1216,20 @@ def default_shutdown(self):
         except Exception as e:
             self.log.error(f"Failed to remove events for {self.skill_id}: {e}")
 
-        try:
-            self.shutdown()
-        except Exception as e:
-            self.log.error(f'Skill specific shutdown function encountered an '
-                           f'error: {e}')
-
         self.bus.emit(
             Message('detach_skill', {'skill_id': self.skill_id},
                     {'skill_id': self.skill_id}))
 
+    def __del__(self):
+        try:
+            self.shutdown()
+        except Exception as e:
+            LOG.error(f"Skill specific shutdown for '{self.skill_id}' encountered an error: {e}")
+        try:
+            self.default_shutdown()
+        except Exception as e:
+            LOG.error(f"Default shutdown for skill '{self.skill_id}' encountered an error: {e}")
+
     def detach(self):
         """
         Detach all intents for this skill from the intent_service.

ovos_workshop/version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 7
 VERSION_MINOR = 0
-VERSION_BUILD = 4
-VERSION_ALPHA = 0
+VERSION_BUILD = 5
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK