@lota-sdk/core 0.4.21 → 0.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lota-sdk/core",
-  "version": "0.4.21",
+  "version": "0.4.23",
   "files": [
     "src",
     "infrastructure/schema"
@@ -29,9 +29,10 @@
   "dependencies": {
     "@ai-sdk/devtools": "^0.0.16",
     "@ai-sdk/openai": "^3.0.54",
+    "@ai-sdk/provider": "^3.0.9",
     "@chat-adapter/slack": "^4.26.0",
     "@chat-adapter/state-ioredis": "^4.26.0",
-    "@lota-sdk/shared": "0.4.21",
+    "@lota-sdk/shared": "0.4.23",
     "@mendable/firecrawl-js": "^4.20.0",
     "@surrealdb/node": "^3.0.3",
     "ai": "^6.0.170",

package/src/ai-gateway/ai-gateway.ts

@@ -1,5 +1,6 @@
 import { devToolsMiddleware } from '@ai-sdk/devtools'
 import { createOpenAI } from '@ai-sdk/openai'
+import type { JSONSchema7 } from '@ai-sdk/provider'
 import { wrapEmbeddingModel, wrapLanguageModel } from 'ai'
 import type { LanguageModelMiddleware } from 'ai'
 import { Cause, Clock, Context, Duration, Effect, Fiber, Layer, Semaphore } from 'effect'
@@ -16,6 +17,7 @@ type WrapStreamOptions = Parameters<NonNullable<LanguageModelMiddleware['wrapStr
 type AiGatewayLanguageModel = Parameters<typeof wrapLanguageModel>[0]['model']
 type AiGatewayEmbeddingModel = Parameters<typeof wrapEmbeddingModel>[0]['model']
 type AiGatewayCallOptions = WrapStreamOptions['params']
+type AiGatewayFunctionTool = Extract<NonNullable<AiGatewayCallOptions['tools']>[number], { type: 'function' }>
 type AiGatewayGenerateResult = Awaited<ReturnType<WrapStreamOptions['doGenerate']>>
 type AiGatewayStreamResult = Awaited<ReturnType<WrapStreamOptions['doStream']>>
 type AiGatewayGeneratedContent = AiGatewayGenerateResult['content'][number]
@@ -892,6 +894,85 @@ function addAiGatewayReasoningRawChunks(
   return { ...params, includeRawChunks: true }
 }
 
+const JSON_SCHEMA_PROPERTY_MAP_KEYS = new Set([
+  '$defs',
+  'definitions',
+  'dependentSchemas',
+  'patternProperties',
+  'properties',
+])
+
+function removeJsonSchemaFormatKeywords(value: unknown): void {
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      removeJsonSchemaFormatKeywords(item)
+    }
+    return
+  }
+
+  if (!isRecord(value)) {
+    return
+  }
+
+  delete value.format
+
+  for (const [key, child] of Object.entries(value)) {
+    if (JSON_SCHEMA_PROPERTY_MAP_KEYS.has(key) && isRecord(child)) {
+      for (const propertySchema of Object.values(child)) {
+        removeJsonSchemaFormatKeywords(propertySchema)
+      }
+      continue
+    }
+
+    removeJsonSchemaFormatKeywords(child)
+  }
+}
+
+function cloneAiGatewayJsonSchema(schema: JSONSchema7): JSONSchema7 {
+  // eslint-disable-next-line typescript-eslint/no-unsafe-assignment -- structuredClone preserves the imported JSONSchema7 shape.
+  const nextSchema: JSONSchema7 = structuredClone(schema)
+  removeJsonSchemaFormatKeywords(nextSchema)
+  return nextSchema
+}
+
+function isAiGatewayFunctionTool(
+  tool: NonNullable<AiGatewayCallOptions['tools']>[number],
+): tool is AiGatewayFunctionTool {
+  return isRecord(tool) && tool.type === 'function'
+}
+
+export function normalizeAiGatewayJsonSchemas(params: AiGatewayCallOptions): AiGatewayCallOptions {
+  let nextParams = params
+
+  if (params.responseFormat?.type === 'json' && params.responseFormat.schema) {
+    // eslint-disable-next-line typescript-eslint/no-unsafe-assignment -- cloneAiGatewayJsonSchema returns the same JSONSchema7 type.
+    const responseSchema: JSONSchema7 = cloneAiGatewayJsonSchema(params.responseFormat.schema)
+    nextParams = {
+      ...nextParams,
+      // eslint-disable-next-line typescript-eslint/no-unsafe-assignment -- responseSchema is JSONSchema7 for responseFormat.schema.
+      responseFormat: { ...params.responseFormat, schema: responseSchema },
+    }
+  }
+
+  const sourceTools = nextParams.tools
+  if (!Array.isArray(sourceTools)) {
+    return nextParams
+  }
+
+  const nextTools = sourceTools.map((tool) => {
+    if (!isAiGatewayFunctionTool(tool)) {
+      return tool
+    }
+
+    // eslint-disable-next-line typescript-eslint/no-unsafe-assignment -- function tool inputSchema is JSONSchema7.
+    const inputSchema: JSONSchema7 = cloneAiGatewayJsonSchema(tool.inputSchema)
+    // eslint-disable-next-line typescript-eslint/no-unsafe-assignment -- inputSchema is JSONSchema7 for function tool inputSchema.
+    return { ...tool, inputSchema }
+  })
+
+  return { ...nextParams, tools: nextTools as AiGatewayCallOptions['tools'] }
+}
+
 function resolveProviderModel(
   provider: ReturnType<typeof createOpenAI>,
   modelId: string,
@@ -942,7 +1023,9 @@ function createAiGatewayLanguageModelMiddleware(
       Promise.resolve(
         withDefaultAiGatewayCacheHeaders(
           addAiGatewayReasoningRawChunks(
-            providerId === OPENAI_CHAT_PROVIDER_ID ? normalizeAiGatewayChatProviderOptions(params, modelId) : params,
+            normalizeAiGatewayJsonSchemas(
+              providerId === OPENAI_CHAT_PROVIDER_ID ? normalizeAiGatewayChatProviderOptions(params, modelId) : params,
+            ),
             type,
           ),
         ),

package/src/ai-gateway/index.ts

@@ -14,6 +14,7 @@ export {
   injectAiGatewayChatReasoningContent,
   injectAiGatewayChatReasoningStream,
   normalizeAiGatewayChatProviderOptions,
+  normalizeAiGatewayJsonSchemas,
   normalizeAiGatewayUrl,
 } from './ai-gateway'
 export type { AiGatewayDeps, AiGatewayModels, RuntimeBridge } from './ai-gateway'