From 291707ce29a60e7702797be8314cdf4d0a2a7ef3 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:50:51 -0700 Subject: [PATCH] Cleanup deprecated skill util references (#558) Co-authored-by: Daniel McKnight --- docker_overlay/root/run.sh | 4 ++-- neon_core/cli.py | 33 +++++++++++++++++---------------- requirements/requirements.txt | 3 +++ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/docker_overlay/root/run.sh b/docker_overlay/root/run.sh index f90379a2b..6072770b0 100644 --- a/docker_overlay/root/run.sh +++ b/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 # TODO: Support xdg path +#neon install-default-skills +#neon install-skill-requirements /skills neon run-skills \ No newline at end of file diff --git a/neon_core/cli.py b/neon_core/cli.py index d71010d14..a1a65336e 100644 --- a/neon_core/cli.py +++ b/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") diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 9e1df4c9d..63cc90f3c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -14,6 +14,9 @@ ovos-plugin-manager~=0.0.21 ovos-backend-client~=0.0.6 psutil~=5.6 +click~=8.0 +click-default-group~=1.2 + # Used for patching skill settings mock~=5.0