dsh-model-params 0.1.0 → 0.1.2

package/lib/modelsdev.js

@@ -1,39 +1,62 @@
 // dsh-model-params — pure models.dev catalog parsing and matching helpers.
 //
-// models.dev/api.json shape (defensive reads only):
-//   { providers: { <id>: { id, name, models: [ { id, name, limit?: { context?, output? },
-//       reasoning_options?: [ { type: 'effort', values?: string[] } ] } ] } } }
+// REAL models.dev/api.json shape (verified live):
+//   root = flat provider map { <id>: { id, name, ..., models: {
+//     <modelId>: { id, name, family, reasoning?, reasoning_options?:
+//         [ {type:'toggle'}, {type:'effort', values:[...]} ], limit?: { context?, output? } } } } }
 //
-// A requested model id may carry a vendor prefix ("z-ai/glm-5.3-flash",
-// "deepseek/deepseek-v4-flash"). Matching therefore tries the exact id first
-// and then the segment after the last "/". Reasoning-effort values offered by
-// models.dev are intersected with the pi-ai THINKING_LEVELS key space
-// (off/minimal/low/medium/high/xhigh/max) so a write can never fail schema
-// validation.
+// Matching mirrors the upstream dsh-llm-newapi approach: keys tried are the
+// full gateway id and its last path segment; family-prefix hints decide which
+// catalog provider leads; inside the hinted provider a NEAR key (one side
+// contains the other) still yields facts for versioned ids like
+// `deepseek-v4-flash-0731`. Reasoning-effort values are intersected with the
+// pi-ai THINKING_LEVELS space so writes can never fail schema validation.
 
 export const THINKING_LEVELS = ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max']
 
+/** Family-prefix → catalog provider, mirroring upstream defaults. */
+export const DEFAULT_PROVIDER_HINTS = Object.freeze({
+  glm: 'zai',
+  gpt: 'openai',
+  o: 'openai',
+  claude: 'anthropic',
+  deepseek: 'deepseek',
+  gemini: 'google',
+  grok: 'xai',
+  hunyuan: 'tencent',
+  qwen: 'alibaba',
+  kimi: 'moonshotai',
+  mimo: 'xiaomi',
+  minimax: 'minimax',
+})
+
 const nonEmpty = (value) => typeof value === 'string' && value.trim().length > 0
 const clean = (value) => nonEmpty(value) ? value.trim() : undefined
 const positiveInt = (value) => Number.isSafeInteger(value) && value > 0 ? value : undefined
 
-/** Parse one models.dev catalog document into a detached match index. */
+/**
+ * Parse a models.dev document into a detached map keyed by lower-cased model
+ * id. Tolerant of both the real flat-provider root and a `{providers}` wrap.
+ * @returns {Map<string, object[]>} entries with providerId/providerName/modelId/name/context/maxOutput/efforts.
+ */
 export function parseModelsDevCatalog(document) {
-  const root = document && typeof document === 'object' ? document : {}
-  const providers = root.providers && typeof root.providers === 'object' && !Array.isArray(root.providers) ? root.providers : {}
+  const root0 = document && typeof document === 'object' ? document : {}
+  const providersRoot = root0.providers && typeof root0.providers === 'object' && !Array.isArray(root0.providers)
+    ? root0.providers
+    : root0
   const byId = new Map()
-  for (const [providerId, provider] of Object.entries(providers)) {
-    if (!provider || typeof provider !== 'object') continue
+  for (const [providerId, provider] of Object.entries(providersRoot)) {
+    if (!provider || typeof provider !== 'object' || Array.isArray(provider.models)) continue
     const providerName = clean(provider.name) || clean(provider.id) || providerId
-    const models = Array.isArray(provider.models) ? provider.models : []
-    for (const model of models) {
+    const models = provider.models && typeof provider.models === 'object' ? provider.models : {}
+    for (const [key, model] of Object.entries(models)) {
       if (!model || typeof model !== 'object') continue
-      const modelId = clean(model.id)
+      const modelId = clean(model.id) || clean(key)
       if (!modelId) continue
       const limit = model.limit && typeof model.limit === 'object' ? model.limit : {}
       const context = positiveInt(limit.context)
       const output = positiveInt(limit.output)
-      let efforts = []
+      const efforts = []
       const options = Array.isArray(model.reasoning_options) ? model.reasoning_options : []
       for (const option of options) {
         if (!option || option.type !== 'effort' || !Array.isArray(option.values)) continue
@@ -43,7 +66,6 @@ export function parseModelsDevCatalog(document) {
         }
       }
       if (context === undefined && output === undefined && efforts.length === 0) continue
-      const key = modelId.toLowerCase()
       const entry = {
         providerId,
         providerName,
@@ -53,49 +75,74 @@ export function parseModelsDevCatalog(document) {
         ...(output !== undefined ? { maxOutput: output } : {}),
         ...(efforts.length ? { efforts } : {}),
       }
-      const list = byId.get(key)
+      const list = byId.get(modelId.toLowerCase())
       if (list) list.push(entry)
-      else byId.set(key, [entry])
+      else byId.set(modelId.toLowerCase(), [entry])
     }
   }
   return byId
 }
 
-/** Prefer the entry whose provider matches a hint; otherwise the first. */
-function pickEntry(entries, hint) {
-  if (entries.length <= 1) return entries[0]
-  const lower = hint ? String(hint).toLowerCase() : ''
-  if (lower) {
-    const preferred = entries.find((entry) =>
-      entry.providerId.toLowerCase().includes(lower) || lower.includes(entry.providerId.toLowerCase()))
-    if (preferred) return preferred
-  }
-  return entries[0]
+/** Provider hinted for one gateway id by exact model rule or longest prefix. */
+export function hintedProviderOf(id, bare, hints = {}) {
+  const exact = hints.models ? (hints.models[id] || hints.models[bare]) : undefined
+  if (exact) return exact
+  const lower = String(bare).toLowerCase()
+  const entries = Object.entries({ ...DEFAULT_PROVIDER_HINTS, ...(hints.defaults || {}) })
+  const hit = entries
+    .filter(([prefix]) => lower.startsWith(prefix.toLowerCase()))
+    .sort((a, b) => b[0].length - a[0].length)[0]
+  return hit ? hit[1] : undefined
 }
 
 /**
- * Look up requested model ids. Returns entries only for ids with at least one
- * metadata-bearing models.dev record; every other id is reported as unmatched.
- * @param {Map<string, object[]>} index - output of parseModelsDevCatalog.
- * @param {string[]} ids - configured model ids (vendor prefixes allowed).
- * @param {(id: string) => string|undefined} hintFor - optional provider hint per id.
+ * Match requested ids against the catalog. Keys tried are the full id and its
+ * last path segment; within the hinted provider a NEAR key also matches.
+ * @param {Map<string, object[]>} index - parseModelsDevCatalog output.
+ * @param {string[]} ids - gateway model ids.
+ * @param {{ models?: object, defaults?: object }} hints - optional provider hints.
  * @returns {{ matched: object[], unmatched: string[] }}
  */
-export function lookupModels(index, ids, hintFor = () => undefined) {
+export function lookupModels(index, ids, hints = {}) {
   const matched = []
   const unmatched = []
   for (const raw of ids || []) {
     const modelId = clean(raw)
     if (!modelId) continue
-    const exact = index.get(modelId.toLowerCase())
-    const base = modelId.slice(modelId.lastIndexOf('/') + 1)
-    const byBase = base !== modelId ? index.get(base.toLowerCase()) : undefined
-    const entries = byBase && byBase.length && (!exact || byBase.length < exact.length) ? byBase : exact
-    if (!entries || !entries.length) {
+    const bare = modelId.slice(modelId.lastIndexOf('/') + 1)
+    // Prefer un-prefixed (official vendor) records over gateway mirrors whose
+    // catalog keys embed the same prefix ("deepseek/deepseek-v4-flash").
+    const seen = new Set()
+    const candidates = []
+    for (const key of [bare, modelId]) {
+      const lower = key.toLowerCase()
+      const exact = index.get(lower)
+      if (exact) {
+        for (const entry of exact) {
+          if (!seen.has(entry.providerId)) {
+            seen.add(entry.providerId)
+            candidates.push(entry)
+          }
+        }
+      }
+    }
+    const hinted = hintedProviderOf(modelId, bare, hints)
+    const hintedEntry = candidates.find((entry) => entry.providerId === hinted)
+    let selected = hintedEntry || candidates[0]
+    if (!selected && hinted) {
+      // Near match inside the hinted vendor only: versioned ids such as
+      // `deepseek-v4-flash-0731` resolve to the family's facts.
+      const near = [...index.values()].flat()
+        .filter((entry) => entry.providerId === hinted)
+        .filter((entry) => entry.modelId.includes(bare) || bare.includes(entry.modelId))
+        .sort((a, b) => a.modelId.length - b.modelId.length)[0]
+      selected = near
+    }
+    if (!selected) {
       unmatched.push(modelId)
       continue
     }
-    matched.push({ requested: modelId, ...pickEntry(entries, hintFor(modelId)) })
+    matched.push({ requested: modelId, ...selected, ...(selected.providerId === hinted ? { hinted: true } : {}) })
   }
   return { matched, unmatched }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model-params",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "EN: models.dev parameter assistant for the official DeepSeek Harness Models page: per-provider one-click context / max-output / reasoning-effort fill. ZH: 官方模型设置页的 models.dev 参数助手：按 provider 一键补全上下文、max 输出与推理档位。",
   "type": "module",
   "main": "lib/index.js",