Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve init and typing #42

Merged
merged 2 commits into from
Nov 5, 2024
+11 −16
Merged

improve init and typing #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73591f9
requirements.txt
JarbasAl Nov 5, 2024
8df9129
fix: typing and init
JarbasAl Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions ovos_gui_plugin_shell_companion/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
JarbasAl marked this conversation as resolved.
Show resolved Hide resolved
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()

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ovos-plugin-manager>=0.0.23,<1.0.0
ovos-plugin-manager>=0.5.5,<1.0.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to include OpenVoiceOS/ovos-plugin-manager#281

ovos-utils>=0.0.34,<1.0.0
ovos-bus-client>=0.0.3,<1.0.0
astral~=3.0
Loading