Merge pull request #43 from OpenVoiceOS/release-1.0.2a1

Release 1.0.2a1
OpenVoiceOS · Nov 5, 2024 · 37c5077 · 37c5077
2 parents cdc05b8 + d7c346f
commit 37c5077
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # Changelog
 
-## [1.0.1a1](https://github.com/OpenVoiceOS/ovos-gui-plugin-shell-companion/tree/1.0.1a1) (2024-11-04)
+## [1.0.2a1](https://github.com/OpenVoiceOS/ovos-gui-plugin-shell-companion/tree/1.0.2a1) (2024-11-05)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-gui-plugin-shell-companion/compare/1.0.0...1.0.1a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-gui-plugin-shell-companion/compare/1.0.1...1.0.2a1)
 
 **Merged pull requests:**
 
-- fix: there are no QT6 res files [\#38](https://github.com/OpenVoiceOS/ovos-gui-plugin-shell-companion/pull/38) ([JarbasAl](https://github.com/JarbasAl))
+- improve init and typing [\#42](https://github.com/OpenVoiceOS/ovos-gui-plugin-shell-companion/pull/42) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

diff --git a/ovos_gui_plugin_shell_companion/__init__.py b/ovos_gui_plugin_shell_companion/__init__.py
@@ -4,7 +4,8 @@
 from ovos_bus_client import Message
 from ovos_bus_client.apis.gui import GUIInterface
 from ovos_bus_client.client import MessageBusClient
-from ovos_config.config import Configuration
+from ovos_bus_client.util import get_mycroft_bus
+from ovos_config import Configuration
 from ovos_plugin_manager.templates.gui import GUIExtension
 from ovos_utils import network_utils
 from ovos_utils.log import LOG
@@ -23,25 +24,19 @@ class OVOSShellCompanionExtension(GUIExtension):
     Args:
         config: plugin configuration
         bus: MessageBus instance
-        gui: GUI instance
-        preload_gui (bool): load GUI skills even if gui client not connected
-        permanent (bool): disable unloading of GUI skills on gui client disconnections
     """
 
-    def __init__(self, config: dict, bus: MessageBusClient = None,
-                 gui: GUIInterface = None,
-                 preload_gui=False, permanent=True):
+    def __init__(self, config: dict, bus: MessageBusClient = None):
+        LOG.info("OVOS Shell: Initializing")
+        bus = bus or get_mycroft_bus()
         config["homescreen_supported"] = True
         res_dir = join(dirname(__file__), "gui")
-        gui = gui or GUIInterface("ovos_gui_plugin_shell_companion",
-                                  bus=bus, config=Configuration(),
-                                  ui_directories={"qt5": join(res_dir, "qt5")})
-        if not gui.ui_directories:
-            LOG.info(f"Setting default qt5 resource directory to: {res_dir}/qt5")
-            gui.ui_directories["qt5"] = join(res_dir, "qt5")
-        LOG.info("OVOS Shell: Initializing")
+        gui = GUIInterface("ovos_gui_plugin_shell_companion",
+                           bus=bus, config=Configuration().get("gui", {}),
+                           ui_directories={"qt5": join(res_dir, "qt5")})
+        LOG.info(f"Setting default qt5 resource directory to: {res_dir}/qt5")
         super().__init__(config=config, bus=bus, gui=gui,
-                         preload_gui=preload_gui, permanent=permanent)
+                         preload_gui=False, permanent=True)
         self.about_page_data = []
         self.build_initial_about_page_data()
 

diff --git a/ovos_gui_plugin_shell_companion/version.py b/ovos_gui_plugin_shell_companion/version.py
@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 0
-VERSION_BUILD = 1
-VERSION_ALPHA = 0
+VERSION_BUILD = 2
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-ovos-plugin-manager>=0.0.23,<1.0.0
+ovos-plugin-manager>=0.5.5,<1.0.0
 ovos-utils>=0.0.34,<1.0.0
 ovos-bus-client>=0.0.3,<1.0.0
 astral~=3.0