@discomedia/utils 1.0.68 → 1.0.70

package/dist/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.68",
+  "version": "1.0.70",
   "author": "Disco Media",
   "description": "Utility functions used in Disco Media apps",
   "always-build-npm": true,

package/dist/test.js

@@ -366,33 +366,59 @@ function getLastFullTradingDate(currentDate = new Date()) {
     return getLastFullTradingDateImpl(currentDate);
 }
 
+/**
+ * Represents OpenAI models
+ */
+const OPENAI_MODELS = [
+    'gpt-5',
+    'gpt-5-mini',
+    'gpt-5.4-mini',
+    'gpt-5-nano',
+    'gpt-5.1',
+    'gpt-5.4',
+    'gpt-5.5',
+    'gpt-5.5-pro',
+    'gpt-5.2',
+    'gpt-5.2-pro',
+    'gpt-5.1-codex',
+    'gpt-5.1-codex-max',
+];
+/**
+ * Type guard to check if a model is a supported direct OpenAI model.
+ */
+function isOpenAIModel(model) {
+    return OPENAI_MODELS.includes(model);
+}
+/**
+ * Represents OpenRouter models
+ */
+const OPENROUTER_MODELS = [
+    'openai/gpt-5',
+    'openai/gpt-5-mini',
+    'openai/gpt-5.4-mini',
+    'openai/gpt-5-nano',
+    'openai/gpt-5.1',
+    'openai/gpt-5.4',
+    'openai/gpt-5.4-pro',
+    'openai/gpt-5.5',
+    'openai/gpt-5.5-pro',
+    'openai/gpt-5.2',
+    'openai/gpt-5.2-pro',
+    'openai/gpt-5.1-codex',
+    'openai/gpt-5.1-codex-max',
+    'openai/gpt-oss-120b',
+    'z.ai/glm-4.5',
+    'z.ai/glm-4.5-air',
+    'google/gemini-2.5-flash',
+    'google/gemini-2.5-flash-lite',
+    'deepseek/deepseek-r1-0528',
+    'deepseek/deepseek-chat-v3-0324',
+];
 /**
  * Type guard to check if a model is an OpenRouter model
  */
 function isOpenRouterModel(model) {
-    const openRouterModels = [
-        'openai/gpt-5',
-        'openai/gpt-5-mini',
-        'openai/gpt-5.4-mini',
-        'openai/gpt-5-nano',
-        'openai/gpt-5.1',
-        'openai/gpt-5.4',
-        'openai/gpt-5.4-pro',
-        'openai/gpt-5.5',
-        'openai/gpt-5.5-pro',
-        'openai/gpt-5.2',
-        'openai/gpt-5.2-pro',
-        'openai/gpt-5.1-codex',
-        'openai/gpt-5.1-codex-max',
-        'openai/gpt-oss-120b',
-        'z.ai/glm-4.5',
-        'z.ai/glm-4.5-air',
-        'google/gemini-2.5-flash',
-        'google/gemini-2.5-flash-lite',
-        'deepseek/deepseek-r1-0528',
-        'deepseek/deepseek-chat-v3-0324',
-    ];
-    return openRouterModels.includes(model);
+    return OPENROUTER_MODELS.includes(model);
 }
 
 function __classPrivateFieldSet(receiver, state, value, kind, f) {
@@ -14143,57 +14169,12 @@ function zodTextFormat(zodObject, name, props) {
 }
 
 // llm-openai-config.ts
-const DEFAULT_MODEL = 'gpt-4.1-mini';
+const DEFAULT_MODEL = 'gpt-5-mini';
 const GPT_5_HIGH_CONTEXT_THRESHOLD_TOKENS = 272_000;
 const GPT_5_HIGH_CONTEXT_INPUT_MULTIPLIER = 2;
 const GPT_5_HIGH_CONTEXT_OUTPUT_MULTIPLIER = 1.5;
 /** Token costs in USD per 1M tokens. Last updated May 2026. */
 const openAiModelCosts = {
-    'gpt-4o': {
-        inputCost: 2.5 / 1_000_000,
-        cacheHitCost: 1.25 / 1_000_000,
-        outputCost: 10 / 1_000_000,
-    },
-    'gpt-4o-mini': {
-        inputCost: 0.15 / 1_000_000,
-        cacheHitCost: 0.075 / 1_000_000,
-        outputCost: 0.6 / 1_000_000,
-    },
-    'o1-mini': {
-        inputCost: 1.1 / 1_000_000,
-        cacheHitCost: 0.55 / 1_000_000,
-        outputCost: 4.4 / 1_000_000,
-    },
-    'o1': {
-        inputCost: 15 / 1_000_000,
-        cacheHitCost: 7.5 / 1_000_000,
-        outputCost: 60 / 1_000_000,
-    },
-    'o3-mini': {
-        inputCost: 1.1 / 1_000_000,
-        cacheHitCost: 0.55 / 1_000_000,
-        outputCost: 4.4 / 1_000_000,
-    },
-    'o3': {
-        inputCost: 2 / 1_000_000,
-        cacheHitCost: 0.5 / 1_000_000,
-        outputCost: 8 / 1_000_000,
-    },
-    'gpt-4.1': {
-        inputCost: 2 / 1_000_000,
-        cacheHitCost: 0.5 / 1_000_000,
-        outputCost: 8 / 1_000_000,
-    },
-    'gpt-4.1-mini': {
-        inputCost: 0.4 / 1_000_000,
-        cacheHitCost: 0.1 / 1_000_000,
-        outputCost: 1.6 / 1_000_000,
-    },
-    'gpt-4.1-nano': {
-        inputCost: 0.1 / 1_000_000,
-        cacheHitCost: 0.025 / 1_000_000,
-        outputCost: 0.4 / 1_000_000,
-    },
     'gpt-5': {
         inputCost: 1.25 / 1_000_000,
         cacheHitCost: 0.125 / 1_000_000,
@@ -14224,10 +14205,6 @@ const openAiModelCosts = {
         cacheHitCost: 0.25 / 1_000_000,
         outputCost: 15 / 1_000_000,
     },
-    'gpt-5.4-pro': {
-        inputCost: 30 / 1_000_000,
-        outputCost: 180 / 1_000_000,
-    },
     'gpt-5.5': {
         inputCost: 5 / 1_000_000,
         cacheHitCost: 0.5 / 1_000_000,
@@ -14256,11 +14233,6 @@ const openAiModelCosts = {
         cacheHitCost: 0.125 / 1_000_000,
         outputCost: 10 / 1_000_000,
     },
-    'o4-mini': {
-        inputCost: 1.1 / 1_000_000,
-        cacheHitCost: 0.275 / 1_000_000,
-        outputCost: 4.4 / 1_000_000,
-    },
 };
 const deepseekModelCosts = {
     'deepseek-chat': {
@@ -14275,8 +14247,7 @@ const deepseekModelCosts = {
     },
 };
 function shouldUseGPT5HighContextPricing(model, inputTokens) {
-    return ((model === 'gpt-5.4' || model === 'gpt-5.4-pro' || model === 'gpt-5.5') &&
-        inputTokens > GPT_5_HIGH_CONTEXT_THRESHOLD_TOKENS);
+    return (model === 'gpt-5.4' || model === 'gpt-5.5') && inputTokens > GPT_5_HIGH_CONTEXT_THRESHOLD_TOKENS;
 }
 /** Image generation costs in USD per image. Based on OpenAI pricing as of Feb 2025. */
 const openAiImageCosts = {
@@ -14717,101 +14688,6 @@ async function parseResponse(content, responseFormat) {
 }
 
 // llm-openai.ts
-const isSupportedModel = (model) => {
-    return [
-        'gpt-4o-mini',
-        'gpt-4o',
-        'o1-mini',
-        'o1',
-        'o3-mini',
-        'gpt-4.1',
-        'gpt-4.1-mini',
-        'gpt-4.1-nano',
-        'gpt-5',
-        'gpt-5-mini',
-        'gpt-5.4-mini',
-        'gpt-5-nano',
-        'gpt-5.1',
-        'gpt-5.4',
-        'gpt-5.4-pro',
-        'gpt-5.5',
-        'gpt-5.5-pro',
-        'gpt-5.2',
-        'gpt-5.2-pro',
-        'gpt-5.1-codex',
-        'gpt-5.1-codex-max',
-        'o4-mini',
-        'o3',
-    ].includes(model);
-};
-/**
- * Checks if the given model supports the temperature parameter. Reasoning models (o1*, o3*, o4*) do not support temperature.
- * @param model The model to check.
- * @returns True if the model supports the temperature parameter, false otherwise.
- */
-function supportsTemperature(model) {
-    // Reasoning models don't support temperature
-    // GPT-5 models also do not support temperature
-    const reasoningAndGPT5Models = [
-        'o1',
-        'o1-mini',
-        'o3-mini',
-        'o4-mini',
-        'o3',
-        'gpt-5',
-        'gpt-5-mini',
-        'gpt-5.4-mini',
-        'gpt-5-nano',
-        'gpt-5.1',
-        'gpt-5.4',
-        'gpt-5.4-pro',
-        'gpt-5.5',
-        'gpt-5.5-pro',
-        'gpt-5.2',
-        'gpt-5.2-pro',
-        'gpt-5.1-codex',
-        'gpt-5.1-codex-max',
-    ];
-    return !reasoningAndGPT5Models.includes(model);
-}
-/**
- * Checks if the given model is a reasoning model. Reasoning models have different tool choice constraints.
- * @param model The model to check.
- * @returns True if the model is a reasoning model, false otherwise.
- */
-function isReasoningModel(model) {
-    const reasoningModels = ['o1', 'o1-mini', 'o3-mini', 'o4-mini', 'o3'];
-    return reasoningModels.includes(model);
-}
-/**
- * Checks if the given model is a GPT-5 model. GPT-5 models don't support tool_choice other than 'auto'.
- * @param model The model to check.
- * @returns True if the model is a GPT-5 model, false otherwise.
- */
-function isGPT5Model(model) {
-    const gpt5Models = [
-        'gpt-5',
-        'gpt-5-mini',
-        'gpt-5.4-mini',
-        'gpt-5-nano',
-        'gpt-5.1',
-        'gpt-5.4',
-        'gpt-5.4-pro',
-        'gpt-5.5',
-        'gpt-5.5-pro',
-        'gpt-5.2',
-        'gpt-5.2-pro',
-        'gpt-5.1-codex',
-        'gpt-5.1-codex-max',
-    ];
-    return gpt5Models.includes(model);
-}
-function supportsStructuredOutputs(model) {
-    return normalizeModelName(model) !== 'gpt-5.4-pro';
-}
-function supportsDistillation(model) {
-    return normalizeModelName(model) !== 'gpt-5.4-pro';
-}
 function isZodSchema(schema) {
     return typeof schema === 'object' && schema !== null && 'safeParse' in schema;
 }
@@ -14845,7 +14721,7 @@ function buildJsonSchemaFormat(schema, schemaName, schemaDescription, schemaStri
  * - Built-in tools (web search, file search, computer use, code interpreter, image generation)
  * - Background processing
  * - Conversation state management
- * - Reasoning support for o-series models
+ * - GPT-5 reasoning controls
  *
  * @example
  * // Basic text response
@@ -14866,6 +14742,9 @@ function buildJsonSchemaFormat(schema, schemaName, schemaDescription, schemaStri
  */
 const makeResponsesAPICall = async (input, options = {}) => {
     const normalizedModel = normalizeModelName(options.model || DEFAULT_MODEL);
+    if (!isOpenAIModel(normalizedModel)) {
+        throw new Error(`Unsupported OpenAI model: ${normalizedModel}. Please use a supported GPT-5 model.`);
+    }
     const apiKey = options.apiKey || process.env.OPENAI_API_KEY;
     if (!apiKey) {
         throw new Error('OpenAI API key is not provided and OPENAI_API_KEY environment variable is not set');
@@ -14880,12 +14759,6 @@ const makeResponsesAPICall = async (input, options = {}) => {
         input,
         ...cleanOptions,
     };
-    if (requestBody.text?.format?.type === 'json_schema' && !supportsStructuredOutputs(normalizedModel)) {
-        throw new Error(`Model ${normalizedModel} does not support structured outputs`);
-    }
-    if (requestBody.store && !supportsDistillation(normalizedModel)) {
-        throw new Error(`Model ${normalizedModel} does not support distillation`);
-    }
     // Make the API call to the Responses endpoint
     const response = await openai.responses.create(requestBody);
     const cacheHitTokens = response.usage?.input_tokens_details?.cached_tokens || 0;
@@ -14992,8 +14865,8 @@ async function makeLLMCall(input, options = {}) {
     const { apiKey, model = DEFAULT_MODEL, responseFormat = 'text', schema, schemaName = 'response', schemaDescription, schemaStrict, tools, useCodeInterpreter = false, useWebSearch = false, imageBase64, imageDetail = 'high', context, } = options;
     // Validate model
     const normalizedModel = normalizeModelName(model);
-    if (!isSupportedModel(normalizedModel)) {
-        throw new Error(`Unsupported model: ${normalizedModel}. Please use one of the supported models.`);
+    if (!isOpenAIModel(normalizedModel)) {
+        throw new Error(`Unsupported OpenAI model: ${normalizedModel}. Please use a supported GPT-5 model.`);
     }
     // Process input for conversation context and image analysis
     let processedInput;
@@ -15062,10 +14935,6 @@ async function makeLLMCall(input, options = {}) {
         parallel_tool_calls: false,
         tools,
     };
-    // Only include temperature if the model supports it
-    if (supportsTemperature(normalizedModel)) {
-        responsesOptions.temperature = 0.2;
-    }
     // Configure response format
     if (schema) {
         responsesOptions.text = {
@@ -15081,41 +14950,17 @@ async function makeLLMCall(input, options = {}) {
     // Configure built-in tools
     if (useCodeInterpreter) {
         responsesOptions.tools = [{ type: 'code_interpreter', container: { type: 'auto' } }];
-        // For reasoning models, we can't force tool choice - they only support 'auto'
-        if (!isReasoningModel(normalizedModel)) {
-            responsesOptions.tool_choice = { type: 'code_interpreter' };
-        }
         responsesOptions.include = ['code_interpreter_call.outputs'];
     }
     if (useWebSearch) {
         responsesOptions.tools = [{ type: 'web_search_preview' }];
-        // For reasoning models and GPT-5 models, we can't force tool choice - they only support 'auto'
-        if (!isReasoningModel(normalizedModel) && !isGPT5Model(normalizedModel)) {
-            responsesOptions.tool_choice = { type: 'web_search_preview' };
-        }
     }
     return await makeResponsesAPICall(processedInput, responsesOptions);
 }
 
 const DEFAULT_IMAGE_MODEL = 'gpt-image-1.5';
 const resolveImageModel = (model) => model ?? DEFAULT_IMAGE_MODEL;
-const MULTIMODAL_VISION_MODELS = new Set([
-    'gpt-4o-mini',
-    'gpt-4o',
-    'gpt-5',
-    'gpt-5-mini',
-    'gpt-5.4-mini',
-    'gpt-5-nano',
-    'gpt-5.1',
-    'gpt-5.4',
-    'gpt-5.4-pro',
-    'gpt-5.5',
-    'gpt-5.5-pro',
-    'gpt-5.2',
-    'gpt-5.2-pro',
-    'gpt-5.1-codex',
-    'gpt-5.1-codex-max',
-]);
+const MULTIMODAL_VISION_MODELS = new Set(OPENAI_MODELS);
 /**
  * Makes a call to the OpenAI Images API to generate images based on a text prompt.
  *
@@ -22399,7 +22244,7 @@ async function testLLM() {
         console.log('Skipping OpenAI LLM tests: OPENAI_API_KEY not set');
         return;
     }
-    const models = ['gpt-5.5'];
+    const models = ['gpt-5-mini'];
     for (const model of models) {
         console.log(`\nTesting model: ${model}`);
         // 1. Basic call
@@ -22415,14 +22260,70 @@ async function testLLM() {
         }
         console.log(`Response: ${JSON.stringify(json.response)}`);
         // 3. Web search
-        const searchPrompt = 'Use web search to identify the official OpenAI model ID for GPT-5.5. Respond with the model ID only.';
+        const searchPrompt = `Use web search to identify the official OpenAI model ID for ${model}. Respond with the model ID only.`;
         const tool = await disco.llm.call(searchPrompt, { model, useWebSearch: true });
-        if (!tool.response || !tool.response.includes('gpt-5.5')) {
-            throw new Error(`Expected web search response to include gpt-5.5, received: ${tool.response}`);
+        if (!tool.response || !tool.response.includes(model)) {
+            throw new Error(`Expected web search response to include ${model}, received: ${tool.response}`);
         }
         console.log(`Response: ${tool.response}`);
     }
 }
+function testOpenAIModelDeprecation() {
+    const supportedModels = [
+        'gpt-5',
+        'gpt-5-mini',
+        'gpt-5.4-mini',
+        'gpt-5-nano',
+        'gpt-5.1',
+        'gpt-5.4',
+        'gpt-5.5',
+        'gpt-5.5-pro',
+        'gpt-5.2',
+        'gpt-5.2-pro',
+        'gpt-5.1-codex',
+        'gpt-5.1-codex-max',
+    ];
+    for (const model of supportedModels) {
+        if (!isOpenAIModel(model)) {
+            throw new Error(`Expected ${model} to be accepted as a direct OpenAI model`);
+        }
+    }
+    const deprecatedModels = [
+        'gpt-4o-mini',
+        'gpt-4o',
+        'o1-mini',
+        'o1',
+        'o3-mini',
+        'gpt-4.1',
+        'gpt-4.1-mini',
+        'o4-mini',
+        'gpt-4.1-nano',
+        'o3',
+        'gpt-5.4-pro',
+    ];
+    for (const model of deprecatedModels) {
+        if (isOpenAIModel(model)) {
+            throw new Error(`Expected ${model} to be deprecated from direct OpenAI support`);
+        }
+    }
+    if (OPENAI_MODELS.length !== supportedModels.length) {
+        throw new Error(`Expected ${supportedModels.length} direct OpenAI models, received ${OPENAI_MODELS.length}`);
+    }
+    const expectedOpenRouterModel = 'openai/gpt-5-mini';
+    if (!OPENROUTER_MODELS.includes(expectedOpenRouterModel)) {
+        throw new Error(`Expected OPENROUTER_MODELS to include ${expectedOpenRouterModel}`);
+    }
+    if (!isOpenRouterModel(expectedOpenRouterModel)) {
+        throw new Error(`Expected ${expectedOpenRouterModel} to be accepted as an OpenRouter model`);
+    }
+    if (isOpenRouterModel('openai/gpt-4o-mini')) {
+        throw new Error('Expected openai/gpt-4o-mini to be excluded from OpenRouter runtime models');
+    }
+    console.log('\n[OpenAI] Model deprecation test');
+    console.log(`  Default model: ${DEFAULT_MODEL}`);
+    console.log(`  Supported direct OpenAI models: ${OPENAI_MODELS.join(', ')}`);
+    console.log(`  Supported OpenRouter models: ${OPENROUTER_MODELS.join(', ')}`);
+}
 async function testLLMStructuredOutputWithZod() {
     if (!process.env.OPENAI_API_KEY) {
         console.log('Skipping OpenAI structured output Zod test: OPENAI_API_KEY not set');
@@ -22461,6 +22362,7 @@ async function testLLMStructuredOutputWithZod() {
     console.log('  Usage:', result.usage);
 }
 async function runActiveTests() {
+    testOpenAIModelDeprecation();
     await testLLM();
     await testLLMStructuredOutputWithZod();
 }