@automagik/omni 2.260921.1 → 2.260921.3

package/dist/index.js

@@ -137424,7 +137424,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260921.1",
+  version: "2.260921.3",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",

package/dist/server/index.js

@@ -251115,7 +251115,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260921.1",
+    version: "2.260921.3",
     private: true,
     type: "module",
     exports: {
@@ -362264,7 +362264,319 @@ function buildWhatsAppMessageContext(rawPayload, chatId, instance4, text3) {
   return { isDirectMessage, mentionsBot, isReplyToBot, text: text3 };
 }
 
+// ../api/src/services/model-catalog.ts
+var exports_model_catalog = {};
+__export(exports_model_catalog, {
+  fetchOpenAiCatalog: () => fetchOpenAiCatalog,
+  fetchGeminiCatalog: () => fetchGeminiCatalog
+});
+function defaultFetch(url, init5) {
+  return fetch(url, init5);
+}
+function readId(record2) {
+  if (typeof record2 !== "object" || record2 === null)
+    return;
+  const id = record2.id ?? record2.name;
+  return typeof id === "string" && id.length > 0 ? id : undefined;
+}
+function parseGeminiCatalog(payload) {
+  const raw2 = payload?.models;
+  if (!Array.isArray(raw2))
+    return [];
+  const models = [];
+  const seen = new Set;
+  for (const entry of raw2) {
+    const rawId = readId(entry);
+    if (!rawId)
+      continue;
+    const id = rawId.replace(/^models\//, "");
+    if (!id || seen.has(id))
+      continue;
+    const declared = entry.supportedGenerationMethods;
+    const methods = Array.isArray(declared) ? declared.filter((method) => typeof method === "string") : [];
+    seen.add(id);
+    models.push({ id, methods });
+  }
+  return models;
+}
+function parseOpenAiCatalog(payload) {
+  const raw2 = payload?.data;
+  if (!Array.isArray(raw2))
+    return [];
+  const models = [];
+  const seen = new Set;
+  for (const entry of raw2) {
+    const id = readId(entry);
+    if (!id || seen.has(id))
+      continue;
+    seen.add(id);
+    models.push({ id, methods: [] });
+  }
+  return models;
+}
+async function fetchGeminiCatalog(apiKey, deps = {}) {
+  if (!apiKey)
+    return null;
+  const doFetch = deps.fetchImpl ?? defaultFetch;
+  const timeoutMs = deps.timeoutMs ?? CATALOG_TIMEOUT_MS;
+  const collected = [];
+  let pageToken;
+  try {
+    for (let page = 0;page < MAX_GEMINI_PAGES; page += 1) {
+      const url = new URL(GEMINI_MODELS_URL);
+      url.searchParams.set("key", apiKey);
+      url.searchParams.set("pageSize", String(GEMINI_PAGE_SIZE));
+      if (pageToken)
+        url.searchParams.set("pageToken", pageToken);
+      const res = await doFetch(url.toString(), { signal: AbortSignal.timeout(timeoutMs) });
+      if (!res.ok)
+        return null;
+      const payload = await res.json();
+      collected.push(...parseGeminiCatalog(payload));
+      const next = payload?.nextPageToken;
+      if (typeof next !== "string" || next.length === 0)
+        break;
+      pageToken = next;
+    }
+  } catch {
+    return null;
+  }
+  return collected;
+}
+async function fetchOpenAiCatalog(apiKey, deps = {}) {
+  if (!apiKey)
+    return null;
+  const doFetch = deps.fetchImpl ?? defaultFetch;
+  const timeoutMs = deps.timeoutMs ?? CATALOG_TIMEOUT_MS;
+  try {
+    const res = await doFetch(OPENAI_MODELS_URL, {
+      headers: { Authorization: `Bearer ${apiKey}` },
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (!res.ok)
+      return null;
+    const payload = await res.json();
+    return parseOpenAiCatalog(payload);
+  } catch {
+    return null;
+  }
+}
+var GEMINI_MODELS_URL = "https://generativelanguage.googleapis.com/v1beta/models", OPENAI_MODELS_URL = "https://api.openai.com/v1/models", CATALOG_TIMEOUT_MS = 5000, GEMINI_PAGE_SIZE = 200, MAX_GEMINI_PAGES = 10;
+
+// ../api/src/services/model-resolver.ts
+var exports_model_resolver = {};
+__export(exports_model_resolver, {
+  resolveModel: () => resolveModel2,
+  parseVersion: () => parseVersion
+});
+function parseVersion(id) {
+  const match2 = id.match(/(?:^|[-_/])(\d+(?:\.\d+)*)(?=[-_/.]|$)/);
+  const captured = match2?.[1];
+  if (!captured)
+    return [];
+  return captured.split(".").map((part) => Number.parseInt(part, 10)).filter((n2) => Number.isFinite(n2));
+}
+function compareVersionDesc(a, b3) {
+  const len = Math.max(a.length, b3.length);
+  for (let i = 0;i < len; i += 1) {
+    const left = a[i];
+    const right = b3[i];
+    if (left === undefined)
+      return 1;
+    if (right === undefined)
+      return -1;
+    if (left !== right)
+      return right - left;
+  }
+  return 0;
+}
+function isVariantId(id) {
+  const tokens = idTokens(id);
+  const last = tokens.at(-1) ?? "";
+  return VARIANT_SUFFIX_TOKENS.includes(last);
+}
+function nameTier(id, version3) {
+  if (version3.length > 0)
+    return 1;
+  return isVariantId(id) ? 2 : 0;
+}
+function idTokens(id) {
+  return id.toLowerCase().split(/[-_/]+/).filter((token) => token.length > 0);
+}
+function isRejected(id) {
+  const tokens = idTokens(id);
+  return REJECTED_TOKENS.some((token) => tokens.includes(token));
+}
+function previewTier(id) {
+  return idTokens(id).includes("preview") ? 1 : 0;
+}
+function aliasTier(id) {
+  return idTokens(id).includes("latest") ? 1 : 0;
+}
+function compareCandidateDesc(a, b3, cheapFirst) {
+  if (a.alias !== b3.alias)
+    return a.alias - b3.alias;
+  if (a.tier !== b3.tier)
+    return a.tier - b3.tier;
+  if (a.name !== b3.name)
+    return a.name - b3.name;
+  const byExtra = compareExtraAsc(a.extra, b3.extra);
+  const byVersion = compareVersionDesc(a.version, b3.version);
+  if (cheapFirst) {
+    if (byExtra !== 0)
+      return byExtra;
+    if (byVersion !== 0)
+      return byVersion;
+  } else {
+    if (byVersion !== 0)
+      return byVersion;
+    if (byExtra !== 0)
+      return byExtra;
+  }
+  if (a.id.length !== b3.id.length)
+    return a.id.length - b3.id.length;
+  return a.id.localeCompare(b3.id);
+}
+function compareExtraAsc(a, b3) {
+  const len = Math.max(a.length, b3.length);
+  for (let i = 0;i < len; i += 1) {
+    const left = a[i] ?? Number.POSITIVE_INFINITY;
+    const right = b3[i] ?? Number.POSITIVE_INFINITY;
+    if (left !== right)
+      return left - right;
+  }
+  return 0;
+}
+function hasMethod(model, method) {
+  if (model.methods.length === 0)
+    return true;
+  return model.methods.includes(method);
+}
+function resolveOpenAi(catalog, role) {
+  const pattern = OPENAI_ROLE_PATTERNS[role];
+  if (!pattern)
+    return null;
+  const scored = [];
+  for (const model of catalog) {
+    const id = model.id;
+    if (isRejected(id))
+      continue;
+    if (!pattern.test(id))
+      continue;
+    scored.push({
+      id,
+      alias: aliasTier(id),
+      tier: previewTier(id),
+      name: nameTier(id, parseVersion(id)),
+      version: parseVersion(id),
+      extra: []
+    });
+  }
+  if (scored.length === 0)
+    return null;
+  scored.sort((a, b3) => compareCandidateDesc(a, b3, role === "chat-fast"));
+  return scored[0]?.id ?? null;
+}
+function geminiExtra(role, id) {
+  if (role !== "chat-fast")
+    return [];
+  return [idTokens(id).includes("lite") ? 0 : 1];
+}
+function resolveGemini(catalog, role) {
+  const fragment2 = GEMINI_ROLE_FRAGMENT[role];
+  if (!fragment2)
+    return null;
+  const requiredMethod = GEMINI_ROLE_METHOD[role];
+  const isChatStyle = role === "chat-fast" || role === "chat" || role === "vision" || role === "transcribe";
+  const scored = [];
+  for (const model of catalog) {
+    const lower = model.id.toLowerCase();
+    if (!lower.includes(fragment2))
+      continue;
+    if (isRejected(model.id))
+      continue;
+    if (isChatStyle && GEMINI_NON_CHAT_FRAGMENTS.some((family) => lower.includes(family)))
+      continue;
+    if (requiredMethod && !hasMethod(model, requiredMethod))
+      continue;
+    scored.push({
+      id: model.id,
+      alias: aliasTier(model.id),
+      tier: previewTier(model.id),
+      name: nameTier(model.id, parseVersion(model.id)),
+      version: parseVersion(model.id),
+      extra: geminiExtra(role, model.id)
+    });
+  }
+  if (scored.length === 0)
+    return null;
+  scored.sort((a, b3) => compareCandidateDesc(a, b3, role === "chat-fast"));
+  return scored[0]?.id ?? null;
+}
+function resolveModel2(catalog, provider, role) {
+  if (!catalog || catalog.length === 0)
+    return null;
+  const model = provider === "openai" ? resolveOpenAi(catalog, role) : resolveGemini(catalog, role);
+  if (!model)
+    return null;
+  return { model, role, provider, source: "catalog" };
+}
+var GEMINI_SPECIAL_FAMILIES, VARIANT_SUFFIX_TOKENS, REJECTED_TOKENS, OPENAI_ROLE_PATTERNS, GEMINI_ROLE_FRAGMENT, GEMINI_ROLE_METHOD, GEMINI_NON_CHAT_FRAGMENTS;
+var init_model_resolver = __esm(() => {
+  GEMINI_SPECIAL_FAMILIES = ["lyria", "veo", "embedding", "embed", "aqa", "imagen", "gemma"];
+  VARIANT_SUFFIX_TOKENS = ["turbo", "diarize", "mini", "lite", "nano", "hd", "flash", "pro", "max", "fast"];
+  REJECTED_TOKENS = ["exp", "experimental", "deprecated", "legacy", "alpha", "beta"];
+  OPENAI_ROLE_PATTERNS = {
+    "chat-fast": null,
+    chat: null,
+    transcribe: /^(?:gpt-[\w.-]*transcribe[\w.-]*|whisper-[\w.-]+)$/,
+    tts: /-tts$/,
+    image: /^gpt-image-[\w.-]+$/,
+    music: null,
+    video: null,
+    vision: null
+  };
+  GEMINI_ROLE_FRAGMENT = {
+    "chat-fast": "flash",
+    chat: "flash",
+    transcribe: "transcribe",
+    tts: "tts",
+    image: "image",
+    music: "lyria",
+    video: "veo",
+    vision: "flash"
+  };
+  GEMINI_ROLE_METHOD = {
+    "chat-fast": "generateContent",
+    chat: "generateContent",
+    transcribe: "generateContent",
+    tts: "generateContent",
+    image: "generateContent",
+    music: null,
+    video: "predictLongRunning",
+    vision: "generateContent"
+  };
+  GEMINI_NON_CHAT_FRAGMENTS = [...GEMINI_SPECIAL_FAMILIES, "tts", "image"];
+});
+
 // ../api/src/services/response-gate.ts
+async function resolveGateModelFromCatalog(provider, settings) {
+  const fallback = provider === "openai" ? DEFAULT_GATE_MODEL_OPENAI : DEFAULT_GATE_MODEL_GEMINI;
+  try {
+    const { fetchGeminiCatalog: fetchGeminiCatalog2, fetchOpenAiCatalog: fetchOpenAiCatalog2 } = await Promise.resolve().then(() => exports_model_catalog);
+    const { resolveModel: resolveModel3 } = await Promise.resolve().then(() => (init_model_resolver(), exports_model_resolver));
+    const key = provider === "openai" ? await settings.getSecret("openai.api_key", "OPENAI_API_KEY") : await settings.getSecret("gemini.api_key", "GEMINI_API_KEY");
+    if (!key)
+      return { model: fallback, source: "constant" };
+    const catalog = provider === "openai" ? await fetchOpenAiCatalog2(key) : await fetchGeminiCatalog2(key);
+    const resolved = resolveModel3(catalog, provider, "chat-fast");
+    if (!resolved)
+      return { model: fallback, source: "constant" };
+    return { model: resolved.model, source: "catalog" };
+  } catch {
+    return { model: fallback, source: "constant" };
+  }
+}
 async function resolveGateProvider(settings) {
   const configured = await settings.getString("gate.provider", "GATE_PROVIDER");
   return configured?.trim().toLowerCase() === "openai" ? "openai" : DEFAULT_GATE_PROVIDER;
@@ -362272,10 +362584,11 @@ async function resolveGateProvider(settings) {
 async function resolveGateModel(provider, instanceModel, settings) {
   if (instanceModel)
     return instanceModel;
-  if (provider === "openai") {
-    return await settings.getString("gate.openai.model", "GATE_OPENAI_MODEL") ?? DEFAULT_GATE_MODEL_OPENAI;
-  }
-  return await settings.getString("gate.gemini.model", "GATE_GEMINI_MODEL") ?? DEFAULT_GATE_MODEL_GEMINI;
+  const configured = provider === "openai" ? await settings.getString("gate.openai.model", "GATE_OPENAI_MODEL") : await settings.getString("gate.gemini.model", "GATE_GEMINI_MODEL");
+  if (configured)
+    return configured;
+  const discovered = await resolveGateModelFromCatalog(provider, settings);
+  return discovered.model;
 }
 async function callGeminiGate(prompt, model, settings, signal2) {
   const apiKey = await settings.getSecret("gemini.api_key", "GEMINI_API_KEY");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260921.1",
+  "version": "2.260921.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",