Merge pull request #170 from suvanbanerjee/main

Add autoconfig support to installer
OpenVoiceOS · Oct 11, 2024 · 44d854b · 44d854b
2 parents 750f257 + 9423a24
commit 44d854b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/ansible/roles/ovos_installer/tasks/docker/composer.yml b/ansible/roles/ovos_installer/tasks/docker/composer.yml
@@ -76,6 +76,14 @@
     command: hivemind-client set-identity --key {{ ovos_installer_satellite_key }} --password {{ ovos_installer_satellite_password }} --host {{ ovos_installer_listener_host }} --port {{ ovos_installer_listener_port | default(5678) }} --siteid {{ ovos_installer_site_id | default("voice-sat-1") }}
   when: ovos_installer_profile == "satellite"
 
+- name: Run ovos-config for auto-configuration of STT and TTS based on language
+  become: true
+  become_user: "{{ ovos_installer_user }}"
+  community.docker.docker_container_exec:
+    container: ovos_cli
+    command: ovos-config autoconfigure --lang {{ ovos_installer_locale }} --male --online
+  when: ovos_installer_profile != "server"
+
 - name: Block uninstall composer
   when: ovos_installer_cleaning | bool
   tags:

diff --git a/ansible/roles/ovos_installer/tasks/virtualenv/venv.yml b/ansible/roles/ovos_installer/tasks/virtualenv/venv.yml
@@ -118,6 +118,22 @@
   changed_when: false
   when: ovos_installer_profile == "satellite"
 
+- name: Run ovos-config for auto-configuration of STT and TTS based on language
+  become: true
+  become_user: "{{ ovos_installer_user }}"
+  ansible.builtin.shell:
+    cmd: |
+      ovos-config autoconfigure \
+        --lang {{ ovos_installer_locale }} \
+        --male \
+        --online
+    executable: /bin/bash
+  environment:
+    PATH: "{{ ovos_installer_user_home }}/.venvs/ovos/bin"
+    VIRTUAL_ENV: "{{ ovos_installer_user_home }}/.venvs/ovos"
+  changed_when: false
+  when: ovos_installer_profile != "server"
+
 - name: Remove {{ ovos_installer_user_home }}/.venvs/ovos Python virtualenv and requirements.txt files
   ansible.builtin.file:
     path: "{{ ovos_installer_user_home }}/.venvs/ovos"

diff --git a/ansible/roles/ovos_installer/templates/mycroft.conf.j2 b/ansible/roles/ovos_installer/templates/mycroft.conf.j2
@@ -64,26 +64,5 @@
       }
     }
 {% endif %}
-  }{% if ovos_installer_profile != "server" %},
-  "tts": {
-    "ovos-tts-plugin-server": {
-      "sentence_tokenize": true,
-      {% if ovos_installer_locale == "de-de" %}
-      "voice": "thorsten-low"
-      {% elif ovos_installer_locale == "en-us" %}
-      "voice": "ryan-low"
-      {% elif ovos_installer_locale == "es-es" %}
-      "voice": "davefx-medium"
-      {% elif ovos_installer_locale == "fr-fr" %}
-      "voice": "siwis-medium"
-      {% elif ovos_installer_locale == "it-it" %}
-      "voice": "riccardo_fasol-x-low"
-      {% elif ovos_installer_locale == "nl-nl" %}
-      "voice": "rdh-medium"
-      {% elif ovos_installer_locale == "pt-pt" %}
-      "voice": "tugao-medium"
-      {% endif %}
-    }
   }
-{% endif %}
 }