@shun-js/aibaiban-server 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/aibaiban-server",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "aibaiban.com server",
   "keywords": [
     "ai aibaiban"
@@ -44,5 +44,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "5d962a5890ad35e4399adbf9359ae36fb096046f"
+  "gitHead": "2284cb85d3534a7c0e78e717db78bafeb1f67703"
 }

package/server/controller/IndexController.js

@@ -9,12 +9,4 @@ module.exports = (app) => {
   app.get('/', (req, res) => {
     service.index(req, res);
   });
-
-  // chat
-  app.post('/chat', (req, res) => {
-    service.chat(req, res);
-  });
-  app.post('/chat-streaming', (req, res) => {
-    service.chatWithStreaming(req, res);
-  });
 };

package/server/controller/LLMController.js

@@ -0,0 +1,17 @@
+// service
+const service = require('../service/LLMService.js');
+
+/**
+ * controller
+ */
+module.exports = (app) => {
+  // intent
+  app.post('/intent', (req, res) => {
+    service.intent(req, res);
+  });
+
+  //
+  app.post('/chat-streaming', (req, res) => {
+    service.chatWithStreaming(req, res);
+  });
+};

package/server/service/IndexService.js

@@ -1,9 +1,3 @@
-// llm
-const { llmParseIntent } = require('../util/llm');
-
-// util
-const { chatFeishuMsg, chatResFeishuMsg, errorFeishuMsg } = require('../util/feishu.js');
-
 /**
  * index
  * @param {*} req
@@ -20,88 +14,3 @@ exports.index = async (req, res) => {
   // render
   res.render(pagePath, {}, true);
 };
-
-/**
- * chat
- * @param {*} req
- * @param {*} res
- * @returns
- */
-exports.chat = async (req, res) => {
-  const methodName = 'chat';
-
-  // check
-  if (!req.body.userPrompt) {
-    const msg = 'need userPrompt';
-    req.logger.error(methodName, msg);
-    res.jsonFail(msg);
-    return;
-  }
-
-  // const
-  const userPrompt = decodeURIComponent(req.body.userPrompt);
-  req.logger.info(methodName, 'userPrompt', userPrompt);
-  chatFeishuMsg(req);
-
-  // go
-  try {
-    const llmParseIntentRes = await llmParseIntent(userPrompt);
-    const llmParseIntentObj = JSON.parse(llmParseIntentRes);
-    req.logger.info(methodName, 'llmParseIntentObj', llmParseIntentObj);
-
-    // r
-    chatResFeishuMsg(req, JSON.stringify(llmParseIntentObj));
-    res.jsonSuccess('success', llmParseIntentObj);
-  } catch (error) {
-    const msg = 'chat error';
-    errorFeishuMsg(req, msg);
-    req.logger.error(methodName, msg, error);
-    res.jsonFail(msg);
-  }
-};
-
-/**
- * chatWithStreaming
- * @param {*} req
- * @param {*} res
- * @returns
- */
-exports.chatWithStreaming = async () => {
-  // const methodName = 'chatWithStreaming';
-  // // check
-  // if (!req.body.userPrompt) {
-  //   const msg = 'need userPrompt';
-  //   req.logger.error(methodName, msg);
-  //   res.jsonFail(msg);
-  //   return;
-  // }
-  // // const
-  // const userPrompt = decodeURIComponent(req.body.userPrompt);
-  // req.logger.info(methodName, 'userPrompt', userPrompt);
-  // chatFeishuMsg(req);
-  // // go
-  // const userPrompts = [{ text: userPrompt }];
-  // chatWithStreaming(userPrompts, {
-  //   beginCallback: () => {
-  //     req.logger.info(methodName, 'beginCallback');
-  //     res.streamingStart();
-  //   },
-  //   firstContentCallback: () => {
-  //     req.logger.info(methodName, 'firstContentCallback');
-  //     // res.streaming('First chunk received!');
-  //   },
-  //   contentCallback: (content) => {
-  //     req.logger.info(methodName, 'contentCallback', content);
-  //     res.streaming(content);
-  //   },
-  //   endCallback: () => {
-  //     req.logger.info(methodName, 'endCallback');
-  //     res.streamingEnd();
-  //   },
-  //   errorCallback: (error) => {
-  //     errorFeishuMsg(req, 'errorCallback');
-  //     req.logger.info(methodName, 'errorCallback', error);
-  //     res.streamingEnd();
-  //   },
-  // });
-};

package/server/service/LLMService.js

@@ -0,0 +1,90 @@
+// llm
+const { llmParseIntent } = require('../util/llm.js');
+
+// util
+const { chatFeishuMsg, chatResFeishuMsg, errorFeishuMsg } = require('../util/feishu.js');
+
+/**
+ * intent
+ * @param {*} req
+ * @param {*} res
+ * @returns
+ */
+exports.intent = async (req, res) => {
+  const methodName = 'intent';
+
+  // check
+  if (!req.body.userPrompt) {
+    const msg = 'need userPrompt';
+    req.logger.error(methodName, msg);
+    res.jsonFail(msg);
+    return;
+  }
+
+  // const
+  const userPrompt = decodeURIComponent(req.body.userPrompt);
+  req.logger.info(methodName, 'userPrompt', userPrompt);
+  chatFeishuMsg(req);
+
+  // go
+  try {
+    const llmParseIntentRes = await llmParseIntent(userPrompt);
+    const llmParseIntentObj = JSON.parse(llmParseIntentRes);
+    req.logger.info(methodName, 'llmParseIntentObj', llmParseIntentObj);
+
+    // r
+    chatResFeishuMsg(req, JSON.stringify(llmParseIntentObj));
+    res.jsonSuccess('success', llmParseIntentObj);
+  } catch (error) {
+    const msg = 'parse intent error';
+    errorFeishuMsg(req, msg);
+    req.logger.error(methodName, msg, error);
+    res.jsonFail(msg);
+  }
+};
+
+/**
+ * chatWithStreaming
+ * @param {*} req
+ * @param {*} res
+ * @returns
+ */
+exports.chatWithStreaming = async () => {
+  // const methodName = 'chatWithStreaming';
+  // // check
+  // if (!req.body.userPrompt) {
+  //   const msg = 'need userPrompt';
+  //   req.logger.error(methodName, msg);
+  //   res.jsonFail(msg);
+  //   return;
+  // }
+  // // const
+  // const userPrompt = decodeURIComponent(req.body.userPrompt);
+  // req.logger.info(methodName, 'userPrompt', userPrompt);
+  // chatFeishuMsg(req);
+  // // go
+  // const userPrompts = [{ text: userPrompt }];
+  // chatWithStreaming(userPrompts, {
+  //   beginCallback: () => {
+  //     req.logger.info(methodName, 'beginCallback');
+  //     res.streamingStart();
+  //   },
+  //   firstContentCallback: () => {
+  //     req.logger.info(methodName, 'firstContentCallback');
+  //     // res.streaming('First chunk received!');
+  //   },
+  //   contentCallback: (content) => {
+  //     req.logger.info(methodName, 'contentCallback', content);
+  //     res.streaming(content);
+  //   },
+  //   endCallback: () => {
+  //     req.logger.info(methodName, 'endCallback');
+  //     res.streamingEnd();
+  //   },
+  //   errorCallback: (error) => {
+  //     errorFeishuMsg(req, 'errorCallback');
+  //     req.logger.info(methodName, 'errorCallback', error);
+  //     res.streamingEnd();
+  //   },
+  // });
+};

package/server/util/llm.js

@@ -15,58 +15,62 @@ const gemini = GeminiVertex({
 });
 
 // const
-let cachedSystemPrompt = null;
-const jsonSchema = (() => {
-  return zodToJsonSchema(
-    z.object({
-      intent: z.enum(['DRAW', 'REJECT']).describe('用户意图：DRAW（绘图）或 REJECT（非绘图）'),
-      reason: z.string().describe('判断理由（一句话说明）'),
-    }),
-  );
-})();
+const chatConfig = {
+  responseMimeType: 'application/json',
+  temperature: 0.2,
+  topP: 0.9,
+  topK: 40,
+  maxOutputTokens: 8192,
+  thinkingConfig: {
+    thinkingBudget: 0,
+    includeThoughts: false,
+  },
+};
+const safetySettings = [
+  {
+    category: 'HARM_CATEGORY_HATE_SPEECH',
+    threshold: 'BLOCK_ONLY_HIGH',
+  },
+  {
+    category: 'HARM_CATEGORY_DANGEROUS_CONTENT',
+    threshold: 'BLOCK_ONLY_HIGH',
+  },
+  {
+    category: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
+    threshold: 'BLOCK_ONLY_HIGH',
+  },
+  {
+    category: 'HARM_CATEGORY_HARASSMENT',
+    threshold: 'BLOCK_ONLY_HIGH',
+  },
+];
 
 /**
  * llmParseIntent
  * @param {*} userPrompts
  */
+let intentSystemPrompt = null;
 exports.llmParseIntent = async (userPrompts) => {
-  // cache
-  if (!cachedSystemPrompt) cachedSystemPrompt = await readFile(path.resolve(__dirname, './prompt-intent.md'));
+  // intent system prompt
+  if (!intentSystemPrompt) {
+    intentSystemPrompt = await readFile(path.resolve(__dirname, './prompt-intent.md'));
+    console.log('read md');
+  }
+
+  // chat config
+  chatConfig.responseJsonSchema = zodToJsonSchema(
+    z.object({
+      intent: z.enum(['DRAW', 'REJECT']).describe('用户意图：DRAW（绘图）或 REJECT（非绘图）'),
+      reason: z.string().describe('判断理由（一句话说明）'),
+    }),
+  );
 
   // chat options
   const chatOptions = {
     contents: userPrompts,
-    systemInstruction: cachedSystemPrompt,
-    config: {
-      responseMimeType: 'application/json',
-      responseJsonSchema: jsonSchema,
-      temperature: 0.2,
-      topP: 0.9,
-      topK: 40,
-      maxOutputTokens: 8192,
-      thinkingConfig: {
-        thinkingBudget: 0,
-        includeThoughts: false,
-      },
-      safetySettings: [
-        {
-          category: 'HARM_CATEGORY_HATE_SPEECH',
-          threshold: 'BLOCK_ONLY_HIGH',
-        },
-        {
-          category: 'HARM_CATEGORY_DANGEROUS_CONTENT',
-          threshold: 'BLOCK_ONLY_HIGH',
-        },
-        {
-          category: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
-          threshold: 'BLOCK_ONLY_HIGH',
-        },
-        {
-          category: 'HARM_CATEGORY_HARASSMENT',
-          threshold: 'BLOCK_ONLY_HIGH',
-        },
-      ],
-    },
+    systemInstruction: intentSystemPrompt,
+    config: chatConfig,
+    safetySettings: safetySettings,
   };
 
   // go

package/views/index.html

@@ -56,7 +56,7 @@
     <script
       type="module"
       crossorigin
-      src="https://static-small.vincentqiao.com/aibaiban/static/index-DLP1j0ul.js"
+      src="https://static-small.vincentqiao.com/aibaiban/static/index-DX_c8Rs5.js"
     ></script>
     <link rel="stylesheet" crossorigin href="https://static-small.vincentqiao.com/aibaiban/static/index-BN_GcTDx.css" />
   </head>