@ai-sdk/moonshotai 2.0.29 → 2.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/dist/index.js +18 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +18 -1
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
- package/src/moonshotai-provider.ts +24 -0
package/CHANGELOG.md
CHANGED
package/dist/index.js
CHANGED
|
@@ -109,7 +109,7 @@ var MoonshotAIChatLanguageModel = class extends import_openai_compatible.OpenAIC
|
|
|
109
109
|
};
|
|
110
110
|
|
|
111
111
|
// src/version.ts
|
|
112
|
-
var VERSION = true ? "2.0.
|
|
112
|
+
var VERSION = true ? "2.0.30" : "0.0.0-test";
|
|
113
113
|
|
|
114
114
|
// src/moonshotai-provider.ts
|
|
115
115
|
var moonshotaiErrorSchema = import_v4.z.object({
|
|
@@ -123,6 +123,10 @@ var moonshotaiErrorStructure = {
|
|
|
123
123
|
errorToMessage: (data) => data.error.message
|
|
124
124
|
};
|
|
125
125
|
var defaultBaseURL = "https://api.moonshot.ai/v1";
|
|
126
|
+
function getModelStructuredOutputSupport(modelId) {
|
|
127
|
+
if (modelId.startsWith("kimi-k")) return true;
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
126
130
|
function createMoonshotAI(options = {}) {
|
|
127
131
|
var _a;
|
|
128
132
|
const baseURL = (0, import_provider_utils.withoutTrailingSlash)((_a = options.baseURL) != null ? _a : defaultBaseURL);
|
|
@@ -148,10 +152,23 @@ function createMoonshotAI(options = {}) {
|
|
|
148
152
|
...getCommonModelConfig("chat"),
|
|
149
153
|
includeUsage: true,
|
|
150
154
|
errorStructure: moonshotaiErrorStructure,
|
|
155
|
+
supportsStructuredOutputs: getModelStructuredOutputSupport(modelId),
|
|
151
156
|
transformRequestBody: (args) => {
|
|
157
|
+
var _a2, _b;
|
|
152
158
|
const thinking = args.thinking;
|
|
153
159
|
const reasoningHistory = args.reasoningHistory;
|
|
154
160
|
const { thinking: _, reasoningHistory: __, ...rest } = args;
|
|
161
|
+
const schema = (_b = (_a2 = rest.response_format) == null ? void 0 : _a2.json_schema) == null ? void 0 : _b.schema;
|
|
162
|
+
if (schema != null) {
|
|
163
|
+
const { $schema: _$schema, ...schemaWithoutDollarSchema } = schema;
|
|
164
|
+
rest.response_format = {
|
|
165
|
+
...rest.response_format,
|
|
166
|
+
json_schema: {
|
|
167
|
+
...rest.response_format.json_schema,
|
|
168
|
+
schema: schemaWithoutDollarSchema
|
|
169
|
+
}
|
|
170
|
+
};
|
|
171
|
+
}
|
|
155
172
|
return {
|
|
156
173
|
...rest,
|
|
157
174
|
...thinking && {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["export { createMoonshotAI, moonshotai } from './moonshotai-provider';\nexport type {\n MoonshotAIProvider,\n MoonshotAIProviderSettings,\n} from './moonshotai-provider';\nexport type {\n MoonshotAIChatModelId,\n MoonshotAILanguageModelOptions,\n /** @deprecated Use `MoonshotAILanguageModelOptions` instead. */\n MoonshotAILanguageModelOptions as MoonshotAIProviderOptions,\n} from './moonshotai-chat-options';\n","import type { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n NoSuchModelError,\n type LanguageModelV3,\n type ProviderV3,\n} from '@ai-sdk/provider';\nimport {\n loadApiKey,\n withoutTrailingSlash,\n withUserAgentSuffix,\n type FetchFunction,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n error: z.object({\n message: z.string(),\n type: z.string().nullish(),\n }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n errorSchema: moonshotaiErrorSchema,\n errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n /**\n * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n * environment variable.\n */\n apiKey?: string;\n /**\n * Base URL for the API calls.\n */\n baseURL?: string;\n /**\n * Custom headers to include in the requests.\n */\n headers?: Record<string, string>;\n /**\n * Custom fetch implementation. You can use it as a middleware to intercept requests,\n * or to provide a custom fetch implementation for e.g. testing.\n */\n fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV3 {\n /**\n * Creates a model for text generation.\n */\n (modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a chat model for text generation.\n */\n chatModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a language model for text generation.\n */\n languageModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function createMoonshotAI(\n options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n const getHeaders = () =>\n withUserAgentSuffix(\n {\n Authorization: `Bearer ${loadApiKey({\n apiKey: options.apiKey,\n environmentVariableName: 'MOONSHOT_API_KEY',\n description: 'Moonshot API key',\n })}`,\n ...options.headers,\n },\n `ai-sdk/moonshotai/${VERSION}`,\n );\n\n interface CommonModelConfig {\n provider: string;\n url: ({ path }: { path: string }) => string;\n headers: () => Record<string, string>;\n fetch?: FetchFunction;\n }\n\n const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n provider: `moonshotai.${modelType}`,\n url: ({ path }) => `${baseURL}${path}`,\n headers: getHeaders,\n fetch: options.fetch,\n });\n\n const createChatModel = (modelId: MoonshotAIChatModelId) => {\n return new MoonshotAIChatLanguageModel(modelId, {\n ...getCommonModelConfig('chat'),\n includeUsage: true,\n errorStructure: moonshotaiErrorStructure,\n transformRequestBody: (args: Record<string, any>) => {\n const thinking = args.thinking as\n | { type?: string; budgetTokens?: number }\n | undefined;\n const reasoningHistory = args.reasoningHistory as string | undefined;\n\n const { thinking: _, reasoningHistory: __, ...rest } = args;\n\n return {\n ...rest,\n ...(thinking && {\n thinking: {\n type: thinking.type,\n ...(thinking.budgetTokens !== undefined && {\n budget_tokens: thinking.budgetTokens,\n }),\n },\n }),\n ...(reasoningHistory && {\n reasoning_history: reasoningHistory,\n }),\n };\n },\n });\n };\n\n const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n provider.specificationVersion = 'v3' as const;\n provider.chatModel = createChatModel;\n provider.languageModel = createChatModel;\n\n provider.embeddingModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'embeddingModel' });\n };\n\n provider.imageModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n };\n\n return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport type { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport type {\n LanguageModelV3CallOptions,\n LanguageModelV3GenerateResult,\n LanguageModelV3StreamPart,\n LanguageModelV3StreamResult,\n} from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n constructor(\n modelId: MoonshotAIChatModelId,\n config: OpenAICompatibleChatConfig,\n ) {\n super(modelId, config);\n }\n\n async doGenerate(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3GenerateResult> {\n const result = await super.doGenerate(options);\n\n // @ts-expect-error accessing response body from parent result\n const usage = result.response?.body?.usage;\n\n return {\n ...result,\n usage: convertMoonshotAIChatUsage(usage),\n };\n }\n\n async doStream(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3StreamResult> {\n const result = await super.doStream(options);\n\n return {\n ...result,\n stream: result.stream.pipeThrough(\n new TransformStream<\n LanguageModelV3StreamPart,\n LanguageModelV3StreamPart\n >({\n transform(chunk, controller) {\n if (chunk.type === 'finish' && chunk.usage) {\n controller.enqueue({\n ...chunk,\n usage: convertMoonshotAIChatUsage(chunk.usage.raw as any),\n });\n } else {\n controller.enqueue(chunk);\n }\n },\n }),\n ),\n };\n }\n}\n","import type { LanguageModelV3Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n usage:\n | {\n prompt_tokens?: number | null;\n completion_tokens?: number | null;\n cached_tokens?: number | null;\n prompt_tokens_details?: {\n cached_tokens?: number | null;\n } | null;\n completion_tokens_details?: {\n reasoning_tokens?: number | null;\n } | null;\n }\n | undefined\n | null,\n): LanguageModelV3Usage {\n if (usage == null) {\n return {\n inputTokens: {\n total: undefined,\n noCache: undefined,\n cacheRead: undefined,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: undefined,\n text: undefined,\n reasoning: undefined,\n },\n raw: undefined,\n };\n }\n\n const promptTokens = usage.prompt_tokens ?? 0;\n const completionTokens = usage.completion_tokens ?? 0;\n\n const cacheReadTokens =\n usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? 0;\n\n const reasoningTokens =\n usage.completion_tokens_details?.reasoning_tokens ?? 0;\n\n return {\n inputTokens: {\n total: promptTokens,\n noCache: promptTokens - cacheReadTokens,\n cacheRead: cacheReadTokens,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: completionTokens,\n text: completionTokens - reasoningTokens,\n reasoning: reasoningTokens,\n },\n raw: usage,\n };\n}\n","// Version string of this package injected at build time.\ndeclare const __PACKAGE_VERSION__: string | undefined;\nexport const VERSION: string =\n typeof __PACKAGE_VERSION__ !== 'undefined'\n ? __PACKAGE_VERSION__\n : '0.0.0-test';\n"],"mappings":"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","names":[]}
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["export { createMoonshotAI, moonshotai } from './moonshotai-provider';\nexport type {\n MoonshotAIProvider,\n MoonshotAIProviderSettings,\n} from './moonshotai-provider';\nexport type {\n MoonshotAIChatModelId,\n MoonshotAILanguageModelOptions,\n /** @deprecated Use `MoonshotAILanguageModelOptions` instead. */\n MoonshotAILanguageModelOptions as MoonshotAIProviderOptions,\n} from './moonshotai-chat-options';\n","import type { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n NoSuchModelError,\n type LanguageModelV3,\n type ProviderV3,\n} from '@ai-sdk/provider';\nimport {\n loadApiKey,\n withoutTrailingSlash,\n withUserAgentSuffix,\n type FetchFunction,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n error: z.object({\n message: z.string(),\n type: z.string().nullish(),\n }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n errorSchema: moonshotaiErrorSchema,\n errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n /**\n * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n * environment variable.\n */\n apiKey?: string;\n /**\n * Base URL for the API calls.\n */\n baseURL?: string;\n /**\n * Custom headers to include in the requests.\n */\n headers?: Record<string, string>;\n /**\n * Custom fetch implementation. You can use it as a middleware to intercept requests,\n * or to provide a custom fetch implementation for e.g. testing.\n */\n fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV3 {\n /**\n * Creates a model for text generation.\n */\n (modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a chat model for text generation.\n */\n chatModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a language model for text generation.\n */\n languageModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function getModelStructuredOutputSupport(\n modelId: MoonshotAIChatModelId,\n): boolean {\n if (modelId.startsWith('kimi-k')) return true;\n return false;\n}\n\nexport function createMoonshotAI(\n options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n const getHeaders = () =>\n withUserAgentSuffix(\n {\n Authorization: `Bearer ${loadApiKey({\n apiKey: options.apiKey,\n environmentVariableName: 'MOONSHOT_API_KEY',\n description: 'Moonshot API key',\n })}`,\n ...options.headers,\n },\n `ai-sdk/moonshotai/${VERSION}`,\n );\n\n interface CommonModelConfig {\n provider: string;\n url: ({ path }: { path: string }) => string;\n headers: () => Record<string, string>;\n fetch?: FetchFunction;\n }\n\n const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n provider: `moonshotai.${modelType}`,\n url: ({ path }) => `${baseURL}${path}`,\n headers: getHeaders,\n fetch: options.fetch,\n });\n\n const createChatModel = (modelId: MoonshotAIChatModelId) => {\n return new MoonshotAIChatLanguageModel(modelId, {\n ...getCommonModelConfig('chat'),\n includeUsage: true,\n errorStructure: moonshotaiErrorStructure,\n supportsStructuredOutputs: getModelStructuredOutputSupport(modelId),\n transformRequestBody: (args: Record<string, any>) => {\n const thinking = args.thinking as\n | { type?: string; budgetTokens?: number }\n | undefined;\n const reasoningHistory = args.reasoningHistory as string | undefined;\n\n const { thinking: _, reasoningHistory: __, ...rest } = args;\n\n const schema = rest.response_format?.json_schema?.schema;\n if (schema != null) {\n // kimi-k2.5 produces nonsensical output when the top-level `$schema`\n // keyword injected by the AI SDK is present, even though it otherwise\n // supports structured outputs. Strip it from the schema sent to\n // Moonshot; the full original schema is still used for result validation.\n const { $schema: _$schema, ...schemaWithoutDollarSchema } = schema;\n rest.response_format = {\n ...rest.response_format,\n json_schema: {\n ...rest.response_format.json_schema,\n schema: schemaWithoutDollarSchema,\n },\n };\n }\n\n return {\n ...rest,\n ...(thinking && {\n thinking: {\n type: thinking.type,\n ...(thinking.budgetTokens !== undefined && {\n budget_tokens: thinking.budgetTokens,\n }),\n },\n }),\n ...(reasoningHistory && {\n reasoning_history: reasoningHistory,\n }),\n };\n },\n });\n };\n\n const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n provider.specificationVersion = 'v3' as const;\n provider.chatModel = createChatModel;\n provider.languageModel = createChatModel;\n\n provider.embeddingModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'embeddingModel' });\n };\n\n provider.imageModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n };\n\n return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport type { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport type {\n LanguageModelV3CallOptions,\n LanguageModelV3GenerateResult,\n LanguageModelV3StreamPart,\n LanguageModelV3StreamResult,\n} from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n constructor(\n modelId: MoonshotAIChatModelId,\n config: OpenAICompatibleChatConfig,\n ) {\n super(modelId, config);\n }\n\n async doGenerate(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3GenerateResult> {\n const result = await super.doGenerate(options);\n\n // @ts-expect-error accessing response body from parent result\n const usage = result.response?.body?.usage;\n\n return {\n ...result,\n usage: convertMoonshotAIChatUsage(usage),\n };\n }\n\n async doStream(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3StreamResult> {\n const result = await super.doStream(options);\n\n return {\n ...result,\n stream: result.stream.pipeThrough(\n new TransformStream<\n LanguageModelV3StreamPart,\n LanguageModelV3StreamPart\n >({\n transform(chunk, controller) {\n if (chunk.type === 'finish' && chunk.usage) {\n controller.enqueue({\n ...chunk,\n usage: convertMoonshotAIChatUsage(chunk.usage.raw as any),\n });\n } else {\n controller.enqueue(chunk);\n }\n },\n }),\n ),\n };\n }\n}\n","import type { LanguageModelV3Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n usage:\n | {\n prompt_tokens?: number | null;\n completion_tokens?: number | null;\n cached_tokens?: number | null;\n prompt_tokens_details?: {\n cached_tokens?: number | null;\n } | null;\n completion_tokens_details?: {\n reasoning_tokens?: number | null;\n } | null;\n }\n | undefined\n | null,\n): LanguageModelV3Usage {\n if (usage == null) {\n return {\n inputTokens: {\n total: undefined,\n noCache: undefined,\n cacheRead: undefined,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: undefined,\n text: undefined,\n reasoning: undefined,\n },\n raw: undefined,\n };\n }\n\n const promptTokens = usage.prompt_tokens ?? 0;\n const completionTokens = usage.completion_tokens ?? 0;\n\n const cacheReadTokens =\n usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? 0;\n\n const reasoningTokens =\n usage.completion_tokens_details?.reasoning_tokens ?? 0;\n\n return {\n inputTokens: {\n total: promptTokens,\n noCache: promptTokens - cacheReadTokens,\n cacheRead: cacheReadTokens,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: completionTokens,\n text: completionTokens - reasoningTokens,\n reasoning: reasoningTokens,\n },\n raw: usage,\n };\n}\n","// Version string of this package injected at build time.\ndeclare const __PACKAGE_VERSION__: string | undefined;\nexport const VERSION: string =\n typeof __PACKAGE_VERSION__ !== 'undefined'\n ? __PACKAGE_VERSION__\n : '0.0.0-test';\n"],"mappings":"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","names":["_a"]}
|
package/dist/index.mjs
CHANGED
|
@@ -88,7 +88,7 @@ var MoonshotAIChatLanguageModel = class extends OpenAICompatibleChatLanguageMode
|
|
|
88
88
|
};
|
|
89
89
|
|
|
90
90
|
// src/version.ts
|
|
91
|
-
var VERSION = true ? "2.0.
|
|
91
|
+
var VERSION = true ? "2.0.30" : "0.0.0-test";
|
|
92
92
|
|
|
93
93
|
// src/moonshotai-provider.ts
|
|
94
94
|
var moonshotaiErrorSchema = z.object({
|
|
@@ -102,6 +102,10 @@ var moonshotaiErrorStructure = {
|
|
|
102
102
|
errorToMessage: (data) => data.error.message
|
|
103
103
|
};
|
|
104
104
|
var defaultBaseURL = "https://api.moonshot.ai/v1";
|
|
105
|
+
function getModelStructuredOutputSupport(modelId) {
|
|
106
|
+
if (modelId.startsWith("kimi-k")) return true;
|
|
107
|
+
return false;
|
|
108
|
+
}
|
|
105
109
|
function createMoonshotAI(options = {}) {
|
|
106
110
|
var _a;
|
|
107
111
|
const baseURL = withoutTrailingSlash((_a = options.baseURL) != null ? _a : defaultBaseURL);
|
|
@@ -127,10 +131,23 @@ function createMoonshotAI(options = {}) {
|
|
|
127
131
|
...getCommonModelConfig("chat"),
|
|
128
132
|
includeUsage: true,
|
|
129
133
|
errorStructure: moonshotaiErrorStructure,
|
|
134
|
+
supportsStructuredOutputs: getModelStructuredOutputSupport(modelId),
|
|
130
135
|
transformRequestBody: (args) => {
|
|
136
|
+
var _a2, _b;
|
|
131
137
|
const thinking = args.thinking;
|
|
132
138
|
const reasoningHistory = args.reasoningHistory;
|
|
133
139
|
const { thinking: _, reasoningHistory: __, ...rest } = args;
|
|
140
|
+
const schema = (_b = (_a2 = rest.response_format) == null ? void 0 : _a2.json_schema) == null ? void 0 : _b.schema;
|
|
141
|
+
if (schema != null) {
|
|
142
|
+
const { $schema: _$schema, ...schemaWithoutDollarSchema } = schema;
|
|
143
|
+
rest.response_format = {
|
|
144
|
+
...rest.response_format,
|
|
145
|
+
json_schema: {
|
|
146
|
+
...rest.response_format.json_schema,
|
|
147
|
+
schema: schemaWithoutDollarSchema
|
|
148
|
+
}
|
|
149
|
+
};
|
|
150
|
+
}
|
|
134
151
|
return {
|
|
135
152
|
...rest,
|
|
136
153
|
...thinking && {
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["import type { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n NoSuchModelError,\n type LanguageModelV3,\n type ProviderV3,\n} from '@ai-sdk/provider';\nimport {\n loadApiKey,\n withoutTrailingSlash,\n withUserAgentSuffix,\n type FetchFunction,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n error: z.object({\n message: z.string(),\n type: z.string().nullish(),\n }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n errorSchema: moonshotaiErrorSchema,\n errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n /**\n * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n * environment variable.\n */\n apiKey?: string;\n /**\n * Base URL for the API calls.\n */\n baseURL?: string;\n /**\n * Custom headers to include in the requests.\n */\n headers?: Record<string, string>;\n /**\n * Custom fetch implementation. You can use it as a middleware to intercept requests,\n * or to provide a custom fetch implementation for e.g. testing.\n */\n fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV3 {\n /**\n * Creates a model for text generation.\n */\n (modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a chat model for text generation.\n */\n chatModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a language model for text generation.\n */\n languageModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function createMoonshotAI(\n options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n const getHeaders = () =>\n withUserAgentSuffix(\n {\n Authorization: `Bearer ${loadApiKey({\n apiKey: options.apiKey,\n environmentVariableName: 'MOONSHOT_API_KEY',\n description: 'Moonshot API key',\n })}`,\n ...options.headers,\n },\n `ai-sdk/moonshotai/${VERSION}`,\n );\n\n interface CommonModelConfig {\n provider: string;\n url: ({ path }: { path: string }) => string;\n headers: () => Record<string, string>;\n fetch?: FetchFunction;\n }\n\n const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n provider: `moonshotai.${modelType}`,\n url: ({ path }) => `${baseURL}${path}`,\n headers: getHeaders,\n fetch: options.fetch,\n });\n\n const createChatModel = (modelId: MoonshotAIChatModelId) => {\n return new MoonshotAIChatLanguageModel(modelId, {\n ...getCommonModelConfig('chat'),\n includeUsage: true,\n errorStructure: moonshotaiErrorStructure,\n transformRequestBody: (args: Record<string, any>) => {\n const thinking = args.thinking as\n | { type?: string; budgetTokens?: number }\n | undefined;\n const reasoningHistory = args.reasoningHistory as string | undefined;\n\n const { thinking: _, reasoningHistory: __, ...rest } = args;\n\n return {\n ...rest,\n ...(thinking && {\n thinking: {\n type: thinking.type,\n ...(thinking.budgetTokens !== undefined && {\n budget_tokens: thinking.budgetTokens,\n }),\n },\n }),\n ...(reasoningHistory && {\n reasoning_history: reasoningHistory,\n }),\n };\n },\n });\n };\n\n const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n provider.specificationVersion = 'v3' as const;\n provider.chatModel = createChatModel;\n provider.languageModel = createChatModel;\n\n provider.embeddingModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'embeddingModel' });\n };\n\n provider.imageModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n };\n\n return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport type { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport type {\n LanguageModelV3CallOptions,\n LanguageModelV3GenerateResult,\n LanguageModelV3StreamPart,\n LanguageModelV3StreamResult,\n} from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n constructor(\n modelId: MoonshotAIChatModelId,\n config: OpenAICompatibleChatConfig,\n ) {\n super(modelId, config);\n }\n\n async doGenerate(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3GenerateResult> {\n const result = await super.doGenerate(options);\n\n // @ts-expect-error accessing response body from parent result\n const usage = result.response?.body?.usage;\n\n return {\n ...result,\n usage: convertMoonshotAIChatUsage(usage),\n };\n }\n\n async doStream(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3StreamResult> {\n const result = await super.doStream(options);\n\n return {\n ...result,\n stream: result.stream.pipeThrough(\n new TransformStream<\n LanguageModelV3StreamPart,\n LanguageModelV3StreamPart\n >({\n transform(chunk, controller) {\n if (chunk.type === 'finish' && chunk.usage) {\n controller.enqueue({\n ...chunk,\n usage: convertMoonshotAIChatUsage(chunk.usage.raw as any),\n });\n } else {\n controller.enqueue(chunk);\n }\n },\n }),\n ),\n };\n }\n}\n","import type { LanguageModelV3Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n usage:\n | {\n prompt_tokens?: number | null;\n completion_tokens?: number | null;\n cached_tokens?: number | null;\n prompt_tokens_details?: {\n cached_tokens?: number | null;\n } | null;\n completion_tokens_details?: {\n reasoning_tokens?: number | null;\n } | null;\n }\n | undefined\n | null,\n): LanguageModelV3Usage {\n if (usage == null) {\n return {\n inputTokens: {\n total: undefined,\n noCache: undefined,\n cacheRead: undefined,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: undefined,\n text: undefined,\n reasoning: undefined,\n },\n raw: undefined,\n };\n }\n\n const promptTokens = usage.prompt_tokens ?? 0;\n const completionTokens = usage.completion_tokens ?? 0;\n\n const cacheReadTokens =\n usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? 0;\n\n const reasoningTokens =\n usage.completion_tokens_details?.reasoning_tokens ?? 0;\n\n return {\n inputTokens: {\n total: promptTokens,\n noCache: promptTokens - cacheReadTokens,\n cacheRead: cacheReadTokens,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: completionTokens,\n text: completionTokens - reasoningTokens,\n reasoning: reasoningTokens,\n },\n raw: usage,\n };\n}\n","// Version string of this package injected at build time.\ndeclare const __PACKAGE_VERSION__: string | undefined;\nexport const VERSION: string =\n typeof __PACKAGE_VERSION__ !== 'undefined'\n ? __PACKAGE_VERSION__\n : '0.0.0-test';\n"],"mappings":"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","names":[]}
|
|
1
|
+
{"version":3,"sources":["../src/moonshotai-provider.ts","../src/moonshotai-chat-language-model.ts","../src/convert-moonshotai-chat-usage.ts","../src/version.ts"],"sourcesContent":["import type { ProviderErrorStructure } from '@ai-sdk/openai-compatible';\nimport {\n NoSuchModelError,\n type LanguageModelV3,\n type ProviderV3,\n} from '@ai-sdk/provider';\nimport {\n loadApiKey,\n withoutTrailingSlash,\n withUserAgentSuffix,\n type FetchFunction,\n} from '@ai-sdk/provider-utils';\nimport { z } from 'zod/v4';\nimport { MoonshotAIChatLanguageModel } from './moonshotai-chat-language-model';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\nimport { VERSION } from './version';\n\nexport type MoonshotAIErrorData = z.infer<typeof moonshotaiErrorSchema>;\n\nconst moonshotaiErrorSchema = z.object({\n error: z.object({\n message: z.string(),\n type: z.string().nullish(),\n }),\n});\n\nconst moonshotaiErrorStructure: ProviderErrorStructure<MoonshotAIErrorData> = {\n errorSchema: moonshotaiErrorSchema,\n errorToMessage: data => data.error.message,\n};\n\nexport interface MoonshotAIProviderSettings {\n /**\n * Moonshot API key. Default value is taken from the `MOONSHOT_API_KEY`\n * environment variable.\n */\n apiKey?: string;\n /**\n * Base URL for the API calls.\n */\n baseURL?: string;\n /**\n * Custom headers to include in the requests.\n */\n headers?: Record<string, string>;\n /**\n * Custom fetch implementation. You can use it as a middleware to intercept requests,\n * or to provide a custom fetch implementation for e.g. testing.\n */\n fetch?: FetchFunction;\n}\n\nexport interface MoonshotAIProvider extends ProviderV3 {\n /**\n * Creates a model for text generation.\n */\n (modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a chat model for text generation.\n */\n chatModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n\n /**\n * Creates a language model for text generation.\n */\n languageModel(modelId: MoonshotAIChatModelId): LanguageModelV3;\n}\n\nconst defaultBaseURL = 'https://api.moonshot.ai/v1';\n\nexport function getModelStructuredOutputSupport(\n modelId: MoonshotAIChatModelId,\n): boolean {\n if (modelId.startsWith('kimi-k')) return true;\n return false;\n}\n\nexport function createMoonshotAI(\n options: MoonshotAIProviderSettings = {},\n): MoonshotAIProvider {\n const baseURL = withoutTrailingSlash(options.baseURL ?? defaultBaseURL);\n const getHeaders = () =>\n withUserAgentSuffix(\n {\n Authorization: `Bearer ${loadApiKey({\n apiKey: options.apiKey,\n environmentVariableName: 'MOONSHOT_API_KEY',\n description: 'Moonshot API key',\n })}`,\n ...options.headers,\n },\n `ai-sdk/moonshotai/${VERSION}`,\n );\n\n interface CommonModelConfig {\n provider: string;\n url: ({ path }: { path: string }) => string;\n headers: () => Record<string, string>;\n fetch?: FetchFunction;\n }\n\n const getCommonModelConfig = (modelType: string): CommonModelConfig => ({\n provider: `moonshotai.${modelType}`,\n url: ({ path }) => `${baseURL}${path}`,\n headers: getHeaders,\n fetch: options.fetch,\n });\n\n const createChatModel = (modelId: MoonshotAIChatModelId) => {\n return new MoonshotAIChatLanguageModel(modelId, {\n ...getCommonModelConfig('chat'),\n includeUsage: true,\n errorStructure: moonshotaiErrorStructure,\n supportsStructuredOutputs: getModelStructuredOutputSupport(modelId),\n transformRequestBody: (args: Record<string, any>) => {\n const thinking = args.thinking as\n | { type?: string; budgetTokens?: number }\n | undefined;\n const reasoningHistory = args.reasoningHistory as string | undefined;\n\n const { thinking: _, reasoningHistory: __, ...rest } = args;\n\n const schema = rest.response_format?.json_schema?.schema;\n if (schema != null) {\n // kimi-k2.5 produces nonsensical output when the top-level `$schema`\n // keyword injected by the AI SDK is present, even though it otherwise\n // supports structured outputs. Strip it from the schema sent to\n // Moonshot; the full original schema is still used for result validation.\n const { $schema: _$schema, ...schemaWithoutDollarSchema } = schema;\n rest.response_format = {\n ...rest.response_format,\n json_schema: {\n ...rest.response_format.json_schema,\n schema: schemaWithoutDollarSchema,\n },\n };\n }\n\n return {\n ...rest,\n ...(thinking && {\n thinking: {\n type: thinking.type,\n ...(thinking.budgetTokens !== undefined && {\n budget_tokens: thinking.budgetTokens,\n }),\n },\n }),\n ...(reasoningHistory && {\n reasoning_history: reasoningHistory,\n }),\n };\n },\n });\n };\n\n const provider = (modelId: MoonshotAIChatModelId) => createChatModel(modelId);\n\n provider.specificationVersion = 'v3' as const;\n provider.chatModel = createChatModel;\n provider.languageModel = createChatModel;\n\n provider.embeddingModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'embeddingModel' });\n };\n\n provider.imageModel = (modelId: string) => {\n throw new NoSuchModelError({ modelId, modelType: 'imageModel' });\n };\n\n return provider;\n}\n\nexport const moonshotai = createMoonshotAI();\n","import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible';\nimport type { OpenAICompatibleChatConfig } from '@ai-sdk/openai-compatible/internal';\nimport type {\n LanguageModelV3CallOptions,\n LanguageModelV3GenerateResult,\n LanguageModelV3StreamPart,\n LanguageModelV3StreamResult,\n} from '@ai-sdk/provider';\nimport { convertMoonshotAIChatUsage } from './convert-moonshotai-chat-usage';\nimport type { MoonshotAIChatModelId } from './moonshotai-chat-options';\n\nexport class MoonshotAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {\n constructor(\n modelId: MoonshotAIChatModelId,\n config: OpenAICompatibleChatConfig,\n ) {\n super(modelId, config);\n }\n\n async doGenerate(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3GenerateResult> {\n const result = await super.doGenerate(options);\n\n // @ts-expect-error accessing response body from parent result\n const usage = result.response?.body?.usage;\n\n return {\n ...result,\n usage: convertMoonshotAIChatUsage(usage),\n };\n }\n\n async doStream(\n options: LanguageModelV3CallOptions,\n ): Promise<LanguageModelV3StreamResult> {\n const result = await super.doStream(options);\n\n return {\n ...result,\n stream: result.stream.pipeThrough(\n new TransformStream<\n LanguageModelV3StreamPart,\n LanguageModelV3StreamPart\n >({\n transform(chunk, controller) {\n if (chunk.type === 'finish' && chunk.usage) {\n controller.enqueue({\n ...chunk,\n usage: convertMoonshotAIChatUsage(chunk.usage.raw as any),\n });\n } else {\n controller.enqueue(chunk);\n }\n },\n }),\n ),\n };\n }\n}\n","import type { LanguageModelV3Usage } from '@ai-sdk/provider';\n\nexport function convertMoonshotAIChatUsage(\n usage:\n | {\n prompt_tokens?: number | null;\n completion_tokens?: number | null;\n cached_tokens?: number | null;\n prompt_tokens_details?: {\n cached_tokens?: number | null;\n } | null;\n completion_tokens_details?: {\n reasoning_tokens?: number | null;\n } | null;\n }\n | undefined\n | null,\n): LanguageModelV3Usage {\n if (usage == null) {\n return {\n inputTokens: {\n total: undefined,\n noCache: undefined,\n cacheRead: undefined,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: undefined,\n text: undefined,\n reasoning: undefined,\n },\n raw: undefined,\n };\n }\n\n const promptTokens = usage.prompt_tokens ?? 0;\n const completionTokens = usage.completion_tokens ?? 0;\n\n const cacheReadTokens =\n usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? 0;\n\n const reasoningTokens =\n usage.completion_tokens_details?.reasoning_tokens ?? 0;\n\n return {\n inputTokens: {\n total: promptTokens,\n noCache: promptTokens - cacheReadTokens,\n cacheRead: cacheReadTokens,\n cacheWrite: undefined,\n },\n outputTokens: {\n total: completionTokens,\n text: completionTokens - reasoningTokens,\n reasoning: reasoningTokens,\n },\n raw: usage,\n };\n}\n","// Version string of this package injected at build time.\ndeclare const __PACKAGE_VERSION__: string | undefined;\nexport const VERSION: string =\n typeof __PACKAGE_VERSION__ !== 'undefined'\n ? __PACKAGE_VERSION__\n : '0.0.0-test';\n"],"mappings":";AACA;AAAA,EACE;AAAA,OAGK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AACP,SAAS,SAAS;;;ACZlB,SAAS,yCAAyC;;;ACE3C,SAAS,2BACd,OAcsB;AAjBxB;AAkBE,MAAI,SAAS,MAAM;AACjB,WAAO;AAAA,MACL,aAAa;AAAA,QACX,OAAO;AAAA,QACP,SAAS;AAAA,QACT,WAAW;AAAA,QACX,YAAY;AAAA,MACd;AAAA,MACA,cAAc;AAAA,QACZ,OAAO;AAAA,QACP,MAAM;AAAA,QACN,WAAW;AAAA,MACb;AAAA,MACA,KAAK;AAAA,IACP;AAAA,EACF;AAEA,QAAM,gBAAe,WAAM,kBAAN,YAAuB;AAC5C,QAAM,oBAAmB,WAAM,sBAAN,YAA2B;AAEpD,QAAM,mBACJ,iBAAM,kBAAN,aAAuB,WAAM,0BAAN,mBAA6B,kBAApD,YAAqE;AAEvE,QAAM,mBACJ,iBAAM,8BAAN,mBAAiC,qBAAjC,YAAqD;AAEvD,SAAO;AAAA,IACL,aAAa;AAAA,MACX,OAAO;AAAA,MACP,SAAS,eAAe;AAAA,MACxB,WAAW;AAAA,MACX,YAAY;AAAA,IACd;AAAA,IACA,cAAc;AAAA,MACZ,OAAO;AAAA,MACP,MAAM,mBAAmB;AAAA,MACzB,WAAW;AAAA,IACb;AAAA,IACA,KAAK;AAAA,EACP;AACF;;;AD/CO,IAAM,8BAAN,cAA0C,kCAAkC;AAAA,EACjF,YACE,SACA,QACA;AACA,UAAM,SAAS,MAAM;AAAA,EACvB;AAAA,EAEA,MAAM,WACJ,SACwC;AArB5C;AAsBI,UAAM,SAAS,MAAM,MAAM,WAAW,OAAO;AAG7C,UAAM,SAAQ,kBAAO,aAAP,mBAAiB,SAAjB,mBAAuB;AAErC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,OAAO,2BAA2B,KAAK;AAAA,IACzC;AAAA,EACF;AAAA,EAEA,MAAM,SACJ,SACsC;AACtC,UAAM,SAAS,MAAM,MAAM,SAAS,OAAO;AAE3C,WAAO;AAAA,MACL,GAAG;AAAA,MACH,QAAQ,OAAO,OAAO;AAAA,QACpB,IAAI,gBAGF;AAAA,UACA,UAAU,OAAO,YAAY;AAC3B,gBAAI,MAAM,SAAS,YAAY,MAAM,OAAO;AAC1C,yBAAW,QAAQ;AAAA,gBACjB,GAAG;AAAA,gBACH,OAAO,2BAA2B,MAAM,MAAM,GAAU;AAAA,cAC1D,CAAC;AAAA,YACH,OAAO;AACL,yBAAW,QAAQ,KAAK;AAAA,YAC1B;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACF;;;AEzDO,IAAM,UACX,OACI,WACA;;;AHcN,IAAM,wBAAwB,EAAE,OAAO;AAAA,EACrC,OAAO,EAAE,OAAO;AAAA,IACd,SAAS,EAAE,OAAO;AAAA,IAClB,MAAM,EAAE,OAAO,EAAE,QAAQ;AAAA,EAC3B,CAAC;AACH,CAAC;AAED,IAAM,2BAAwE;AAAA,EAC5E,aAAa;AAAA,EACb,gBAAgB,UAAQ,KAAK,MAAM;AACrC;AAwCA,IAAM,iBAAiB;AAEhB,SAAS,gCACd,SACS;AACT,MAAI,QAAQ,WAAW,QAAQ,EAAG,QAAO;AACzC,SAAO;AACT;AAEO,SAAS,iBACd,UAAsC,CAAC,GACnB;AAhFtB;AAiFE,QAAM,UAAU,sBAAqB,aAAQ,YAAR,YAAmB,cAAc;AACtE,QAAM,aAAa,MACjB;AAAA,IACE;AAAA,MACE,eAAe,UAAU,WAAW;AAAA,QAClC,QAAQ,QAAQ;AAAA,QAChB,yBAAyB;AAAA,QACzB,aAAa;AAAA,MACf,CAAC,CAAC;AAAA,MACF,GAAG,QAAQ;AAAA,IACb;AAAA,IACA,qBAAqB,OAAO;AAAA,EAC9B;AASF,QAAM,uBAAuB,CAAC,eAA0C;AAAA,IACtE,UAAU,cAAc,SAAS;AAAA,IACjC,KAAK,CAAC,EAAE,KAAK,MAAM,GAAG,OAAO,GAAG,IAAI;AAAA,IACpC,SAAS;AAAA,IACT,OAAO,QAAQ;AAAA,EACjB;AAEA,QAAM,kBAAkB,CAAC,YAAmC;AAC1D,WAAO,IAAI,4BAA4B,SAAS;AAAA,MAC9C,GAAG,qBAAqB,MAAM;AAAA,MAC9B,cAAc;AAAA,MACd,gBAAgB;AAAA,MAChB,2BAA2B,gCAAgC,OAAO;AAAA,MAClE,sBAAsB,CAAC,SAA8B;AAnH3D,YAAAA,KAAA;AAoHQ,cAAM,WAAW,KAAK;AAGtB,cAAM,mBAAmB,KAAK;AAE9B,cAAM,EAAE,UAAU,GAAG,kBAAkB,IAAI,GAAG,KAAK,IAAI;AAEvD,cAAM,UAAS,MAAAA,MAAA,KAAK,oBAAL,gBAAAA,IAAsB,gBAAtB,mBAAmC;AAClD,YAAI,UAAU,MAAM;AAKlB,gBAAM,EAAE,SAAS,UAAU,GAAG,0BAA0B,IAAI;AAC5D,eAAK,kBAAkB;AAAA,YACrB,GAAG,KAAK;AAAA,YACR,aAAa;AAAA,cACX,GAAG,KAAK,gBAAgB;AAAA,cACxB,QAAQ;AAAA,YACV;AAAA,UACF;AAAA,QACF;AAEA,eAAO;AAAA,UACL,GAAG;AAAA,UACH,GAAI,YAAY;AAAA,YACd,UAAU;AAAA,cACR,MAAM,SAAS;AAAA,cACf,GAAI,SAAS,iBAAiB,UAAa;AAAA,gBACzC,eAAe,SAAS;AAAA,cAC1B;AAAA,YACF;AAAA,UACF;AAAA,UACA,GAAI,oBAAoB;AAAA,YACtB,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,CAAC,YAAmC,gBAAgB,OAAO;AAE5E,WAAS,uBAAuB;AAChC,WAAS,YAAY;AACrB,WAAS,gBAAgB;AAEzB,WAAS,iBAAiB,CAAC,YAAoB;AAC7C,UAAM,IAAI,iBAAiB,EAAE,SAAS,WAAW,iBAAiB,CAAC;AAAA,EACrE;AAEA,WAAS,aAAa,CAAC,YAAoB;AACzC,UAAM,IAAI,iBAAiB,EAAE,SAAS,WAAW,aAAa,CAAC;AAAA,EACjE;AAEA,SAAO;AACT;AAEO,IAAM,aAAa,iBAAiB;","names":["_a"]}
|
package/package.json
CHANGED
|
@@ -69,6 +69,13 @@ export interface MoonshotAIProvider extends ProviderV3 {
|
|
|
69
69
|
|
|
70
70
|
const defaultBaseURL = 'https://api.moonshot.ai/v1';
|
|
71
71
|
|
|
72
|
+
export function getModelStructuredOutputSupport(
|
|
73
|
+
modelId: MoonshotAIChatModelId,
|
|
74
|
+
): boolean {
|
|
75
|
+
if (modelId.startsWith('kimi-k')) return true;
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
|
|
72
79
|
export function createMoonshotAI(
|
|
73
80
|
options: MoonshotAIProviderSettings = {},
|
|
74
81
|
): MoonshotAIProvider {
|
|
@@ -105,6 +112,7 @@ export function createMoonshotAI(
|
|
|
105
112
|
...getCommonModelConfig('chat'),
|
|
106
113
|
includeUsage: true,
|
|
107
114
|
errorStructure: moonshotaiErrorStructure,
|
|
115
|
+
supportsStructuredOutputs: getModelStructuredOutputSupport(modelId),
|
|
108
116
|
transformRequestBody: (args: Record<string, any>) => {
|
|
109
117
|
const thinking = args.thinking as
|
|
110
118
|
| { type?: string; budgetTokens?: number }
|
|
@@ -113,6 +121,22 @@ export function createMoonshotAI(
|
|
|
113
121
|
|
|
114
122
|
const { thinking: _, reasoningHistory: __, ...rest } = args;
|
|
115
123
|
|
|
124
|
+
const schema = rest.response_format?.json_schema?.schema;
|
|
125
|
+
if (schema != null) {
|
|
126
|
+
// kimi-k2.5 produces nonsensical output when the top-level `$schema`
|
|
127
|
+
// keyword injected by the AI SDK is present, even though it otherwise
|
|
128
|
+
// supports structured outputs. Strip it from the schema sent to
|
|
129
|
+
// Moonshot; the full original schema is still used for result validation.
|
|
130
|
+
const { $schema: _$schema, ...schemaWithoutDollarSchema } = schema;
|
|
131
|
+
rest.response_format = {
|
|
132
|
+
...rest.response_format,
|
|
133
|
+
json_schema: {
|
|
134
|
+
...rest.response_format.json_schema,
|
|
135
|
+
schema: schemaWithoutDollarSchema,
|
|
136
|
+
},
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
|
|
116
140
|
return {
|
|
117
141
|
...rest,
|
|
118
142
|
...(thinking && {
|