@baishuyun/chat-backend 0.0.2 → 0.0.3

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

@@ -1,138 +1,138 @@
-import { type LanguageModelV2StreamPart } from '@ai-sdk/provider';
-import { JSONParser } from '@streamparser/json';
-import { createTextInfoEnqueuer } from '@baishuyun/coze-provider';
-import { getLastSubFormField } from './utils.js';
-import { logger } from '../../../logger/index.js';
-
-export const createFieldsFillingResultTransformer = (enableJsonParser: boolean) => {
-  let parser: JSONParser;
-  let id: string;
-  // 解析完成标记：用于等待解析器内部队列处理完毕
-  let parseCompleted: Promise<void>;
-  let resolveParseCompleted: () => void;
-
-  const chunkGuard = (chunk: LanguageModelV2StreamPart): boolean => {
-    if (!enableJsonParser) {
-      return false;
-    }
-
-    if (chunk.type !== 'text-delta' || !('delta' in chunk)) {
-      return false;
-    }
-
-    return true;
-  };
-
-  const transformer = {
-    flush: async (controller: TransformStreamDefaultController<any>) => {
-      try {
-        if (parser) {
-          await parseCompleted; // 等待闭包中的完成标记
-          logger.debug('stop parser');
-          // parser.end(); // 此时调用 end() 不会出现未完成 Token 异常
-        }
-        controller.terminate(); // 信号通知下游可读流已关闭
-      } catch (e) {
-        controller.error('stop error' + e);
-        // controller.terminate(); // 信号通知下游可读流已关闭
-      }
-    },
-
-    transform: (
-      chunk: LanguageModelV2StreamPart,
-      controller: TransformStreamDefaultController<LanguageModelV2StreamPart>
-    ) => {
-      if (!parser) {
-        logger.warn('json parser not init');
-        return;
-      }
-
-      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 {
-          controller.enqueue(chunk);
-        }
-      } catch (e) {
-        controller.error(e);
-      }
-    },
-    start: (controller: TransformStreamDefaultController<any>) => {
-      parser = new JSONParser({
-        paths: ['$.*', '$.*.value.*.*'],
-      });
-
-      parseCompleted = new Promise((resolve) => {
-        resolveParseCompleted = resolve;
-      });
-
-      const enqueueTextDelta = enableJsonParser
-        ? createTextInfoEnqueuer(controller)
-        : (content: string) => {};
-
-      parser.onValue = (parsedInfo: any) => {
-        const value = parsedInfo.value;
-
-        const subFormField = getLastSubFormField(parsedInfo);
-        if (subFormField) {
-          enqueueTextDelta(JSON.stringify(value), {
-            type: 'mcp-fields-json',
-            field: subFormField.value,
-          });
-
-          return;
-        }
-
-        if (value.fieldType === 'subform') {
-          return;
-        }
-
-        enqueueTextDelta(
-          JSON.stringify(value),
-          {
-            type: 'mcp-fields-json',
-            field: value,
-          },
-          id
-        );
-      };
-
-      let errorLogged = false;
-      parser.onError = (err: any) => {
-        // 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');
-        controller.terminate(); // 信号通知下游可读流已关闭
-      };
-
-      parser.onEnd = () => {
-        enqueueTextDelta(
-          ' ',
-          JSON.stringify({
-            appendConfirm: 'save-fields',
-          })
-        );
-
-        logger.debug('mark as end');
-        resolveParseCompleted?.();
-      };
-    },
-  };
-
-  return new TransformStream<LanguageModelV2StreamPart, any>(transformer);
-};
+import { type LanguageModelV2StreamPart } from '@ai-sdk/provider';
+import { JSONParser } from '@streamparser/json';
+import { createTextInfoEnqueuer } from '@baishuyun/coze-provider';
+import { getLastSubFormField } from './utils.js';
+import { logger } from '../../../logger/index.js';
+
+export const createFieldsFillingResultTransformer = (enableJsonParser: boolean) => {
+  let parser: JSONParser;
+  let id: string;
+  // 解析完成标记：用于等待解析器内部队列处理完毕
+  let parseCompleted: Promise<void>;
+  let resolveParseCompleted: () => void;
+
+  const chunkGuard = (chunk: LanguageModelV2StreamPart): boolean => {
+    if (!enableJsonParser) {
+      return false;
+    }
+
+    if (chunk.type !== 'text-delta' || !('delta' in chunk)) {
+      return false;
+    }
+
+    return true;
+  };
+
+  const transformer = {
+    flush: async (controller: TransformStreamDefaultController<any>) => {
+      try {
+        if (parser) {
+          await parseCompleted; // 等待闭包中的完成标记
+          logger.debug('stop parser');
+          // parser.end(); // 此时调用 end() 不会出现未完成 Token 异常
+        }
+        controller.terminate(); // 信号通知下游可读流已关闭
+      } catch (e) {
+        controller.error('stop error' + e);
+        // controller.terminate(); // 信号通知下游可读流已关闭
+      }
+    },
+
+    transform: (
+      chunk: LanguageModelV2StreamPart,
+      controller: TransformStreamDefaultController<LanguageModelV2StreamPart>
+    ) => {
+      if (!parser) {
+        logger.warn('json parser not init');
+        return;
+      }
+
+      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 {
+          controller.enqueue(chunk);
+        }
+      } catch (e) {
+        controller.error(e);
+      }
+    },
+    start: (controller: TransformStreamDefaultController<any>) => {
+      parser = new JSONParser({
+        paths: ['$.*', '$.*.value.*.*'],
+      });
+
+      parseCompleted = new Promise((resolve) => {
+        resolveParseCompleted = resolve;
+      });
+
+      const enqueueTextDelta = enableJsonParser
+        ? createTextInfoEnqueuer(controller)
+        : (content: string) => {};
+
+      parser.onValue = (parsedInfo: any) => {
+        const value = parsedInfo.value;
+
+        const subFormField = getLastSubFormField(parsedInfo);
+        if (subFormField) {
+          enqueueTextDelta(JSON.stringify(value), {
+            type: 'mcp-fields-json',
+            field: subFormField.value,
+          });
+
+          return;
+        }
+
+        if (value.fieldType === 'subform') {
+          return;
+        }
+
+        enqueueTextDelta(
+          JSON.stringify(value),
+          {
+            type: 'mcp-fields-json',
+            field: value,
+          },
+          id
+        );
+      };
+
+      let errorLogged = false;
+      parser.onError = (err: any) => {
+        // 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');
+        controller.terminate(); // 信号通知下游可读流已关闭
+      };
+
+      parser.onEnd = () => {
+        enqueueTextDelta(
+          ' ',
+          JSON.stringify({
+            appendConfirm: 'save-fields',
+          })
+        );
+
+        logger.debug('mark as end');
+        resolveParseCompleted?.();
+      };
+    },
+  };
+
+  return new TransformStream<LanguageModelV2StreamPart, any>(transformer);
+};

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

@@ -1,45 +1,45 @@
-import { type Context } from 'hono';
-import { convertToModelMessages, streamText } from 'ai';
-import { logger } from '../../../logger/index.js';
-import { createFillingModel } from './model.js';
-
-/**
- * 表单填写
- * @param c
- * @returns
- */
-export const fillForm = async (c: Context) => {
-  let requestBody;
-
-  try {
-    const json = await c.req.json();
-    requestBody = json;
-  } catch (_) {
-    return c.json({ error: 'Invalid JSON' }, 400);
-  }
-
-  const formStructure = requestBody.formStructure;
-  if (formStructure) {
-    try {
-      let lastMsg = requestBody.messages[requestBody.messages.length - 1];
-
-      lastMsg.parts.push({
-        type: 'text',
-        text: JSON.stringify(formStructure),
-      });
-    } catch (e) {
-      logger.error('Failed to append form structure');
-    }
-  }
-
-  const stream = streamText({
-    model: createFillingModel(),
-    messages: convertToModelMessages(requestBody.messages),
-    includeRawChunks: true,
-    headers: {
-      'x-user-stage': requestBody.stage,
-    },
-  });
-
-  return stream.toUIMessageStreamResponse();
-};
+import { type Context } from 'hono';
+import { convertToModelMessages, streamText } from 'ai';
+import { logger } from '../../../logger/index.js';
+import { createFillingModel } from './model.js';
+
+/**
+ * 表单填写
+ * @param c
+ * @returns
+ */
+export const fillForm = async (c: Context) => {
+  let requestBody;
+
+  try {
+    const json = await c.req.json();
+    requestBody = json;
+  } catch (_) {
+    return c.json({ error: 'Invalid JSON' }, 400);
+  }
+
+  const formStructure = requestBody.formStructure;
+  if (formStructure) {
+    try {
+      let lastMsg = requestBody.messages[requestBody.messages.length - 1];
+
+      lastMsg.parts.push({
+        type: 'text',
+        text: JSON.stringify(formStructure),
+      });
+    } catch (e) {
+      logger.error('Failed to append form structure');
+    }
+  }
+
+  const stream = streamText({
+    model: createFillingModel(),
+    messages: convertToModelMessages(requestBody.messages),
+    includeRawChunks: true,
+    headers: {
+      'x-user-stage': requestBody.stage,
+    },
+  });
+
+  return stream.toUIMessageStreamResponse();
+};

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

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

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

@@ -1,75 +1,75 @@
-import type { JSONObject } from "@ai-sdk/provider";
-import config from "config";
-import type { ParsedElementInfo } from "@streamparser/json/utils/types/parsedElementInfo.js";
-import { logger } from "../../../logger/index.js";
-
-export const isSubFormField = (parsedInfo: ParsedElementInfo) => {
-  if (!parsedInfo || !parsedInfo.stack?.length) {
-    return false;
-  }
-
-  const lastStackItem = parsedInfo.stack[parsedInfo.stack.length - 1];
-  return lastStackItem?.key === "value";
-};
-
-export const getLastStackItem = (parsedInfo: ParsedElementInfo) => {
-  if (!parsedInfo || !parsedInfo.stack?.length) {
-    return null;
-  }
-
-  return parsedInfo.stack[parsedInfo.stack.length - 1];
-};
-
-export const getLastSubFormField = (parsedInfo: ParsedElementInfo) => {
-  if (!parsedInfo || !parsedInfo.stack?.length) {
-    return null;
-  }
-
-  const targetStackItem = parsedInfo.stack.findLast((s) => {
-    return (s.value as JSONObject)?.fieldType === "subform";
-  });
-
-  return targetStackItem;
-};
-
-export const parseImg = async (file: File) => {
-  const isImg = file.type.startsWith("image/");
-  if (!isImg) {
-    return null;
-  }
-
-  const ocrApiKey = config.get<string>("agent.form.fill.ocrApiKey");
-  const ocrEndpoint = "https://api.ocr.space/parse/image";
-
-  const formData = new FormData();
-
-  formData.append("language", "chs");
-  formData.append("file", file);
-
-  const response = await fetch(ocrEndpoint, {
-    method: "POST",
-    body: formData,
-    headers: {
-      // Add any auth headers
-      apiKey: ocrApiKey,
-    },
-  });
-
-  const result = await response.json();
-  console.log(result);
-
-  if (result.IsErroredOnProcessing) {
-    logger.error("image ocr parse error");
-    return null;
-  }
-
-  if (!result.ParsedResults || !result.ParsedResults.length) {
-    logger.debug("image ocr parse no result");
-    return null;
-  }
-
-  // join all parsed text
-  const parsedTexts = result.ParsedResults.map((pr: any) => pr.ParsedText);
-
-  return parsedTexts.join("\n");
-};
+import type { JSONObject } from "@ai-sdk/provider";
+import config from "config";
+import type { ParsedElementInfo } from "@streamparser/json/utils/types/parsedElementInfo.js";
+import { logger } from "../../../logger/index.js";
+
+export const isSubFormField = (parsedInfo: ParsedElementInfo) => {
+  if (!parsedInfo || !parsedInfo.stack?.length) {
+    return false;
+  }
+
+  const lastStackItem = parsedInfo.stack[parsedInfo.stack.length - 1];
+  return lastStackItem?.key === "value";
+};
+
+export const getLastStackItem = (parsedInfo: ParsedElementInfo) => {
+  if (!parsedInfo || !parsedInfo.stack?.length) {
+    return null;
+  }
+
+  return parsedInfo.stack[parsedInfo.stack.length - 1];
+};
+
+export const getLastSubFormField = (parsedInfo: ParsedElementInfo) => {
+  if (!parsedInfo || !parsedInfo.stack?.length) {
+    return null;
+  }
+
+  const targetStackItem = parsedInfo.stack.findLast((s) => {
+    return (s.value as JSONObject)?.fieldType === "subform";
+  });
+
+  return targetStackItem;
+};
+
+export const parseImg = async (file: File) => {
+  const isImg = file.type.startsWith("image/");
+  if (!isImg) {
+    return null;
+  }
+
+  const ocrApiKey = config.get<string>("agent.form.fill.ocrApiKey");
+  const ocrEndpoint = "https://api.ocr.space/parse/image";
+
+  const formData = new FormData();
+
+  formData.append("language", "chs");
+  formData.append("file", file);
+
+  const response = await fetch(ocrEndpoint, {
+    method: "POST",
+    body: formData,
+    headers: {
+      // Add any auth headers
+      apiKey: ocrApiKey,
+    },
+  });
+
+  const result = await response.json();
+  console.log(result);
+
+  if (result.IsErroredOnProcessing) {
+    logger.error("image ocr parse error");
+    return null;
+  }
+
+  if (!result.ParsedResults || !result.ParsedResults.length) {
+    logger.debug("image ocr parse no result");
+    return null;
+  }
+
+  // join all parsed text
+  const parsedTexts = result.ParsedResults.map((pr: any) => pr.ParsedText);
+
+  return parsedTexts.join("\n");
+};

package/src/index.ts

@@ -1,2 +1,2 @@
-import "../config/index.js";
-import("./app/main.js");
+import "../config/index.js";
+import("./app/main.js");

package/src/logger/index.ts

@@ -1,54 +1,54 @@
-import pino from "pino";
-import path from "path";
-import fs from "fs";
-import os from "os";
-import { fileURLToPath } from "url";
-
-const isDev = process.env.NODE_ENV === "development";
-const isProd = process.env.NODE_ENV === "production";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const logDir = path.join(__dirname, "logs");
-if (isProd && !fs.existsSync(logDir)) {
-  fs.mkdirSync(logDir, { recursive: true }); // 递归创建目录
-}
-
-// 3. 初始化 Pino 日志实例
-const logger = pino(
-  {
-    level: isDev ? "debug" : "info",
-    base: isDev
-      ? { pid: false, hostname: false }
-      : { pid: process.pid, hostname: os.hostname() },
-    timestamp: isProd,
-    transport: isDev
-      ? {
-          target: "pino-pretty", // 依赖 pino-pretty
-          options: {
-            colorize: true, // 彩色输出（更易阅读）
-            translateTime: "SYS:yyyy-mm-dd HH:MM:ss", // 时间格式转换
-            ignore: "pid,hostname", // 忽略无用字段
-            singleLine: true, // 单行会输出（简化日志体积）
-          },
-        }
-      : {
-          // 生产环境使用 pino/file 实现日志轮转（官方推荐）
-          target: "pino/file",
-          options: {
-            destination: path.join(logDir, "app.log"), // 基础日志文件路径
-            mkdir: true, // 自动创建日志目录（无需手动判断，可选增强）
-            // 轮转配置
-            rotate: {
-              frequency: "daily", // 轮转频率：每日轮转（支持 hourly/weekly/monthly 等）
-              maxSize: "10m", // 单个日志文件最大体积（支持 k/m/g 单位）
-              maxFiles: 7, // 保留最近 7 个日志文件（自动删除更早的文件）
-            },
-          },
-        },
-  },
-  isProd ? pino.destination(path.join(logDir, "app.log")) : undefined,
-);
-
-export { logger };
+import pino from "pino";
+import path from "path";
+import fs from "fs";
+import os from "os";
+import { fileURLToPath } from "url";
+
+const isDev = process.env.NODE_ENV === "development";
+const isProd = process.env.NODE_ENV === "production";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const logDir = path.join(__dirname, "logs");
+if (isProd && !fs.existsSync(logDir)) {
+  fs.mkdirSync(logDir, { recursive: true }); // 递归创建目录
+}
+
+// 3. 初始化 Pino 日志实例
+const logger = pino(
+  {
+    level: isDev ? "debug" : "info",
+    base: isDev
+      ? { pid: false, hostname: false }
+      : { pid: process.pid, hostname: os.hostname() },
+    timestamp: isProd,
+    transport: isDev
+      ? {
+          target: "pino-pretty", // 依赖 pino-pretty
+          options: {
+            colorize: true, // 彩色输出（更易阅读）
+            translateTime: "SYS:yyyy-mm-dd HH:MM:ss", // 时间格式转换
+            ignore: "pid,hostname", // 忽略无用字段
+            singleLine: true, // 单行会输出（简化日志体积）
+          },
+        }
+      : {
+          // 生产环境使用 pino/file 实现日志轮转（官方推荐）
+          target: "pino/file",
+          options: {
+            destination: path.join(logDir, "app.log"), // 基础日志文件路径
+            mkdir: true, // 自动创建日志目录（无需手动判断，可选增强）
+            // 轮转配置
+            rotate: {
+              frequency: "daily", // 轮转频率：每日轮转（支持 hourly/weekly/monthly 等）
+              maxSize: "10m", // 单个日志文件最大体积（支持 k/m/g 单位）
+              maxFiles: 7, // 保留最近 7 个日志文件（自动删除更早的文件）
+            },
+          },
+        },
+  },
+  isProd ? pino.destination(path.join(logDir, "app.log")) : undefined,
+);
+
+export { logger };