Skip to content

Commit

Permalink
Add missing click dependencies
Browse files Browse the repository at this point in the history
Update run.sh and cli.py to account for removed skill installation helpers
  • Loading branch information
NeonDaniel committed Oct 6, 2023
1 parent 02a4a24 commit 992c8bf
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
4 changes: 2 additions & 2 deletions docker_overlay/root/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
33 changes: 17 additions & 16 deletions neon_core/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
3 changes: 3 additions & 0 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 992c8bf

Please sign in to comment.