25e95a7366
Codex re-check: degenerate URIs still leaked — gpt://folder123 returned the
authority, gpt://folder123/${MODEL} returned the placeholder. Removed the _all[0]
authority fallback and guarded the literal-last-path fallback against placeholders;
a URI with no usable model segment now falls back to the raw id. Added regression
cases for gpt://folder123 and gpt://folder123/${MODEL}.
114 lines
5.0 KiB
Python
114 lines
5.0 KiB
Python
"""Regression test for #3429 — getModelLabel() mangles URI-scheme model IDs.
|
|
|
|
PR #3366 (fix for #3360) changed getModelLabel() to strip only the first
|
|
``/``-segment instead of ``split('/').pop()``. That fixed multi-slash proxy IDs
|
|
but regressed URI-scheme IDs (e.g. Yandex ``gpt://${FOLDER}/deepseek-v4-flash/latest``)
|
|
because ``indexOf('/')`` lands inside the ``://`` and leaves ``/${FOLDER}/...``
|
|
path junk in the composer model chip.
|
|
|
|
The fix detects a ``scheme://`` id and takes the last meaningful path segment
|
|
(skipping ``${...}`` env-var placeholders and bare version tails like ``latest``),
|
|
while NOT touching the #3360 multi-slash behavior for non-URI ids.
|
|
|
|
Runs the live getModelLabel() via Node so drift between the test and the real
|
|
code is caught immediately.
|
|
"""
|
|
import shutil
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
REPO_ROOT = Path(__file__).parent.parent.resolve()
|
|
UI_JS_PATH = REPO_ROOT / "static" / "ui.js"
|
|
NODE = shutil.which("node")
|
|
|
|
pytestmark = pytest.mark.skipif(NODE is None, reason="node not on PATH")
|
|
|
|
_DRIVER = r"""
|
|
const fs = require('fs');
|
|
const ui = fs.readFileSync(process.argv[1], 'utf8');
|
|
// Slice getModelLabel() by function boundaries (regex literals inside it defeat
|
|
// a naive brace counter, so bound it by the next top-level function instead).
|
|
const start = ui.indexOf('function getModelLabel(');
|
|
if (start < 0) throw new Error('getModelLabel not found');
|
|
const after = ui.indexOf('\nfunction _gatewayProviderName(', start);
|
|
if (after < 0) throw new Error('getModelLabel end boundary not found');
|
|
const fnSrc = ui.slice(start, after);
|
|
const _dynamicModelLabels = {};
|
|
function _fmtOllamaLabel(s){ return s; }
|
|
eval(fnSrc);
|
|
const out = {};
|
|
for (const m of JSON.parse(process.argv[2])) out[m] = getModelLabel(m);
|
|
process.stdout.write(JSON.stringify(out));
|
|
"""
|
|
|
|
|
|
def _labels(model_ids):
|
|
import json
|
|
proc = subprocess.run(
|
|
[NODE, "-e", _DRIVER, str(UI_JS_PATH), json.dumps(model_ids)],
|
|
capture_output=True, text=True, timeout=30,
|
|
)
|
|
assert proc.returncode == 0, f"node driver failed: {proc.stderr}"
|
|
return json.loads(proc.stdout)
|
|
|
|
|
|
def test_uri_scheme_model_id_label_is_model_name_not_path_junk():
|
|
"""#3429: a gpt://.../model/latest id must label as the model name."""
|
|
out = _labels([
|
|
"gpt://${YANDEX_FOLDER_ID}/deepseek-v4-flash/latest",
|
|
"gpt://folder123/deepseek-v4-flash/latest",
|
|
"openrouter://acct/qwen-3-coder",
|
|
"gpt://${F}/qwen-3-coder",
|
|
])
|
|
assert out["gpt://${YANDEX_FOLDER_ID}/deepseek-v4-flash/latest"] == "deepseek-v4-flash"
|
|
assert out["gpt://folder123/deepseek-v4-flash/latest"] == "deepseek-v4-flash"
|
|
assert out["openrouter://acct/qwen-3-coder"] == "qwen-3-coder"
|
|
assert out["gpt://${F}/qwen-3-coder"] == "qwen-3-coder"
|
|
# The env-var placeholder must never leak into the label.
|
|
for label in out.values():
|
|
assert "${" not in label, f"env-var placeholder leaked into label: {label!r}"
|
|
|
|
|
|
def test_uri_label_edge_cases_never_return_authority_or_drop_digit_models():
|
|
"""#3429 follow-up (Codex gate): a single path segment is kept even when it
|
|
looks version-like, a digit-leading model name (2026-model) is NOT mistaken
|
|
for a version tail, and the authority/folder is never returned as the label."""
|
|
out = _labels([
|
|
"gpt://folder123/v4", # single path seg — keep it, don't fall back to authority
|
|
"gpt://folder123/latest", # single path seg — keep it
|
|
"gpt://folder123/2026-model/latest", # digit-leading real model name
|
|
])
|
|
assert out["gpt://folder123/v4"] == "v4"
|
|
assert out["gpt://folder123/latest"] == "latest"
|
|
assert out["gpt://folder123/2026-model/latest"] == "2026-model"
|
|
# The authority/folder must never be promoted to the label.
|
|
for label in out.values():
|
|
assert label != "folder123", "authority/folder leaked into label"
|
|
|
|
|
|
def test_uri_degenerate_ids_fall_back_to_raw_not_authority_or_placeholder():
|
|
"""#3429 follow-up 2 (Codex gate): a URI with no usable model segment must
|
|
fall back to the raw id — never the authority/folder, never a ${...} env-var."""
|
|
out = _labels([
|
|
"gpt://folder123", # authority only, no path
|
|
"gpt://folder123/${MODEL}", # path is only an env-var placeholder
|
|
])
|
|
assert out["gpt://folder123"] == "gpt://folder123"
|
|
assert out["gpt://folder123/${MODEL}"] == "gpt://folder123/${MODEL}"
|
|
for label in out.values():
|
|
assert label != "folder123", "authority leaked into label"
|
|
assert label not in ("${MODEL}",), "env-var placeholder leaked into label"
|
|
|
|
|
|
def test_uri_fix_does_not_regress_multi_slash_or_bare_ids():
|
|
"""#3360 multi-slash hierarchy + single-slash/bare ids stay correct."""
|
|
out = _labels([
|
|
"vendor_a/deepseek/deepseek-v4-pro", # #3360: keep vendor hierarchy
|
|
"claude-sonnet-4-6", # bare id unchanged
|
|
])
|
|
# Non-URI multi-slash id keeps everything after the first segment (#3360).
|
|
assert out["vendor_a/deepseek/deepseek-v4-pro"] == "deepseek/deepseek-v4-pro"
|
|
assert out["claude-sonnet-4-6"] == "claude-sonnet-4-6"
|