Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
727e7f1
Remove `patched_skill_settings` (#652)
NeonDaniel May 1, 2024
9ac49a5
Increment Version to 24.5.1a1
NeonDaniel May 1, 2024
e44e3b7
Update dependencies to allow newer alpha versions (#664)
NeonDaniel May 6, 2024
1601063
Increment Version to 24.5.6a2
NeonDaniel May 6, 2024
026dce7
Support configured backend URL (#665)
NeonDaniel May 7, 2024
333f75e
Increment Version to 24.5.7a3
NeonDaniel May 7, 2024
0d59aea
Update skills to prep for ovos-core 0.0.8 (#667)
NeonDaniel May 8, 2024
f86d1c5
Increment Version to 24.5.8a4
NeonDaniel May 8, 2024
7b0a8d5
Test ovos-core 0.0.8 compat. (#641)
NeonDaniel May 9, 2024
cc58f44
Increment Version to 24.5.9a5
NeonDaniel May 9, 2024
2a4665c
ovos-core 0.0.8 compat. (#411)
NeonDaniel May 10, 2024
a3e4415
Increment Version to 24.5.10a6
NeonDaniel May 10, 2024
37206af
Update skills to resolve deprecation warnings (#668)
NeonDaniel May 14, 2024
be90caf
Increment Version to 24.5.14a7
NeonDaniel May 14, 2024
92748f9
Update configuration to use HANA public IP endpoint (#670)
NeonDaniel May 15, 2024
7b99c9b
Increment Version to 24.5.15a8
NeonDaniel May 15, 2024
72d50ce
Update weather and wiki skills to resolve user-reported errors (#671)
NeonDaniel May 15, 2024
df7657b
Increment Version to 24.5.15a9
NeonDaniel May 15, 2024
ccc115d
Resolve shutdown/restart bug (#674)
NeonDaniel May 16, 2024
611d2a2
Increment Version to 24.5.16a10
NeonDaniel May 16, 2024
62204fe
Remove deprecated code (#672)
NeonDaniel May 16, 2024
67369f9
Increment Version to 24.5.16a11
NeonDaniel May 16, 2024
f2c6445
Update skills and updater plugin (#676)
NeonDaniel May 17, 2024
e2ef808
Increment Version to 24.5.17a12
NeonDaniel May 17, 2024
56e15f3
Update neon-audio to resolve media playback errors (#677)
NeonDaniel May 18, 2024
7aa0820
Increment Version to 24.5.18a13
NeonDaniel May 18, 2024
a496bf4
Update skills to resolve deprecation warnings and user feedback (#678)
NeonDaniel May 20, 2024
ca41011
Increment Version to 24.5.20a14
NeonDaniel May 20, 2024
c902c32
Update config and neon-utils to use HANA to send emails (#679)
NeonDaniel May 21, 2024
ffb038d
Increment Version to 24.5.21a15
NeonDaniel May 21, 2024
3a57992
Update stock skill and CommonQuery configuration (#680)
NeonDaniel May 22, 2024
0e3e69f
Increment Version to 24.5.22a16
NeonDaniel May 22, 2024
bfc9069
Update neon-utils dependency to validate changes (#682)
NeonDaniel May 31, 2024
44ff11c
Increment Version to 24.5.31a17
NeonDaniel May 31, 2024
b07a7df
Update tests to deprecate Python3.7 and add 3.12 (#685)
NeonDaniel Jun 4, 2024
97feb02
Increment Version to 24.6.4a18
NeonDaniel Jun 4, 2024
863035e
Use Whisper STT endpoint as default remote STT (#684)
NeonDaniel Jun 5, 2024
99288a3
Increment Version to 24.6.5a19
NeonDaniel Jun 5, 2024
fa4d3b9
Improvements to device updates (#691)
NeonDaniel Jun 12, 2024
de6760c
Increment Version to 24.6.12a20
NeonDaniel Jun 12, 2024
4f2d59b
Update dependencies to resolve wallpaper rotation bug (#692)
NeonDaniel Jun 13, 2024
ec123d6
Increment Version to 24.6.13a21
NeonDaniel Jun 13, 2024
c0d2107
Update neon-utils dependency (#693)
NeonDaniel Jun 17, 2024
ca8ca10
Increment Version to 24.6.17a22
NeonDaniel Jun 17, 2024
fac7a76
Update normalization and W|A dependencies to improve responses (#694)
NeonDaniel Jun 18, 2024
0ffc7be
Increment Version to 24.6.18a23
NeonDaniel Jun 18, 2024
fbef1c5
Update skills (#695)
NeonDaniel Jun 26, 2024
92db24f
Increment Version to 24.6.26a24
NeonDaniel Jun 26, 2024
88d8e65
feat: Home Assistant skill config (#669)
mikejgray Jun 27, 2024
60b6dbd
Increment Version to 24.6.27a25
NeonDaniel Jun 27, 2024
fe2c32b
feat: config to support additional voices and wakewords (#688)
mikejgray Jun 27, 2024
4ef8764
Increment Version to 24.6.27a26
NeonDaniel Jun 27, 2024
d145671
Update neon-enclosure and ovos-bus-client to resolve issues (#696)
NeonDaniel Jun 29, 2024
30c2a9b
Increment Version to 24.6.29a27
NeonDaniel Jun 29, 2024
e7d052d
Truncate Mark2 Logs (#697)
NeonDaniel Jul 5, 2024
5c4bac2
Increment Version to 24.7.5a28
NeonDaniel Jul 5, 2024
98705c9
Update for Ukrainian language support and better email attachment han…
NeonDaniel Jul 5, 2024
c85fbd0
Increment Version to 24.7.5a29
NeonDaniel Jul 5, 2024
207f440
Update required skills to stable release specs (#699)
NeonDaniel Jul 9, 2024
078e9c9
Increment Version to 24.7.9a30
NeonDaniel Jul 9, 2024
0e746f3
Update essential skills to latest versions (#700)
NeonDaniel Jul 9, 2024
5cc1729
Increment Version to 24.7.9a31
NeonDaniel Jul 9, 2024
9adccd1
Update default skills (#701)
NeonDaniel Jul 10, 2024
1f5c6b8
Increment Version to 24.7.10a32
NeonDaniel Jul 10, 2024
687c6b5
Update updater plugin dependency version to validate changes (#703)
NeonDaniel Jul 15, 2024
80d08d7
Increment Version to 24.7.15a33
NeonDaniel Jul 15, 2024
d5ab415
Update updater dependency versions (#704)
NeonDaniel Jul 17, 2024
add7589
Increment Version to 24.7.17a34
NeonDaniel Jul 17, 2024
d6a68d8
feat: piper TTS plugin (#702)
mikejgray Jul 17, 2024
2ae382b
Increment Version to 24.7.17a35
NeonDaniel Jul 17, 2024
5e41493
Validate update skill backwards-compat. change (#705)
NeonDaniel Jul 19, 2024
8e722ed
Increment Version to 24.7.19a36
NeonDaniel Jul 19, 2024
e1be8d6
Update test image URLs to neonaiservices.com (#707)
NeonDaniel Aug 8, 2024
bebf3dc
Increment Version to 24.8.8a37
NeonDaniel Aug 8, 2024
0d1453d
Update logging config handling and default configurations (#706)
NeonDaniel Aug 9, 2024
c0d3c4e
Increment Version to 24.8.9a38
NeonDaniel Aug 9, 2024
3d5f028
Update tests for neon-utils and GHA compat. (#710)
NeonDaniel Sep 13, 2024
2ece730
Increment Version to 24.9.13a39
NeonDaniel Sep 13, 2024
bd5674f
Pin audio module dependencies to resolve missing audio output (#711)
NeonDaniel Sep 13, 2024
0b61791
Increment Version to 24.9.13a40
NeonDaniel Sep 13, 2024
4ea488c
Update neon-audio to resolve playback errors (#712)
NeonDaniel Sep 16, 2024
887501e
Increment Version to 24.9.16a41
NeonDaniel Sep 16, 2024
9ab49b5
Update essential and required skills to latest alpha versions (#709)
NeonDaniel Sep 16, 2024
96e07b1
Increment Version to 24.9.16a42
NeonDaniel Sep 16, 2024
5884ab2
Update extended skills dependencies (#714)
NeonDaniel Sep 17, 2024
5033bf9
Increment Version to 24.9.17a43
NeonDaniel Sep 17, 2024
047a225
Update default skills (#713)
NeonDaniel Sep 18, 2024
a890c30
Increment Version to 24.9.18a44
NeonDaniel Sep 18, 2024
a0df9ff
Update Neon PHAL plugin dependencies (#715)
NeonDaniel Sep 19, 2024
412d7b7
Increment Version to 24.9.19a45
NeonDaniel Sep 19, 2024
3553eae
Update Neon dependencies to support OVOS 0.x packages (#717)
NeonDaniel Sep 20, 2024
1953134
Increment Version to 24.9.20a46
NeonDaniel Sep 20, 2024
bf87c22
Update dependencies to resolve deprecation warnings (#718)
NeonDaniel Sep 20, 2024
3042eab
Increment Version to 24.9.20a47
NeonDaniel Sep 20, 2024
9add144
Update OVOS dependencies to latest stable versions (#708)
NeonDaniel Sep 20, 2024
90847d6
Increment Version to 24.9.20a48
NeonDaniel Sep 20, 2024
1c19a67
Update to resolve logged deprecation warnings (#719)
NeonDaniel Sep 21, 2024
a5b3ca7
Increment Version to 24.9.21a49
NeonDaniel Sep 21, 2024
749cfba
Update speech module and default configuration (#716)
NeonDaniel Sep 21, 2024
c77c57d
Increment Version to 24.9.21a50
NeonDaniel Sep 21, 2024
d3a5107
Load system plugin with Admin Enclosure service (#722)
NeonDaniel Oct 18, 2024
a46bbac
Increment Version to 24.10.18a51
NeonDaniel Oct 18, 2024
f5b2835
Fix Mark2 Beta Bugs (#723)
NeonDaniel Dec 28, 2024
20ac1c3
Increment Version to 24.12.28a52
NeonDaniel Dec 28, 2024
ae0c20f
Patch breaking change to language handling and Patch imports to resol…
NeonDaniel Jan 27, 2025
d13660b
Increment Version to 25.1.27a53
NeonDaniel Jan 27, 2025
e2e8e38
Update wallpaper manager plugin to resolve missing default (#725)
NeonDaniel Jan 28, 2025
95e5d6c
Increment Version to 25.1.28a54
NeonDaniel Jan 28, 2025
242260c
Update bundled configuration and license notices (#726)
NeonDaniel Feb 5, 2025
d3caf81
Increment Version to 25.2.5a55
NeonDaniel Feb 5, 2025
7ae0c67
Patch wallpaper bug observed on Mark2 (#727)
NeonDaniel Feb 7, 2025
9508668
Increment Version to 25.2.7a56
NeonDaniel Feb 7, 2025
a90515a
Update meta-configuration handling (#728)
NeonDaniel Feb 7, 2025
c7952ae
Increment Version to 25.2.7a57
NeonDaniel Feb 7, 2025
c82ba06
Deprecate `PIDLock` usage and update Dockerfile to resolve warnings (…
NeonDaniel Feb 12, 2025
d920875
Increment Version to 25.2.12a58
NeonDaniel Feb 12, 2025
a118378
Update neon-audio core module dependency (#730)
NeonDaniel Feb 12, 2025
280ed07
Increment Version to 25.2.12a59
NeonDaniel Feb 12, 2025
e3bd094
Update core module dependencies to latest alpha versions (#731)
NeonDaniel Mar 12, 2025
cb141e1
Increment Version to 25.3.12a60
NeonDaniel Mar 12, 2025
151fb77
Update transformers to validate latest changes (#732)
NeonDaniel Mar 13, 2025
3af0df7
Increment Version to 25.3.13a61
NeonDaniel Mar 13, 2025
68abd95
Update dependencies to stable versions where available (#733)
NeonDaniel Mar 13, 2025
6d4f2a5
Increment Version to 25.3.13a62
NeonDaniel Mar 13, 2025
90eabb2
Update GHA to use current Python versions and resolve errors/warnings…
NeonDaniel Mar 13, 2025
72c267f
Increment Version to 25.3.13a63
NeonDaniel Mar 13, 2025
6b4c4e1
Update dependencies to available stable versions (#735)
NeonDaniel Mar 14, 2025
673e64a
Increment Version to 25.3.14a64
NeonDaniel Mar 14, 2025
94a11e5
Update core_modules dependencies (#737)
NeonDaniel Mar 18, 2025
6787c04
Increment Version to 25.3.18a65
NeonDaniel Mar 18, 2025
e9b40d0
Update required skills to stable versions (#738)
NeonDaniel Mar 18, 2025
3a4908f
Increment Version to 25.3.18a66
NeonDaniel Mar 18, 2025
58fc2b3
Update dependencies to stable releases (#736)
NeonDaniel Mar 19, 2025
91bd7c8
Increment Version to 25.3.19a67
NeonDaniel Mar 19, 2025
5c4f8b3
Update essential skill dependencies to stable versions (#739)
NeonDaniel Mar 19, 2025
7c81750
Increment Version to 25.3.19a68
NeonDaniel Mar 19, 2025
e9457da
Update to stable core modules (#740)
NeonDaniel Mar 19, 2025
d96af51
Increment Version to 25.3.19a69
NeonDaniel Mar 19, 2025
907098f
Update default skills to stable versions (#741)
NeonDaniel Mar 20, 2025
beba8b5
Increment Version to 25.3.20a70
NeonDaniel Mar 20, 2025
e0aba8f
Update extended skill dependencies (#742)
NeonDaniel Mar 20, 2025
6ec4926
Increment Version to 25.3.20a71
NeonDaniel Mar 20, 2025
139abe8
Implement status server (#743)
NeonDaniel Jun 25, 2025
b4819c6
Increment Version to 25.6.25a72
NeonDaniel Jun 25, 2025
1b1f9f2
Update skills with Ukrainian Translations (#745)
NeonDaniel Jul 23, 2025
6dee147
Increment Version to 25.7.23a73
NeonDaniel Jul 23, 2025
bf577a1
Update skill installation to force-reinstall git skills (#744)
NeonDaniel Jul 28, 2025
0195cb9
Increment Version to 25.7.28a74
NeonDaniel Jul 28, 2025
2d7637e
Update skills to include Ukrainian Translations
NeonDaniel Jul 31, 2025
bf23fc1
Increment Version to 25.7.31a75
NeonDaniel Jul 31, 2025
1a16fa0
Update dependencies to stable versions (#749)
NeonDaniel Aug 12, 2025
6310f2f
Increment Version to 25.8.12a76
NeonDaniel Aug 12, 2025
0ad863c
Patch Default Configuration Handling (#750)
NeonDaniel Aug 15, 2025
8b5081d
Increment Version to 25.8.15a77
NeonDaniel Aug 15, 2025
7083405
Increment Version to 25.8.18
NeonDaniel Aug 18, 2025
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
2 changes: 0 additions & 2 deletions .github/workflows/license_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ 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).*'
50 changes: 43 additions & 7 deletions .github/workflows/setup_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ jobs:
core_and_skills:
strategy:
matrix:
python-version: [ 3.8, 3.9, '3.10', '3.11' ]
python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v2
- name: Checkout neon-core
uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
- name: Install System Dependencies
run: |
sudo apt update
Expand All @@ -33,12 +35,29 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- name: Checkout neon-core
uses: actions/checkout@v4
- name: Restore base image cache
uses: actions/cache@v3
id: image-cache
with:
path: ${{ github.workspace }}/pi_image_3.img.xz
key: ${{ runner.os }}-pi_image_3.img.xz-v1
- name: Ensure base image files are pulled
if: steps.image-cache.outputs.cache-hit != 'true'
run: wget https://download.neonaiservices.com/test_images/pi_image_3.img.xz -O ${{ github.workspace }}/pi_image_3.img.xz
- name: Save base image Cache
if: steps.image-cache.outputs.cache-hit != 'true'
id: image-cache-save
uses: actions/cache/save@v3
with:
path: ${{ github.workspace }}/pi_image_3.img.xz
key: ${{ runner.os }}-pi_image_3.img.xz-v1
- name: Test chroot installation
uses: pguyot/arm-runner-action@v2
with:
optimize_image: false
base_image: https://2222.us/app/files/neon_images/test_images/pi_image_3.img.xz
base_image: file://${{ github.workspace }}/pi_image_3.img.xz
cpu: cortex-a53
copy_repository_path: /core
commands: |
Expand All @@ -50,12 +69,29 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- name: Checkout neon-core
uses: actions/checkout@v4
- name: Restore base image cache
uses: actions/cache@v3
id: image-cache
with:
path: ${{ github.workspace }}/pi_image_3.img.xz
key: ${{ runner.os }}-pi_image_3.img.xz-v1
- name: Ensure base image is pulled
if: steps.image-cache.outputs.cache-hit != 'true'
run: wget https://download.neonaiservices.com/test_images/pi_image_3.img.xz -O ${{ github.workspace }}/pi_image_3.img.xz
- name: Save base image Cache
if: steps.image-cache.outputs.cache-hit != 'true'
id: image-cache-save
uses: actions/cache/save@v3
with:
path: ${{ github.workspace }}/pi_image_3.img.xz
key: ${{ runner.os }}-pi_image_3.img.xz-v1
- name: Test chroot installation
uses: pguyot/arm-runner-action@v2
with:
optimize_image: false
base_image: https://2222.us/app/files/neon_images/test_images/pi_image_3.img.xz
base_image: file://${{ github.workspace }}/pi_image_3.img.xz
cpu: cortex-a53
copy_repository_path: /core
commands: |
Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ jobs:
uses: neongeckocom/.github/.github/workflows/docker_build_tests.yml@master
with:
platforms: linux/amd64,linux/arm64
build_timeout: 120
util_tests:
strategy:
matrix:
python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
python-version: [ 3.9, '3.10', '3.11', '3.12' ]
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand All @@ -41,9 +42,9 @@ jobs:
env:
GITHUB_TOKEN: ${{secrets.neon_token}}
- name: Upload Skill Utils test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: skill-utils-test-results
name: skill-utils-test-results-${{ matrix.python-version }}
path: tests/skill-utils-test-results.xml

- name: Test Diagnostic Utils
Expand All @@ -52,21 +53,21 @@ jobs:
env:
GITHUB_TOKEN: ${{secrets.neon_token}}
- name: Upload Diagnostic Utils test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: diagnostic-utils-test-results
name: diagnostic-utils-test-results-${{ matrix.python-version }}
path: tests/diagnostic-utils-test-results.xml

unit_tests:
strategy:
matrix:
python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
python-version: [ 3.9, '3.10', '3.11', '3.12' ]
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand All @@ -82,25 +83,25 @@ jobs:
run: |
pytest test/test_configuration.py --doctest-modules --junitxml=tests/configuration-test-results.xml
- name: Upload Configuration test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: configuration-test-results
name: configuration-test-results-${{ matrix.python-version }}
path: tests/configuration-test-results.xml

- name: Test Language
run: |
pytest test/test_language.py --doctest-modules --junitxml=tests/language-test-results.xml
- name: Upload Language test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: language-test-results
name: language-test-results-${{ matrix.python-version }}
path: tests/language-test-results.xml

- name: Test Skills Module
run: |
pytest test/test_skills_module.py --doctest-modules --junitxml=tests/skills-module-test-results.xml
- name: Upload Language test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: skills-module-test-results
name: skills-module-test-results-${{ matrix.python-version }}
path: tests/skills-module-test-results.xml
1 change: 0 additions & 1 deletion .github/workflows/update_skills_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:

jobs:
build_and_publish_docker:
needs: build_and_publish_pypi
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
secrets: inherit
with:
Expand Down
21 changes: 12 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM python:3.10-slim as base
FROM python:3.10-slim AS base

LABEL vendor=neon.ai \
ai.neon.name="neon-skills"

ENV OVOS_CONFIG_BASE_FOLDER neon
ENV OVOS_CONFIG_FILENAME neon.yaml
ENV XDG_CONFIG_HOME /config
ENV OVOS_CONFIG_BASE_FOLDER=neon
ENV OVOS_CONFIG_FILENAME=neon.yaml
ENV XDG_CONFIG_HOME=/config

RUN apt-get update && \
apt-get install -y \
Expand All @@ -21,6 +21,8 @@ RUN curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.ke

RUN apt-get update && \
apt-get install -y \
curl \
jq \
gcc \
g++ \
python3-dev \
Expand All @@ -41,18 +43,19 @@ RUN apt-get update && \
# TODO: git required for getting scripts, skill should be refactored to remove this dependency
# TODO: sox, mimic required for demo skill, audio service should be refactored to handle TTS engines/voices in request

ADD . /neon_core
COPY . /neon_core
WORKDIR /neon_core

RUN pip install wheel && \
pip install .[docker]
RUN pip install --no-cache-dir wheel && \
pip install --no-cache-dir .[docker]

COPY docker_overlay/ /
RUN chmod ugo+x /root/run.sh && \
neon update-default-resources

HEALTHCHECK CMD "/opt/neon/healthcheck.sh"
CMD ["/root/run.sh"]

FROM base as default_skills
RUN pip install .[skills_required,skills_essential,skills_default,skills_extended]
FROM base AS default_skills
RUN pip install --no-cache-dir .[skills_required,skills_essential,skills_default,skills_extended]
# Default skills from configuration are installed at container creation
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
# All trademark and other rights reserved by their respective owners
# Copyright 2008-2021 Neongecko.com Inc.
# Copyright 2008-2025 Neongecko.com Inc.
# BSD-3 License

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
Expand Down
8 changes: 6 additions & 2 deletions docker_overlay/etc/neon/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ skills:
- /default_skills
- /skills
upload_skill_manifest: false
blacklisted_skills: []
blacklisted_skills:
- skill-recipes.neongeckocom
priority_skills: []
fallbacks:
fallback_priorities: {}
Expand Down Expand Up @@ -41,4 +42,7 @@ play_wav_cmdline: "play %1"
play_mp3_cmdline: "play %1"
play_ogg_cmdline: "play %1"
ready_settings:
- skills
- skills
signal:
use_signal_files: false
patch_imports: false
39 changes: 14 additions & 25 deletions neon_core/skills/patched_skill_settings.py → docker_overlay/opt/neon/healthcheck.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
#!/bin/bash
# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
# All trademark and other rights reserved by their respective owners
# Copyright 2008-2022 Neongecko.com Inc.
# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
# BSD-3 License
# Copyright 2008-2025 Neongecko.com Inc.
# BSD-3
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
# 1. Redistributions of source code must retain the above copyright notice,
Expand All @@ -26,23 +25,13 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

from ovos_utils.log import LOG
# TODO: Deprecate with ovos-backend-client update
try:
import ovos_workshop.settings
from ovos_workshop.settings import SkillSettingsManager as _SM
from ovos_backend_client.api import DeviceApi
from mock import Mock

class SkillSettingsManager(_SM):
def __init__(self, skill):
self.download_timer = None
self.skill = skill
self.api = DeviceApi()
self.remote_settings = Mock()
self.register_bus_handlers()

LOG.info("Patching SkillSettingsManager")
ovos_workshop.settings.SkillSettingsManager = SkillSettingsManager
except ImportError:
pass
port=8000
# Perform the health check using curl
resp_content=$(curl -s http://localhost:${port}/status)
status=$(echo "${resp_content}" | jq -r '.status')
if [ "${status}" == "Ready" ]; then
exit 0 # Success
else
echo "Health check failed with response: ${resp_content}" >&2
exit 1 # Failure
fi
4 changes: 2 additions & 2 deletions docker_overlay/root/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
# All trademark and other rights reserved by their respective owners
# Copyright 2008-2022 Neongecko.com Inc.
# Copyright 2008-2025 Neongecko.com Inc.
# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
# BSD-3 License
Expand Down Expand Up @@ -29,4 +29,4 @@

# Python package installation must occur in a separate thread, before module load, for the entry point to be loaded.
neon install-default-skills
neon run-skills
neon run-skills -hp 8000
36 changes: 29 additions & 7 deletions neon_core/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
# All trademark and other rights reserved by their respective owners
# Copyright 2008-2022 Neongecko.com Inc.
# Copyright 2008-2025 Neongecko.com Inc.
# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
# BSD-3 License
Expand All @@ -26,10 +26,32 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

from os import environ
from os.path import join, dirname

# TODO: Patching for ovos-core 0.0.7
import ovos_utils.messagebus
from ovos_utils.events import get_handler_name, create_wrapper, EventContainer
ovos_utils.messagebus.get_handler_name = get_handler_name
ovos_utils.messagebus.create_wrapper = create_wrapper
ovos_utils.messagebus.EventContainer = EventContainer
environ["OVOS_DEFAULT_CONFIG"] = join(dirname(__file__),
"configuration", "neon.yaml")

# Patching deprecation warnings
# TODO: Deprecate after migration to ovos-workshop 1.0+ and ovos-core 0.1+
import ovos_workshop.resource_files
import ovos_core.intent_services.stop_service
from ovos_utils.bracket_expansion import expand_template
ovos_workshop.resource_files.expand_options = expand_template
ovos_core.intent_services.stop_service.expand_options = expand_template


# Patching backwards-compat. intent language codes
import ovos_core.intent_services
from ovos_bus_client.util import get_message_lang


def _patched_get_message_lang(*args, **kwargs):
# https://github.com/OpenVoiceOS/ovos-utils/pull/267 started normalizing
# lang codes to `en-US`, where previously this would be `en-us`. This
# patches the intent_service to use the lowercase tags for improved
# backwards-compatibility
return get_message_lang(*args, **kwargs).lower()


ovos_core.intent_services.get_message_lang = _patched_get_message_lang
Loading
Loading