v0.3.6.3

AGIUI · Jun 24, 2023 · d1db431 · d1db431
1 parent f5b63ba
commit d1db431
Show file tree

Hide file tree

Showing 13 changed files with 131 additions and 654 deletions.
diff --git a/examples/combo/Earth_1687585065120.json b/examples/combo/Earth_1687585065120.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Earth",
     "displayName": "Earth",
-    "version": "0.3.6.2",
+    "version": "0.3.6.3",
     "description": "AGIUI for Browser Extension",
     "license": "MIT",
     "repository": {

diff --git a/src/components/ChatbotMain.tsx b/src/components/ChatbotMain.tsx
@@ -1049,6 +1049,9 @@ class Main extends React.Component<{
                 if (p.role == 'user' && prompt['context']) {
                     p.content = p.content.replaceAll("${context}", prompt['context'])
                 }
+                if (p.role == 'system' && prompt['context']) {
+                    p.content = p.content.replaceAll("${context}", prompt['context'])
+                }
                 return p
             })
         } else {
@@ -1581,6 +1584,7 @@ class Main extends React.Component<{
                 // role 给调试用
                 if ([
                     'prompt',
+                    'promptCustom',
                     'role',
                 ].includes(promptJson.type)) this._llmRun(promptJson, newTalk);
 

diff --git a/src/components/flow/Workflow.tsx b/src/components/flow/Workflow.tsx
@@ -363,9 +363,9 @@ const debugInfo = (prompt: any) => {
     if (merged && merged.length > 0) {
         info += `<p>使用Merged数据</p>`
     };
-    info=info.trim();
-    if(info==""||info=="<p></p>"){
-        info=i18n.t("debug")+":''"
+    info = info.trim();
+    if (info == "" || info == "<p></p>") {
+        info = i18n.t("debug") + ":''"
     }
     console.log('debugInfo', info)
     return info
@@ -389,7 +389,7 @@ const parsePrompt2ControlEvent = (id: string, prompt: any) => {
     if (prompt.type == 'role') {
         prompt.role.merged = prompt.merged;
     }
-    // console.log('role',prompt.role)
+
     const d = debugInfo(prompt);
 
     const controlEvent = {
@@ -400,9 +400,12 @@ const parsePrompt2ControlEvent = (id: string, prompt: any) => {
         debugInfo: d,
         newTalk: true,
         autoRun: true,
-        id: id,
+        id,
         createTime: (new Date()).getTime()
     }
+
+    console.log('controlEvent', controlEvent)
+
     return controlEvent
 }
 

diff --git a/src/components/flow/locales/en.json b/src/components/flow/locales/en.json
diff --git a/src/components/flow/locales/i18nConfig.ts b/src/components/flow/locales/i18nConfig.ts