@baishuyun/chat-backend 0.0.12 → 0.0.14

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @baishuyun/chat-backend
 
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @baishuyun/coze-provider@0.0.14
+  - @baishuyun/types@1.0.14
+
+## 0.0.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @baishuyun/coze-provider@0.0.13
+  - @baishuyun/types@1.0.13
+
 ## 0.0.12
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/chat-backend",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -22,8 +22,8 @@
     "parse-sse": "^0.1.0",
     "pino": "^10.1.0",
     "zod": "^4.1.13",
-    "@baishuyun/coze-provider": "0.0.12",
-    "@baishuyun/types": "1.0.12"
+    "@baishuyun/coze-provider": "0.0.14",
+    "@baishuyun/types": "1.0.14"
   },
   "devDependencies": {
     "@types/config": "^3.3.5",
@@ -34,7 +34,7 @@
     "pm2": "^6.0.14",
     "tsx": "^4.7.1",
     "typescript": "^5.8.3",
-    "@baishuyun/typescript-config": "0.0.12"
+    "@baishuyun/typescript-config": "0.0.14"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development tsx watch src/index.ts",

package/src/controllers/form/fill/createBatchFillingTransformStream.ts

@@ -49,6 +49,16 @@ export const createBatchFillingResultTransformer = (enableJsonParser: boolean) =
           }
         } else {
           // logger.debug(`bypass chunk in batch filling transformer: ${JSON.stringify(chunk)}`);
+          if (chunk.type === 'error') {
+            enqueueTextDelta('error', {
+              type: 'agent-error',
+              error: '操作超时，请刷新重试',
+            });
+
+            resolveParseCompleted?.();
+            controller.terminate(); // 信号通知下游可读流已关闭
+            return;
+          }
           controller.enqueue(chunk);
         }
       } catch (e) {

package/src/controllers/form/fill/createFieldsFillingResultTransformStream.ts

@@ -48,6 +48,17 @@ export const createFieldsFillingResultTransformer = (enableJsonParser: boolean)
             parser.write(delta.replace('json', ''));
           }
         } else {
+          if (chunk.type === 'error') {
+            enqueueTextDelta('error', {
+              type: 'agent-error',
+              error: '操作超时，请刷新重试',
+            });
+
+            resolveParseCompleted?.();
+            controller.terminate(); // 信号通知下游可读流已关闭
+            return;
+          }
+
           controller.enqueue(chunk);
         }
       } catch (e) {

package/src/controllers/form/fill/fill.controller.ts

@@ -2,7 +2,7 @@ import { type Context } from 'hono';
 import { convertToModelMessages, streamText, type UIMessage, generateId } from 'ai';
 import { logger } from '../../../logger/index.js';
 import { createFillingModel } from './model.js';
-import { mode2part } from './utils.js';
+import { mode2part, trimFormStructure } from './utils.js';
 import { batchFillForm } from './batch-fill.controller.js';
 
 /**
@@ -20,7 +20,7 @@ export const fillForm = async (c: Context) => {
     return c.json({ error: 'Invalid JSON' }, 400);
   }
 
-  const formStructure = requestBody.formStructure;
+  const formStructure = trimFormStructure(requestBody.formStructure || []);
   const mode = requestBody.mode;
   const num = requestBody.count;
   const messages: UIMessage[] = requestBody.messages;
@@ -30,14 +30,19 @@ export const fillForm = async (c: Context) => {
     return batchFillForm(c);
   }
 
+  const flattenParts = messages.flatMap((msg) => msg.parts);
+
+  const msg = [] as UIMessage[];
+
   if (formStructure) {
     const extraPart = mode2part(mode, num);
 
     try {
-      messages.push({
+      msg.push({
         id: generateId(),
         role: 'user',
         parts: [
+          ...flattenParts,
           {
             type: 'text',
             text: `formStructure: ${JSON.stringify(formStructure)}`,
@@ -50,9 +55,11 @@ export const fillForm = async (c: Context) => {
     }
   }
 
+  const modelMessages = convertToModelMessages(msg);
+
   const stream = streamText({
     model: createFillingModel(),
-    messages: convertToModelMessages(messages),
+    messages: modelMessages,
     includeRawChunks: true,
     headers: {
       'x-user-stage': requestBody.stage,

package/src/controllers/form/fill/utils.ts

@@ -109,3 +109,67 @@ export const fillingChunkGuard = (
 
   return true;
 };
+
+interface TrimmedWidget {
+  type: string;
+  widgetName: string;
+  // 子表单只展开一层，不再嵌套递归
+  items?: Array<{
+    description?: string | null;
+    label: string;
+    widget: {
+      type: string;
+      widgetName: string;
+    };
+  }>;
+}
+
+interface TrimmedField {
+  description?: string | null;
+  label: string;
+  widget: TrimmedWidget;
+}
+
+interface OriginalField {
+  description?: string | null;
+  label: string;
+  widget: {
+    type: string;
+    widgetName: string;
+    items?: OriginalField[];
+    [key: string]: any;
+  };
+  [key: string]: any;
+}
+
+/**
+ * 裁剪表单结构，子表单只展开一层
+ */
+export function trimFormStructure(fields: OriginalField[]): TrimmedField[] {
+  return fields.map((field) => {
+    const trimmed: TrimmedField = {
+      description: field.description,
+      label: field.label,
+      widget: {
+        type: field.widget.type,
+        widgetName: field.widget.widgetName,
+      },
+    };
+
+    if (field.widget.items && Array.isArray(field.widget.items)) {
+      // 过滤掉无效 item（null/undefined 或缺少 widget）
+      trimmed.widget.items = field.widget.items
+        .filter((item): item is OriginalField => item != null && item.widget != null)
+        .map((item) => ({
+          description: item.description,
+          label: item.label,
+          widget: {
+            type: item.widget.type,
+            widgetName: item.widget.widgetName,
+          },
+        }));
+    }
+
+    return trimmed;
+  });
+}