Merge pull request #94 from yenche123/dev

fix: working log title & translation for drawing

Author: yenche123

liubai-backends/liubai-laf/cloud-functions/ai-entrance.ts

@@ -2687,7 +2687,7 @@ class ToolHandler {
     let imagePrompt = prompt
     const num2 = valTool.getChineseCharNum(prompt)
     console.warn("chinese char num: ", num2)
-    if(num2 > 3) {
+    if(num2 > 6) {
       const user = this._aiParam.entry.user
       const translator = new Translator(bot, user)
       const res2 = await translator.run(prompt)

liubai-backends/liubai-laf/cloud-functions/ai-system-two.ts

@@ -796,19 +796,20 @@ class SystemTwo {
 
     // 5. working logs
     if(workingLogs.length > 0) {
-      msg += (t("working_title") + "\n")
+      msg += (t("working_log_title") + "\n")
       workingLogs.forEach(v => {
         msg += (v.textToUser + "\n")
       })
       msg += "\n"
     }
-    console.log("see msg: ", msg)
 
     // 6. send
     if(msg) {
-      await valTool.waitMilli(900)
+      msg = msg.trim()
+      console.log("see msg in handleRunLogs: ", msg)
+      await valTool.waitMilli(1500)
       const entry = System2Util.mockAiEntry(this._ctx.user)
-      TellUser.text(entry, msg, { fromSystem2: true })
+      TellUser.text(entry, msg)
     }
   }
 
@@ -1155,6 +1156,8 @@ class SystemTwo {
       content: newUserContent,
     }
     this._reasonerAndUs.push(userPrompt)
+    
+    console.warn("tool result prompt: ", newUserContent)
 
     return true
   }
@@ -1439,7 +1442,7 @@ class ToolHandler2 {
     return chatId
   }
 
-  private async _replyToUser(msg: string) {
+  private _replyToUser(msg: string) {
     const entry = System2Util.mockAiEntry(this._user)
     TellUser.text(entry, msg, { fromSystem2: true })
   }
@@ -1467,7 +1470,8 @@ class ToolHandler2 {
     // 3. reply
     const toolShared = this._toolShared
     const msg = toolShared.get_msg_for_adding_note(funcJson, chatId)
-    await this._replyToUser(msg)
+    console.warn("add_note msg: ", msg)
+    this._replyToUser(msg)
     return { pass: true }
   }
 
@@ -1492,6 +1496,7 @@ class ToolHandler2 {
     // 3. reply
     const toolShared = this._toolShared
     const msg = toolShared.get_msg_for_adding_todo(chatId, funcJson)
+    console.warn("add_todo msg: ", msg)
     this._replyToUser(msg)
     return { pass: true }
   }
@@ -1521,7 +1526,8 @@ class ToolHandler2 {
     // 3. reply
     const toolShared = this._toolShared
     const msg = toolShared.get_msg_for_adding_calendar(chatId, funcJson)
-    await this._replyToUser(msg)
+    console.warn("add_calendar msg: ", msg)
+    this._replyToUser(msg)
     return { pass: true }
   }
 
@@ -1557,7 +1563,7 @@ class ToolHandler2 {
     // 2. translate if needed
     let imagePrompt = prompt
     const num2 = valTool.getChineseCharNum(prompt)
-    if(num2 > 3) {
+    if(num2 > 6) {
       const translator = new Translator()
       const res2 = await translator.run(prompt)
       if(!res2) {
@@ -1618,6 +1624,7 @@ class ToolHandler2 {
       data4.text = res3.prompt
     }
     AiShared.updateAiChat(chatId, data4)
+    console.warn("draw picture result: ", res3)
 
     // 5. reply
     const entry = System2Util.mockAiEntry(this._user)

liubai-backends/liubai-laf/cloud-functions/clock-one-hr.ts

@@ -37,6 +37,7 @@ import {
   set as date_fn_set, 
   addDays,
 } from "date-fns"
+import { LiuReporter } from '@/service-send'
 
 const API_WECHAT_ACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token"
 const API_WX_JSAPI_TICKET = "https://api.weixin.qq.com/cgi-bin/ticket/getticket"
@@ -481,21 +482,37 @@ async function handleStatistics() {
   console.warn("statistic overview: ")
   console.log(data4)
 
-  // 5. fetch to nocodb
+  // 5. define data sent to nocodb
   const body = {
     ...data4,
     "Date": date,
   }
   const url = `${baseURL}/api/v2/tables/${tableId}/records`
   const headers = { "xc-token": token }
-  const res = await liuReq(url, body, { method: "POST", headers })
 
-  if(res.code !== "0000" || !res.data?.Id) {
+  // 6. define a function to add row into statistics
+  // and try again if needed
+  const _tryToAdd = async () => {
+    let res6 = await liuReq(url, body, { method: "POST", headers })
+
+    if(res6.code !== "0000" || !res6.data?.Id) {
+      await valTool.waitMilli(3000)
+      res6 = await liuReq(url, body, { method: "POST", headers })
+    }
+
+    return res6
+  }
+
+  // 7. fetch
+  let res7 = await _tryToAdd()
+  if(res7.code !== "0000" || !res7.data?.Id) {
     console.warn("fail to add row into statistics!")
-    console.log(res)
+    console.log(res7)
+    const reporter = new LiuReporter()
+    reporter.send("Liubai: fail to add row into statistics", "Statistics Error")
   }
 
-  return res
+  return res7
 }
 
 // get D1 / D2 .......