Neon Core 23.10.30

.github/workflows/build_debos.yml

@@ -21,13 +21,19 @@ jobs:
           repository: NeonGeckoCom/neon_debos
           path: action/neon_debos
       - name: Ensure LFS files are pulled
-        run: git lfs pull action/neon_debos
+        run: |
+          cd action/neon_debos 
+          git lfs pull
+          cd ../..
       - name: Export keys for image build
         run: |
           mkdir -p action/neon_debos/overlays/80-google-json-overlay/home/neon/.local/share/neon
           echo ${GOOGLE_KEY}>action/neon_debos/overlays/80-google-json-overlay/home/neon/.local/share/neon/google.json
         env:
           GOOGLE_KEY: ${{secrets.google_api_key}}
-      - name: Build and Export Image
+      - name: Build and Export Mk2 Image
+        run: |
+          bash action/neon_debos/run_automation.sh debian-neon-image.yml ${{ github.ref_name }} /var/www/html/app/files/neon_images/pi/mycroft_mark_2 rpi4 mark_2
+      - name: Build and Export OPi5 Image
         run: |
-          bash action/neon_debos/run_automation.sh debian-neon-image-rpi4.yml ${{ github.ref_name }} /var/www/html/app/files/neon_images/pi/mycroft_mark_2 ${{ github.ref_name }}
+          bash action/neon_debos/run_automation.sh debian-neon-image.yml ${{ github.ref_name }} /var/www/html/app/files/neon_images/orange_pi_5/ opi5 opi5

.github/workflows/license_tests.yml

@@ -6,3 +6,5 @@ on:
 jobs:
   license_tests:
     uses: neongeckocom/.github/.github/workflows/license_tests.yml@master
+    with:
+      packages-exclude: '^(precise-runner|fann2|tqdm|bs4|ovos-phal-plugin|ovos-skill|neon-core|nvidia|neon-phal-plugin|bitstruct|audioread).*'

.github/workflows/setup_tests.yml

@@ -63,6 +63,23 @@ jobs:
             . /core/venv/bin/activate || exit 2
             neon-audio init-plugin -p coqui || exit 2
             neon-speech init-plugin -p neon-stt-plugin-nemo || exit 2
+  pi_image_3_11:
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test chroot installation
+        uses: pguyot/arm-runner-action@v2
+        with:
+          optimize_image: false
+          base_image: https://2222.us/app/files/neon_images/pi/debian-base-image-rpi4_2023-07-12_16_30.img.xz
+          cpu: cortex-a53
+          copy_repository_path: /core
+          commands: |
+            bash /core/test/pi_setup_3_11.sh || exit 2
+            . /core/venv/bin/activate || exit 2
+            neon-audio init-plugin -p coqui || exit 2
+            neon-speech init-plugin -p neon-stt-plugin-nemo || exit 2
   legacy-remote:
     strategy:
       matrix:

.github/workflows/unit_tests.yml

@@ -15,7 +15,7 @@ jobs:
   util_tests:
     strategy:
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, '3.10' ]
+        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -58,7 +58,7 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, '3.10' ]
+        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:

docker/.env

@@ -1,2 +1,3 @@
-NEON_SKILLS_DIR=./skills/
-NEON_XDG_PATH=./xdg
+NEON_SKILLS_DIR=${PWD}/skills/
+NEON_XDG_PATH=${PWD}/xdg
+XDG_RUNTIME_DIR=/run/user/1000

docker_overlay/root/run.sh

@@ -28,6 +28,6 @@
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Python package installation must occur in a separate thread, before module load, for the entry point to be loaded.
-neon install-default-skills
-neon install-skill-requirements /skills
+#neon install-default-skills
+#neon install-skill-requirements /skills
 neon run-skills

neon_core/__init__.py

@@ -26,16 +26,17 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import sys
+# import sys
 
 from neon_core.config import setup_resolve_resource_file, get_core_version
 from os.path import dirname
 
 
+# TODO: Deprecate below
 NEON_ROOT_PATH = dirname(__file__)
-sys.path.append(NEON_ROOT_PATH)
+# sys.path.append(NEON_ROOT_PATH)
 
-CORE_VERSION_STR = get_core_version()
+CORE_VERSION_STR = ""  # get_core_version()
 setup_resolve_resource_file()
 
 __all__ = ['NEON_ROOT_PATH',

neon_core/cli.py

@@ -83,16 +83,16 @@ def install_default_skills():
     click.echo("Default Skills Installed")
 
 
-@neon_core_cli.command(help=
-                       "Install skill requirements for a specified directory")
-@click.argument("skill_dir")
-def install_skill_requirements(skill_dir):
-    from neon_core.util.skill_utils import install_local_skills
-    try:
-        installed = install_local_skills(skill_dir)
-        click.echo(f"Installed {len(installed)} skills from {skill_dir}")
-    except ValueError as e:
-        click.echo(e)
+# @neon_core_cli.command(help=
+#                        "Install skill requirements for a specified directory")
+# @click.argument("skill_dir")
+# def install_skill_requirements(skill_dir):
+#     from neon_core.util.skill_utils import install_local_skills
+#     try:
+#         installed = install_local_skills(skill_dir)
+#         click.echo(f"Installed {len(installed)} skills from {skill_dir}")
+#     except ValueError as e:
+#         click.echo(e)
 
 
 @neon_core_cli.command(help="Start Neon Skills module")
@@ -102,14 +102,15 @@ def run_skills(install_skills):
     from neon_utils.configuration_utils import init_config_dir
     init_config_dir()
 
-    from neon_core.util.skill_utils import install_local_skills
+    # from neon_core.util.skill_utils import install_local_skills
     from neon_core.skills.__main__ import main
     if install_skills:
-        click.echo(f"Handling installation of skills in: {install_skills}")
-        try:
-            install_local_skills(install_skills)
-        except ValueError as e:
-            click.echo(f"Skill Installation Failed: {e}")
+        click.echo(f"Local skill installation is deprecated. "
+                   f"Add pip specs to config.")
+        # try:
+        #     install_local_skills(install_skills)
+        # except ValueError as e:
+        #     click.echo(f"Skill Installation Failed: {e}")
     click.echo("Starting Skills Service")
     main()
     click.echo("Skills Service Shutdown")

neon_core/config.py

@@ -32,15 +32,19 @@ def get_core_version() -> str:
     Get the core version string.
     NOTE: `init_config` should be called before this method
     """
-    # from neon_core.configuration import Configuration
-    # Configuration.load_all_configs({"disable_remote_config": True})
-
+    # TODO: Remove by 2024
+    from ovos_utils.log import log_deprecation
+    log_deprecation("This method is deprecated; use Python built-in utilities "
+                    "to find package versions", "23.12.1")
     # patch version string to allow downstream to know where it is running
-    import mycroft.version
-    core_version_str = '.'.join(map(str,
-                                    mycroft.version.CORE_VERSION_TUPLE)) + \
-                       "(NeonGecko)"
-    mycroft.version.CORE_VERSION_STR = core_version_str
+    try:
+        import mycroft.version
+        core_version_str = '.'.join(map(str,
+                                        mycroft.version.CORE_VERSION_TUPLE)) + \
+                           "(NeonGecko)"
+        mycroft.version.CORE_VERSION_STR = core_version_str
+    except (ImportError, AttributeError):
+        return ""
     return core_version_str
 
 
@@ -49,14 +53,24 @@ def setup_resolve_resource_file():
     Override default resolve_resource_file to include resources in neon-core.
     Priority: neon-utils, neon-core, ~/.local/share/neon, ~/.neon, mycroft-core
     """
+    from ovos_utils.log import log_deprecation
     from neon_utils.file_utils import resolve_neon_resource_file
-    from mycroft.util.file_utils import resolve_resource_file
+    try:
+        from mycroft.util.file_utils import resolve_resource_file
+    except (ImportError, AttributeError):
+        resolve_resource_file = None
 
     def patched_resolve_resource_file(res_name):
+        log_deprecation("This method is deprecated; use "
+                        "`ovos_utils.file_utils.resolve_resource_file.",
+                        "23.12.1")
         resource = resolve_neon_resource_file(res_name) or \
-                   resolve_resource_file(res_name)
+            resolve_resource_file(res_name)
         return resource
 
-    import mycroft.util
-    mycroft.util.file_utils.resolve_resource_file = \
-        patched_resolve_resource_file
+    try:
+        import mycroft.util
+        mycroft.util.file_utils.resolve_resource_file = \
+            patched_resolve_resource_file
+    except (ImportError, AttributeError):
+        pass

neon_core/configuration/mark_2/neon.yaml

@@ -89,9 +89,7 @@ skills:
   # TODO: extra_directories here is the default, can it be removed?
   extra_directories:
     - /home/neon/.local/share/neon/skills
-  default_skills:
-  # TODO: Defaults are just patching skills not yet pip installable
-  - https://github.com/JarbasSkills/skill-icanhazdadjokes/tree/dev
+  default_skills: []
 PHAL:
   ovos-PHAL-plugin-balena-wifi:
     enabled: false
@@ -169,3 +167,6 @@ system:
     user:
       - gui_websocket:host
       - websocket:host
+language:
+  detection_module: None
+  translation_module: libretranslate_plug

neon_core/configuration/opi5/apps/ovos.common_play/settings.json

@@ -0,0 +1,3 @@
+{
+  "app_view_timeout_mode": "pause"
+}