[skills] Add extra skills

ansible/roles/ovos_installer/tasks/docker/composer.yml

@@ -52,6 +52,10 @@
         "file": "docker-compose.skills.yml",
         "state": "{{ 'false' if (ansible_memtotal_mb < 2048 and ovos_installer_profile != 'satellite' or not ovos_installer_feature_skills | bool) else 'true' }}",
       }
+    - {
+        "file": "docker-compose.skills-extra.yml",
+        "state": "{{ 'false' if (ansible_memtotal_mb < 2048 and ovos_installer_profile != 'satellite' or not ovos_installer_feature_extra_skills | bool) else 'true' }}",
+      }
     - {
         "file": "docker-compose.hivemind.yml",
         "state": "{{ 'true' if ovos_installer_profile == 'listener' else 'false' }}",
@@ -119,6 +123,11 @@
               "name": "ovos",
               "file": "docker-compose.skills.yml",
             }
+          - {
+              "src": "ovos-docker",
+              "name": "ovos",
+              "file": "docker-compose.skills-extra.yml",
+            }
           - {
               "src": "ovos-docker",
               "name": "ovos",

ansible/roles/ovos_installer/tasks/virtualenv/venv.yml

@@ -21,6 +21,11 @@
         "dest": "/tmp/skills-requirements.txt",
         "state": "{{ true if (ovos_installer_feature_skills | bool and ovos_installer_profile != 'satellite') else false }}",
       }
+    - {
+        "file": "virtualenv/extra-skills-requirements.txt",
+        "dest": "/tmp/extra-skills-requirements.txt",
+        "state": "{{ true if (ovos_installer_feature_extra_skills | bool and ovos_installer_profile != 'satellite') else false }}",
+      }
     - {
         "file": "virtualenv/listener-requirements.txt",
         "dest": "/tmp/listener-requirements.txt",
@@ -81,6 +86,10 @@
         "file": "/tmp/skills-requirements.txt",
         "state": "{{ true if (ovos_installer_feature_skills | bool and ovos_installer_profile != 'satellite') else false }}",
       }
+    - {
+        "file": "/tmp/extra-skills-requirements.txt",
+        "state": "{{ true if (ovos_installer_feature_extra_skills | bool and ovos_installer_profile != 'satellite') else false }}",
+      }
     - {
         "file": "/tmp/listener-requirements.txt",
         "state": "{{ true if ovos_installer_profile == 'listener' else false }}",
@@ -93,7 +102,6 @@
         "file": "/tmp/server-requirements.txt",
         "state": "{{ true if ovos_installer_profile == 'server' else false }}",
       }
-
   when: item.state | bool
   tags:
     - skip_ansible_lint
@@ -146,6 +154,7 @@
     - /tmp/core-requirements.txt
     - /tmp/gui-requirements.txt
     - /tmp/skills-requirements.txt
+    - /tmp/extra-skills-requirements.txt
     - /tmp/listener-requirements.txt
     - /tmp/satellite-requirements.txt
     - /tmp/server-requirements.txt

ansible/roles/ovos_installer/templates/virtualenv/extra-skills-requirements.txt.j2

@@ -0,0 +1,12 @@
+# No PyPi release
+git+https://github.com/OpenVoiceOS/skill-ovos-icanhazdadjokes.git
+git+https://github.com/OpenVoiceOS/skill-ovos-fallback-chatgpt.git
+git+https://github.com/OpenVoiceOS/skill-ovos-parrot.git
+git+https://github.com/OpenVoiceOS/skill-ovos-randomness.git
+git+https://github.com/OpenVoiceOS/skill-ovos-tunein.git
+git+https://github.com/OpenVoiceOS/skill-ovos-wolfie.git
+
+# Non-OVOS libraries
+{% if ovos_installer_profile != "server" %}
+git+https://github.com/OpenVoiceOS/ovos-skill-easter-eggs.git
+{% endif %}

ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2

@@ -12,12 +12,6 @@ git+https://github.com/OpenVoiceOS/ovos-skill-ggwave.git
 {% if ovos_installer_profile != "server" %}
 git+https://github.com/OpenVoiceOS/skill-ovos-boot-finished.git
 {% endif %}
-git+https://github.com/OpenVoiceOS/skill-ovos-icanhazdadjokes.git
 git+https://github.com/OpenVoiceOS/skill-ovos-naptime.git
 git+https://github.com/OpenVoiceOS/skill-ovos-weather.git
 git+https://github.com/OpenVoiceOS/skill-ovos-wikipedia.git
-
-# Non-OVOS libraries
-{% if ovos_installer_profile != "server" %}
-skill-easter-eggs
-{% endif %}

setup.sh

@@ -93,6 +93,7 @@ unbuffer ansible-playbook -i 127.0.0.1, ansible/site.yml \
   -e "ovos_installer_channel=${CHANNEL}" \
   -e "ovos_installer_feature_gui=${FEATURE_GUI}" \
   -e "ovos_installer_feature_skills=${FEATURE_SKILLS}" \
+  -e "ovos_installer_feature_extra_skills=${FEATURE_EXTRA_SKILLS}" \
   -e "ovos_installer_tuning=${TUNING}" \
   -e "ovos_installer_listener_host=${HIVEMIND_HOST}" \
   -e "ovos_installer_listener_port=${HIVEMIND_PORT}" \

tui/features.sh

@@ -5,8 +5,10 @@ source "tui/locales/$LOCALE/features.sh"
 
 export FEATURE_GUI="false"
 export FEATURE_SKILLS="false"
+export FEATURE_EXTRA_SKILLS="false"
 
 features=("skills" "$SKILL_DESCRIPTION" ON)
+features+=("extra skills" "$EXTRA_SKILL_DESCRIPTION" OFF)
 if [[ "$RASPBERRYPI_MODEL" != *"Raspberry Pi 3"* ]] && [[ "$KERNEL" != *"microsoft"* ]] && [ "$PROFILE" != "server" ]; then
   features+=("gui" "$GUI_DESCRIPTION" OFF)
 fi
@@ -19,9 +21,9 @@ exit_status=$?
 if [ "$exit_status" -ne 0 ]; then
   source tui/profiles.sh
   if [[ "$PROFILE" == "satellite" ]]; then
-      source tui/satellite/main.sh
+    source tui/satellite/main.sh
   else
-      source tui/features.sh
+    source tui/features.sh
   fi
 fi
 
@@ -33,5 +35,8 @@ for FEATURE in $OVOS_FEATURES; do
   "skills")
     export FEATURE_SKILLS="true"
     ;;
+  "extra skills")
+    export FEATURE_EXTRA_SKILLS="true"
+    ;;
   esac
 done

tui/locales/de-de/features.sh

@@ -11,6 +11,7 @@ Bitte wählen Sie die zu aktivierenden Funktionen aus:
 "
 TITLE="Open Voice OS Installation - Funktionen"
 SKILL_DESCRIPTION="Lade eine Auswahl an OVOS skills"
+EXTRA_SKILL_DESCRIPTION="Laden Sie zusätzliche OVOS-Fähigkeiten"
 GUI_DESCRIPTION="Mit grafischer Benutzeroberfläche"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/en-us/features.sh

@@ -11,6 +11,7 @@ Please choose the features to enable:
 "
 TITLE="Open Voice OS Installation - Features"
 SKILL_DESCRIPTION="Load default OVOS skills"
+EXTRA_SKILL_DESCRIPTION="Load extra OVOS skills"
 GUI_DESCRIPTION="Enable graphical user interface"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/es-es/features.sh

@@ -11,6 +11,7 @@ Seleccione las funciones que desea activar:
 "
 TITLE="Open Voice OS Installation - Características"
 SKILL_DESCRIPTION="Descargar una selección de competencias (skills) OVOS"
+EXTRA_SKILL_DESCRIPTION="Cargar habilidades OVOS adicionales"
 GUI_DESCRIPTION="Con interfaz gráfica de usuario"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/fr-fr/features.sh

@@ -11,6 +11,7 @@ Veuillez sélectionner les fonctionnalités à activer:
 "
 TITLE="Open Voice OS Installation - Fonctionnalités"
 SKILL_DESCRIPTION="Chargement des compétences par défaut d'OVOS"
+EXTRA_SKILL_DESCRIPTION="Chargement des compétences OVOS supplémentaires"
 GUI_DESCRIPTION="Activation de l'interface graphique"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/hi-in/features.sh

@@ -11,6 +11,7 @@ GUI KDE प्लाज्मा के शीर्ष पर चलने व
 "
 TITLE="Open Voice OS Installation - विशेषताएँ"
 SKILL_DESCRIPTION="डिफ़ॉल्ट OVOS कौशल लोड करें"
+EXTRA_SKILL_DESCRIPTION="अतिरिक्त OVOS कौशल लोड करें"
 GUI_DESCRIPTION="ग्राफिकल यूजर इंटरफेस (GUI) इस्तमाल करें"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/it-it/features.sh

@@ -11,6 +11,7 @@ Selezionare le funzioni da attivare:
 "
 TITLE="Open Voice OS Installation - Features"
 SKILL_DESCRIPTION="Scarica una selezione di competenze (skills) OVOS"
+EXTRA_SKILL_DESCRIPTION="Caricare le competenze extra OVOS"
 GUI_DESCRIPTION="Con interfaccia utente grafica"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/nl-nl/features.sh

@@ -11,6 +11,7 @@ Kies welke functies je wil activeren (meerdere opties mogelijk):
 "
 TITLE="Open Voice OS Installatie - Kenmerken"
 SKILL_DESCRIPTION="Standaard OVOS skills"
+EXTRA_SKILL_DESCRIPTION="Laad extra OVOS-vaardigheden"
 GUI_DESCRIPTION="Grafische gebruikersinterface"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

tui/locales/pt-pt/features.sh

@@ -11,6 +11,7 @@ Seleccione as funções a ativar:
 "
 TITLE="Open Voice OS Installation - Características"
 SKILL_DESCRIPTION="Descarregar uma seleção de competências (skills) OVOS"
+EXTRA_SKILL_DESCRIPTION="Carregar competências OVOS adicionais"
 GUI_DESCRIPTION="Com interface gráfica do utilizador"
 
-export CONTENT TITLE SKILL_DESCRIPTION GUI_DESCRIPTION
+export CONTENT TITLE SKILL_DESCRIPTION EXTRA_SKILL_DESCRIPTION GUI_DESCRIPTION

utils/constants.sh

@@ -42,7 +42,7 @@ export PULSE_SOCKET_WSL2=/mnt/wslg/PulseServer
 export REBOOT_FILE_PATH=/tmp/ovos.reboot
 declare -ra SCENARIO_ALLOWED_OPTIONS=(features channel share_telemetry profile method uninstall rapsberry_pi_tuning hivemind)
 export SCENARIO_ALLOWED_OPTIONS
-declare -ra SCENARIO_ALLOWED_FEATURES=(skills gui)
+declare -ra SCENARIO_ALLOWED_FEATURES=(skills 'extra skills' gui)
 export SCENARIO_ALLOWED_FEATURES
 declare -ra SCENARIO_ALLOWED_HIVEMIND_OPTIONS=(host port key password)
 export SCENARIO_ALLOWED_HIVEMIND_OPTIONS
@@ -51,7 +51,7 @@ export SCENARIO_PATH=""
 declare -rA SUPPORTED_DEVICES=(
     ["atmega328p"]="1a" #https://www.microchip.com/en-us/product/atmega328p
     ["attiny1614"]="04" #https://www.microchip.com/en-us/product/attiny1614
-    ["tas5806"]="2f" #https://www.ti.com/product/TAS5806MD
+    ["tas5806"]="2f"    #https://www.ti.com/product/TAS5806MD
 )
 export SUPPORTED_DEVICES
 export TUI_WINDOW_HEIGHT="35"