Merge pull request #189 from bernardladenthin/claude/stoic-archimedes-brMrb

Add per-session thread-safety and streaming guard to Session

Author: bernardladenthin

.github/validate-models.bat

@@ -11,7 +11,12 @@ setlocal enabledelayedexpansion
 
 set "MODELS=models\codellama-7b.Q2_K.gguf" "models\jina-reranker-v1-tiny-en-Q4_0.gguf" "models\AMD-Llama-135m-code.Q2_K.gguf" "models\Qwen3-0.6B-Q4_K_M.gguf"
 
-echo Validating model files...
+REM Vision GGUFs are validated only when present (the Windows job downloads
+REM them too, but the validation step must not fail when a future job opts
+REM out of the vision matrix).
+set "OPTIONAL_MODELS=models\SmolVLM-500M-Instruct-Q8_0.gguf" "models\mmproj-SmolVLM-500M-Instruct-Q8_0.gguf"
+
+echo Validating required model files...
 for %%M in (%MODELS%) do (
   if not exist "%%M" (
     echo ERROR: Model not found: %%M
@@ -37,5 +42,24 @@ for %%M in (%MODELS%) do (
   echo OK: %%M ^(!size! bytes^)
 )
 
+echo Validating optional vision model files...
+for %%M in (%OPTIONAL_MODELS%) do (
+  if not exist "%%M" (
+    echo SKIP: %%M not present
+  ) else (
+    for /f %%S in ('powershell -Command "(Get-Item '%%M').Length"') do set "size=%%S"
+    if !size! lss 4 (
+      echo ERROR: Model file too small (likely corrupted^): %%M (size: !size! bytes^)
+      exit /b 1
+    )
+    for /f %%H in ('powershell -Command "[System.BitConverter]::ToString((Get-Content '%%M' -Encoding Byte -ReadCount 4)[0]) -replace '-',''"') do set "magic=%%H"
+    if not "!magic!"=="47475546" (
+      echo ERROR: Invalid GGUF magic bytes in %%M (got: !magic!, expected: 47475546^)
+      exit /b 1
+    )
+    echo OK: %%M ^(!size! bytes^)
+  )
+)
+
 echo All models validated successfully!
 exit /b 0

.github/validate-models.sh

@@ -17,28 +17,49 @@ MODELS=(
   "models/Qwen3-0.6B-Q4_K_M.gguf"
 )
 
-echo "Validating model files..."
-for model in "${MODELS[@]}"; do
+# Optional GGUFs validated only when present so jobs that do not download
+# them (e.g. cross-compile smoke runs) still pass. The vision test image is
+# committed to src/test/resources/images/test-image.jpg and is not validated
+# here — its presence is asserted directly by MultimodalIntegrationTest.
+OPTIONAL_MODELS=(
+  "models/nomic-embed-text-v1.5.f16.gguf"
+  "models/SmolVLM-500M-Instruct-Q8_0.gguf"
+  "models/mmproj-SmolVLM-500M-Instruct-Q8_0.gguf"
+)
+
+validate_gguf() {
+  local model="$1"
+  local required="$2"
   if [[ ! -f "$model" ]]; then
-    echo "ERROR: Model not found: $model"
-    exit 1
+    if [[ "$required" == "required" ]]; then
+      echo "ERROR: Model not found: $model"
+      exit 1
+    else
+      echo "- $model (optional, skipped: not present)"
+      return
+    fi
   fi
-
-  # Check file size (must be > 4 bytes for magic header)
+  local size
   size=$(stat -f%z "$model" 2>/dev/null || stat -c%s "$model" 2>/dev/null)
   if [[ $size -lt 4 ]]; then
     echo "ERROR: Model file too small (likely corrupted): $model (size: $size bytes)"
     exit 1
   fi
-
-  # Check GGUF magic bytes: 0x47 0x47 0x55 0x46
+  local magic
   magic=$(xxd -p -l 4 "$model")
   if [[ "$magic" != "47475546" ]]; then
     echo "ERROR: Invalid GGUF magic bytes in $model (got: $magic, expected: 47475546)"
     exit 1
   fi
-
   echo "✓ $model ($(numfmt --to=iec-i --suffix=B $size 2>/dev/null || echo $size bytes))"
+}
+
+echo "Validating model files..."
+for model in "${MODELS[@]}"; do
+  validate_gguf "$model" required
+done
+for model in "${OPTIONAL_MODELS[@]}"; do
+  validate_gguf "$model" optional
 done
 
 echo "All models validated successfully!"