fix(llm): require explicit model and persist trimmed value

Author: goldyfruit

ansible/roles/ovos_config/tasks/install.yml

@@ -128,13 +128,14 @@
     _ovos_persona_path: "{{ ovos_installer_user_home }}/{{ _ovos_persona_relpath }}"
     _ovos_persona_file: "{{ _ovos_persona_path }}/ovos-installer-llm.json"
     _ovos_llm_persona_name: "{{ ovos_installer_llm_persona_name | default('OVOS Installer LLM') | trim }}"
+    _ovos_llm_model: "{{ ovos_installer_llm_model | default('') | trim }}"
   when:
     - ovos_installer_feature_llm | default(false) | bool
     - ovos_installer_method in ["virtualenv", "containers"]
     - ovos_installer_profile not in ['satellite', 'server']
     - (ovos_installer_llm_api_url | default('') | trim | length) > 0
     - (ovos_installer_llm_api_key | default('') | trim | length) > 0
-    - (ovos_installer_llm_model | default('') | trim | length) > 0
+    - (_ovos_llm_model | length) > 0
     - (ovos_installer_llm_persona | default('') | trim | length) > 0
     - (_ovos_llm_persona_name | length) > 0
   block:
@@ -159,12 +160,12 @@
               "solvers": [
                 "ovos-solver-openai-plugin"
               ],
-              "ovos-solver-openai-plugin": {
-                "api_url": ovos_installer_llm_api_url,
-                "key": ovos_installer_llm_api_key,
-                "model": ovos_installer_llm_model,
-                "system_prompt": ovos_installer_llm_persona
-              }
-            } | to_nice_json
+                "ovos-solver-openai-plugin": {
+                  "api_url": ovos_installer_llm_api_url,
+                  "key": ovos_installer_llm_api_key,
+                  "model": _ovos_llm_model,
+                  "system_prompt": ovos_installer_llm_persona
+                }
+              } | to_nice_json
           }}
       no_log: true

ansible/roles/ovos_installer/defaults/main.yml

@@ -141,7 +141,7 @@ ovos_installer_homeassistant_host: ""
 ovos_installer_homeassistant_api_key: ""
 ovos_installer_llm_api_url: ""
 ovos_installer_llm_api_key: ""
-ovos_installer_llm_model: "gpt-4o-mini"
+ovos_installer_llm_model: ""
 ovos_installer_llm_persona: "helpful, creative, clever, and very friendly."
 ovos_installer_llm_persona_name: "OVOS Installer LLM"
 ovos_installer_usage_telemetry: false

tests/bats/code_quality.bats

@@ -1473,6 +1473,9 @@ function setup() {
     run grep -q "ovos_installer_llm_model:" ansible/roles/ovos_installer/defaults/main.yml
     assert_success
 
+    run grep -q 'ovos_installer_llm_model: ""' ansible/roles/ovos_installer/defaults/main.yml
+    assert_success
+
     run grep -q "ovos_installer_llm_model | default('') | trim | length > 0" ansible/roles/ovos_installer/tasks/assert.yml
     assert_success
 
@@ -1485,9 +1488,15 @@ function setup() {
     run grep -q '"ovos-solver-openai-plugin": {' ansible/roles/ovos_config/tasks/install.yml
     assert_success
 
-    run grep -q '"model": ovos_installer_llm_model' ansible/roles/ovos_config/tasks/install.yml
+    run grep -q "_ovos_llm_model: \"{{ ovos_installer_llm_model | default('') | trim }}\"" ansible/roles/ovos_config/tasks/install.yml
+    assert_success
+
+    run grep -q '"model": _ovos_llm_model' ansible/roles/ovos_config/tasks/install.yml
     assert_success
 
+    run grep -q '"model": ovos_installer_llm_model' ansible/roles/ovos_config/tasks/install.yml
+    assert_failure
+
     run grep -q '"system_prompt": ovos_installer_llm_persona' ansible/roles/ovos_config/tasks/install.yml
     assert_success