Skip to content

fix(installer): quote model metadata in generated env #2811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tang-vu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(installer): quote model metadata in generated env #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ods/installers/macos/lib/env-generator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,13 +535,13 @@ CTX_SIZE=${MAX_CONTEXT}
MODEL_RECOMMENDED_MODEL=${LLM_MODEL}
MODEL_RECOMMENDED_GGUF=${GGUF_FILE}
MODEL_RECOMMENDED_CONTEXT=${MAX_CONTEXT}
MODEL_RECOMMENDATION_SOURCE=${MODEL_RECOMMENDATION_SOURCE:-installer_tier_map}
MODEL_RECOMMENDATION_POLICY=${MODEL_RECOMMENDATION_POLICY:-tier-map}
MODEL_RECOMMENDATION_CONFIDENCE=${MODEL_RECOMMENDATION_CONFIDENCE:-medium}
MODEL_RECOMMENDATION_REASON=${MODEL_RECOMMENDATION_REASON:-Selected by installer tier ${tier} (${TIER_NAME}) for apple backend; benchmark locally after first launch.}
MODEL_RECOMMENDED_ALTERNATIVES=${MODEL_RECOMMENDED_ALTERNATIVES:-}
MODEL_RECOMMENDATION_SOURCE="${MODEL_RECOMMENDATION_SOURCE:-installer_tier_map}"
MODEL_RECOMMENDATION_POLICY="${MODEL_RECOMMENDATION_POLICY:-tier-map}"
MODEL_RECOMMENDATION_CONFIDENCE="${MODEL_RECOMMENDATION_CONFIDENCE:-medium}"
MODEL_RECOMMENDATION_REASON="${MODEL_RECOMMENDATION_REASON:-Selected by installer tier ${tier} (${TIER_NAME}) for apple backend; benchmark locally after first launch.}"
MODEL_RECOMMENDED_ALTERNATIVES="${MODEL_RECOMMENDED_ALTERNATIVES:-}"
MODEL_PERFORMANCE_SOURCE=benchmark_required
MODEL_PERFORMANCE_LABEL=Benchmark after first launch
MODEL_PERFORMANCE_LABEL="Benchmark after first launch"
GPU_BACKEND=apple
HOST_RAM_GB=${SYSTEM_RAM_GB}
N_GPU_LAYERS=${n_gpu_layers}
Expand Down
12 changes: 6 additions & 6 deletions ods/installers/phases/06-directories.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,13 +825,13 @@ CTX_SIZE=${MAX_CONTEXT}
MODEL_RECOMMENDED_MODEL=${MODEL_RECOMMENDED_MODEL_VALUE}
MODEL_RECOMMENDED_GGUF=${MODEL_RECOMMENDED_GGUF_VALUE}
MODEL_RECOMMENDED_CONTEXT=${MODEL_RECOMMENDED_CONTEXT_VALUE}
MODEL_RECOMMENDATION_SOURCE=${MODEL_RECOMMENDATION_SOURCE:-installer_tier_map}
MODEL_RECOMMENDATION_POLICY=${MODEL_RECOMMENDATION_POLICY:-tier-map}
MODEL_RECOMMENDATION_CONFIDENCE=${MODEL_RECOMMENDATION_CONFIDENCE:-medium}
MODEL_RECOMMENDATION_REASON=${MODEL_RECOMMENDATION_REASON:-Selected by installer tier ${TIER} (${TIER_NAME}) for ${GPU_BACKEND} backend; benchmark locally after first launch.}
MODEL_RECOMMENDED_ALTERNATIVES=${MODEL_RECOMMENDED_ALTERNATIVES:-}
MODEL_RECOMMENDATION_SOURCE="${MODEL_RECOMMENDATION_SOURCE:-installer_tier_map}"
MODEL_RECOMMENDATION_POLICY="${MODEL_RECOMMENDATION_POLICY:-tier-map}"
MODEL_RECOMMENDATION_CONFIDENCE="${MODEL_RECOMMENDATION_CONFIDENCE:-medium}"
MODEL_RECOMMENDATION_REASON="${MODEL_RECOMMENDATION_REASON:-Selected by installer tier ${TIER} (${TIER_NAME}) for ${GPU_BACKEND} backend; benchmark locally after first launch.}"
MODEL_RECOMMENDED_ALTERNATIVES="${MODEL_RECOMMENDED_ALTERNATIVES:-}"
MODEL_PERFORMANCE_SOURCE=benchmark_required
MODEL_PERFORMANCE_LABEL=Benchmark after first launch
MODEL_PERFORMANCE_LABEL="Benchmark after first launch"
GPU_BACKEND=${GPU_BACKEND}
SYSTEM_RAM_GB=${RAM_GB:-0}
N_GPU_LAYERS=${N_GPU_LAYERS_VALUE}
Expand Down
12 changes: 6 additions & 6 deletions ods/installers/windows/lib/env-generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,16 +923,16 @@ CTX_SIZE=$($TierConfig.MaxContext)
MODEL_RECOMMENDED_MODEL=$($TierConfig.LlmModel)
MODEL_RECOMMENDED_GGUF=$($TierConfig.GgufFile)
MODEL_RECOMMENDED_CONTEXT=$($TierConfig.MaxContext)
MODEL_RECOMMENDATION_SOURCE=$(if ($TierConfig.RecommendationSource) { $TierConfig.RecommendationSource } else { "installer_tier_map" })
MODEL_RECOMMENDATION_POLICY=$(if ($TierConfig.RecommendationPolicy) { $TierConfig.RecommendationPolicy } else { "tier-map" })
MODEL_RECOMMENDATION_CONFIDENCE=$(if ($TierConfig.RecommendationConfidence) { $TierConfig.RecommendationConfidence } else { "medium" })
MODEL_RECOMMENDATION_REASON=$(if ($TierConfig.RecommendationReason) { $TierConfig.RecommendationReason } else { "Selected by installer tier $Tier ($($TierConfig.TierName)) for $GpuBackend backend; benchmark locally after first launch." })
MODEL_RECOMMENDED_ALTERNATIVES=$(if ($TierConfig.RecommendationAlternatives) { $TierConfig.RecommendationAlternatives } else { "" })
MODEL_RECOMMENDATION_SOURCE="$(if ($TierConfig.RecommendationSource) { $TierConfig.RecommendationSource } else { "installer_tier_map" })"
MODEL_RECOMMENDATION_POLICY="$(if ($TierConfig.RecommendationPolicy) { $TierConfig.RecommendationPolicy } else { "tier-map" })"
MODEL_RECOMMENDATION_CONFIDENCE="$(if ($TierConfig.RecommendationConfidence) { $TierConfig.RecommendationConfidence } else { "medium" })"
MODEL_RECOMMENDATION_REASON="$(if ($TierConfig.RecommendationReason) { $TierConfig.RecommendationReason } else { "Selected by installer tier $Tier ($($TierConfig.TierName)) for $GpuBackend backend; benchmark locally after first launch." })"
MODEL_RECOMMENDED_ALTERNATIVES="$(if ($TierConfig.RecommendationAlternatives) { $TierConfig.RecommendationAlternatives } else { "" })"
MODEL_RUNTIME_PROFILE=$(if ($TierConfig.RuntimeProfile) { $TierConfig.RuntimeProfile } else { "" })
MODEL_RUNTIME_PROFILE_LABEL=$(if ($TierConfig.RuntimeProfileLabel) { $TierConfig.RuntimeProfileLabel } else { "" })
MODEL_RUNTIME_PROFILE_SOURCE=$(if ($TierConfig.RuntimeProfileSource) { $TierConfig.RuntimeProfileSource } else { "" })
MODEL_PERFORMANCE_SOURCE=benchmark_required
MODEL_PERFORMANCE_LABEL=Benchmark after first launch
MODEL_PERFORMANCE_LABEL="Benchmark after first launch"
GPU_BACKEND=$GpuBackend
SYSTEM_RAM_GB=$SystemRamGB
N_GPU_LAYERS=$nGpuLayers
Expand Down
15 changes: 15 additions & 0 deletions ods/tests/smoke/installer-env-smoke.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ if bash -c "
export LLM_MODEL=qwen3-1.7b
export GGUF_FILE=Qwen3-1.7B-Q4_K_M.gguf
export MAX_CONTEXT=4096
export MODEL_RECOMMENDATION_REASON='Arch-aware catalog policy (spark-aarch64): selected after fit check'
export MODEL_RECOMMENDED_ALTERNATIVES='deepseek-r1:32768:48;qwen-a3b:131072:35.48'
export ODS_VERSION=2.1.0
export ENABLE_VOICE=true
export ENABLE_WORKFLOWS=true
Expand Down Expand Up @@ -186,6 +188,19 @@ fi
echo ""
echo "── .env schema validation ──"
if [[ "$ENV_GENERATED" == true && -f "$INSTALL_DIR/.env" ]]; then
if bash -c '
set -a
source "$1"
set +a
[[ "$MODEL_RECOMMENDATION_REASON" == "Arch-aware catalog policy (spark-aarch64): selected after fit check" ]]
[[ "$MODEL_RECOMMENDED_ALTERNATIVES" == "deepseek-r1:32768:48;qwen-a3b:131072:35.48" ]]
[[ "$MODEL_PERFORMANCE_LABEL" == "Benchmark after first launch" ]]
' _ "$INSTALL_DIR/.env"; then
pass "Generated model metadata is safe to source as dotenv"
else
fail "Generated model metadata breaks dotenv parsing"
fi

if bash scripts/validate-env.sh "$INSTALL_DIR/.env" "$ROOT_DIR/.env.schema.json" 2>/dev/null; then
pass ".env validates against schema"
else
Expand Down
Loading