Skip to content

Commit

Permalink
Neon Core 24.5.1 (#663)
Browse files Browse the repository at this point in the history
  • Loading branch information
NeonDaniel authored May 1, 2024
2 parents 4d6ea89 + 0de668c commit 741b89c
Show file tree
Hide file tree
Showing 37 changed files with 389 additions and 1,022 deletions.
74 changes: 0 additions & 74 deletions .github/workflows/build_debos.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/publish_test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@ jobs:
publish_prerelease: true
update_changelog: false
# Changelog automation fails with this large repo
trigger_os_build:
runs-on: ubuntu-latest
steps:
- name: Call Release Action
uses: peter-evans/repository-dispatch@v3
with:
token: ${{secrets.NEON_OS_TOKEN}}
repository: neongeckocom/neon-os
event-type: Publish Release
client-payload: |-
{
"ref": "dev",
"repo": "neon-core"
}
build_and_publish_docker:
needs: publish_alpha_release
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
Expand Down
109 changes: 2 additions & 107 deletions .github/workflows/setup_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,6 @@ jobs:
- name: Test Skills Installation
run: |
pip install .[skills_required,skills_essential,skills_default,skills_extended]
# pi_image_3_7:
# 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-02-13_09_05.img.xz
# cpu: cortex-a53
# copy_repository_path: /core
# commands: |
# bash /core/test/pi_setup_3_7.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
pi_image_3_10:
runs-on: ubuntu-latest
timeout-minutes: 90
Expand All @@ -55,7 +38,7 @@ jobs:
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
base_image: https://2222.us/app/files/neon_images/test_images/pi_image_3.img.xz
cpu: cortex-a53
copy_repository_path: /core
commands: |
Expand All @@ -72,99 +55,11 @@ jobs:
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
base_image: https://2222.us/app/files/neon_images/test_images/pi_image_3.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:
python-version: [ 3.9 ]
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Setup Core
run: |
mkdir -p ~/.local/share/neon
echo ${GOOGLE_KEY}>~/.local/share/neon/google.json
echo ${AWS_CREDS}>~/.local/share/neon/aws.json
bash test/legacy_setup_remote.sh ${NEON_TOKEN}
env:
NEON_TOKEN: ${{secrets.neon_token}}
GOOGLE_KEY: ${{secrets.google_api_key}}
AWS_CREDS: ${{secrets.amazon_creds}}
- name: Test Core Setup
timeout-minutes: 10
run: |
. test/.venv/bin/activate
pytest test/test_setup_remote.py --junitxml=tests/remote-setup-results.xml
pytest test/test_run_neon.py --junitxml=tests/remote-test-results.xml
- name: Upload Core Setup test results
uses: actions/upload-artifact@v2
with:
name: pytest-results-remote-${{ matrix.python-version }}
path: tests/remote-test-results.xml
if: always()
- name: Upload Core Setup logs
uses: actions/upload-artifact@v2
with:
name: core-logs-remote-${{ matrix.python-version }}
path: ~/.local/share/neon/logs/*.log
if: always()
- name: Upload Configuration
uses: actions/upload-artifact@v2
with:
name: configuration-remote-${{ matrix.python-version }}
path: ~/.config/neon/neon.yaml
if: always()
legacy-dev_local:
strategy:
matrix:
python-version: [ 3.8 ]
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Setup Core
run: |
bash test/legacy_setup_dev_local.sh ${NEON_TOKEN}
env:
NEON_TOKEN: ${{secrets.neon_token}}
- name: Test Core Setup
timeout-minutes: 10
run: |
. test/.venv/bin/activate
pip install pytest pytest-timeout
pytest test/test_setup_dev_local.py --junitxml=tests/dev_local-setup-results.xml
pytest test/test_run_neon.py --junitxml=tests/dev_local-test-results.xml
- name: Upload Core Setup test results
uses: actions/upload-artifact@v2
with:
name: pytest-results-local-${{ matrix.python-version }}
path: tests/dev_local-test-results.xml
if: always()
- name: Upload Core Setup logs
uses: actions/upload-artifact@v2
with:
name: core-logs-dev-local-${{ matrix.python-version }}
path: ~/test/logs/*.log
if: always()
- name: Upload Configuration
uses: actions/upload-artifact@v2
with:
name: configuration-dev-local-${{ matrix.python-version }}
path: ~/.config/neon/neon.yaml
if: always()
1 change: 0 additions & 1 deletion docker_overlay/root/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +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 install-skill-requirements /skills
neon run-skills
11 changes: 0 additions & 11 deletions neon_core/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,6 @@ def update_default_resources():
click.echo("Updating Default Resources")
update_default_resources()

# @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")
@click.option("--install-skills", "-i", default=None,
Expand Down
11 changes: 2 additions & 9 deletions neon_core/configuration/mark_2/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ listener:
instant_listen: true
speech_begin: 0.5
silence_end: 0.9
utterance_chunks_to_rewind: 1
utterance_chunks_to_rewind: 0
hotwords:
wake_up:
active: false
Expand Down Expand Up @@ -73,13 +73,6 @@ gui:
run_gui_file_server: false
generic:
homescreen_supported: true
MQ:
server: mq.2023.us
port: 35672
users:
mq_handler:
user: neon_api_utils
password: Klatchat2021
signal:
use_signal_files: false
skills:
Expand All @@ -91,7 +84,7 @@ skills:
- skill-audio_record.neongeckocom
default_skills: []
PHAL:
ovos-PHAL-plugin-mk1:
ovos-phal-mk1:
enabled: false
ovos-PHAL-plugin-balena-wifi:
enabled: false
Expand Down
3 changes: 1 addition & 2 deletions neon_core/configuration/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ skills:
appstore_sync_interval: 6
auto_update: false
auto_update_interval: 24
neon_token: ''
install_essential: true
essential_skills: []
install_default: false
Expand Down Expand Up @@ -212,7 +211,7 @@ network_tests:
ncsi_endpoint: http://www.msftncsi.com/ncsi.txt
ncsi_expected_text: Microsoft NCSI
MQ:
server: mq.2021.us
server: mq.neonaiservices.com
port: 5672
users:
mq_handler:
Expand Down
7 changes: 0 additions & 7 deletions neon_core/configuration/opi5/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ gui:
run_gui_file_server: false
generic:
homescreen_supported: true
MQ:
server: mq.2023.us
port: 35672
users:
mq_handler:
user: neon_api_utils
password: Klatchat2021
signal:
use_signal_files: false
skills:
Expand Down
7 changes: 0 additions & 7 deletions neon_core/configuration/rpi4/neon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ gui:
run_gui_file_server: false
generic:
homescreen_supported: true
MQ:
server: mq.2023.us
port: 35672
users:
mq_handler:
user: neon_api_utils
password: Klatchat2021
signal:
use_signal_files: false
skills:
Expand Down
2 changes: 1 addition & 1 deletion neon_core/run_neon.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from threading import Event
from subprocess import Popen, STDOUT
from ovos_bus_client import MessageBusClient, Message
from typing.io import IO
from typing import IO

from neon_utils.configuration_utils import init_config_dir
init_config_dir()
Expand Down
Loading

0 comments on commit 741b89c

Please sign in to comment.