@baishuyun/chat-backend 0.0.4 → 0.0.7

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @baishuyun/chat-backend
 
+## 0.0.7
+
+### Patch Changes
+
+- bump
+
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @baishuyun/coze-provider@0.0.7
+  - @baishuyun/types@1.0.7
+
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @baishuyun/coze-provider@0.0.6
+  - @baishuyun/types@1.0.6
+
 ## 0.0.4
 
 ### Patch Changes

package/config/index.ts

@@ -1,14 +1,12 @@
-import path from "path";
-import dotenv from "dotenv";
-import { fileURLToPath } from "url";
+import path from 'path';
+import dotenv from 'dotenv';
+import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// export const parseConfig = () => {
-if (process.env.NODE_ENV !== "production") {
-  // 加载本地.env文件到process.env
-  dotenv.config({
-    path: path.resolve(__dirname, "../.env"),
-  });
-}
+const isProd = process.env.NODE_ENV === 'production';
+
+dotenv.config({
+  path: path.resolve(__dirname, isProd ? '../../.env' : '../.env'),
+});

package/dist/config/index.js

@@ -1,12 +1,9 @@
-import path from "path";
-import dotenv from "dotenv";
-import { fileURLToPath } from "url";
+import path from 'path';
+import dotenv from 'dotenv';
+import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-// export const parseConfig = () => {
-if (process.env.NODE_ENV !== "production") {
-    // 加载本地.env文件到process.env
-    dotenv.config({
-        path: path.resolve(__dirname, "../.env"),
-    });
-}
+const isProd = process.env.NODE_ENV === 'production';
+dotenv.config({
+    path: path.resolve(__dirname, isProd ? '../../.env' : '../.env'),
+});

package/dist/src/app/main.js

@@ -6,8 +6,8 @@ import app from '../config/hono.config.js';
 // 子路由
 import { createFormRouter } from '../routes/form/form.route.js';
 // 挂载子路由
-app.route('api/form', createFormRouter());
+app.route('web/api/form', createFormRouter());
 // add test route
-app.get('/api/test', (c) => {
+app.get('web/api/test', (c) => {
     return c.json({ message: 'Test route is working!' });
 });

package/dist/src/config/hono.config.js

@@ -1,15 +1,15 @@
-import { Hono } from "hono";
-import { serve } from "@hono/node-server";
-import config from "config";
-import { cors } from "hono/cors";
-import { logMiddleware } from "../logger/log-middleware.js";
-import { logger } from "../logger/index.js";
+import { Hono } from 'hono';
+import { serve } from '@hono/node-server';
+import config from 'config';
+import { cors } from 'hono/cors';
+import { logMiddleware } from '../logger/log-middleware.js';
+import { logger } from '../logger/index.js';
 /**
  * 公共配置层，跨域、日志等中间件配置
  */
 const app = new Hono();
 // Enable CORS for all routes starting with /api/
-app.use("/api/*", cors());
+app.use('web/api/*', cors());
 // Logging middleware
 app.use(logMiddleware);
 // 全局错误处理中间件（捕获所有路由/中间件异常）
@@ -20,14 +20,14 @@ app.onError((err, c) => {
         method: c.req.method,
         path: c.req.path,
         status: 500, // 默认 500 错误
-    }, "Request failed with unhandled error"); // 错误描述
+    }, 'Request failed with unhandled error'); // 错误描述
     // 返回统一的 JSON 错误响应
-    return c.json({ message: "Internal Server Error" }, 500);
+    return c.json({ message: 'Internal Server Error' }, 500);
 });
 serve({
     fetch: app.fetch,
-    hostname: config.get("app.host") || "",
-    port: config.get("app.port") || 3001,
+    hostname: config.get('app.host') || '',
+    port: config.get('app.port') || 3001,
 }, (info) => {
     logger.info(`Server is running on http://localhost:${info.port}`);
 });

package/dist/src/controllers/form/build/build.controller.js

@@ -19,14 +19,15 @@ export const buildForm = async (c) => {
     const isBuildStage = requestBody.stage === "build";
     const stream = streamText({
         model: createModel([
-            createFieldsJsonTransformStream(isBuildStage),
-            new SuggestionTransformStream(isBuildStage),
+            () => createFieldsJsonTransformStream(isBuildStage),
+            () => new SuggestionTransformStream(isBuildStage),
         ]),
         messages: convertToModelMessages(requestBody.messages),
         includeRawChunks: true,
         headers: {
             "x-user-stage": requestBody.stage,
             "x-user-id": Date.now().toString(),
+            "x-user-token": c.req.header("authorization") || "",
         },
     });
     return stream.toUIMessageStreamResponse();

package/dist/src/controllers/form/fill/batch-fill.controller.js

@@ -0,0 +1,139 @@
+import {} from 'hono';
+import { convertToModelMessages, streamText, createUIMessageStream, createUIMessageStreamResponse, generateId, } from 'ai';
+import { logger } from '../../../logger/index.js';
+import { createBatchFillingModel } from './model.js';
+import { mode2part } from './utils.js';
+const getModelMessagesFromUserMessages = ({ continueMessageId, currentMsg, formStructure, mode, messages, }) => {
+    // init fill
+    if (continueMessageId && currentMsg) {
+        return convertToModelMessages([
+            {
+                role: 'user',
+                parts: [
+                    {
+                        type: 'text',
+                        text: `formStructure: ${JSON.stringify(formStructure)}`,
+                    },
+                    mode2part(mode),
+                    {
+                        type: 'text',
+                        text: currentMsg,
+                    },
+                ],
+            },
+        ]);
+    }
+    let lastUserMsg = messages.findLast((m) => m.role === 'user') || {
+        id: generateId(),
+        role: 'user',
+        parts: [],
+    };
+    lastUserMsg.parts.push({
+        type: 'text',
+        text: `formStructure: ${JSON.stringify(formStructure)}`,
+    });
+    lastUserMsg.parts.push(mode2part(mode));
+    return convertToModelMessages([lastUserMsg]);
+};
+/**
+ * 表单填写
+ * @param c
+ * @returns
+ */
+export const batchFillForm = async (c) => {
+    let requestBody;
+    try {
+        const json = await c.req.json();
+        requestBody = json;
+    }
+    catch (_) {
+        return c.json({ error: 'Invalid JSON' }, 400);
+    }
+    const formStructure = requestBody.formStructure;
+    const mode = requestBody.mode;
+    const continueMessageId = requestBody.continueMessageId; // 新增：继续生成的消息 ID
+    const userMessages = requestBody.messages;
+    // clear empty user text part  message
+    const messages = userMessages.filter((msg) => {
+        if (msg.role !== 'user') {
+            return true;
+        }
+        const firstPart = msg.parts[0];
+        if (!firstPart) {
+            return false;
+        }
+        if (firstPart.type === 'text' && firstPart.text.trim() === '') {
+            return false;
+        }
+        return true;
+    });
+    // 如果是继续生成模式
+    if (continueMessageId) {
+        return handleContinueGeneration(c, {
+            messages,
+            formStructure,
+            continueMessageId,
+            msg: requestBody.msg,
+            mode,
+            stage: requestBody.stage,
+        });
+    }
+    const modelMessages = getModelMessagesFromUserMessages({
+        messages,
+        mode,
+        formStructure,
+    });
+    // 正常创建新流
+    const stream = streamText({
+        model: createBatchFillingModel(),
+        messages: modelMessages,
+        includeRawChunks: true,
+        headers: {
+            'x-user-stage': requestBody.stage,
+            'x-user-token': c.req.header('authorization') || '',
+            'x-user-var': JSON.stringify({
+                mode: requestBody.mode,
+            }),
+        },
+    });
+    return stream.toUIMessageStreamResponse({
+        originalMessages: messages, // 建议添加，便于消息 ID 管理
+    });
+};
+/**
+ * 处理继续生成（扩展同一消息）
+ */
+async function handleContinueGeneration(c, { messages, continueMessageId, mode, msg, formStructure, stage, }) {
+    const stream = createUIMessageStream({
+        execute: async ({ writer }) => {
+            writer.write({
+                type: 'start',
+                messageId: continueMessageId,
+            });
+            // 构建模型消息
+            const modelMessages = getModelMessagesFromUserMessages({
+                messages,
+                continueMessageId,
+                currentMsg: msg,
+                mode,
+                formStructure,
+            });
+            logger.debug(`continue modelMessages ${JSON.stringify(modelMessages)}`);
+            const result = streamText({
+                model: createBatchFillingModel(),
+                messages: modelMessages,
+                includeRawChunks: true,
+                headers: {
+                    'x-user-stage': stage,
+                    'x-user-var': JSON.stringify({
+                        mode,
+                    }),
+                },
+            });
+            writer.merge(result.toUIMessageStream({
+                sendStart: false,
+            }));
+        },
+    });
+    return createUIMessageStreamResponse({ stream });
+}

package/dist/src/controllers/form/fill/createBatchFillingTransformStream.js

@@ -0,0 +1,124 @@
+import {} from '@ai-sdk/provider';
+import { JSONParser } from '@streamparser/json';
+import { createTextInfoEnqueuer } from '@baishuyun/coze-provider';
+import { getLastSubFormField } from './utils.js';
+import { fillingChunkGuard as chunkGuard } from './utils.js';
+import { logger } from '../../../logger/index.js';
+export const createBatchFillingResultTransformer = (enableJsonParser) => {
+    let parser;
+    let id;
+    // 解析完成标记：用于等待解析器内部队列处理完毕
+    let parseCompleted;
+    let resolveParseCompleted;
+    const transformer = {
+        flush: async (controller) => {
+            try {
+                if (parser) {
+                    await parseCompleted;
+                    logger.debug('stop parser');
+                }
+                controller.terminate(); // 信号通知下游可读流已关闭
+            }
+            catch (e) {
+                controller.error('stop error' + e);
+                // controller.terminate(); // 信号通知下游可读流已关闭
+            }
+        },
+        transform: (chunk, controller) => {
+            if (!parser) {
+                logger.warn('json parser not init');
+                return;
+            }
+            const enqueueTextDelta = createTextInfoEnqueuer(controller);
+            try {
+                if (chunkGuard(chunk)) {
+                    if ('id' in chunk && 'delta' in chunk) {
+                        id = chunk.id;
+                        const regExp = /`?`?`?/;
+                        let delta = chunk.delta.replace(regExp, '');
+                        parser.write(delta.replace('json', ''));
+                    }
+                }
+                else {
+                    // logger.debug(`bypass chunk in batch filling transformer: ${JSON.stringify(chunk)}`);
+                    controller.enqueue(chunk);
+                }
+            }
+            catch (e) {
+                logger.debug('exception in transform while processing filling chunk');
+                controller.error(e);
+                enqueueTextDelta('error', {
+                    type: 'agent-error',
+                    error: '解析异常，请刷新重试',
+                });
+                resolveParseCompleted?.();
+                controller.terminate(); // 信号通知下游可读流已关闭
+            }
+        },
+        start: (controller) => {
+            parser = new JSONParser({
+                paths: ['$.*', '$.*.value.*.*'],
+            });
+            parseCompleted = new Promise((resolve) => {
+                resolveParseCompleted = resolve;
+            });
+            const enqueueTextDelta = enableJsonParser
+                ? createTextInfoEnqueuer(controller)
+                : (content) => { };
+            parser.onValue = (parsedInfo) => {
+                const value = parsedInfo.value;
+                if (value.error && value.errorMessage === 'timeout') {
+                    enqueueTextDelta(JSON.stringify(value), {
+                        type: 'agent-error',
+                        error: '操作超时，请刷新重试',
+                    });
+                    resolveParseCompleted?.();
+                    controller.terminate(); // 信号通知下游可读流已关闭
+                    return;
+                }
+                const subFormField = getLastSubFormField(parsedInfo);
+                if (subFormField) {
+                    // enqueueTextDelta(
+                    //   JSON.stringify(value),
+                    //   {
+                    //     type: 'mcp-fields-json',
+                    //     field: subFormField.value,
+                    //   },
+                    //   id,
+                    //   true
+                    // );
+                    return;
+                }
+                if (value.fieldType === 'subform') {
+                    return;
+                }
+                // logger.debug(`id in onValue: ${id}`);
+                enqueueTextDelta(`${JSON.stringify(value)},`, {
+                    type: 'mcp-fields-json',
+                    field: value,
+                }, id, true);
+            };
+            let errorLogged = false;
+            parser.onError = (err) => {
+                if (!errorLogged) {
+                    console.error('JsonWidgetStream: JSON Parsing Error:', err);
+                    errorLogged = true;
+                }
+                enqueueTextDelta('error', {
+                    type: 'agent-error',
+                    error: '操作超时，请刷新重试',
+                });
+                resolveParseCompleted?.();
+                controller.terminate(); // 信号通知下游可读流已关闭
+            };
+            parser.onEnd = () => {
+                enqueueTextDelta(' ', JSON.stringify({
+                    appendConfirm: 'save-fields',
+                }));
+                logger.debug('mark as end');
+                resolveParseCompleted?.();
+            };
+        },
+    };
+    return new TransformStream(transformer);
+};

package/dist/src/controllers/form/fill/createFieldsFillingResultTransformStream.js

@@ -2,6 +2,7 @@ import {} from '@ai-sdk/provider';
 import { JSONParser } from '@streamparser/json';
 import { createTextInfoEnqueuer } from '@baishuyun/coze-provider';
 import { getLastSubFormField } from './utils.js';
+import { fillingChunkGuard as chunkGuard } from './utils.js';
 import { logger } from '../../../logger/index.js';
 export const createFieldsFillingResultTransformer = (enableJsonParser) => {
     let parser;
@@ -9,22 +10,12 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
     // 解析完成标记：用于等待解析器内部队列处理完毕
     let parseCompleted;
     let resolveParseCompleted;
-    const chunkGuard = (chunk) => {
-        if (!enableJsonParser) {
-            return false;
-        }
-        if (chunk.type !== 'text-delta' || !('delta' in chunk)) {
-            return false;
-        }
-        return true;
-    };
     const transformer = {
         flush: async (controller) => {
             try {
                 if (parser) {
-                    await parseCompleted; // 等待闭包中的完成标记
+                    await parseCompleted;
                     logger.debug('stop parser');
-                    // parser.end(); // 此时调用 end() 不会出现未完成 Token 异常
                 }
                 controller.terminate(); // 信号通知下游可读流已关闭
             }
@@ -38,6 +29,7 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
                 logger.warn('json parser not init');
                 return;
             }
+            const enqueueTextDelta = createTextInfoEnqueuer(controller);
             try {
                 if (chunkGuard(chunk)) {
                     if ('id' in chunk && 'delta' in chunk) {
@@ -52,7 +44,14 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
                 }
             }
             catch (e) {
+                logger.debug('exception in transform while processing filling chunk');
                 controller.error(e);
+                enqueueTextDelta('error', {
+                    type: 'agent-error',
+                    error: '解析异常，请刷新重试',
+                });
+                resolveParseCompleted?.();
+                controller.terminate(); // 信号通知下游可读流已关闭
             }
         },
         start: (controller) => {
@@ -67,6 +66,15 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
                 : (content) => { };
             parser.onValue = (parsedInfo) => {
                 const value = parsedInfo.value;
+                if (value.error && value.errorMessage === 'timeout') {
+                    enqueueTextDelta(JSON.stringify(value), {
+                        type: 'agent-error',
+                        error: '操作超时，请刷新重试',
+                    });
+                    resolveParseCompleted?.();
+                    controller.terminate(); // 信号通知下游可读流已关闭
+                    return;
+                }
                 const subFormField = getLastSubFormField(parsedInfo);
                 if (subFormField) {
                     enqueueTextDelta(JSON.stringify(value), {
@@ -85,16 +93,15 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
             };
             let errorLogged = false;
             parser.onError = (err) => {
-                // controller.enqueue({
-                //   type: "error",
-                //   error: "JsonWidgetStream: JSON Parsing Error:" + err.message,
-                // });
                 if (!errorLogged) {
                     console.error('JsonWidgetStream: JSON Parsing Error:', err);
                     errorLogged = true;
                 }
-                // close stream
-                logger.error('JsonStream: closing stream due to parsing error');
+                enqueueTextDelta('error', {
+                    type: 'agent-error',
+                    error: '操作超时，请刷新重试',
+                });
+                resolveParseCompleted?.();
                 controller.terminate(); // 信号通知下游可读流已关闭
             };
             parser.onEnd = () => {

package/dist/src/controllers/form/fill/fill.controller.js

@@ -1,7 +1,9 @@
 import {} from 'hono';
-import { convertToModelMessages, streamText } from 'ai';
+import { convertToModelMessages, streamText, generateId } from 'ai';
 import { logger } from '../../../logger/index.js';
 import { createFillingModel } from './model.js';
+import { mode2part } from './utils.js';
+import { batchFillForm } from './batch-fill.controller.js';
 /**
  * 表单填写
  * @param c
@@ -17,12 +19,26 @@ export const fillForm = async (c) => {
         return c.json({ error: 'Invalid JSON' }, 400);
     }
     const formStructure = requestBody.formStructure;
+    const mode = requestBody.mode;
+    const num = requestBody.count;
+    const messages = requestBody.messages;
+    // 如果是批量填写，调用批量填写接口
+    if (mode === 'batch') {
+        return batchFillForm(c);
+    }
     if (formStructure) {
+        const extraPart = mode2part(mode, num);
         try {
-            let lastMsg = requestBody.messages[requestBody.messages.length - 1];
-            lastMsg.parts.push({
-                type: 'text',
-                text: JSON.stringify(formStructure),
+            messages.push({
+                id: generateId(),
+                role: 'user',
+                parts: [
+                    {
+                        type: 'text',
+                        text: `formStructure: ${JSON.stringify(formStructure)}`,
+                    },
+                    extraPart,
+                ],
             });
         }
         catch (e) {
@@ -31,11 +47,17 @@ export const fillForm = async (c) => {
     }
     const stream = streamText({
         model: createFillingModel(),
-        messages: convertToModelMessages(requestBody.messages),
+        messages: convertToModelMessages(messages),
         includeRawChunks: true,
         headers: {
             'x-user-stage': requestBody.stage,
+            'x-user-var': JSON.stringify({
+                mode: requestBody.mode,
+            }),
+            'x-user-token': c.req.header('authorization') || '',
         },
     });
-    return stream.toUIMessageStreamResponse();
+    return stream.toUIMessageStreamResponse({
+        originalMessages: messages, // 建议添加，便于消息 ID 管理
+    });
 };

package/dist/src/controllers/form/fill/model.js

@@ -1,12 +1,23 @@
 import { createCoze } from '@baishuyun/coze-provider';
 import { createFieldsFillingResultTransformer } from './createFieldsFillingResultTransformStream.js';
 import config from 'config';
+import { createBatchFillingResultTransformer } from './createBatchFillingTransformStream.js';
 export const createFillingModel = (enableParser = true) => {
     const aiFormFilling = createCoze({
         apiKey: config.get('agent.form.fill.apiKey'),
         baseURL: config.get('agent.form.fill.baseUrl'),
         botId: config.get('agent.form.fill.botId'),
-        extraStreamTransformers: [createFieldsFillingResultTransformer(enableParser)],
+        extraStreamTransformers: [() => createFieldsFillingResultTransformer(enableParser)],
+    });
+    const formFillingModel = aiFormFilling.chat('chat');
+    return formFillingModel;
+};
+export const createBatchFillingModel = (enableParser = true) => {
+    const aiFormFilling = createCoze({
+        apiKey: config.get('agent.form.fill.apiKey'),
+        baseURL: config.get('agent.form.fill.baseUrl'),
+        botId: config.get('agent.form.fill.botId'),
+        extraStreamTransformers: [() => createBatchFillingResultTransformer(enableParser)],
     });
     const formFillingModel = aiFormFilling.chat('chat');
     return formFillingModel;