Merge branch 'TEN-framework:main' into main

cyfyifanchen · Dec 9, 2024 · 40e3cc8 · 40e3cc8
2 parents 9cbd489 + d913c2d
commit 40e3cc8
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/agents/examples/demo/property.json b/agents/examples/demo/property.json
@@ -1058,6 +1058,12 @@
               "enable_tools": true
             }
           },
+          {
+            "type": "extension",
+            "extension_group": "chatgpt",
+            "addon": "vision_tool_python",
+            "name": "vision_tool"
+          },
           {
             "type": "extension",
             "extension_group": "tts",
@@ -1127,6 +1133,17 @@
                   }
                 ]
               }
+            ],
+            "video_frame": [
+              {
+                "name": "video_frame",
+                "dest": [
+                  {
+                    "extension_group": "chatgpt",
+                    "extension": "vision_tool"
+                  }
+                ]
+              }
             ]
           },
           {
@@ -1198,6 +1215,15 @@
                     "extension": "azure_tts"
                   }
                 ]
+              },
+              {
+                "name": "tool_call",
+                "dest": [
+                  {
+                    "extension_group": "chatgpt",
+                    "extension": "vision_tool"
+                  }
+                ]
               }
             ]
           },
@@ -1276,6 +1302,21 @@
                 ]
               }
             ]
+          },
+          {
+            "extension_group": "chatgpt",
+            "extension": "vision_tool",
+            "cmd": [
+              {
+                "name": "tool_register",
+                "dest": [
+                  {
+                    "extension_group": "chatgpt",
+                    "extension": "openai_chatgpt"
+                  }
+                ]
+              }
+            ]
           }
         ]
       },

diff --git a/demo/src/common/constant.ts b/demo/src/common/constant.ts
@@ -24,7 +24,7 @@ export const DEFAULT_AGENT_SETTINGS = {
 }
 
 export enum ECozeBaseUrl {
-  // CN = "https://api.coze.cn",
+  CN = "https://api.coze.cn",
   GLOBAL = "https://api.coze.com",
 }
 

diff --git a/demo/src/components/Dialog/Settings.tsx b/demo/src/components/Dialog/Settings.tsx
@@ -308,6 +308,9 @@ export function CozeSettingsTab(props: {
                     <SelectItem value={ECozeBaseUrl.GLOBAL}>
                       {ECozeBaseUrl.GLOBAL}
                     </SelectItem>
+                    <SelectItem value={ECozeBaseUrl.CN}>
+                      {ECozeBaseUrl.CN}
+                    </SelectItem>
                     {/* <SelectItem value={ECozeBaseUrl.CN}>
                       {ECozeBaseUrl.CN}
                     </SelectItem> */}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
       - AGENT_SERVER_URL=http://ten_agent_dev:8080
       - TEN_DEV_SERVER_URL=http://ten_agent_dev:49483
   ten_agent_demo:
-    image: ghcr.io/ten-framework/ten_agent_demo:0.5.0-118-g35ffaa4
+    image: ghcr.io/ten-framework/ten_agent_demo:0.6.1-40-ge6c28a4
     container_name: ten_agent_demo
     restart: always
     ports: