feat(llm-router): switch to --models-preset mode; add Phi-3.5-mini-instruct-8bit alias (t_9adf0889)

- Add templates/llama-server-router-preset.ini.j2: defines all 3 router GGUFs
  (Qwen3.6-35B, Phi-3.5-mini-Q8_0, Meta-Llama-3.1-8B) with explicit ctx-size,
  gpu-layers, cache settings carried over from --models-dir baseline. The Phi
  entry adds alias=Phi-3.5-mini-instruct-8bit (Ryan's aux.title_generation target).

- Update templates/llama-server-router.service.j2: Jinja2 conditional emits
  --models-preset <path> when llm_router_preset_enabled=true, otherwise
  --models-dir (backward compat, default unchanged).

- Add tasks/preset.yml: deploy preset INI, restart router on change, verify
  both Phi-3.5-mini-instruct-Q8_0 (primary) and Phi-3.5-mini-instruct-8bit
  (alias) appear in /v1/models, plus Qwen and Llama IDs unchanged.

- Update defaults/main.yml: add llm_router_preset_enabled (default false) and
  llm_router_preset_path=/opt/llama-server-router-preset.ini.

- Update tasks/main.yml: import preset.yml as Phase P (gated, no-op by default).
- Update handlers/main.yml: add 'restart router' handler for preset changes.
- Add playbooks/day2_add_phi_alias.yml: single-command deployment.

GH #22364 note: --models-preset mode creates an extra 'default' entry in
/v1/models — cosmetic, does not affect model selection by name.
This commit is contained in:
Hermes Agent service account
2026-08-12 22:58:12 -05:00
parent 9c969f783d
commit a47b29d49f
7 changed files with 489 additions and 6 deletions

View File

@@ -131,3 +131,21 @@ llm_router_bind_address: "{{ llm_bind_address }}" # 10.1.71.130
llm_router_allowed_source_cidr: "{{ llm_allowed_source_cidr }}" # 10.1.70.0/24
llm_router_expected_model_id: "Qwen3.6-35B-A3B-UD-Q4_K_S" # verified at Gate 1
llm_router_vram_max_mib: 23000 # Gate 3: fail if exceeded under load
# --- Router preset mode (--models-preset INI) ---------------------------------
# Set llm_router_preset_enabled: true to switch from --models-dir to
# --models-preset. Preset mode is REQUIRED to support model aliases.
# The template at llama-server-router-preset.ini.j2 defines all 3 router models:
# - Qwen3.6-35B-A3B-UD-Q4_K_S (no alias — primary ID unchanged)
# - Phi-3.5-mini-instruct-Q8_0 (alias: Phi-3.5-mini-instruct-8bit) <-- t_9adf0889
# - Meta-Llama-3.1-8B-Instruct-Q4_K_M (no alias — primary ID unchanged)
#
# llm_router_preset_path: on-disk path where the rendered INI is deployed.
# Default: /opt/llama-server-router-preset.ini (owned by root, readable by all).
#
# GH #22364 note: --models-preset causes an extra "default" entry in /v1/models.
# This is cosmetic and does not affect model selection by name. Accept it.
#
# Added 2026-08-12 (t_9adf0889) — War Machine.
llm_router_preset_enabled: false # flip true to activate preset mode
llm_router_preset_path: /opt/llama-server-router-preset.ini

View File

@@ -35,3 +35,12 @@
name: "{{ llm_router_service_name | default('llama-server-router') }}"
state: restarted
become: true
# Restart handler for preset mode changes (notified by tasks/preset.yml when
# the preset INI or unit file changes). Distinct from "restart llama-server-router
# on new GGUF" so each change path can notify independently.
- name: restart router
ansible.builtin.systemd:
name: "{{ llm_router_service_name | default('llama-server-router') }}"
state: restarted
become: true

View File

@@ -50,3 +50,13 @@
- include_tasks: router.yml
when: llm_router_enabled | default(false)
tags: [always]
# Phase P — Router preset mode / alias deployment
# Gates on llm_router_preset_enabled (default false — complete no-op until enabled).
# Use playbooks/day2_add_phi_alias.yml which sets llm_router_preset_enabled: true.
# Purpose: switch from --models-dir to --models-preset to enable model aliases.
# The Phi-3.5-mini-instruct-Q8_0 entry gains alias "Phi-3.5-mini-instruct-8bit".
# Added 2026-08-12 (t_9adf0889): Phi alias — War Machine.
- include_tasks: preset.yml
when: llm_router_preset_enabled | default(false)
tags: [always]

View File

@@ -0,0 +1,161 @@
---
# ------------------------------------------------------------------------------
# FILE: roles/llm-inference-multimodel/tasks/preset.yml
# DESCRIPTION: Phase P — deploy --models-preset INI file and switch the router
# from --models-dir to --models-preset mode.
#
# Purpose: preset mode is required to add model aliases. The alias
# field in the INI lets the Phi-3.5-mini-instruct-Q8_0 entry also
# respond to "Phi-3.5-mini-instruct-8bit" — Ryan's Hermes
# auxiliary.title_generation already uses this friendlier name.
#
# This phase is gated on llm_router_preset_enabled | default(false).
# With the default (false) it is a no-op. Flip to true in a playbook
# or extra-vars to activate.
#
# Tag: router_preset (deploy INI + restart service on change)
#
# Order: run AFTER router_systemd. The systemd unit template
# conditionally emits --models-preset when llm_router_preset_enabled
# is true; this phase deploys the INI the unit references.
#
# Added 2026-08-12 (t_9adf0889): Phi alias — War Machine.
# ------------------------------------------------------------------------------
# =============================================================================
# TAG: router_preset
# Deploy the preset INI and restart the router if the INI or unit changed.
# =============================================================================
- name: "[router_preset] Deploy preset INI to {{ llm_router_preset_path }}"
ansible.builtin.template:
src: llama-server-router-preset.ini.j2
dest: "{{ llm_router_preset_path }}"
owner: root
group: root
mode: "0644"
become: true
register: llm_router_preset_deployed
notify:
- restart router
when: llm_router_preset_enabled | default(false)
tags: [router_preset]
- name: "[router_preset] Report preset INI deployment result"
ansible.builtin.debug:
msg: >-
Preset INI {{ 'deployed (changed)' if llm_router_preset_deployed.changed | default(false) else 'already up-to-date (no change)' }}
at {{ llm_router_preset_path }}.
when: llm_router_preset_enabled | default(false)
tags: [router_preset]
- name: "[router_preset] Flush handlers so router restarts before verification"
ansible.builtin.meta: flush_handlers
when: llm_router_preset_enabled | default(false)
tags: [router_preset]
# =============================================================================
# Verification: confirm both the original ID and the alias appear in /v1/models
# =============================================================================
- name: "[router_preset] Wait for router /health after potential restart"
ansible.builtin.uri:
url: "http://{{ llm_router_bind_address }}:{{ llm_router_port }}/health"
status_code: 200
timeout: 30
retries: 12
delay: 5
register: llm_preset_health
until: llm_preset_health.status == 200
when: llm_router_preset_enabled | default(false)
tags: [router_preset]
- name: "[router_preset] Query /v1/models to verify preset loaded"
ansible.builtin.uri:
url: "http://{{ llm_router_bind_address }}:{{ llm_router_port }}/v1/models"
status_code: 200
return_content: true
timeout: 30
register: llm_preset_models
when: llm_router_preset_enabled | default(false)
tags: [router_preset]
- name: "[router_preset] Extract model IDs and aliases from /v1/models"
ansible.builtin.set_fact:
llm_preset_model_ids: >-
{{ llm_preset_models.json.data | map(attribute='id') | list }}
llm_preset_model_aliases: >-
{{ llm_preset_models.json.data | map(attribute='aliases') | flatten | list }}
when:
- llm_router_preset_enabled | default(false)
- llm_preset_models is defined
tags: [router_preset]
- name: "[router_preset] VERIFY: Phi original ID (Phi-3.5-mini-instruct-Q8_0) present in /v1/models"
ansible.builtin.fail:
msg: >-
PRESET VERIFY FAIL: 'Phi-3.5-mini-instruct-Q8_0' not found in /v1/models IDs.
Returned IDs: {{ llm_preset_model_ids | default([]) }}
Check the preset INI section name.
when:
- llm_router_preset_enabled | default(false)
- llm_preset_model_ids is defined
- "'Phi-3.5-mini-instruct-Q8_0' not in llm_preset_model_ids"
tags: [router_preset]
- name: "[router_preset] VERIFY: Phi alias (Phi-3.5-mini-instruct-8bit) present in /v1/models aliases"
ansible.builtin.fail:
msg: >-
PRESET VERIFY FAIL: alias 'Phi-3.5-mini-instruct-8bit' not found in /v1/models.
Returned IDs: {{ llm_preset_model_ids | default([]) }}
Returned aliases: {{ llm_preset_model_aliases | default([]) }}
Check the 'alias' field in the preset INI for the [Phi-3.5-mini-instruct-Q8_0] section.
when:
- llm_router_preset_enabled | default(false)
- llm_preset_model_ids is defined
- "'Phi-3.5-mini-instruct-8bit' not in llm_preset_model_ids and 'Phi-3.5-mini-instruct-8bit' not in llm_preset_model_aliases"
tags: [router_preset]
- name: "[router_preset] VERIFY: Qwen model ID unchanged"
ansible.builtin.fail:
msg: >-
PRESET VERIFY FAIL: 'Qwen3.6-35B-A3B-UD-Q4_K_S' not found in /v1/models.
Returned IDs: {{ llm_preset_model_ids | default([]) }}
when:
- llm_router_preset_enabled | default(false)
- llm_preset_model_ids is defined
- "'Qwen3.6-35B-A3B-UD-Q4_K_S' not in llm_preset_model_ids"
tags: [router_preset]
- name: "[router_preset] VERIFY: Llama model ID unchanged"
ansible.builtin.fail:
msg: >-
PRESET VERIFY FAIL: 'Meta-Llama-3.1-8B-Instruct-Q4_K_M' not found in /v1/models.
Returned IDs: {{ llm_preset_model_ids | default([]) }}
when:
- llm_router_preset_enabled | default(false)
- llm_preset_model_ids is defined
- "'Meta-Llama-3.1-8B-Instruct-Q4_K_M' not in llm_preset_model_ids"
tags: [router_preset]
- name: "[router_preset] VERIFY PASS — preset mode active, all models and alias confirmed"
ansible.builtin.debug:
msg:
- "======================================================================"
- "PRESET VERIFY PASS: --models-preset mode active on llama-server-router."
- ""
- " /v1/models IDs: {{ llm_preset_model_ids | default([]) }}"
- " /v1/models aliases: {{ llm_preset_model_aliases | default([]) }}"
- ""
- " 'Phi-3.5-mini-instruct-Q8_0' => PRESENT (primary ID)"
- " 'Phi-3.5-mini-instruct-8bit' => PRESENT (alias — Ryan's title_generation target)"
- " 'Qwen3.6-35B-A3B-UD-Q4_K_S' => PRESENT"
- " 'Meta-Llama-3.1-8B-Instruct-Q4_K_M' => PRESENT"
- ""
- " GH #22364 note: a 'default' model entry may also appear above."
- " This is an expected upstream behavior in preset mode — cosmetic only."
- "======================================================================"
when:
- llm_router_preset_enabled | default(false)
- llm_preset_model_ids is defined
tags: [router_preset]

View File

@@ -0,0 +1,74 @@
; ------------------------------------------------------------------------------
; FILE: roles/llm-inference-multimodel/templates/llama-server-router-preset.ini.j2
; DESCRIPTION: llama.cpp --models-preset INI for llama-server-router.
;
; Purpose: define all router-served GGUFs as named model entries so that:
; - Each model is explicitly named and configured (no auto-discovery surprises)
; - Aliases can be added per model (impossible with --models-dir alone)
; - The Phi-3.5-mini-instruct-Q8_0 entry carries the alias
; "Phi-3.5-mini-instruct-8bit" — Ryan's Hermes auxiliary.title_generation
; already references this friendlier name; both names resolve to the same
; GGUF child process.
;
; INI format notes (llama.cpp preset.md):
; - Section header (e.g. [Phi-3.5-mini-instruct-Q8_0]) is the primary model ID
; that appears in /v1/models and that clients send in the "model" field.
; - `alias` adds an ADDITIONAL name — both the section name and the alias work.
; - The `model` key is the absolute path to the GGUF file.
; - All other keys map directly to llama-server CLI flags (underscores or hyphens).
;
; Known upstream issues (Aug 2026):
; - GH #22364: --models-preset creates an extra "default" model entry in
; /v1/models. This is cosmetic — it has no functional effect on model
; selection by name. Document and move on.
; - GH #23460: can't pass per-model samplers via --models-preset in router
; mode. Non-issue: Hermes always sends sampling params in the request body.
;
; Added 2026-08-12 (t_9adf0889): Phi alias — War Machine.
; All per-model settings carry over unchanged from the --models-dir baseline
; (ctx_size=65536, n_gpu_layers=99, cache=q4_0 for both K and V, models-max=4).
; ------------------------------------------------------------------------------
; --- Production model: Qwen3.6-35B-A3B-UD-Q4_K_S ----------------------------
; Primary model ID: Qwen3.6-35B-A3B-UD-Q4_K_S (unchanged from --models-dir)
; ~20GB, primary Hermes production LLM. Context: 64K with q4_0 KV cache.
[Qwen3.6-35B-A3B-UD-Q4_K_S]
model = {{ llm_models_dir }}/Qwen3.6-35B-A3B-UD-Q4_K_S.gguf
n-gpu-layers = {{ llm_router_gpu_layers }}
ctx-size = {{ llm_router_ctx_size }}
cache-type-k = {{ llm_router_cache_type_k }}
cache-type-v = {{ llm_router_cache_type_v }}
batch-size = {{ llm_router_batch_size }}
ubatch-size = {{ llm_router_ubatch_size }}
parallel = {{ llm_router_parallel }}
; --- Auxiliary model: Phi-3.5-mini-instruct-Q8_0 ----------------------------
; Primary model ID: Phi-3.5-mini-instruct-Q8_0 (unchanged from --models-dir)
; Alias: Phi-3.5-mini-instruct-8bit (NEW — Ryan's config target)
; Both names resolve to this GGUF child process.
; ~3.8GB, auxiliary.title_generation consumer in Ryan's Hermes config.
; The alias is what this entire task is about — once deployed, the
; "Auxiliary title generation failed" warning will be gone.
[Phi-3.5-mini-instruct-Q8_0]
model = {{ llm_models_dir }}/Phi-3.5-mini-instruct-Q8_0.gguf
alias = Phi-3.5-mini-instruct-8bit
n-gpu-layers = {{ llm_router_gpu_layers }}
ctx-size = {{ llm_router_ctx_size }}
cache-type-k = {{ llm_router_cache_type_k }}
cache-type-v = {{ llm_router_cache_type_v }}
batch-size = {{ llm_router_batch_size }}
ubatch-size = {{ llm_router_ubatch_size }}
parallel = {{ llm_router_parallel }}
; --- Auxiliary model: Meta-Llama-3.1-8B-Instruct-Q4_K_M --------------------
; Primary model ID: Meta-Llama-3.1-8B-Instruct-Q4_K_M (unchanged)
; ~4.6GB, general-purpose small model.
[Meta-Llama-3.1-8B-Instruct-Q4_K_M]
model = {{ llm_models_dir }}/Meta-Llama-3.1-8B-Instruct-Q4_K_M.gguf
n-gpu-layers = {{ llm_router_gpu_layers }}
ctx-size = {{ llm_router_ctx_size }}
cache-type-k = {{ llm_router_cache_type_k }}
cache-type-v = {{ llm_router_cache_type_v }}
batch-size = {{ llm_router_batch_size }}
ubatch-size = {{ llm_router_ubatch_size }}
parallel = {{ llm_router_parallel }}

View File

@@ -10,7 +10,11 @@ User={{ llm_service_user }}
Group={{ llm_service_user }}
Environment="HOME=/home/{{ llm_service_user }}"
ExecStart={{ llm_binary_path }} \
{% if llm_router_preset_enabled | default(false) %}
--models-preset {{ llm_router_preset_path }} \
{% else %}
--models-dir {{ llm_router_models_dir }} \
{% endif %}
--models-max {{ llm_router_models_max }} \
--host {{ llm_router_bind_address }} \
--port {{ llm_router_port }} \
@@ -24,19 +28,23 @@ ExecStart={{ llm_binary_path }} \
--parallel {{ llm_router_parallel }} \
--metrics
# ROUTER MODE NOTES (2026-08-12, t_0cca74a2):
# ROUTER MODE NOTES (2026-08-12, t_0cca74a2 / updated t_9adf0889):
# - NO -m/--model flag: this is what enables llama-server router/supervisor mode.
# Without -m, llama-server discovers all .gguf files in --models-dir, spawning
# each as its own child process on demand (LRU-eviction when over models-max).
# Without -m, llama-server discovers all .gguf files in --models-dir, or uses
# the per-model definitions in a --models-preset INI file.
# - PRESET MODE (t_9adf0889, 2026-08-12):
# llm_router_preset_enabled=true switches from --models-dir to --models-preset.
# Preset mode adds alias support (--models-dir cannot assign aliases).
# The preset INI is at {{ llm_router_preset_path | default('/opt/llama-server-router-preset.ini') }}.
# Both the section name and the alias field in the INI work as model IDs.
# GH #22364 (extra "default" entry in /v1/models) is expected in preset mode — cosmetic.
# - --models-max {{ llm_router_models_max }} is driven by llm_router_models_max
# (default 1 in defaults/main.yml; overridden to 4 in host_vars/astro-orbiter
# as of t_33acbb2e after VRAM budget review — see host_vars for OOM risk note).
# Default llama-server cap is 4 simultaneous — OOM on 24GB if all 3 current
# GGUFs load at once. LRU eviction mitigates in practice but review before adding
# models. See host_vars/astro-orbiter/vars.yml for full VRAM breakdown.
# - --models-dir /opt/models: auto-discovers all .gguf files. Keep that directory
# clean (Qwen-only) to avoid spurious extra entries in /v1/models.
# - Clients select a model via "model": "<gguf-basename-without-.gguf>" in their
# - Clients select a model via "model": "<section-name-or-alias>" in their
# chat completion request. Hermes sends model: "<id>" on every request already.
# - Cold model load on first request: ~30-60s for Qwen3.6-35B. First response
# will be slow. This is expected. Document in runbook.