@tanstack/ai-mistral 0.6.17 → 0.7.0
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/dist/esm/adapters/text.d.ts +8 -2
- package/dist/esm/adapters/text.js +164 -13
- package/dist/esm/adapters/text.js.map +1 -1
- package/dist/esm/model-meta.d.ts +73 -1
- package/dist/esm/model-meta.js +33 -5
- package/dist/esm/model-meta.js.map +1 -1
- package/dist/esm/utils/schema-converter.js +4 -4
- package/dist/esm/utils/schema-converter.js.map +1 -1
- package/package.json +4 -4
- package/src/adapters/text.ts +269 -15
- package/src/model-meta.ts +53 -1
- package/src/utils/schema-converter.test.ts +24 -0
- package/src/utils/schema-converter.ts +12 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-converter.js","names":[],"sources":["../../../src/utils/schema-converter.ts"],"sourcesContent":["import type { NullWideningMap } from '@tanstack/ai-utils'\n\ninterface MistralStructuredOutputCompatibility {\n schema: Record<string, any>\n nullWideningMap: NullWideningMap | undefined\n strict: boolean\n}\n\n/**\n * Convert a schema for Mistral strict mode and record how to invert it.\n *\n * Outcomes:\n * - `strict: true` — rewritten schema (`required` closed, optionals null-widened).\n * `nullWideningMap` marks synthesized optional nulls only; already-nullable\n * fields and enum/const repairs on required nodes are unmarked.\n * - `strict: false` — original schema, no map. Used when `oneOf`/`allOf`/`not`/\n * `$ref`/`$defs` appear, or an `anyOf` branch would need a branch-dependent map.\n */\nexport function makeMistralStructuredOutputCompatibleWithMap(\n schema: Record<string, any>,\n originalRequired: Array<string> = [],\n): MistralStructuredOutputCompatibility {\n if (containsUnsupportedStrictKeyword(schema)) {\n return { schema, nullWideningMap: undefined, strict: false }\n }\n\n const converted = coerceMistralStrictSchema(schema, originalRequired)\n if (converted.hasUntrackableAnyOfWidening) {\n return { schema, nullWideningMap: undefined, strict: false }\n }\n\n return {\n schema: converted.schema,\n nullWideningMap: converted.nullWideningMap,\n strict: true,\n }\n}\n\ninterface CoercedMistralStrictSchema {\n schema: Record<string, any>\n nullWideningMap: NullWideningMap | undefined\n hasUntrackableAnyOfWidening: boolean\n}\n\nconst UNSUPPORTED_STRICT_KEYWORDS: ReadonlyArray<string> = [\n 'oneOf',\n 'allOf',\n 'not',\n '$ref',\n '$defs',\n 'definitions',\n]\n\n/**\n * Tree-wide key scan for `oneOf`/`allOf`/`not`/`$ref`/`$defs`/`definitions`.\n * Conservative: a property literally named e.g. `oneOf` also trips fallback.\n * `anyOf` is handled separately in the coerce walk.\n */\nfunction containsUnsupportedStrictKeyword(node: unknown): boolean {\n if (Array.isArray(node)) return node.some(containsUnsupportedStrictKeyword)\n if (!isSchemaObject(node)) return false\n\n return Object.entries(node).some(\n ([key, value]) =>\n UNSUPPORTED_STRICT_KEYWORDS.includes(key) ||\n containsUnsupportedStrictKeyword(value),\n )\n}\n\nfunction pruneMap(map: NullWideningMap): NullWideningMap | undefined {\n return Object.keys(map).length > 0 ? map : undefined\n}\n\nfunction isSchemaObject(schema: unknown): schema is Record<string, any> {\n return typeof schema === 'object' && schema !== null && !Array.isArray(schema)\n}\n\nfunction coerceArrayItems(items: unknown): {\n schema: unknown\n itemMap: NullWideningMap | Array<NullWideningMap> | undefined\n hasUntrackableAnyOfWidening: boolean\n} {\n if (Array.isArray(items)) {\n const converted = items.map((item) =>\n isSchemaObject(item)\n ? coerceMistralStrictSchema(item, item.required || [])\n : {\n schema: item,\n nullWideningMap: undefined,\n hasUntrackableAnyOfWidening: false,\n },\n )\n const itemMaps = converted.map((item) => item.nullWideningMap)\n return {\n schema: converted.map((item) => item.schema),\n itemMap: itemMaps.some(Boolean)\n ? itemMaps.map((map) => map ?? {})\n : undefined,\n hasUntrackableAnyOfWidening: converted.some(\n (item) => item.hasUntrackableAnyOfWidening,\n ),\n }\n }\n\n if (isSchemaObject(items)) {\n const converted = coerceMistralStrictSchema(items, items.required || [])\n return {\n schema: converted.schema,\n itemMap: converted.nullWideningMap,\n hasUntrackableAnyOfWidening: converted.hasUntrackableAnyOfWidening,\n }\n }\n\n return {\n schema: items,\n itemMap: undefined,\n hasUntrackableAnyOfWidening: false,\n }\n}\n\nfunction schemaTypeIncludes(\n schema: Record<string, any>,\n typeName: string,\n): boolean {\n return (\n schema.type === typeName ||\n (Array.isArray(schema.type) && schema.type.includes(typeName))\n )\n}\n\nfunction admitNullInEnumOrConst(\n prop: Record<string, any>,\n): Record<string, any> {\n if ('const' in prop && prop.const !== null) {\n const { const: constValue, ...withoutConst } = prop\n return { ...withoutConst, enum: [constValue, null] }\n }\n if (Array.isArray(prop.enum) && !prop.enum.includes(null)) {\n return { ...prop, enum: [...prop.enum, null] }\n }\n return prop\n}\n\n/**\n * True when `type`/`enum`/`const`/`anyOf` already admit null. `oneOf`/`allOf`/\n * `not` are not inspected — callers must reject those first.\n */\nfunction acceptsNull(schema: unknown): boolean {\n if (schema === true) return true\n if (!isSchemaObject(schema)) return false\n\n if ('const' in schema && schema.const !== null) return false\n if (Array.isArray(schema.enum) && !schema.enum.includes(null)) return false\n\n if (typeof schema.type === 'string' && schema.type !== 'null') return false\n if (Array.isArray(schema.type) && !schema.type.includes('null')) return false\n\n if (\n Array.isArray(schema.anyOf) &&\n !schema.anyOf.some((variant: unknown) => acceptsNull(variant))\n ) {\n return false\n }\n\n return true\n}\n\nfunction coerceMistralStrictSchema(\n schema: Record<string, any>,\n originalRequired: Array<string>,\n): CoercedMistralStrictSchema {\n const result = { ...schema }\n const nullWideningMap: NullWideningMap = {}\n let hasUntrackableAnyOfWidening = false\n\n if (schemaTypeIncludes(result, 'object')) {\n if (!result.properties) {\n result.properties = {}\n }\n const properties = { ...result.properties }\n const allPropertyNames = Object.keys(properties)\n const propertyMaps: Record<string, NullWideningMap> = {}\n\n for (const propName of allPropertyNames) {\n let prop = properties[propName]\n const wasOptional = !originalRequired.includes(propName)\n let childMap: NullWideningMap | undefined\n let widenedHere = false\n\n if (\n isSchemaObject(prop) &&\n schemaTypeIncludes(prop, 'object') &&\n prop.properties\n ) {\n const converted = coerceMistralStrictSchema(prop, prop.required || [])\n prop = converted.schema\n childMap = converted.nullWideningMap\n hasUntrackableAnyOfWidening ||= converted.hasUntrackableAnyOfWidening\n } else if (\n isSchemaObject(prop) &&\n schemaTypeIncludes(prop, 'array') &&\n prop.items != null\n ) {\n const convertedItems = coerceArrayItems(prop.items)\n prop = {\n ...prop,\n items: convertedItems.schema,\n }\n if (convertedItems.itemMap) {\n childMap = { items: convertedItems.itemMap }\n }\n hasUntrackableAnyOfWidening ||=\n convertedItems.hasUntrackableAnyOfWidening\n } else if (isSchemaObject(prop) && Array.isArray(prop.anyOf)) {\n const converted = coerceMistralStrictSchema(prop, prop.required || [])\n prop = converted.schema\n childMap = converted.nullWideningMap\n hasUntrackableAnyOfWidening ||= converted.hasUntrackableAnyOfWidening\n }\n\n if (!acceptsNull(prop)) {\n if (wasOptional) {\n if (isSchemaObject(prop)) {\n prop = admitNullInEnumOrConst(prop)\n }\n\n if (isSchemaObject(prop) && prop.type && !Array.isArray(prop.type)) {\n prop = { ...prop, type: [prop.type, 'null'] }\n } else if (\n isSchemaObject(prop) &&\n Array.isArray(prop.type) &&\n !prop.type.includes('null')\n ) {\n prop = { ...prop, type: [...prop.type, 'null'] }\n } else if (!isSchemaObject(prop) || !prop.type) {\n prop = { anyOf: [prop, { type: 'null' }] }\n }\n\n widenedHere = true\n } else if (isSchemaObject(prop) && schemaTypeIncludes(prop, 'null')) {\n prop = admitNullInEnumOrConst(prop)\n }\n }\n\n properties[propName] = prop\n if (childMap || widenedHere) {\n propertyMaps[propName] = {\n ...(childMap ?? {}),\n ...(widenedHere ? { widened: true } : {}),\n }\n }\n }\n\n result.properties = properties\n if (allPropertyNames.length > 0) {\n result.required = allPropertyNames\n } else {\n delete result.required\n }\n result.additionalProperties = false\n if (Object.keys(propertyMaps).length > 0) {\n nullWideningMap.properties = propertyMaps\n }\n }\n\n if (schemaTypeIncludes(result, 'array') && result.items != null) {\n const convertedItems = coerceArrayItems(result.items)\n result.items = convertedItems.schema\n if (convertedItems.itemMap) {\n nullWideningMap.items = convertedItems.itemMap\n }\n hasUntrackableAnyOfWidening ||= convertedItems.hasUntrackableAnyOfWidening\n }\n\n if (Array.isArray(result.anyOf)) {\n const variants = result.anyOf.map((variant: unknown) => {\n if (!isSchemaObject(variant)) {\n return {\n schema: variant,\n nullWideningMap: undefined,\n hasUntrackableAnyOfWidening: false,\n }\n }\n return coerceMistralStrictSchema(variant, variant.required || [])\n })\n result.anyOf = variants.map((variant) => variant.schema)\n hasUntrackableAnyOfWidening ||= variants.some(\n (variant) =>\n variant.nullWideningMap !== undefined ||\n variant.hasUntrackableAnyOfWidening,\n )\n }\n\n return {\n schema: result,\n nullWideningMap: pruneMap(nullWideningMap),\n hasUntrackableAnyOfWidening,\n }\n}\n"],"mappings":";;;;;;;;;;;AAkBA,SAAgB,6CACd,QACA,mBAAkC,CAAC,GACG;CACtC,IAAI,iCAAiC,MAAM,GACzC,OAAO;EAAE;EAAQ,iBAAiB,KAAA;EAAW,QAAQ;CAAM;CAG7D,MAAM,YAAY,0BAA0B,QAAQ,gBAAgB;CACpE,IAAI,UAAU,6BACZ,OAAO;EAAE;EAAQ,iBAAiB,KAAA;EAAW,QAAQ;CAAM;CAG7D,OAAO;EACL,QAAQ,UAAU;EAClB,iBAAiB,UAAU;EAC3B,QAAQ;CACV;AACF;AAQA,IAAM,8BAAqD;CACzD;CACA;CACA;CACA;CACA;CACA;AACF;;;;;;AAOA,SAAS,iCAAiC,MAAwB;CAChE,IAAI,MAAM,QAAQ,IAAI,GAAG,OAAO,KAAK,KAAK,gCAAgC;CAC1E,IAAI,CAAC,eAAe,IAAI,GAAG,OAAO;CAElC,OAAO,OAAO,QAAQ,IAAI,CAAC,CAAC,MACzB,CAAC,KAAK,WACL,4BAA4B,SAAS,GAAG,KACxC,iCAAiC,KAAK,CAC1C;AACF;AAEA,SAAS,SAAS,KAAmD;CACnE,OAAO,OAAO,KAAK,GAAG,CAAC,CAAC,SAAS,IAAI,MAAM,KAAA;AAC7C;AAEA,SAAS,eAAe,QAAgD;CACtE,OAAO,OAAO,WAAW,YAAY,WAAW,QAAQ,CAAC,MAAM,QAAQ,MAAM;AAC/E;AAEA,SAAS,iBAAiB,OAIxB;CACA,IAAI,MAAM,QAAQ,KAAK,GAAG;EACxB,MAAM,YAAY,MAAM,KAAK,SAC3B,eAAe,IAAI,IACf,0BAA0B,MAAM,KAAK,YAAY,CAAC,CAAC,IACnD;GACE,QAAQ;GACR,iBAAiB,KAAA;GACjB,6BAA6B;EAC/B,CACN;EACA,MAAM,WAAW,UAAU,KAAK,SAAS,KAAK,eAAe;EAC7D,OAAO;GACL,QAAQ,UAAU,KAAK,SAAS,KAAK,MAAM;GAC3C,SAAS,SAAS,KAAK,OAAO,IAC1B,SAAS,KAAK,QAAQ,OAAO,CAAC,CAAC,IAC/B,KAAA;GACJ,6BAA6B,UAAU,MACpC,SAAS,KAAK,2BACjB;EACF;CACF;CAEA,IAAI,eAAe,KAAK,GAAG;EACzB,MAAM,YAAY,0BAA0B,OAAO,MAAM,YAAY,CAAC,CAAC;EACvE,OAAO;GACL,QAAQ,UAAU;GAClB,SAAS,UAAU;GACnB,6BAA6B,UAAU;EACzC;CACF;CAEA,OAAO;EACL,QAAQ;EACR,SAAS,KAAA;EACT,6BAA6B;CAC/B;AACF;AAEA,SAAS,mBACP,QACA,UACS;CACT,OACE,OAAO,SAAS,YACf,MAAM,QAAQ,OAAO,IAAI,KAAK,OAAO,KAAK,SAAS,QAAQ;AAEhE;AAEA,SAAS,uBACP,MACqB;CACrB,IAAI,WAAW,QAAQ,KAAK,UAAU,MAAM;EAC1C,MAAM,EAAE,OAAO,YAAY,GAAG,iBAAiB;EAC/C,OAAO;GAAE,GAAG;GAAc,MAAM,CAAC,YAAY,IAAI;EAAE;CACrD;CACA,IAAI,MAAM,QAAQ,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,GACtD,OAAO;EAAE,GAAG;EAAM,MAAM,CAAC,GAAG,KAAK,MAAM,IAAI;CAAE;CAE/C,OAAO;AACT;;;;;AAMA,SAAS,YAAY,QAA0B;CAC7C,IAAI,WAAW,MAAM,OAAO;CAC5B,IAAI,CAAC,eAAe,MAAM,GAAG,OAAO;CAEpC,IAAI,WAAW,UAAU,OAAO,UAAU,MAAM,OAAO;CACvD,IAAI,MAAM,QAAQ,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,GAAG,OAAO;CAEtE,IAAI,OAAO,OAAO,SAAS,YAAY,OAAO,SAAS,QAAQ,OAAO;CACtE,IAAI,MAAM,QAAQ,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,MAAM,GAAG,OAAO;CAExE,IACE,MAAM,QAAQ,OAAO,KAAK,KAC1B,CAAC,OAAO,MAAM,MAAM,YAAqB,YAAY,OAAO,CAAC,GAE7D,OAAO;CAGT,OAAO;AACT;AAEA,SAAS,0BACP,QACA,kBAC4B;CAC5B,MAAM,SAAS,EAAE,GAAG,OAAO;CAC3B,MAAM,kBAAmC,CAAC;CAC1C,IAAI,8BAA8B;CAElC,IAAI,mBAAmB,QAAQ,QAAQ,GAAG;EACxC,IAAI,CAAC,OAAO,YACV,OAAO,aAAa,CAAC;EAEvB,MAAM,aAAa,EAAE,GAAG,OAAO,WAAW;EAC1C,MAAM,mBAAmB,OAAO,KAAK,UAAU;EAC/C,MAAM,eAAgD,CAAC;EAEvD,KAAK,MAAM,YAAY,kBAAkB;GACvC,IAAI,OAAO,WAAW;GACtB,MAAM,cAAc,CAAC,iBAAiB,SAAS,QAAQ;GACvD,IAAI;GACJ,IAAI,cAAc;GAElB,IACE,eAAe,IAAI,KACnB,mBAAmB,MAAM,QAAQ,KACjC,KAAK,YACL;IACA,MAAM,YAAY,0BAA0B,MAAM,KAAK,YAAY,CAAC,CAAC;IACrE,OAAO,UAAU;IACjB,WAAW,UAAU;IACrB,gCAAgC,UAAU;GAC5C,OAAO,IACL,eAAe,IAAI,KACnB,mBAAmB,MAAM,OAAO,KAChC,KAAK,SAAS,MACd;IACA,MAAM,iBAAiB,iBAAiB,KAAK,KAAK;IAClD,OAAO;KACL,GAAG;KACH,OAAO,eAAe;IACxB;IACA,IAAI,eAAe,SACjB,WAAW,EAAE,OAAO,eAAe,QAAQ;IAE7C,gCACE,eAAe;GACnB,OAAO,IAAI,eAAe,IAAI,KAAK,MAAM,QAAQ,KAAK,KAAK,GAAG;IAC5D,MAAM,YAAY,0BAA0B,MAAM,KAAK,YAAY,CAAC,CAAC;IACrE,OAAO,UAAU;IACjB,WAAW,UAAU;IACrB,gCAAgC,UAAU;GAC5C;GAEA,IAAI,CAAC,YAAY,IAAI,GAAG;IACtB,IAAI,aAAa;KACf,IAAI,eAAe,IAAI,GACrB,OAAO,uBAAuB,IAAI;KAGpC,IAAI,eAAe,IAAI,KAAK,KAAK,QAAQ,CAAC,MAAM,QAAQ,KAAK,IAAI,GAC/D,OAAO;MAAE,GAAG;MAAM,MAAM,CAAC,KAAK,MAAM,MAAM;KAAE;UACvC,IACL,eAAe,IAAI,KACnB,MAAM,QAAQ,KAAK,IAAI,KACvB,CAAC,KAAK,KAAK,SAAS,MAAM,GAE1B,OAAO;MAAE,GAAG;MAAM,MAAM,CAAC,GAAG,KAAK,MAAM,MAAM;KAAE;UAC1C,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,KAAK,MACxC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,EAAE;KAG3C,cAAc;IAChB,OAAO,IAAI,eAAe,IAAI,KAAK,mBAAmB,MAAM,MAAM,GAChE,OAAO,uBAAuB,IAAI;GAEtC;GAEA,WAAW,YAAY;GACvB,IAAI,YAAY,aACd,aAAa,YAAY;IACvB,GAAI,YAAY,CAAC;IACjB,GAAI,cAAc,EAAE,SAAS,KAAK,IAAI,CAAC;GACzC;EAEJ;EAEA,OAAO,aAAa;EACpB,IAAI,iBAAiB,SAAS,GAC5B,OAAO,WAAW;OAElB,OAAO,OAAO;EAEhB,OAAO,uBAAuB;EAC9B,IAAI,OAAO,KAAK,YAAY,CAAC,CAAC,SAAS,GACrC,gBAAgB,aAAa;CAEjC;CAEA,IAAI,mBAAmB,QAAQ,OAAO,KAAK,OAAO,SAAS,MAAM;EAC/D,MAAM,iBAAiB,iBAAiB,OAAO,KAAK;EACpD,OAAO,QAAQ,eAAe;EAC9B,IAAI,eAAe,SACjB,gBAAgB,QAAQ,eAAe;EAEzC,gCAAgC,eAAe;CACjD;CAEA,IAAI,MAAM,QAAQ,OAAO,KAAK,GAAG;EAC/B,MAAM,WAAW,OAAO,MAAM,KAAK,YAAqB;GACtD,IAAI,CAAC,eAAe,OAAO,GACzB,OAAO;IACL,QAAQ;IACR,iBAAiB,KAAA;IACjB,6BAA6B;GAC/B;GAEF,OAAO,0BAA0B,SAAS,QAAQ,YAAY,CAAC,CAAC;EAClE,CAAC;EACD,OAAO,QAAQ,SAAS,KAAK,YAAY,QAAQ,MAAM;EACvD,gCAAgC,SAAS,MACtC,YACC,QAAQ,oBAAoB,KAAA,KAC5B,QAAQ,2BACZ;CACF;CAEA,OAAO;EACL,QAAQ;EACR,iBAAiB,SAAS,eAAe;EACzC;CACF;AACF"}
|
|
1
|
+
{"version":3,"file":"schema-converter.js","names":[],"sources":["../../../src/utils/schema-converter.ts"],"sourcesContent":["import type { NullWideningMap } from '@tanstack/ai-utils'\n\ninterface MistralStructuredOutputCompatibility {\n schema: Record<string, any>\n nullWideningMap: NullWideningMap | undefined\n strict: boolean\n}\n\n/**\n * Convert a schema for Mistral strict mode and record how to invert it.\n *\n * Outcomes:\n * - `strict: true` — rewritten schema (`required` closed, optionals null-widened).\n * `nullWideningMap` marks synthesized optional nulls only; already-nullable\n * fields and enum/const repairs on required nodes are unmarked.\n * - `strict: false` — original schema, no map. Used when `oneOf`/`allOf`/`not`/\n * `$ref`/`$defs` appear, or an `anyOf` branch would need a branch-dependent map.\n */\nexport function makeMistralStructuredOutputCompatibleWithMap(\n schema: Record<string, any>,\n originalRequired: Array<string> = [],\n): MistralStructuredOutputCompatibility {\n if (containsUnsupportedStrictKeyword(schema)) {\n return { schema, nullWideningMap: undefined, strict: false }\n }\n\n const converted = coerceMistralStrictSchema(schema, originalRequired)\n if (converted.hasUntrackableAnyOfWidening) {\n return { schema, nullWideningMap: undefined, strict: false }\n }\n\n return {\n schema: converted.schema,\n nullWideningMap: converted.nullWideningMap,\n strict: true,\n }\n}\n\ninterface CoercedMistralStrictSchema {\n schema: Record<string, any>\n nullWideningMap: NullWideningMap | undefined\n hasUntrackableAnyOfWidening: boolean\n}\n\nconst UNSUPPORTED_STRICT_KEYWORDS: ReadonlyArray<string> = [\n 'oneOf',\n 'allOf',\n 'not',\n '$ref',\n '$defs',\n 'definitions',\n]\n\n/**\n * Tree-wide key scan for `oneOf`/`allOf`/`not`/`$ref`/`$defs`/`definitions`.\n * Conservative: a property literally named e.g. `oneOf` also trips fallback.\n * `anyOf` is handled separately in the coerce walk.\n */\nfunction containsUnsupportedStrictKeyword(node: unknown): boolean {\n if (Array.isArray(node)) return node.some(containsUnsupportedStrictKeyword)\n if (!isSchemaObject(node)) return false\n\n return Object.entries(node).some(\n ([key, value]) =>\n UNSUPPORTED_STRICT_KEYWORDS.includes(key) ||\n containsUnsupportedStrictKeyword(value),\n )\n}\n\nfunction pruneMap(map: NullWideningMap): NullWideningMap | undefined {\n return Object.keys(map).length > 0 ? map : undefined\n}\n\nfunction isSchemaObject(schema: unknown): schema is Record<string, any> {\n return typeof schema === 'object' && schema !== null && !Array.isArray(schema)\n}\n\nfunction coerceArrayItems(items: unknown): {\n schema: unknown\n itemMap: NullWideningMap | Array<NullWideningMap> | undefined\n hasUntrackableAnyOfWidening: boolean\n} {\n if (Array.isArray(items)) {\n const converted = items.map((item) =>\n isSchemaObject(item)\n ? coerceMistralStrictSchema(item, item.required || [])\n : {\n schema: item,\n nullWideningMap: undefined,\n hasUntrackableAnyOfWidening: false,\n },\n )\n const itemMaps = converted.map((item) => item.nullWideningMap)\n return {\n schema: converted.map((item) => item.schema),\n itemMap: itemMaps.some(Boolean)\n ? itemMaps.map((map) => map ?? {})\n : undefined,\n hasUntrackableAnyOfWidening: converted.some(\n (item) => item.hasUntrackableAnyOfWidening,\n ),\n }\n }\n\n if (isSchemaObject(items)) {\n const converted = coerceMistralStrictSchema(items, items.required || [])\n return {\n schema: converted.schema,\n itemMap: converted.nullWideningMap,\n hasUntrackableAnyOfWidening: converted.hasUntrackableAnyOfWidening,\n }\n }\n\n return {\n schema: items,\n itemMap: undefined,\n hasUntrackableAnyOfWidening: false,\n }\n}\n\nfunction schemaTypeIncludes(\n schema: Record<string, any>,\n typeName: string,\n): boolean {\n return (\n schema.type === typeName ||\n (Array.isArray(schema.type) && schema.type.includes(typeName))\n )\n}\n\nfunction admitNullInEnumOrConst(\n prop: Record<string, any>,\n): Record<string, any> {\n if ('const' in prop && prop.const !== null) {\n const { const: constValue, ...withoutConst } = prop\n return { ...withoutConst, enum: [constValue, null] }\n }\n if (Array.isArray(prop.enum) && !prop.enum.includes(null)) {\n return { ...prop, enum: [...prop.enum, null] }\n }\n return prop\n}\n\n/**\n * True when `type`/`enum`/`const`/`anyOf` already admit null. `oneOf`/`allOf`/\n * `not` are not inspected — callers must reject those first.\n */\nfunction acceptsNull(schema: unknown): boolean {\n if (schema === true) return true\n if (!isSchemaObject(schema)) return false\n\n if ('const' in schema && schema.const !== null) return false\n if (Array.isArray(schema.enum) && !schema.enum.includes(null)) return false\n\n if (typeof schema.type === 'string' && schema.type !== 'null') return false\n if (Array.isArray(schema.type) && !schema.type.includes('null')) return false\n\n if (\n Array.isArray(schema.anyOf) &&\n !schema.anyOf.some((variant: unknown) => acceptsNull(variant))\n ) {\n return false\n }\n\n return true\n}\n\nfunction coerceMistralStrictSchema(\n schema: Record<string, any>,\n originalRequired: Array<string>,\n): CoercedMistralStrictSchema {\n const result = { ...schema }\n const nullWideningMap: NullWideningMap = {}\n let hasUntrackableAnyOfWidening = false\n\n if (schemaTypeIncludes(result, 'object')) {\n if (!result.properties) {\n result.properties = {}\n }\n const properties = { ...result.properties }\n const allPropertyNames = Object.keys(properties)\n // Entries, not assignment: `map['__proto__'] = x` sets the prototype\n // and drops a property that is really named `__proto__`.\n const propertyMaps: Array<[string, NullWideningMap]> = []\n\n for (const propName of allPropertyNames) {\n let prop = properties[propName]\n const wasOptional = !originalRequired.includes(propName)\n let childMap: NullWideningMap | undefined\n let widenedHere = false\n\n if (\n isSchemaObject(prop) &&\n schemaTypeIncludes(prop, 'object') &&\n prop.properties\n ) {\n const converted = coerceMistralStrictSchema(prop, prop.required || [])\n prop = converted.schema\n childMap = converted.nullWideningMap\n hasUntrackableAnyOfWidening ||= converted.hasUntrackableAnyOfWidening\n } else if (\n isSchemaObject(prop) &&\n schemaTypeIncludes(prop, 'array') &&\n prop.items != null\n ) {\n const convertedItems = coerceArrayItems(prop.items)\n prop = {\n ...prop,\n items: convertedItems.schema,\n }\n if (convertedItems.itemMap) {\n childMap = { items: convertedItems.itemMap }\n }\n hasUntrackableAnyOfWidening ||=\n convertedItems.hasUntrackableAnyOfWidening\n } else if (isSchemaObject(prop) && Array.isArray(prop.anyOf)) {\n const converted = coerceMistralStrictSchema(prop, prop.required || [])\n prop = converted.schema\n childMap = converted.nullWideningMap\n hasUntrackableAnyOfWidening ||= converted.hasUntrackableAnyOfWidening\n }\n\n if (!acceptsNull(prop)) {\n if (wasOptional) {\n if (isSchemaObject(prop)) {\n prop = admitNullInEnumOrConst(prop)\n }\n\n if (isSchemaObject(prop) && prop.type && !Array.isArray(prop.type)) {\n prop = { ...prop, type: [prop.type, 'null'] }\n } else if (\n isSchemaObject(prop) &&\n Array.isArray(prop.type) &&\n !prop.type.includes('null')\n ) {\n prop = { ...prop, type: [...prop.type, 'null'] }\n } else if (!isSchemaObject(prop) || !prop.type) {\n prop = { anyOf: [prop, { type: 'null' }] }\n }\n\n widenedHere = true\n } else if (isSchemaObject(prop) && schemaTypeIncludes(prop, 'null')) {\n prop = admitNullInEnumOrConst(prop)\n }\n }\n\n properties[propName] = prop\n if (childMap || widenedHere) {\n propertyMaps.push([\n propName,\n {\n ...(childMap ?? {}),\n ...(widenedHere ? { widened: true } : {}),\n },\n ])\n }\n }\n\n result.properties = properties\n if (allPropertyNames.length > 0) {\n result.required = allPropertyNames\n } else {\n delete result.required\n }\n result.additionalProperties = false\n if (propertyMaps.length > 0) {\n nullWideningMap.properties = Object.fromEntries(propertyMaps)\n }\n }\n\n if (schemaTypeIncludes(result, 'array') && result.items != null) {\n const convertedItems = coerceArrayItems(result.items)\n result.items = convertedItems.schema\n if (convertedItems.itemMap) {\n nullWideningMap.items = convertedItems.itemMap\n }\n hasUntrackableAnyOfWidening ||= convertedItems.hasUntrackableAnyOfWidening\n }\n\n if (Array.isArray(result.anyOf)) {\n const variants = result.anyOf.map((variant: unknown) => {\n if (!isSchemaObject(variant)) {\n return {\n schema: variant,\n nullWideningMap: undefined,\n hasUntrackableAnyOfWidening: false,\n }\n }\n return coerceMistralStrictSchema(variant, variant.required || [])\n })\n result.anyOf = variants.map((variant) => variant.schema)\n hasUntrackableAnyOfWidening ||= variants.some(\n (variant) =>\n variant.nullWideningMap !== undefined ||\n variant.hasUntrackableAnyOfWidening,\n )\n }\n\n return {\n schema: result,\n nullWideningMap: pruneMap(nullWideningMap),\n hasUntrackableAnyOfWidening,\n }\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/ai-mistral",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Mistral adapter for TanStack AI",
|
|
6
6
|
"author": "",
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
"@vitest/coverage-v8": "4.1.10",
|
|
49
49
|
"google-auth-library": "^10.5.0",
|
|
50
50
|
"vite": "^8.2.1",
|
|
51
|
-
"@tanstack/ai": "0.
|
|
51
|
+
"@tanstack/ai": "0.69.0"
|
|
52
52
|
},
|
|
53
53
|
"peerDependencies": {
|
|
54
54
|
"google-auth-library": "^10.5.0",
|
|
55
|
-
"@tanstack/ai": "^0.
|
|
55
|
+
"@tanstack/ai": "^0.69.0"
|
|
56
56
|
},
|
|
57
57
|
"peerDependenciesMeta": {
|
|
58
58
|
"google-auth-library": {
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
63
|
"@mistralai/mistralai": "2.2.0",
|
|
64
|
-
"@tanstack/ai-utils": "0.4.
|
|
64
|
+
"@tanstack/ai-utils": "0.4.2"
|
|
65
65
|
},
|
|
66
66
|
"scripts": {
|
|
67
67
|
"build": "vite build",
|
package/src/adapters/text.ts
CHANGED
|
@@ -9,19 +9,33 @@ import {
|
|
|
9
9
|
} from '../utils/client'
|
|
10
10
|
import { makeMistralStructuredOutputCompatibleWithMap } from '../utils/schema-converter'
|
|
11
11
|
import { createToolInputNormalizer } from '../utils/tool-input-normalizer'
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
MISTRAL_MODEL_INPUT_MODALITIES,
|
|
14
|
+
MISTRAL_MODEL_REASONING,
|
|
15
|
+
} from '../model-meta'
|
|
16
|
+
import {
|
|
17
|
+
hashToolCallId,
|
|
18
|
+
orderedAssistantBlocks,
|
|
19
|
+
resolveReasoning,
|
|
20
|
+
transformMessagesForReplay,
|
|
21
|
+
} from '@tanstack/ai/adapter-internals'
|
|
13
22
|
import type {
|
|
14
23
|
ContentPart,
|
|
15
24
|
FetchWrapper,
|
|
16
25
|
Modality,
|
|
17
26
|
ModelMessage,
|
|
18
27
|
AdapterYieldChunk,
|
|
28
|
+
ModelReasoning,
|
|
29
|
+
ReasoningRequest,
|
|
30
|
+
ResolvedPromptCache,
|
|
19
31
|
TextOptions,
|
|
32
|
+
ToolChoice,
|
|
20
33
|
} from '@tanstack/ai'
|
|
21
34
|
import type {
|
|
22
35
|
MISTRAL_CHAT_MODELS,
|
|
23
36
|
MistralChatModelProviderOptionsByName,
|
|
24
37
|
MistralModelInputModalitiesByName,
|
|
38
|
+
MistralModelReasoningByName,
|
|
25
39
|
MistralTextAdapterModel,
|
|
26
40
|
} from '../model-meta'
|
|
27
41
|
import type {
|
|
@@ -30,8 +44,10 @@ import type {
|
|
|
30
44
|
} from '@tanstack/ai/adapters'
|
|
31
45
|
import type { Mistral } from '@mistralai/mistralai'
|
|
32
46
|
import type {
|
|
47
|
+
AssistantMessage,
|
|
33
48
|
ChatCompletionStreamRequest,
|
|
34
49
|
ContentChunk,
|
|
50
|
+
ReasoningEffort,
|
|
35
51
|
} from '@mistralai/mistralai/models/components'
|
|
36
52
|
import type {
|
|
37
53
|
ExternalTextProviderOptions,
|
|
@@ -39,7 +55,6 @@ import type {
|
|
|
39
55
|
} from '../text/text-provider-options'
|
|
40
56
|
import type {
|
|
41
57
|
ChatCompletionContentPart,
|
|
42
|
-
ChatCompletionMessageParam,
|
|
43
58
|
MistralImageMetadata,
|
|
44
59
|
MistralMessageMetadataByModality,
|
|
45
60
|
} from '../message-types'
|
|
@@ -97,6 +112,113 @@ type ResolveProviderOptions<TModel extends string> =
|
|
|
97
112
|
? MistralChatModelProviderOptionsByName[TModel]
|
|
98
113
|
: MistralTextProviderOptions
|
|
99
114
|
|
|
115
|
+
/** The reasoning levels of a model, for `chat({ reasoning })`. `never`: none. */
|
|
116
|
+
type ResolveReasoning<TModel extends string> =
|
|
117
|
+
TModel extends keyof MistralModelReasoningByName
|
|
118
|
+
? MistralModelReasoningByName[TModel]
|
|
119
|
+
: never
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* The Mistral reasoning fields for `chat({ reasoning })`, by pi's rule:
|
|
123
|
+
* - a model with effort levels (Mistral Small, Mistral Medium):
|
|
124
|
+
* `reasoningEffort` with the level's value, `none` for `off`.
|
|
125
|
+
* - Magistral: `promptMode: 'reasoning'`, and nothing for `off`.
|
|
126
|
+
*/
|
|
127
|
+
function mistralReasoning(
|
|
128
|
+
model: string,
|
|
129
|
+
request: ReasoningRequest | undefined,
|
|
130
|
+
reasoning: ModelReasoning | undefined,
|
|
131
|
+
): Pick<ChatCompletionStreamRequest, 'promptMode' | 'reasoningEffort'> {
|
|
132
|
+
const resolved = resolveReasoning(request, reasoning)
|
|
133
|
+
if (!resolved) return {}
|
|
134
|
+
if (model.startsWith('magistral')) {
|
|
135
|
+
return resolved.level === 'off' ? {} : { promptMode: 'reasoning' }
|
|
136
|
+
}
|
|
137
|
+
// `ReasoningEffort` is an open enum, so a newer value still goes out.
|
|
138
|
+
return { reasoningEffort: resolved.value as ReasoningEffort }
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/** Maps `chat({ toolChoice })` to the Mistral `toolChoice`. */
|
|
142
|
+
function toMistralToolChoice(
|
|
143
|
+
choice: ToolChoice,
|
|
144
|
+
): NonNullable<ChatCompletionStreamRequest['toolChoice']> {
|
|
145
|
+
if (typeof choice === 'string') return choice
|
|
146
|
+
return { type: 'function', function: { name: choice.name } }
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* The Mistral wire field for `chat({ promptCache })`. Mistral caches without
|
|
151
|
+
* a flag, so only the key goes out. There is no key for `'none'`. Send the
|
|
152
|
+
* key only to `api.mistral.ai`. The SDK request schema drops unknown fields,
|
|
153
|
+
* so structured output adds the key after that schema runs.
|
|
154
|
+
*/
|
|
155
|
+
function mistralPromptCacheKey(promptCache: ResolvedPromptCache | undefined) {
|
|
156
|
+
if (!promptCache?.key || promptCache.retention === 'none') return undefined
|
|
157
|
+
return promptCache.key
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
function mistralOwnApi(config: MistralClientConfig, provider: string) {
|
|
161
|
+
if (provider === 'google-vertex') return false
|
|
162
|
+
const serverURL =
|
|
163
|
+
config.baseURL ?? config.serverURL ?? 'https://api.mistral.ai'
|
|
164
|
+
try {
|
|
165
|
+
return new URL(serverURL).hostname === 'api.mistral.ai'
|
|
166
|
+
} catch {
|
|
167
|
+
return false
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/** Add `prompt_cache_key` to a JSON body the SDK has already serialized. */
|
|
172
|
+
function withPromptCacheKey(next: typeof fetch, key: string): typeof fetch {
|
|
173
|
+
return async (input, init) => {
|
|
174
|
+
const body = init?.body
|
|
175
|
+
const text =
|
|
176
|
+
typeof body === 'string'
|
|
177
|
+
? body
|
|
178
|
+
: body instanceof ArrayBuffer
|
|
179
|
+
? new TextDecoder().decode(body)
|
|
180
|
+
: undefined
|
|
181
|
+
if (text === undefined) return next(input, init)
|
|
182
|
+
let parsed: unknown
|
|
183
|
+
try {
|
|
184
|
+
parsed = JSON.parse(text)
|
|
185
|
+
} catch {
|
|
186
|
+
return next(input, init)
|
|
187
|
+
}
|
|
188
|
+
if (
|
|
189
|
+
typeof parsed !== 'object' ||
|
|
190
|
+
parsed === null ||
|
|
191
|
+
Array.isArray(parsed)
|
|
192
|
+
) {
|
|
193
|
+
return next(input, init)
|
|
194
|
+
}
|
|
195
|
+
return next(input, {
|
|
196
|
+
...init,
|
|
197
|
+
body: JSON.stringify({ ...parsed, prompt_cache_key: key }),
|
|
198
|
+
})
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
/**
|
|
203
|
+
* `promptTokensDetails.cachedTokens` when Mistral read prompt tokens from the
|
|
204
|
+
* cache. Mistral sends the count in `prompt_tokens_details.cached_tokens` or
|
|
205
|
+
* in `num_cached_tokens`. The SDK keeps these raw keys on `usage` with no
|
|
206
|
+
* types, so the values are checked here.
|
|
207
|
+
*/
|
|
208
|
+
function mistralCachedTokens(usage: Record<string, unknown>) {
|
|
209
|
+
const details = usage.prompt_tokens_details
|
|
210
|
+
const hasDetailsCount =
|
|
211
|
+
typeof details === 'object' &&
|
|
212
|
+
details !== null &&
|
|
213
|
+
'cached_tokens' in details
|
|
214
|
+
const cachedTokens = hasDetailsCount
|
|
215
|
+
? details.cached_tokens
|
|
216
|
+
: usage.num_cached_tokens
|
|
217
|
+
return typeof cachedTokens === 'number' && cachedTokens > 0
|
|
218
|
+
? { promptTokensDetails: { cachedTokens } }
|
|
219
|
+
: {}
|
|
220
|
+
}
|
|
221
|
+
|
|
100
222
|
type ResolveInputModalities<TModel extends string> =
|
|
101
223
|
TModel extends keyof MistralModelInputModalitiesByName
|
|
102
224
|
? MistralModelInputModalitiesByName[TModel]
|
|
@@ -157,6 +279,9 @@ interface MistralRawChunk {
|
|
|
157
279
|
prompt_tokens?: number
|
|
158
280
|
completion_tokens?: number
|
|
159
281
|
total_tokens?: number
|
|
282
|
+
// Cache reads. Mistral sends one of these two.
|
|
283
|
+
prompt_tokens_details?: { cached_tokens?: number } | null
|
|
284
|
+
num_cached_tokens?: number | null
|
|
160
285
|
}
|
|
161
286
|
}
|
|
162
287
|
|
|
@@ -178,9 +303,15 @@ export class MistralTextAdapter<
|
|
|
178
303
|
TModel,
|
|
179
304
|
TProviderOptions,
|
|
180
305
|
TInputModalities,
|
|
181
|
-
MistralMessageMetadataByModality
|
|
306
|
+
MistralMessageMetadataByModality,
|
|
307
|
+
ReadonlyArray<string>,
|
|
308
|
+
unknown,
|
|
309
|
+
never,
|
|
310
|
+
ResolveReasoning<TModel>
|
|
182
311
|
> {
|
|
183
312
|
readonly name = 'mistral' as const
|
|
313
|
+
override readonly api = 'mistral-conversations' as const
|
|
314
|
+
override readonly provider: string
|
|
184
315
|
override readonly inputModalities = MISTRAL_MODEL_INPUT_MODALITIES[this.model]
|
|
185
316
|
|
|
186
317
|
private readonly client: Mistral
|
|
@@ -193,6 +324,10 @@ export class MistralTextAdapter<
|
|
|
193
324
|
// the SDK's Zod schemas reject partial tool-call argument deltas.
|
|
194
325
|
this.client = createMistralClient(config)
|
|
195
326
|
this.rawConfig = config
|
|
327
|
+
this.provider =
|
|
328
|
+
config.getAccessToken && config.resolveRequestUrl
|
|
329
|
+
? 'google-vertex'
|
|
330
|
+
: this.name
|
|
196
331
|
}
|
|
197
332
|
|
|
198
333
|
async *chatStream(
|
|
@@ -210,12 +345,40 @@ export class MistralTextAdapter<
|
|
|
210
345
|
}
|
|
211
346
|
|
|
212
347
|
try {
|
|
348
|
+
const cacheKey = mistralOwnApi(this.rawConfig, this.provider)
|
|
349
|
+
? mistralPromptCacheKey(options.promptCache)
|
|
350
|
+
: undefined
|
|
351
|
+
const body = {
|
|
352
|
+
...this.toWireBody(requestParams),
|
|
353
|
+
...(cacheKey !== undefined && { prompt_cache_key: cacheKey }),
|
|
354
|
+
}
|
|
213
355
|
const stream = this.fetchRawMistralStream(
|
|
214
|
-
|
|
356
|
+
body,
|
|
215
357
|
this.rawConfig,
|
|
216
358
|
options.wrapFetch,
|
|
217
359
|
)
|
|
218
|
-
|
|
360
|
+
for await (const chunk of this.processMistralStreamChunks(
|
|
361
|
+
stream,
|
|
362
|
+
options,
|
|
363
|
+
aguiState,
|
|
364
|
+
)) {
|
|
365
|
+
yield chunk.type === 'RUN_STARTED' || chunk.type === 'RUN_ERROR'
|
|
366
|
+
? {
|
|
367
|
+
...chunk,
|
|
368
|
+
metadata: {
|
|
369
|
+
...chunk.metadata,
|
|
370
|
+
tanstack: {
|
|
371
|
+
...chunk.metadata?.tanstack,
|
|
372
|
+
source: {
|
|
373
|
+
provider: this.provider,
|
|
374
|
+
api: this.api,
|
|
375
|
+
model: options.model,
|
|
376
|
+
},
|
|
377
|
+
},
|
|
378
|
+
},
|
|
379
|
+
}
|
|
380
|
+
: chunk
|
|
381
|
+
}
|
|
219
382
|
} catch (error: unknown) {
|
|
220
383
|
const err = error as Error & { code?: string }
|
|
221
384
|
|
|
@@ -225,6 +388,15 @@ export class MistralTextAdapter<
|
|
|
225
388
|
type: 'RUN_STARTED',
|
|
226
389
|
runId: aguiState.runId,
|
|
227
390
|
threadId: aguiState.threadId,
|
|
391
|
+
metadata: {
|
|
392
|
+
tanstack: {
|
|
393
|
+
source: {
|
|
394
|
+
provider: this.provider,
|
|
395
|
+
api: this.api,
|
|
396
|
+
model: options.model,
|
|
397
|
+
},
|
|
398
|
+
},
|
|
399
|
+
},
|
|
228
400
|
model: options.model,
|
|
229
401
|
timestamp,
|
|
230
402
|
})
|
|
@@ -232,6 +404,15 @@ export class MistralTextAdapter<
|
|
|
232
404
|
|
|
233
405
|
yield asChunk({
|
|
234
406
|
type: 'RUN_ERROR',
|
|
407
|
+
metadata: {
|
|
408
|
+
tanstack: {
|
|
409
|
+
source: {
|
|
410
|
+
provider: this.provider,
|
|
411
|
+
api: this.api,
|
|
412
|
+
model: options.model,
|
|
413
|
+
},
|
|
414
|
+
},
|
|
415
|
+
},
|
|
235
416
|
runId: aguiState.runId,
|
|
236
417
|
model: options.model,
|
|
237
418
|
timestamp,
|
|
@@ -266,9 +447,15 @@ export class MistralTextAdapter<
|
|
|
266
447
|
outputSchema.required || [],
|
|
267
448
|
)
|
|
268
449
|
|
|
269
|
-
const
|
|
270
|
-
?
|
|
271
|
-
:
|
|
450
|
+
const cacheKey = mistralOwnApi(this.rawConfig, this.provider)
|
|
451
|
+
? mistralPromptCacheKey(chatOptions.promptCache)
|
|
452
|
+
: undefined
|
|
453
|
+
const next = chatOptions.wrapFetch ? chatOptions.wrapFetch(fetch) : fetch
|
|
454
|
+
const client = cacheKey
|
|
455
|
+
? createMistralClient(this.rawConfig, withPromptCacheKey(next, cacheKey))
|
|
456
|
+
: chatOptions.wrapFetch
|
|
457
|
+
? createMistralClient(this.rawConfig, next)
|
|
458
|
+
: this.client
|
|
272
459
|
const response = await client.chat.complete({
|
|
273
460
|
...nonStreamParams,
|
|
274
461
|
responseFormat: {
|
|
@@ -304,12 +491,15 @@ export class MistralTextAdapter<
|
|
|
304
491
|
const usage = response.usage
|
|
305
492
|
return {
|
|
306
493
|
data: undoNullWidening(parsed, nullWideningMap),
|
|
494
|
+
...(response.id && { responseId: response.id }),
|
|
495
|
+
...(response.model && { model: response.model }),
|
|
307
496
|
rawText: textContent,
|
|
308
497
|
...(usage && {
|
|
309
498
|
usage: {
|
|
310
499
|
promptTokens: usage.promptTokens ?? 0,
|
|
311
500
|
completionTokens: usage.completionTokens ?? 0,
|
|
312
501
|
totalTokens: usage.totalTokens ?? 0,
|
|
502
|
+
...mistralCachedTokens(usage),
|
|
313
503
|
},
|
|
314
504
|
}),
|
|
315
505
|
}
|
|
@@ -336,6 +526,7 @@ export class MistralTextAdapter<
|
|
|
336
526
|
let hasEmittedToolCall = false
|
|
337
527
|
let hasEmittedRunFinished = false
|
|
338
528
|
let lastChunkModel = options.model
|
|
529
|
+
let responseId: string | undefined
|
|
339
530
|
const normalizeToolInput = createToolInputNormalizer(options.tools)
|
|
340
531
|
|
|
341
532
|
// Reasoning lifecycle (magistral-* models stream `thinking` content
|
|
@@ -358,7 +549,8 @@ export class MistralTextAdapter<
|
|
|
358
549
|
|
|
359
550
|
try {
|
|
360
551
|
for await (const chunk of stream) {
|
|
361
|
-
lastChunkModel = chunk.model ||
|
|
552
|
+
lastChunkModel = chunk.model || lastChunkModel
|
|
553
|
+
if (chunk.id) responseId = chunk.id
|
|
362
554
|
const choice = chunk.choices?.[0]
|
|
363
555
|
if (!choice) continue
|
|
364
556
|
|
|
@@ -603,6 +795,7 @@ export class MistralTextAdapter<
|
|
|
603
795
|
hasEmittedRunFinished = true
|
|
604
796
|
yield asChunk({
|
|
605
797
|
type: 'RUN_FINISHED',
|
|
798
|
+
...(responseId && { responseId }),
|
|
606
799
|
runId: aguiState.runId,
|
|
607
800
|
threadId: aguiState.threadId,
|
|
608
801
|
model: chunkModel,
|
|
@@ -612,6 +805,7 @@ export class MistralTextAdapter<
|
|
|
612
805
|
promptTokens: usage.prompt_tokens || 0,
|
|
613
806
|
completionTokens: usage.completion_tokens || 0,
|
|
614
807
|
totalTokens: usage.total_tokens || 0,
|
|
808
|
+
...mistralCachedTokens(usage),
|
|
615
809
|
}
|
|
616
810
|
: undefined,
|
|
617
811
|
finishReason: computedFinishReason,
|
|
@@ -665,6 +859,7 @@ export class MistralTextAdapter<
|
|
|
665
859
|
hasEmittedRunFinished = true
|
|
666
860
|
yield asChunk({
|
|
667
861
|
type: 'RUN_FINISHED',
|
|
862
|
+
...(responseId && { responseId }),
|
|
668
863
|
runId: aguiState.runId,
|
|
669
864
|
threadId: aguiState.threadId,
|
|
670
865
|
model: lastChunkModel,
|
|
@@ -739,7 +934,7 @@ export class MistralTextAdapter<
|
|
|
739
934
|
* rejects streaming tool call chunks that omit `name` in argument deltas.
|
|
740
935
|
*/
|
|
741
936
|
private async *fetchRawMistralStream(
|
|
742
|
-
|
|
937
|
+
body: Record<string, unknown>,
|
|
743
938
|
config: MistralClientConfig,
|
|
744
939
|
wrapFetch: FetchWrapper | undefined,
|
|
745
940
|
): AsyncGenerator<MistralRawChunk> {
|
|
@@ -753,7 +948,6 @@ export class MistralTextAdapter<
|
|
|
753
948
|
const url =
|
|
754
949
|
config.resolveRequestUrl?.(true) ?? `${serverURL}/v1/chat/completions`
|
|
755
950
|
|
|
756
|
-
const body = this.toWireBody(params)
|
|
757
951
|
const accessToken =
|
|
758
952
|
config.getAccessToken === undefined
|
|
759
953
|
? config.apiKey
|
|
@@ -864,6 +1058,8 @@ export class MistralTextAdapter<
|
|
|
864
1058
|
frequencyPenalty,
|
|
865
1059
|
presencePenalty,
|
|
866
1060
|
safePrompt,
|
|
1061
|
+
reasoningEffort,
|
|
1062
|
+
promptMode,
|
|
867
1063
|
stream: _stream,
|
|
868
1064
|
...rest
|
|
869
1065
|
} = params
|
|
@@ -885,6 +1081,8 @@ export class MistralTextAdapter<
|
|
|
885
1081
|
...(frequencyPenalty != null && { frequency_penalty: frequencyPenalty }),
|
|
886
1082
|
...(presencePenalty != null && { presence_penalty: presencePenalty }),
|
|
887
1083
|
...(safePrompt != null && { safe_prompt: safePrompt }),
|
|
1084
|
+
...(reasoningEffort != null && { reasoning_effort: reasoningEffort }),
|
|
1085
|
+
...(promptMode != null && { prompt_mode: promptMode }),
|
|
888
1086
|
}
|
|
889
1087
|
}
|
|
890
1088
|
|
|
@@ -940,7 +1138,21 @@ export class MistralTextAdapter<
|
|
|
940
1138
|
? convertToolsToProviderFormat(options.tools)
|
|
941
1139
|
: undefined
|
|
942
1140
|
|
|
943
|
-
|
|
1141
|
+
// History from another model loses its signatures, and its tool IDs are
|
|
1142
|
+
// rewritten to the 9-character IDs Mistral accepts.
|
|
1143
|
+
const replay = transformMessagesForReplay(
|
|
1144
|
+
options.messages,
|
|
1145
|
+
{ provider: this.provider, api: this.api, model: options.model },
|
|
1146
|
+
(id, { attempt }) => {
|
|
1147
|
+
const normalized = id.replace(/[^a-zA-Z0-9]/g, '')
|
|
1148
|
+
if (attempt === 0 && normalized.length === 9) return normalized
|
|
1149
|
+
const seed = normalized || id
|
|
1150
|
+
return hashToolCallId(attempt === 0 ? seed : `${seed}:${attempt}`)
|
|
1151
|
+
.replace(/[^a-zA-Z0-9]/g, '')
|
|
1152
|
+
.slice(0, 9)
|
|
1153
|
+
},
|
|
1154
|
+
)
|
|
1155
|
+
const messages: ChatCompletionStreamRequest['messages'] = []
|
|
944
1156
|
|
|
945
1157
|
if (options.systemPrompts && options.systemPrompts.length > 0) {
|
|
946
1158
|
messages.push({
|
|
@@ -949,11 +1161,19 @@ export class MistralTextAdapter<
|
|
|
949
1161
|
})
|
|
950
1162
|
}
|
|
951
1163
|
|
|
952
|
-
for (const message of
|
|
1164
|
+
for (const message of replay.messages) {
|
|
953
1165
|
messages.push(this.convertMessageToMistral(message))
|
|
954
1166
|
}
|
|
955
1167
|
|
|
1168
|
+
// `chat({ toolChoice })` is sent only when the request has tools. It goes
|
|
1169
|
+
// before the `modelOptions` spread, so a `tool_choice` there wins.
|
|
1170
|
+
const toolChoiceField =
|
|
1171
|
+
tools?.length && options.toolChoice !== undefined
|
|
1172
|
+
? { toolChoice: toMistralToolChoice(options.toolChoice) }
|
|
1173
|
+
: undefined
|
|
1174
|
+
|
|
956
1175
|
return {
|
|
1176
|
+
...toolChoiceField,
|
|
957
1177
|
model: this.rawConfig.requestModel ?? options.model,
|
|
958
1178
|
messages: messages,
|
|
959
1179
|
temperature: modelOptions?.temperature ?? undefined,
|
|
@@ -961,6 +1181,11 @@ export class MistralTextAdapter<
|
|
|
961
1181
|
topP: modelOptions?.top_p ?? undefined,
|
|
962
1182
|
tools: tools as ChatCompletionStreamRequest['tools'],
|
|
963
1183
|
stream: true,
|
|
1184
|
+
...mistralReasoning(
|
|
1185
|
+
options.model,
|
|
1186
|
+
options.reasoning,
|
|
1187
|
+
MISTRAL_MODEL_REASONING[options.model],
|
|
1188
|
+
),
|
|
964
1189
|
...(modelOptions && {
|
|
965
1190
|
...(modelOptions.stop != null && { stop: modelOptions.stop }),
|
|
966
1191
|
...(modelOptions.random_seed != null && {
|
|
@@ -997,7 +1222,7 @@ export class MistralTextAdapter<
|
|
|
997
1222
|
*/
|
|
998
1223
|
private convertMessageToMistral(
|
|
999
1224
|
message: ModelMessage,
|
|
1000
|
-
):
|
|
1225
|
+
): ChatCompletionStreamRequest['messages'][number] {
|
|
1001
1226
|
if (message.role === 'tool') {
|
|
1002
1227
|
if (!message.toolCallId) {
|
|
1003
1228
|
throw new Error('Missing toolCallId for tool message')
|
|
@@ -1031,7 +1256,7 @@ export class MistralTextAdapter<
|
|
|
1031
1256
|
|
|
1032
1257
|
return {
|
|
1033
1258
|
role: 'assistant',
|
|
1034
|
-
content: this.
|
|
1259
|
+
content: this.assistantContent(message),
|
|
1035
1260
|
...(toolCalls && toolCalls.length > 0 ? { toolCalls } : {}),
|
|
1036
1261
|
}
|
|
1037
1262
|
}
|
|
@@ -1055,6 +1280,35 @@ export class MistralTextAdapter<
|
|
|
1055
1280
|
}
|
|
1056
1281
|
}
|
|
1057
1282
|
|
|
1283
|
+
/** Readable thinking and text, in the stored block order. */
|
|
1284
|
+
private assistantContent(message: ModelMessage): AssistantMessage['content'] {
|
|
1285
|
+
if (!message.thinking?.length)
|
|
1286
|
+
return this.extractTextContent(message.content)
|
|
1287
|
+
const blocks = orderedAssistantBlocks(message) ?? [
|
|
1288
|
+
...message.thinking.map((thinking) => ({
|
|
1289
|
+
type: 'thinking' as const,
|
|
1290
|
+
thinking,
|
|
1291
|
+
})),
|
|
1292
|
+
{ type: 'text' as const, text: this.extractTextContent(message.content) },
|
|
1293
|
+
]
|
|
1294
|
+
const content: Array<ContentChunk> = []
|
|
1295
|
+
for (const block of blocks) {
|
|
1296
|
+
if (block.type === 'text')
|
|
1297
|
+
content.push({ type: 'text', text: block.text })
|
|
1298
|
+
else if (
|
|
1299
|
+
block.type === 'thinking' &&
|
|
1300
|
+
!block.thinking.redacted &&
|
|
1301
|
+
block.thinking.content.trim()
|
|
1302
|
+
) {
|
|
1303
|
+
content.push({
|
|
1304
|
+
type: 'thinking',
|
|
1305
|
+
thinking: [{ type: 'text', text: block.thinking.content }],
|
|
1306
|
+
})
|
|
1307
|
+
}
|
|
1308
|
+
}
|
|
1309
|
+
return content
|
|
1310
|
+
}
|
|
1311
|
+
|
|
1058
1312
|
/**
|
|
1059
1313
|
* Converts a ContentPart to a Mistral content part. Returns undefined for
|
|
1060
1314
|
* unsupported part types.
|