@siact/sime-x-vue 0.0.11 → 0.0.13

package/dist/sime-x-vue.umd.js

@@ -774,7 +774,8 @@
       debug: { type: Boolean },
       chatbotUrl: {},
       appId: {},
-      appToken: {}
+      appToken: {},
+      agentId: {}
     },
     setup(__props) {
       const props = __props;
@@ -785,6 +786,7 @@
         chatbotUrl: () => props.chatbotUrl,
         appId: () => props.appId,
         appToken: () => props.appToken,
+        agentId: () => props.agentId,
         stopBroadcast: () => stopBroadcastRef.value(),
         registerVoiceMethods: (methods) => {
           if (methods.stopBroadcast) stopBroadcastRef.value = methods.stopBroadcast;
@@ -1683,8 +1685,43 @@
         args: Array.isArray(cmd.args) ? cmd.args : []
       }));
     };
-    const executeHostCommands = async (toolCallId, result) => {
-      const commands = extractExecutableCommands(result);
+    const buildCommandDefinitionMap = (commands) => {
+      return new Map(commands.map((command) => [command.name, command]));
+    };
+    const toExecutableCommand = (toolName, payload, commandDefinitions) => {
+      const commandDefinition = commandDefinitions.get(toolName);
+      if (!commandDefinition) {
+        return null;
+      }
+      const parameters = commandDefinition.parameters || [];
+      if (Array.isArray(payload)) {
+        return {
+          name: toolName,
+          args: payload
+        };
+      }
+      if (!payload || typeof payload !== "object") {
+        return {
+          name: toolName,
+          args: []
+        };
+      }
+      const payloadRecord = payload;
+      return {
+        name: toolName,
+        args: parameters.map((parameter) => payloadRecord[parameter.name])
+      };
+    };
+    const resolveExecutableCommands = (toolName, payload, commandDefinitions) => {
+      const extractedCommands = extractExecutableCommands(payload);
+      if (extractedCommands.length > 0) {
+        return extractedCommands;
+      }
+      const directCommand = toExecutableCommand(toolName, payload, commandDefinitions);
+      return directCommand ? [directCommand] : [];
+    };
+    const executeHostCommands = async (toolCallId, toolName, payload, commandDefinitions) => {
+      const commands = resolveExecutableCommands(toolName, payload, commandDefinitions);
       if (commands.length === 0) return false;
       try {
         executingTools.value = /* @__PURE__ */ new Set([...executingTools.value, toolCallId]);
@@ -1732,11 +1769,12 @@
       const processingToolResults = /* @__PURE__ */ new Set();
       abortController = new AbortController();
       const commands = await aiChatbotX.getCommads();
+      const commandDefinitions = buildCommandDefinitionMap(commands);
       conversationHistory.value.length > 0 ? [...conversationHistory.value] : void 0;
       try {
-        const response = await fetch(options.endpoint.value, {
+        const response = await fetch(options.endpoint, {
           method: "POST",
-          headers: { "Content-Type": "application/json" },
+          headers: { "Content-Type": "application/json", Authorization: `Bearer ${options.appToken || ""}` },
           body: JSON.stringify({
             input: content,
             projectId: options.projectId || "",
@@ -1766,9 +1804,8 @@
                 state: "result"
               };
               currentToolParts.value = [...currentToolParts.value, toolPart];
-              if (tr.toolName === "executeCommand") {
-                console.log("executeCommand", tr.result);
-                void executeHostCommands(toolPart.toolCallId, tr.result);
+              if (commandDefinitions.has(tr.toolName)) {
+                void executeHostCommands(toolPart.toolCallId, tr.toolName, tr.result, commandDefinitions);
               }
             }
           }
@@ -1785,23 +1822,27 @@
             );
             currentToolParts.value = toolParts;
             for (const part of toolParts) {
-              if (part.toolName === "executeCommand" && !processedToolResults.has(part.toolCallId) && !processingToolResults.has(part.toolCallId)) {
+              if (commandDefinitions.has(part.toolName) && !processedToolResults.has(part.toolCallId) && !processingToolResults.has(part.toolCallId)) {
                 if (part.type === "tool-call" && part.state === "call" && part.args) {
                   processingToolResults.add(part.toolCallId);
-                  void executeHostCommands(part.toolCallId, part.args).then((executed) => {
-                    if (executed) {
-                      processedToolResults.add(part.toolCallId);
+                  void executeHostCommands(part.toolCallId, part.toolName, part.args, commandDefinitions).then(
+                    (executed) => {
+                      if (executed) {
+                        processedToolResults.add(part.toolCallId);
+                      }
+                      processingToolResults.delete(part.toolCallId);
                     }
-                    processingToolResults.delete(part.toolCallId);
-                  });
+                  );
                 } else if (part.type === "tool-result" && part.result) {
                   processingToolResults.add(part.toolCallId);
-                  void executeHostCommands(part.toolCallId, part.result).then((executed) => {
-                    if (executed) {
-                      processedToolResults.add(part.toolCallId);
+                  void executeHostCommands(part.toolCallId, part.toolName, part.result, commandDefinitions).then(
+                    (executed) => {
+                      if (executed) {
+                        processedToolResults.add(part.toolCallId);
+                      }
+                      processingToolResults.delete(part.toolCallId);
                     }
-                    processingToolResults.delete(part.toolCallId);
-                  });
+                  );
                 }
               }
             }
@@ -1910,9 +1951,9 @@
       xSize: {},
       xTheme: {},
       wakeWords: {},
+      wakeResponses: {},
       modelPath: {},
       projectId: {},
-      invokeUrl: {},
       voiceConfig: {},
       bubbleSize: {},
       bubbleDismissDelay: {}
@@ -1924,10 +1965,7 @@
         if (props.voiceConfig) return props.voiceConfig;
         return null;
       };
-      const endpoint = vue.computed(() => {
-        return props.invokeUrl || "http://localhost:3001/agent/zyy55sw40nrl801056m0o/stream-invoke";
-      });
-      const wakeResponses = ["在呢"];
+      const wakeResponses = vue.computed(() => props.wakeResponses || ["在呢"]);
       const tts = useTTS(getVoiceConfig);
       const bubbleBridge = {
         open: () => {
@@ -1937,8 +1975,10 @@
         scrollToBottom: () => {
         }
       };
+      const endpoint = `/sime/proxy/agent/${aiChatbotX.agentId()}/stream-invoke`;
       const agent = useAgentInvoke({
         endpoint,
+        appToken: aiChatbotX.appToken(),
         projectId: props.projectId,
         aiChatbotX,
         tts: {
@@ -1977,7 +2017,7 @@
         onWake: () => {
           interruptCurrentResponse();
           tts.warmUpAudio();
-          const text = wakeResponses[Math.floor(Math.random() * wakeResponses.length)];
+          const text = wakeResponses.value[Math.floor(Math.random() * wakeResponses.value.length)];
           tts.speak(text);
         },
         onTranscriptionDone: (text) => {
@@ -2083,7 +2123,7 @@
             vue.unref(transcriptionText) || vue.unref(isInvoking) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11, vue.toDisplayString(vue.unref(isInvoking) ? "正在思考中..." : vue.unref(transcriptionText)), 1)) : vue.createCommentVNode("", true),
             vue.createElementVNode("div", _hoisted_12, [
               vue.createElementVNode("img", {
-                src: __props.xLogo ? __props.xLogo : "/sime.png",
+                src: __props.xLogo ? __props.xLogo : "/x.png",
                 alt: "voice assistant",
                 style: vue.normalizeStyle({
                   width: `${__props.xSize?.width || 88}px`
@@ -2130,7 +2170,7 @@
     }
   });
 
-  const voiceAssistant = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fda883a9"]]);
+  const voiceAssistant = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a88f03ab"]]);
 
   var clientCommandKey = /* @__PURE__ */ ((clientCommandKey2) => {
     clientCommandKey2["SET_THEME"] = "SiMeAgent_setTheme";