Merge pull request #107 from OpenVoiceOS/dev

0.0.9
OpenVoiceOS · Sep 10, 2024 · b272bc5 · b272bc5
2 parents 1db5975 + 170986b
commit b272bc5
Show file tree

Hide file tree

Showing 15 changed files with 1,277 additions and 176 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_alpha.yml
@@ -14,7 +14,7 @@ on:
       - 'LICENSE'
       - 'CHANGELOG.md'
       - 'MANIFEST.in'
-      - 'readme.md'
+      - 'README.md'
       - 'scripts/**'
   workflow_dispatch:
 
@@ -34,20 +34,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: update_version
     steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: V${{ needs.update_version.outputs.version }}
-          release_name: Release ${{ needs.update_version.outputs.version }}
-          body: |
-            Changes in this Release
-            ${{ needs.update_version.outputs.changelog }}
-          draft: false
-          prerelease: true
-          commitish: dev
       - name: Checkout Repository
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -11,7 +11,7 @@ on:
       - 'LICENSE'
       - 'CHANGELOG.md'
       - 'MANIFEST.in'
-      - 'readme.md'
+      - 'README.md'
       - 'scripts/**'
   push:
     branches:
@@ -25,7 +25,7 @@ on:
       - 'LICENSE'
       - 'CHANGELOG.md'
       - 'MANIFEST.in'
-      - 'readme.md'
+      - 'README.md'
       - 'scripts/**'
   workflow_dispatch:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,134 @@
 # Changelog
 
-## [V0.0.8a2](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.8a2) (2023-12-29)
+## [0.0.9](https://github.com/OpenVoiceOS/ovos-bus-client/tree/0.0.9) (2024-09-02)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.8a1...V0.0.8a2)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V...0.0.9)
+
+**Breaking changes:**
+
+- refactor/remove\_stt+tts\_prefs [\#91](https://github.com/OpenVoiceOS/ovos-bus-client/pull/91) ([JarbasAl](https://github.com/JarbasAl))
+
+**Implemented enhancements:**
+
+- feat/blacklist\_from\_session [\#98](https://github.com/OpenVoiceOS/ovos-bus-client/pull/98) ([JarbasAl](https://github.com/JarbasAl))
+- feat/track\_speaking+recording\_per\_session [\#93](https://github.com/OpenVoiceOS/ovos-bus-client/pull/93) ([JarbasAl](https://github.com/JarbasAl))
+- feat/add\_units\_to\_session [\#90](https://github.com/OpenVoiceOS/ovos-bus-client/pull/90) ([JarbasAl](https://github.com/JarbasAl))
+- feat/targeted OCP queries [\#88](https://github.com/OpenVoiceOS/ovos-bus-client/pull/88) ([NeonJarbas](https://github.com/NeonJarbas))
+
+**Fixed bugs:**
+
+- fix/KeyError [\#105](https://github.com/OpenVoiceOS/ovos-bus-client/pull/105) ([JarbasAl](https://github.com/JarbasAl))
+- fix/ocp\_missing\_context [\#104](https://github.com/OpenVoiceOS/ovos-bus-client/pull/104) ([JarbasAl](https://github.com/JarbasAl))
+- fix/ocp\_api\_context [\#103](https://github.com/OpenVoiceOS/ovos-bus-client/pull/103) ([JarbasAl](https://github.com/JarbasAl))
+- fix/ocp\_uris [\#102](https://github.com/OpenVoiceOS/ovos-bus-client/pull/102) ([JarbasAl](https://github.com/JarbasAl))
+- hotfix/StreamPlugin [\#100](https://github.com/OpenVoiceOS/ovos-bus-client/pull/100) ([JarbasAl](https://github.com/JarbasAl))
+- Update error handling to reduce unhandled exceptions [\#96](https://github.com/OpenVoiceOS/ovos-bus-client/pull/96) ([NeonDaniel](https://github.com/NeonDaniel))
+- Update setup.py to resolve version automation bug [\#95](https://github.com/OpenVoiceOS/ovos-bus-client/pull/95) ([NeonDaniel](https://github.com/NeonDaniel))
+
+**Merged pull requests:**
+
+- refactor/handle\_new\_SEIs [\#97](https://github.com/OpenVoiceOS/ovos-bus-client/pull/97) ([JarbasAl](https://github.com/JarbasAl))
+- Update imports to support ovos-utils~=0.0.x with compat. warnings [\#94](https://github.com/OpenVoiceOS/ovos-bus-client/pull/94) ([NeonDaniel](https://github.com/NeonDaniel))
+
+## [V](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V) (2024-03-10)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a12...V)
+
+**Merged pull requests:**
+
+- chore\(docs\): add a long description to PyPi [\#86](https://github.com/OpenVoiceOS/ovos-bus-client/pull/86) ([mikejgray](https://github.com/mikejgray))
+
+## [V0.0.9a12](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a12) (2024-02-21)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a11...V0.0.9a12)
+
+**Implemented enhancements:**
+
+- feat/session\_location [\#85](https://github.com/OpenVoiceOS/ovos-bus-client/pull/85) ([JarbasAl](https://github.com/JarbasAl))
+
+## [V0.0.9a11](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a11) (2024-02-02)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a10...V0.0.9a11)
+
+**Merged pull requests:**
+
+- feat/remove\_all\_pages [\#84](https://github.com/OpenVoiceOS/ovos-bus-client/pull/84) ([NeonJarbas](https://github.com/NeonJarbas))
+
+## [V0.0.9a10](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a10) (2024-01-29)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a9...V0.0.9a10)
+
+**Fixed bugs:**
+
+- Update default values [\#83](https://github.com/OpenVoiceOS/ovos-bus-client/pull/83) ([JarbasAl](https://github.com/JarbasAl))
+
+## [V0.0.9a9](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a9) (2024-01-23)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a8...V0.0.9a9)
+
+**Fixed bugs:**
+
+- fix/info\_leak [\#81](https://github.com/OpenVoiceOS/ovos-bus-client/pull/81) ([JarbasAl](https://github.com/JarbasAl))
+
+## [V0.0.9a8](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a8) (2024-01-13)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a7...V0.0.9a8)
+
+## [V0.0.9a7](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a7) (2024-01-13)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a6...V0.0.9a7)
+
+**Merged pull requests:**
+
+- refactor/orjson [\#75](https://github.com/OpenVoiceOS/ovos-bus-client/pull/75) ([JarbasAl](https://github.com/JarbasAl))
+
+## [V0.0.9a6](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a6) (2024-01-12)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a5...V0.0.9a6)
+
+**Fixed bugs:**
+
+- typo\_and\_docstr [\#79](https://github.com/OpenVoiceOS/ovos-bus-client/pull/79) ([JarbasAl](https://github.com/JarbasAl))
+
+## [V0.0.9a5](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a5) (2024-01-12)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a4...V0.0.9a5)
+
+**Implemented enhancements:**
+
+- feat/ovos-media [\#78](https://github.com/OpenVoiceOS/ovos-bus-client/pull/78) ([NeonJarbas](https://github.com/NeonJarbas))
+
+## [V0.0.9a4](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a4) (2024-01-09)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a3...V0.0.9a4)
+
+**Fixed bugs:**
+
+- hotfix/avoid\_c++\_crash [\#76](https://github.com/OpenVoiceOS/ovos-bus-client/pull/76) ([JarbasAl](https://github.com/JarbasAl))
+
+## [V0.0.9a3](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a3) (2024-01-08)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a2...V0.0.9a3)
 
 **Fixed bugs:**
 
-- fix/get\_message\_lang [\#71](https://github.com/OpenVoiceOS/ovos-bus-client/pull/71) ([JarbasAl](https://github.com/JarbasAl))
+- fix/ocp api [\#77](https://github.com/OpenVoiceOS/ovos-bus-client/pull/77) ([NeonJarbas](https://github.com/NeonJarbas))
 
-## [V0.0.8a1](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.8a1) (2023-12-29)
+## [V0.0.9a2](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a2) (2024-01-06)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.9a1...V0.0.9a2)
+
+**Implemented enhancements:**
+
+- fix/ocp api [\#74](https://github.com/OpenVoiceOS/ovos-bus-client/pull/74) ([NeonJarbas](https://github.com/NeonJarbas))
+
+## [V0.0.9a1](https://github.com/OpenVoiceOS/ovos-bus-client/tree/V0.0.9a1) (2023-12-30)
+
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.8...V0.0.9a1)
+
+**Fixed bugs:**
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/compare/V0.0.7...V0.0.8a1)
+- fix/log spam [\#73](https://github.com/OpenVoiceOS/ovos-bus-client/pull/73) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

diff --git a/LICENSE.md → LICENSE b/LICENSE.md → LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 OpenVoiceOS
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -200,12 +200,4 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-=======================================================================
 
-Component licenses for mycroft-core:
-
-The mycroft-core software references various Python Packages (via PIP),
-each of which has a separate license.  All are compatible with the
-Apache 2.0 license. See the referenced packages listed in the
-"requirements.txt" file for specific terms and conditions.
diff --git a/ovos_bus_client/apis/gui.py b/ovos_bus_client/apis/gui.py
@@ -6,7 +6,7 @@
 from ovos_utils.log import LOG, log_deprecation
 from ovos_bus_client.util import get_mycroft_bus
 from ovos_utils.gui import can_use_gui
-
+from ovos_config import Configuration
 from ovos_bus_client.message import Message
 
 
@@ -91,14 +91,7 @@ def __init__(self, skill_id: str, bus=None,
             `all` key should reference a `gui` directory containing all
             specific resource subdirectories
         """
-        if not config:
-            log_deprecation(f"Expected a dict config and got None.", "0.1.0")
-            try:
-                from ovos_config.config import read_mycroft_config
-                config = read_mycroft_config().get("gui", {})
-            except ImportError:
-                LOG.warning("Config not provided and ovos_config not available")
-                config = dict()
+        config = config or Configuration().get("gui", {})
         self.config = config
         if remote_server:
             self.config["remote-server"] = remote_server
@@ -153,7 +146,9 @@ def page(self) -> Optional[str]:
         """
         Return the active GUI page name to show
         """
-        return self._pages[self.current_page_idx] if len(self._pages) else None
+        if not len(self._pages) or self.current_page_idx >= len(self._pages):
+            return None
+        return self._pages[self.current_page_idx]
 
     @property
     def connected(self) -> bool:
@@ -364,8 +359,8 @@ def _pages2uri(self, page_names: List[str]) -> List[str]:
             # Prefer plugin-specific resources first, then fallback to core
             page = resolve_ovos_resource_file(name, extra_dirs) or \
                    resolve_ovos_resource_file(join('ui', name), extra_dirs) or \
-                   resolve_resource_file(name, self.config) or \
-                   resolve_resource_file(join('ui', name), self.config)
+                   resolve_resource_file(name, config=self.config) or \
+                   resolve_resource_file(join('ui', name), config=self.config)
 
             if page:
                 if self.remote_url:
@@ -403,19 +398,21 @@ def _normalize_page_name(page_name: str) -> str:
 
     # base gui interactions
     def show_page(self, name: str, override_idle: Union[bool, int] = None,
-                  override_animations: bool = False):
+                  override_animations: bool = False, index: int = 0,
+                   remove_others=False):
         """
         Request to show a page in the GUI.
         @param name: page resource requested
         @param override_idle: number of seconds to override display for;
             if True, override display indefinitely
         @param override_animations: if True, disables all GUI animations
         """
-        self.show_pages([name], 0, override_idle, override_animations)
+        self.show_pages([name], index, override_idle, override_animations, remove_others)
 
     def show_pages(self, page_names: List[str], index: int = 0,
                    override_idle: Union[bool, int] = None,
-                   override_animations: bool = False):
+                   override_animations: bool = False,
+                   remove_others=False):
         """
         Request to show a list of pages in the GUI.
         @param page_names: list of page resources requested
@@ -439,6 +436,9 @@ def show_pages(self, page_names: List[str], index: int = 0,
         page_urls = self._pages2uri(page_names)
         page_names = [self._normalize_page_name(n) for n in page_names]
 
+        if remove_others:
+            self.remove_all_pages(except_pages=page_names)
+
         self._pages = page_names
         self.current_page_idx = index
 
@@ -484,6 +484,17 @@ def remove_pages(self, page_names: List[str]):
                                "page_names": page_names,
                                "__from": self.skill_id}))
 
+    def remove_all_pages(self, except_pages=None):
+        """
+        Request to remove all pages from the GUI.
+        @param except_pages: list of optional page resources to keep
+        """
+        if not self.bus:
+            raise RuntimeError("bus not set, did you call self.bind() ?")
+        self.bus.emit(Message("gui.page.delete.all",
+                              {"__from": self.skill_id,
+                               "except": except_pages or []}))
+
     # Utils / Templates
 
     # backport - PR https://github.com/MycroftAI/mycroft-core/pull/2862