@mastra/schema-compat 1.3.14-alpha.0 → 1.3.15-alpha.0

package/dist/index.js

@@ -5150,18 +5150,22 @@ function schemaValuesEqual(left, right, keyword) {
 	const rightRecord = right;
 	return leftEntries.length === Object.keys(rightRecord).length && leftEntries.every(([key, value]) => Object.prototype.hasOwnProperty.call(rightRecord, key) && schemaValuesEqual(value, rightRecord[key], key));
 }
+function isOpenAICompatibleModel(model) {
+	const provider = model.provider ?? "";
+	const modelId = model.modelId ?? "";
+	if (provider.includes("openai") || modelId.includes("openai")) return true;
+	return /^azure\.(chat|responses|completion)$/.test(provider) && /(^|[-_./:])(gpt|chatgpt)(?=$|[-_./:]|\d)|(^|[-_./:])o[1-9](?=$|[-_.:])/i.test(modelId) && !/(^|[-_./:])(claude|deepseek|meta|llama|codellama|mistral|ministral|mixtral|codestral|phi|grok|cohere)(?=$|[-_./:]|\d)/i.test(modelId);
+}
 var OpenAISchemaCompatLayer = class extends SchemaCompatLayer {
 	getSchemaTarget() {
 		return `jsonSchema7`;
 	}
 	isReasoningModel() {
-		const modelId = this.getModel().modelId;
-		if (!modelId) return false;
-		return modelId.includes(`o3`) || modelId.includes(`o4`) || modelId.includes(`o1`);
+		return /(^|[-_./:])o[1-9](?=$|[-_.:])/i.test(this.getModel().modelId ?? "");
 	}
 	shouldApply() {
 		const model = this.getModel();
-		if (!this.isReasoningModel() && (model.provider.includes(`openai`) || model.modelId?.includes(`openai`) || model.provider.includes(`groq`))) return true;
+		if (!this.isReasoningModel() && (isOpenAICompatibleModel(model) || model.provider.includes(`groq`))) return true;
 		return false;
 	}
 	processZodType(value) {
@@ -5388,6 +5392,15 @@ var OpenAISchemaCompatLayer = class extends SchemaCompatLayer {
 							delete prop.type;
 							prop.anyOf = [propSchema, { type: "null" }];
 						}
+					} else if (prop.type === void 0 && Array.isArray(prop.anyOf)) {
+						if (!prop.anyOf.some((branch) => typeof branch !== "boolean" && branch.type === "null")) if (genericConstraintKeywords.some((keyword) => keyword in prop)) {
+							const branch = { anyOf: prop.anyOf };
+							for (const keyword of genericConstraintKeywords) if (keyword in prop) {
+								branch[keyword] = prop[keyword];
+								delete prop[keyword];
+							}
+							prop.anyOf = [branch, { type: "null" }];
+						} else prop.anyOf = [...prop.anyOf, { type: "null" }];
 					}
 				}
 			}
@@ -5450,14 +5463,9 @@ var OpenAIReasoningSchemaCompatLayer = class extends OpenAISchemaCompatLayer {
 	getSchemaTarget() {
 		return `openApi3`;
 	}
-	isReasoningModel() {
-		const modelId = this.getModel().modelId;
-		if (!modelId) return false;
-		return modelId.includes(`o3`) || modelId.includes(`o4`) || modelId.includes(`o1`);
-	}
 	shouldApply() {
 		const model = this.getModel();
-		if (this.isReasoningModel() && (model.provider.includes(`openai`) || model.modelId?.includes(`openai`))) return true;
+		if (this.isReasoningModel() && isOpenAICompatibleModel(model)) return true;
 		return false;
 	}
 	processZodType(value) {
@@ -5545,10 +5553,11 @@ function extractZodSchema(schema) {
 * ```
 */
 function applyOpenAICompatTransforms(schema, modelInfo) {
-	if (!(modelInfo.provider?.includes("openai") || modelInfo.modelId?.includes("openai"))) return schema;
+	if (!isOpenAICompatibleModel(modelInfo)) return schema;
 	const zodSchema = extractZodSchema(schema);
 	if (!zodSchema) return schema;
-	const compatLayer = /^o[1-5]/.test(modelInfo.modelId) ? new OpenAIReasoningSchemaCompatLayer(modelInfo) : new OpenAISchemaCompatLayer(modelInfo);
+	const reasoningLayer = new OpenAIReasoningSchemaCompatLayer(modelInfo);
+	const compatLayer = reasoningLayer.isReasoningModel() ? reasoningLayer : new OpenAISchemaCompatLayer(modelInfo);
 	if (!compatLayer.shouldApply()) return schema;
 	return toStandardSchema(compatLayer.processZodType(zodSchema));
 }