From 278d5dfb6c01415cfb9e0112aac6f013c183266d Mon Sep 17 00:00:00 2001
From: Askhz <1361267452@qq.com>
Date: Thu, 23 Apr 2026 20:16:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BA=E7=BC=BA=E5=B0=91=20required?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E7=9A=84=20object=20schema=20=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E7=A9=BA=E6=95=B0=E7=BB=84=E4=BB=A5=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=20Qwen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Qwen 校验器要求每个 object schema 必须有 required 字段，缺失时报错
"None is not of type 'array'"。在 sanitizeJsonSchema 中补充处理逻辑，
当 object schema 不含 required 键时自动注入 required: []。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../@ant/model-provider/src/shared/openaiConvertTools.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/@ant/model-provider/src/shared/openaiConvertTools.ts b/packages/@ant/model-provider/src/shared/openaiConvertTools.ts
index bace8208b..0e7ea666c 100644
--- a/packages/@ant/model-provider/src/shared/openaiConvertTools.ts
+++ b/packages/@ant/model-provider/src/shared/openaiConvertTools.ts
@@ -48,6 +48,15 @@ function sanitizeJsonSchema(schema: Record<string, unknown>): Record<string, unk
 
   const result = { ...schema }
 
+  // Normalize `required` — Qwen (and other strict validators) reject both
+  // `required: null` and missing `required` on object schemas. Coerce
+  // null/non-array to an empty array, and inject an empty array when absent.
+  if ('required' in result && !Array.isArray(result.required)) {
+    result.required = []
+  } else if (!('required' in result) && result.type === 'object') {
+    result.required = []
+  }
+
   // Convert `const` → `enum: [value]`
   if ('const' in result) {
     result.enum = [result.const]