* fix(studio/mmproj): block cross-family projectors in flat local GGUF dirs (#5347) When a flat local GGUF directory holds several unrelated models with their own mmproj siblings, detect_mmproj_file() returned the first projector it walked into. For the layout reported in #5347 (Qwen weights + a Gemma mmproj in the same dir) that meant llama-server was launched with --mmproj pointing at the Gemma projector, which fails to load and surfaces as a confusing crash. Disambiguation rules: - Drop candidates whose family token (qwen/gemma/llama/mistral/phi/...) disagrees with the model's family. Candidates with no recognised family token (e.g. the HF-convention 'mmproj-F16.gguf') are kept. - Among same-family candidates, prefer the one whose stem shares the longest prefix with the model (Qwen3.5-9B mmproj beats Qwen3.5-35B mmproj for a Qwen3.5-9B model). - If every candidate is dropped, return None — better than attaching a wrong projector and getting a server-launch failure. Tests cover the cross-family block, multi-candidate prefix tie-break, HF-convention 'mmproj-F16.gguf', unrecognised families, and the existing search_root walk. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * studio/mmproj: word-bounded family match, expanded token list, launcher guard Tighten the family-token detector to match only on word boundaries so substring collisions stop tagging false families: phi no longer matches sapphire, yi no longer matches yip, mimo no longer matches mimosa, and mistral does not bleed into ministral/magistral/devstral. Pick the token whose first occurrence is leftmost in the filename rather than the first hit in tuple order, so merge models disambiguate predictably (llama-phi tags llama; phi-llama tags phi). Expand _MODEL_FAMILY_TOKENS with the families an audit of the unsloth HF org turned up that the previous list missed: devstral, ministral, magistral (Mistral-derivative naming), nemotron, kimi, nanonets, cosmos, mimo, apriel, lfm. Without these, a flat local GGUF directory containing one of these weights plus an unrelated renamed projector still hit the original #5347 failure. Add mmproj_matches_model_family() and call it at the llama-server launch site in core/inference/llama_cpp.py. detect_mmproj_file already drops cross-family candidates at discovery time, but mmproj_path can also reach the launcher via config injection or future overrides; this guard keeps those paths from silently loading a known-wrong projector. Tests: 12 new cases covering substring rejection, leftmost-position selection, new family tokens, a new flat-dir Nemotron + Gemma rejection case, and the launcher-level guard. All 21 detect_mmproj_file tests and the existing 106 llama_cpp tests pass. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * studio/mmproj: pair via GGUF general.* metadata, not just filenames Real Unsloth vision GGUFs carry rich identity metadata that has been ignored by the discovery path. Every projector under the unsloth org has general.type='mmproj' plus general.base_model.0.repo_url pointing at the same upstream HF repo as its weight, and the equivalent basename, base_model.0.name, and base_model.0.organization fields. A flat-dir mismatch is therefore decidable from the headers alone, no matter how the user has renamed the files. Add utils/models/gguf_metadata.py with read_gguf_general_metadata(): a fast (~30 ms) header walk that pulls only the general.* string fields and skips everything else, cached by (resolved path, mtime_ns, size). Mirrors the parser shape already used by LlamaCppBackend._read_gguf_metadata so the format handling is consistent. is_mmproj_by_metadata() returns True/False/None from general.type, and pairing_score() returns 100 for an exact base_model URL match, 80 for basename plus organization match, 60 for basename only, -1 for definitive metadata disagreement, and 0 when neither side has enough metadata to decide. Rewire detect_mmproj_file() to a two-stage selector: 1. Detect projectors via metadata (general.type) when present, else fall back to the filename substring heuristic. This recovers headerless projectors AND projectors whose name does not contain 'mmproj' but whose header advertises one. 2. Score each candidate against the weight via pairing_score. Drop candidates with score -1 (definitive metadata disagreement). For candidates with score 0 (no usable metadata) fall back to the existing filename family-token check, dropping recognised-family mismatches. Pick the survivor with the highest (score, longest_prefix, -len(stem)) tuple, so a metadata URL match always wins over a filename-prefix match. Tests: 16 new cases. tests/test_gguf_metadata.py covers the parser (missing file, non-GGUF, string extraction, walking past arrays and uint32s, cache invalidation by mtime/size) and the score helpers. tests/test_detect_mmproj_file.py adds end-to-end cases that synthesise real on-disk GGUF headers: URL match wins over a longer-prefix sibling, URL mismatch returns None even when filenames match, a projector named 'vision-projector.gguf' is still discovered via general.type, and a 100-score header match outranks a near-perfect filename prefix on a headerless candidate. All 75 tests across detect_mmproj_file, gguf_metadata, llama_cpp load progress, cached gguf routes, trained model scan, and vision cache pass. * studio/mmproj: shorten comments and docstrings across the #5347 changes Trim verbose explanations to one-line statements of intent. The behaviour is unchanged: 161 tests across detect_mmproj_file, gguf_metadata, llama_cpp_load_progress (+ matrix), llama_server_args, llama_cpp_cache_aware_disk_check, trained_model_scan, and vision_cache all pass. * studio/mmproj: shorten remaining detect_mmproj_file body comments Trim the docstring and the dir-walking block comments inside detect_mmproj_file to one-liners. Behaviour unchanged; 44 mmproj + gguf_metadata + llama_cpp_load_progress tests pass. * studio/mmproj: cap gguf_metadata cache below ceiling on every insert The eviction branch popped exactly one entry when len >= max, so the cache size could only converge to the cap when entries were added slowly enough for natural growth. After a sandbox sim that reduced the cap mid-run, len stayed above the cap because each insert popped one and added one. Switch to a while loop so we evict until len is strictly below the cap before inserting. Steady-state behaviour at the default 4096 ceiling is unchanged. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel Han <danielhanchen@gmail.com>
216 lines
6.8 KiB
Python
216 lines
6.8 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
"""Tests for :mod:`utils.models.gguf_metadata`. Synthesise small GGUF
|
|
headers in tmp dirs so we never depend on real model files."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import struct
|
|
from pathlib import Path
|
|
from typing import Iterable, Mapping
|
|
|
|
from utils.models.gguf_metadata import (
|
|
is_mmproj_by_metadata,
|
|
pairing_score,
|
|
read_gguf_general_metadata,
|
|
)
|
|
|
|
|
|
_GGUF_MAGIC = 0x46554747
|
|
_VTYPE_STRING = 8
|
|
_VTYPE_UINT32 = 4
|
|
_VTYPE_ARRAY = 9
|
|
|
|
|
|
def _enc_string(s: str) -> bytes:
|
|
b = s.encode("utf-8")
|
|
return struct.pack("<Q", len(b)) + b
|
|
|
|
|
|
def _enc_kv_string(key: str, value: str) -> bytes:
|
|
return _enc_string(key) + struct.pack("<I", _VTYPE_STRING) + _enc_string(value)
|
|
|
|
|
|
def _enc_kv_uint32(key: str, value: int) -> bytes:
|
|
return (
|
|
_enc_string(key) + struct.pack("<I", _VTYPE_UINT32) + struct.pack("<I", value)
|
|
)
|
|
|
|
|
|
def _enc_kv_string_array(key: str, values: Iterable[str]) -> bytes:
|
|
vals = list(values)
|
|
out = _enc_string(key) + struct.pack("<I", _VTYPE_ARRAY)
|
|
out += struct.pack("<I", _VTYPE_STRING) + struct.pack("<Q", len(vals))
|
|
for v in vals:
|
|
out += _enc_string(v)
|
|
return out
|
|
|
|
|
|
def _write_synthetic_gguf(
|
|
path: Path,
|
|
general_strings: Mapping[str, str],
|
|
*,
|
|
extra_uint32: Mapping[str, int] | None = None,
|
|
extra_string_arrays: Mapping[str, Iterable[str]] | None = None,
|
|
) -> Path:
|
|
"""Minimal GGUF: header + KV body, no tensors."""
|
|
extra_uint32 = extra_uint32 or {}
|
|
extra_string_arrays = extra_string_arrays or {}
|
|
kv_count = len(general_strings) + len(extra_uint32) + len(extra_string_arrays)
|
|
body = b""
|
|
for k, v in general_strings.items():
|
|
body += _enc_kv_string(k, v)
|
|
for k, v in extra_uint32.items():
|
|
body += _enc_kv_uint32(k, v)
|
|
for k, v in extra_string_arrays.items():
|
|
body += _enc_kv_string_array(k, v)
|
|
header = struct.pack(
|
|
"<IIQQ",
|
|
_GGUF_MAGIC,
|
|
3, # version
|
|
0, # tensor_count
|
|
kv_count,
|
|
)
|
|
path.parent.mkdir(parents = True, exist_ok = True)
|
|
path.write_bytes(header + body)
|
|
return path
|
|
|
|
|
|
# --- read_gguf_general_metadata ----------------------------------------
|
|
|
|
|
|
def test_returns_none_for_missing_file(tmp_path: Path):
|
|
assert read_gguf_general_metadata(str(tmp_path / "nope.gguf")) is None
|
|
|
|
|
|
def test_returns_none_for_non_gguf(tmp_path: Path):
|
|
p = tmp_path / "garbage.gguf"
|
|
p.write_bytes(b"not a gguf file at all, just bytes")
|
|
assert read_gguf_general_metadata(str(p)) is None
|
|
|
|
|
|
def test_extracts_general_string_fields(tmp_path: Path):
|
|
p = _write_synthetic_gguf(
|
|
tmp_path / "model.gguf",
|
|
{
|
|
"general.architecture": "qwen2vl",
|
|
"general.type": "model",
|
|
"general.basename": "Qwen3.5",
|
|
"general.organization": "Qwen",
|
|
"general.base_model.0.repo_url": "https://huggingface.co/Qwen/Qwen3.5-9B",
|
|
"general.base_model.0.name": "Qwen3.5 9B",
|
|
"general.base_model.0.organization": "Qwen",
|
|
},
|
|
)
|
|
meta = read_gguf_general_metadata(str(p))
|
|
assert meta is not None
|
|
assert meta["general.architecture"] == "qwen2vl"
|
|
assert meta["general.basename"] == "Qwen3.5"
|
|
assert (
|
|
meta["general.base_model.0.repo_url"]
|
|
== "https://huggingface.co/Qwen/Qwen3.5-9B"
|
|
)
|
|
|
|
|
|
def test_skips_unrelated_fields_without_breaking(tmp_path: Path):
|
|
"""Skip unwanted arrays and uint32s without losing position."""
|
|
p = _write_synthetic_gguf(
|
|
tmp_path / "model.gguf",
|
|
{"general.basename": "Foo"},
|
|
extra_uint32 = {"qwen2vl.context_length": 32768},
|
|
extra_string_arrays = {"tokenizer.ggml.tokens": ["a", "bc", "def"]},
|
|
)
|
|
meta = read_gguf_general_metadata(str(p))
|
|
assert meta == {"general.basename": "Foo"}
|
|
|
|
|
|
def test_metadata_is_cached(tmp_path: Path):
|
|
"""Cache invalidates on size change."""
|
|
p = _write_synthetic_gguf(
|
|
tmp_path / "model.gguf",
|
|
{"general.basename": "First"},
|
|
)
|
|
first = read_gguf_general_metadata(str(p))
|
|
assert first == {"general.basename": "First"}
|
|
# Force size change so the (path, mtime, size) key invalidates.
|
|
_write_synthetic_gguf(
|
|
tmp_path / "model.gguf",
|
|
{"general.basename": "Second", "general.organization": "X"},
|
|
)
|
|
second = read_gguf_general_metadata(str(p))
|
|
assert second == {"general.basename": "Second", "general.organization": "X"}
|
|
|
|
|
|
# --- is_mmproj_by_metadata --------------------------------------------
|
|
|
|
|
|
def test_is_mmproj_by_metadata_signals():
|
|
assert is_mmproj_by_metadata({"general.type": "mmproj"}) is True
|
|
assert is_mmproj_by_metadata({"general.type": "MMProj"}) is True
|
|
assert is_mmproj_by_metadata({"general.type": "model"}) is False
|
|
assert is_mmproj_by_metadata({"general.basename": "foo"}) is None
|
|
assert is_mmproj_by_metadata({}) is None
|
|
assert is_mmproj_by_metadata(None) is None
|
|
|
|
|
|
# --- pairing_score -----------------------------------------------------
|
|
|
|
|
|
def test_pairing_score_base_model_url_match():
|
|
weight = {
|
|
"general.base_model.0.repo_url": "https://huggingface.co/Qwen/Qwen3.5-9B",
|
|
}
|
|
mmproj = {
|
|
"general.base_model.0.repo_url": "https://huggingface.co/Qwen/Qwen3.5-9B",
|
|
}
|
|
assert pairing_score(weight, mmproj) == 100
|
|
|
|
|
|
def test_pairing_score_base_model_url_mismatch():
|
|
weight = {
|
|
"general.base_model.0.repo_url": "https://huggingface.co/Qwen/Qwen3.5-9B",
|
|
}
|
|
mmproj = {
|
|
"general.base_model.0.repo_url": "https://huggingface.co/google/gemma-3-9B",
|
|
}
|
|
assert pairing_score(weight, mmproj) == -1
|
|
|
|
|
|
def test_pairing_score_base_model_url_trailing_slash_normalised():
|
|
weight = {
|
|
"general.base_model.0.repo_url": "https://huggingface.co/Qwen/Qwen3.5-9B/",
|
|
}
|
|
mmproj = {
|
|
"general.base_model.0.repo_url": "https://huggingface.co/Qwen/Qwen3.5-9B",
|
|
}
|
|
assert pairing_score(weight, mmproj) == 100
|
|
|
|
|
|
def test_pairing_score_basename_plus_org_fallback():
|
|
weight = {
|
|
"general.basename": "Nanonets-Ocr-S",
|
|
"general.base_model.0.organization": "Nanonets",
|
|
}
|
|
mmproj = {
|
|
"general.basename": "Nanonets-Ocr-S",
|
|
"general.base_model.0.organization": "Nanonets",
|
|
}
|
|
assert pairing_score(weight, mmproj) == 80
|
|
|
|
|
|
def test_pairing_score_basename_only_fallback():
|
|
assert (
|
|
pairing_score(
|
|
{"general.basename": "Nanonets-Ocr-S"},
|
|
{"general.basename": "Nanonets-Ocr-S"},
|
|
)
|
|
== 60
|
|
)
|
|
|
|
|
|
def test_pairing_score_no_overlap_returns_zero():
|
|
"""One side empty: scorer punts to filename fallback."""
|
|
assert pairing_score({"general.basename": "Foo"}, {}) == 0
|
|
assert pairing_score({}, {"general.basename": "Foo"}) == 0
|
|
assert pairing_score(None, {"general.basename": "Foo"}) == 0
|