190proof 1.0.88 → 1.0.89

package/README.md

@@ -12,6 +12,7 @@ Fully-local unified interface across multiple AI providers that includes:
 - 🔄 Automatic retries with configurable attempts
 - 📡 Streaming by default
 - ☁️ Cloud service providers supported (Azure, AWS Bedrock)
+- 🔌 Provider prefix strings for any model without waiting for package updates
 
 ## Installation
 
@@ -23,12 +24,13 @@ npm install 190proof
 
 ### Basic Example
 
+Use any model from any provider with the `provider:model-id` format:
+
 ```typescript
-import { callWithRetries } from "190proof";
-import { GPTModel, GenericPayload } from "190proof/interfaces";
+import { callWithRetries, GenericPayload } from "190proof";
 
 const payload: GenericPayload = {
-  model: GPTModel.GPT4O_MINI,
+  model: "openai:gpt-4o-mini",
   messages: [
     {
       role: "user",
@@ -44,36 +46,35 @@ console.log(response.content);
 ### Using Different Providers
 
 ```typescript
-import { callWithRetries } from "190proof";
-import {
-  ClaudeModel,
-  GeminiModel,
-  GroqModel,
-  OpenRouterModel,
-  GenericPayload,
-} from "190proof/interfaces";
+import { callWithRetries, GenericPayload } from "190proof";
+
+// OpenAI
+const openaiPayload: GenericPayload = {
+  model: "openai:gpt-5",
+  messages: [{ role: "user", content: "Hello!" }],
+};
 
 // Anthropic
 const claudePayload: GenericPayload = {
-  model: ClaudeModel.SONNET_4,
+  model: "anthropic:claude-sonnet-4-5",
   messages: [{ role: "user", content: "Hello!" }],
 };
 
 // Google
 const geminiPayload: GenericPayload = {
-  model: GeminiModel.GEMINI_2_0_FLASH,
+  model: "google:gemini-2.0-flash",
   messages: [{ role: "user", content: "Hello!" }],
 };
 
 // Groq
 const groqPayload: GenericPayload = {
-  model: GroqModel.LLAMA_3_70B_8192,
+  model: "groq:llama-3.3-70b-versatile",
   messages: [{ role: "user", content: "Hello!" }],
 };
 
 // OpenRouter
 const openRouterPayload: GenericPayload = {
-  model: OpenRouterModel.QWEN3_6_PLUS_FREE,
+  model: "openrouter:google/gemma-4-31b-it:free",
   messages: [{ role: "user", content: "Hello!" }],
 };
 
@@ -84,7 +85,7 @@ const response = await callWithRetries("request-id", claudePayload);
 
 ```typescript
 const payload: GenericPayload = {
-  model: GPTModel.GPT4O,
+  model: "openai:gpt-4o",
   messages: [
     {
       role: "user",
@@ -117,7 +118,7 @@ const response = await callWithRetries("function-call-example", payload);
 
 ```typescript
 const payload: GenericPayload = {
-  model: ClaudeModel.SONNET_4,
+  model: "anthropic:claude-sonnet-4-5",
   messages: [
     {
       role: "user",
@@ -139,7 +140,7 @@ const response = await callWithRetries("image-example", payload);
 
 ```typescript
 const payload: GenericPayload = {
-  model: GeminiModel.GEMINI_2_0_FLASH,
+  model: "google:gemini-2.0-flash",
   messages: [
     {
       role: "system",
@@ -155,61 +156,83 @@ const payload: GenericPayload = {
 const response = await callWithRetries("system-message-example", payload);
 ```
 
+### Inspecting Model Routing
+
+Use `parseModelString` to see how a model string will be routed:
+
+```typescript
+import { parseModelString } from "190proof";
+
+parseModelString("openai:gpt-7");
+// → { provider: "openai", modelId: "gpt-7" }
+
+parseModelString("openrouter:org/model-name:free");
+// → { provider: "openrouter", modelId: "org/model-name:free" }
+
+```
+
+## Provider Prefix Format
+
+The model string format is `provider:model-id`, where the provider prefix is one of:
+
+| Prefix | Provider |
+|---|---|
+| `openai` | OpenAI |
+| `anthropic` | Anthropic |
+| `google` | Google (Gemini) |
+| `groq` | Groq |
+| `openrouter` | OpenRouter |
+
+The prefix is stripped before sending to the API, so the model ID should be exactly what the provider expects (e.g. `"openai:gpt-4o"` sends `"gpt-4o"` to OpenAI).
+
 ## Supported Models
 
-### OpenAI Models
-
-- `gpt-3.5-turbo-0613`
-- `gpt-3.5-turbo-16k-0613`
-- `gpt-3.5-turbo-0125`
-- `gpt-4-1106-preview`
-- `gpt-4-0125-preview`
-- `gpt-4-turbo-2024-04-09`
-- `gpt-4o`
-- `gpt-4o-mini`
-- `o1-preview`
-- `o1-mini`
-- `o3-mini`
-- `gpt-4.1`
-- `gpt-4.1-mini`
-- `gpt-4.1-nano`
-- `gpt-5`
-- `gpt-5-mini`
-
-### Anthropic Models
-
-- `claude-3-haiku-20240307`
-- `claude-3-sonnet-20240229`
-- `claude-3-opus-20240229`
-- `claude-3-5-haiku-20241022`
-- `claude-3-5-sonnet-20241022`
-- `claude-sonnet-4-20250514`
-- `claude-opus-4-20250514`
-- `claude-opus-4-1`
-- `claude-haiku-4-5`
-- `claude-sonnet-4-5`
-- `claude-opus-4-5`
-
-### Google Models
-
-- `gemini-1.5-pro-latest`
-- `gemini-exp-1206`
-- `gemini-2.0-flash`
-- `gemini-2.0-flash-exp-image-generation`
-- `gemini-2.0-flash-thinking-exp`
-- `gemini-2.0-flash-thinking-exp-01-21`
-- `gemini-2.5-flash-preview-04-17`
-- `gemini-3-flash-preview`
-- `gemini-3.1-flash-lite-preview`
-
-### Groq Models
-
-- `llama3-70b-8192`
-- `deepseek-r1-distill-llama-70b`
-
-### OpenRouter Models
-
-- `qwen/qwen3.6-plus:free`
+These models are tested. You can use any model with the `provider:model-id` format.
+
+### OpenAI
+
+- `openai:gpt-5`
+- `openai:gpt-5-mini`
+- `openai:gpt-4.1`
+- `openai:gpt-4.1-mini`
+- `openai:gpt-4.1-nano`
+- `openai:gpt-4o`
+- `openai:gpt-4o-mini`
+- `openai:o3-mini`
+- `openai:o1-preview`
+- `openai:o1-mini`
+
+### Anthropic
+
+- `anthropic:claude-opus-4-5`
+- `anthropic:claude-sonnet-4-5`
+- `anthropic:claude-haiku-4-5`
+- `anthropic:claude-opus-4-1`
+- `anthropic:claude-opus-4-20250514`
+- `anthropic:claude-sonnet-4-20250514`
+- `anthropic:claude-3-5-sonnet-20241022`
+- `anthropic:claude-3-5-haiku-20241022`
+
+### Google
+
+- `google:gemini-3.1-flash-lite-preview`
+- `google:gemini-3-flash-preview`
+- `google:gemini-2.5-flash-preview-04-17`
+- `google:gemini-2.0-flash`
+- `google:gemini-2.0-flash-exp-image-generation`
+- `google:gemini-1.5-pro-latest`
+
+### Groq
+
+- `groq:llama-3.3-70b-versatile`
+- `groq:llama3-70b-8192`
+- `groq:qwen/qwen3-32b`
+- `groq:deepseek-r1-distill-llama-70b`
+
+### OpenRouter
+
+- `openrouter:google/gemma-4-31b-it:free`
+- `openrouter:google/gemma-4-31b-it`
 
 ## Environment Variables
 
@@ -269,6 +292,18 @@ interface ParsedResponseMessage {
 }
 ```
 
+### `parseModelString(model)`
+
+Parses a model string into its provider and model ID components.
+
+#### Parameters
+
+- `model`: `string` - A model string in `"provider:model-id"` format
+
+#### Returns
+
+`{ provider: Provider, modelId: string }`
+
 ### Configuration Options
 
 #### OpenAI Config
@@ -280,7 +315,7 @@ interface OpenAIConfig {
   baseUrl: string;
   orgId?: string;
   modelConfigMap?: Record<
-    GPTModel,
+    string,
     {
       resource: string;
       deployment: string;

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+/** @deprecated Use provider prefix strings instead, e.g. `"anthropic:claude-sonnet-4-5"` */
 declare enum ClaudeModel {
     HAIKU_3 = "claude-3-haiku-20240307",
     SONNET_3 = "claude-3-sonnet-20240229",
@@ -11,6 +12,7 @@ declare enum ClaudeModel {
     SONNET_4_5 = "claude-sonnet-4-5",
     OPUS_4_5 = "claude-opus-4-5"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"openai:gpt-4o"` */
 declare enum GPTModel {
     GPT35_0613 = "gpt-3.5-turbo-0613",
     GPT35_0613_16K = "gpt-3.5-turbo-16k-0613",
@@ -29,15 +31,19 @@ declare enum GPTModel {
     GPT5 = "gpt-5",
     GPT5_MINI = "gpt-5-mini"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"groq:llama-3.3-70b-versatile"` */
 declare enum GroqModel {
     LLAMA_3_70B_8192 = "llama3-70b-8192",
     LLAMA_3_3_70B_VERSATILE = "llama-3.3-70b-versatile",
     QWEN3_32B = "qwen/qwen3-32b",
     DEEPSEEK_R1_DISTILL_LLAMA_70B = "deepseek-r1-distill-llama-70b"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"openrouter:qwen/qwen3.6-plus:free"` */
 declare enum OpenRouterModel {
-    QWEN3_6_PLUS_FREE = "qwen/qwen3.6-plus:free"
+    GEMMA_4_31B_IT_FREE = "google/gemma-4-31b-it:free",
+    GEMMA_4_31B_IT = "google/gemma-4-31b-it"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"google:gemini-2.0-flash"` */
 declare enum GeminiModel {
     GEMINI_1_5_PRO = "gemini-1.5-pro-latest",
     GEMINI_EXP_1206 = "gemini-exp-1206",
@@ -102,7 +108,8 @@ interface FunctionDefinition {
     description?: string;
     parameters: Record<string, any>;
 }
-type AnyModel = GPTModel | ClaudeModel | GroqModel | GeminiModel | OpenRouterModel;
+type Provider = "openai" | "anthropic" | "google" | "groq" | "openrouter";
+type AnyModel = GPTModel | ClaudeModel | GroqModel | GeminiModel | OpenRouterModel | (string & {});
 interface GenericPayload {
     model: AnyModel;
     messages: GenericMessage[];
@@ -114,6 +121,10 @@ interface GenericPayload {
     fallbackModel?: AnyModel;
 }
 
+declare function parseModelString(model: string): {
+    provider: Provider;
+    modelId: string;
+};
 declare function callWithRetries(id: string | string[], aiPayload: GenericPayload, aiConfig?: OpenAIConfig | AnthropicAIConfig, retries?: number, chunkTimeoutMs?: number): Promise<ParsedResponseMessage>;
 
-export { type AnyModel, ClaudeModel, type FunctionDefinition, GPTModel, GeminiModel, type GenericMessage, type GenericPayload, GroqModel, type OpenAIConfig, OpenRouterModel, callWithRetries };
+export { type AnyModel, ClaudeModel, type FunctionDefinition, GPTModel, GeminiModel, type GenericMessage, type GenericPayload, GroqModel, type OpenAIConfig, OpenRouterModel, type Provider, callWithRetries, parseModelString };

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/** @deprecated Use provider prefix strings instead, e.g. `"anthropic:claude-sonnet-4-5"` */
 declare enum ClaudeModel {
     HAIKU_3 = "claude-3-haiku-20240307",
     SONNET_3 = "claude-3-sonnet-20240229",
@@ -11,6 +12,7 @@ declare enum ClaudeModel {
     SONNET_4_5 = "claude-sonnet-4-5",
     OPUS_4_5 = "claude-opus-4-5"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"openai:gpt-4o"` */
 declare enum GPTModel {
     GPT35_0613 = "gpt-3.5-turbo-0613",
     GPT35_0613_16K = "gpt-3.5-turbo-16k-0613",
@@ -29,15 +31,19 @@ declare enum GPTModel {
     GPT5 = "gpt-5",
     GPT5_MINI = "gpt-5-mini"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"groq:llama-3.3-70b-versatile"` */
 declare enum GroqModel {
     LLAMA_3_70B_8192 = "llama3-70b-8192",
     LLAMA_3_3_70B_VERSATILE = "llama-3.3-70b-versatile",
     QWEN3_32B = "qwen/qwen3-32b",
     DEEPSEEK_R1_DISTILL_LLAMA_70B = "deepseek-r1-distill-llama-70b"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"openrouter:qwen/qwen3.6-plus:free"` */
 declare enum OpenRouterModel {
-    QWEN3_6_PLUS_FREE = "qwen/qwen3.6-plus:free"
+    GEMMA_4_31B_IT_FREE = "google/gemma-4-31b-it:free",
+    GEMMA_4_31B_IT = "google/gemma-4-31b-it"
 }
+/** @deprecated Use provider prefix strings instead, e.g. `"google:gemini-2.0-flash"` */
 declare enum GeminiModel {
     GEMINI_1_5_PRO = "gemini-1.5-pro-latest",
     GEMINI_EXP_1206 = "gemini-exp-1206",
@@ -102,7 +108,8 @@ interface FunctionDefinition {
     description?: string;
     parameters: Record<string, any>;
 }
-type AnyModel = GPTModel | ClaudeModel | GroqModel | GeminiModel | OpenRouterModel;
+type Provider = "openai" | "anthropic" | "google" | "groq" | "openrouter";
+type AnyModel = GPTModel | ClaudeModel | GroqModel | GeminiModel | OpenRouterModel | (string & {});
 interface GenericPayload {
     model: AnyModel;
     messages: GenericMessage[];
@@ -114,6 +121,10 @@ interface GenericPayload {
     fallbackModel?: AnyModel;
 }
 
+declare function parseModelString(model: string): {
+    provider: Provider;
+    modelId: string;
+};
 declare function callWithRetries(id: string | string[], aiPayload: GenericPayload, aiConfig?: OpenAIConfig | AnthropicAIConfig, retries?: number, chunkTimeoutMs?: number): Promise<ParsedResponseMessage>;
 
-export { type AnyModel, ClaudeModel, type FunctionDefinition, GPTModel, GeminiModel, type GenericMessage, type GenericPayload, GroqModel, type OpenAIConfig, OpenRouterModel, callWithRetries };
+export { type AnyModel, ClaudeModel, type FunctionDefinition, GPTModel, GeminiModel, type GenericMessage, type GenericPayload, GroqModel, type OpenAIConfig, OpenRouterModel, type Provider, callWithRetries, parseModelString };

package/dist/index.js

@@ -35,7 +35,8 @@ __export(proof_exports, {
   GeminiModel: () => GeminiModel,
   GroqModel: () => GroqModel,
   OpenRouterModel: () => OpenRouterModel,
-  callWithRetries: () => callWithRetries
+  callWithRetries: () => callWithRetries,
+  parseModelString: () => parseModelString
 });
 module.exports = __toCommonJS(proof_exports);
 
@@ -81,7 +82,8 @@ var GroqModel = /* @__PURE__ */ ((GroqModel2) => {
   return GroqModel2;
 })(GroqModel || {});
 var OpenRouterModel = /* @__PURE__ */ ((OpenRouterModel2) => {
-  OpenRouterModel2["QWEN3_6_PLUS_FREE"] = "qwen/qwen3.6-plus:free";
+  OpenRouterModel2["GEMMA_4_31B_IT_FREE"] = "google/gemma-4-31b-it:free";
+  OpenRouterModel2["GEMMA_4_31B_IT"] = "google/gemma-4-31b-it";
   return OpenRouterModel2;
 })(OpenRouterModel || {});
 var GeminiModel = /* @__PURE__ */ ((GeminiModel2) => {
@@ -503,7 +505,8 @@ async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries =
     openAiConfig == null ? void 0 : openAiConfig.service,
     openAiPayload.model
   );
-  const useStreaming = openAiPayload.model !== "o1-mini" /* O1_MINI */ && openAiPayload.model !== "o1-preview" /* O1_PREVIEW */;
+  const modelStr = openAiPayload.model;
+  const useStreaming = modelStr !== "o1-mini" /* O1_MINI */ && modelStr !== "o1-preview" /* O1_PREVIEW */ && !modelStr.startsWith("o1");
   return withRetries(
     id,
     "OpenAI",
@@ -1092,62 +1095,82 @@ async function callOpenRouter(id, payload) {
 async function callOpenRouterWithRetries(id, payload, retries = 5) {
   return withRetries(id, "OpenRouter", () => callOpenRouter(id, payload), { retries });
 }
-function isAnthropicPayload(payload) {
-  return Object.values(ClaudeModel).includes(payload.model);
-}
-function isOpenAiPayload(payload) {
-  return Object.values(GPTModel).includes(payload.model);
-}
-function isGroqPayload(payload) {
-  return Object.values(GroqModel).includes(payload.model);
-}
-function isGoogleAIPayload(payload) {
-  return Object.values(GeminiModel).includes(payload.model);
-}
-function isOpenRouterPayload(payload) {
-  return Object.values(OpenRouterModel).includes(payload.model);
+var VALID_PROVIDERS = ["openai", "anthropic", "google", "groq", "openrouter"];
+var ENUM_PROVIDER_MAP = [
+  { values: new Set(Object.values(GPTModel)), provider: "openai" },
+  { values: new Set(Object.values(ClaudeModel)), provider: "anthropic" },
+  { values: new Set(Object.values(GeminiModel)), provider: "google" },
+  { values: new Set(Object.values(GroqModel)), provider: "groq" },
+  { values: new Set(Object.values(OpenRouterModel)), provider: "openrouter" }
+];
+function parseModelString(model) {
+  const colonIndex = model.indexOf(":");
+  if (colonIndex !== -1) {
+    const prefix = model.substring(0, colonIndex);
+    if (VALID_PROVIDERS.includes(prefix)) {
+      const modelId = model.substring(colonIndex + 1);
+      if (!modelId) {
+        throw new Error(
+          `Empty model ID in model string '${model}'. Expected format: 'provider:model-id'`
+        );
+      }
+      return { provider: prefix, modelId };
+    }
+  }
+  for (const { values, provider } of ENUM_PROVIDER_MAP) {
+    if (values.has(model)) {
+      return { provider, modelId: model };
+    }
+  }
+  if (colonIndex !== -1) {
+    const prefix = model.substring(0, colonIndex);
+    throw new Error(
+      `Unknown provider '${prefix}' in model string '${model}'. Valid providers: ${VALID_PROVIDERS.join(", ")}`
+    );
+  }
+  throw new Error(
+    `Unable to determine provider for model '${model}'. Use a provider prefix (e.g. 'openai:${model}') or a known model enum value. Valid providers: ${VALID_PROVIDERS.join(", ")}`
+  );
 }
 async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeoutMs = 15e3) {
   try {
-    if (isAnthropicPayload(aiPayload)) {
-      return await callAnthropicWithRetries(
-        id,
-        await prepareAnthropicPayload(id, aiPayload),
-        aiConfig,
-        retries
-      );
-    }
-    if (isOpenAiPayload(aiPayload)) {
-      return await callOpenAiWithRetries(
-        id,
-        await prepareOpenAIPayload(id, aiPayload),
-        aiConfig,
-        retries,
-        chunkTimeoutMs
-      );
-    }
-    if (isGroqPayload(aiPayload)) {
-      return await callGroqWithRetries(
-        id,
-        prepareGroqPayload(aiPayload),
-        retries
-      );
-    }
-    if (isGoogleAIPayload(aiPayload)) {
-      return await callGoogleAIWithRetries(
-        id,
-        await prepareGoogleAIPayload(id, aiPayload),
-        retries
-      );
-    }
-    if (isOpenRouterPayload(aiPayload)) {
-      return await callOpenRouterWithRetries(
-        id,
-        prepareOpenRouterPayload(aiPayload),
-        retries
-      );
+    const { provider, modelId } = parseModelString(aiPayload.model);
+    const routingPayload = { ...aiPayload, model: modelId };
+    switch (provider) {
+      case "anthropic":
+        return await callAnthropicWithRetries(
+          id,
+          await prepareAnthropicPayload(id, routingPayload),
+          aiConfig,
+          retries
+        );
+      case "openai":
+        return await callOpenAiWithRetries(
+          id,
+          await prepareOpenAIPayload(id, routingPayload),
+          aiConfig,
+          retries,
+          chunkTimeoutMs
+        );
+      case "groq":
+        return await callGroqWithRetries(
+          id,
+          prepareGroqPayload(routingPayload),
+          retries
+        );
+      case "google":
+        return await callGoogleAIWithRetries(
+          id,
+          await prepareGoogleAIPayload(id, routingPayload),
+          retries
+        );
+      case "openrouter":
+        return await callOpenRouterWithRetries(
+          id,
+          prepareOpenRouterPayload(routingPayload),
+          retries
+        );
     }
-    throw new Error("Invalid AI payload: Unknown model type.");
   } catch (error2) {
     if (aiPayload.fallbackModel) {
       logger_default.error(
@@ -1180,6 +1203,7 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
   GeminiModel,
   GroqModel,
   OpenRouterModel,
-  callWithRetries
+  callWithRetries,
+  parseModelString
 });
 //# sourceMappingURL=index.js.map