@ray-js/t-agent-plugin-aistream 0.2.2-beta-1 → 0.2.2-beta-2

package/dist/buildIn/withBuildIn.js

@@ -41,41 +41,18 @@ export function withBuildIn() {
 
     // 关联文档
 
+    // 关联智能家居卡片
     (() => {
       onSkillsEnd((skills, responseMessage) => {
         if (!responseMessage) {
           return;
         }
-        const data = {
-          documents: []
+        const operateData = {
+          deviceInfo: [],
+          sceneInfo: [],
+          changeInfo: []
         };
-        for (const skill of skills) {
-          var _content$custom;
-          if (skill.code !== BuildInSkillCode.SEARCH_KNOWLEDGE) {
-            continue;
-          }
-          const content = skill;
-          if (!((_content$custom = content.custom) !== null && _content$custom !== void 0 && (_content$custom = _content$custom.data) !== null && _content$custom !== void 0 && _content$custom.documents)) {
-            continue;
-          }
-          for (const doc of content.custom.data.documents) {
-            data.documents.push({
-              title: doc.title,
-              url: doc.url
-            });
-          }
-        }
-        if (data.documents.length) {
-          responseMessage.bubble.addTile('documents', data);
-        }
-      });
-    })();
-    (() => {
-      onSkillsEnd((skills, responseMessage) => {
-        if (!responseMessage) {
-          return;
-        }
-        const data = {
+        const executeData = {
           deviceInfo: [],
           sceneInfo: [],
           changeInfo: []
@@ -87,7 +64,7 @@ export function withBuildIn() {
           const content = skill;
           if (content.general.action === ReceivedSmartHomeSkillAction.QUERY_SCENE) {
             for (const scene of content.general.data.scenes) {
-              data.sceneInfo.push({
+              executeData.sceneInfo.push({
                 type: scene.type,
                 enabled: scene.enable,
                 icon: scene.icon,
@@ -101,7 +78,7 @@ export function withBuildIn() {
             }
           } else if (content.general.action === ReceivedSmartHomeSkillAction.CONTROL_SCENE) {
             for (const scene of content.general.data.scenes) {
-              data.sceneInfo.push({
+              operateData.sceneInfo.push({
                 type: scene.type,
                 icon: scene.icon,
                 name: scene.name,
@@ -114,7 +91,7 @@ export function withBuildIn() {
             }
           } else if (content.general.action === ReceivedSmartHomeSkillAction.QUERY_DEVICE) {
             for (const dev of content.general.data.devices) {
-              data.deviceInfo.push({
+              executeData.deviceInfo.push({
                 icon: dev.icon,
                 name: dev.name,
                 deviceId: dev.deviceId,
@@ -125,7 +102,7 @@ export function withBuildIn() {
             }
           } else if (content.general.action === ReceivedSmartHomeSkillAction.CONTROL_DEVICE) {
             for (const dev of content.general.data.devices) {
-              data.deviceInfo.push({
+              operateData.deviceInfo.push({
                 icon: dev.icon,
                 name: dev.name,
                 deviceId: dev.deviceId,
@@ -135,8 +112,41 @@ export function withBuildIn() {
             }
           }
         }
-        if (data.deviceInfo.length) {
-          responseMessage.bubble.addTile('operateCard', data);
+        if (executeData.deviceInfo.length || executeData.sceneInfo.length || executeData.changeInfo.length) {
+          responseMessage.bubble.addTile('executeCard', executeData);
+        }
+        if (operateData.deviceInfo.length || operateData.sceneInfo.length || operateData.changeInfo.length) {
+          responseMessage.bubble.addTile('operateCard', operateData);
+        }
+      });
+    })();
+    // 最后是关联文档
+    (() => {
+      onSkillsEnd((skills, responseMessage) => {
+        if (!responseMessage) {
+          return;
+        }
+        const data = {
+          documents: []
+        };
+        for (const skill of skills) {
+          var _content$custom;
+          if (skill.code !== BuildInSkillCode.SEARCH_KNOWLEDGE) {
+            continue;
+          }
+          const content = skill;
+          if (!((_content$custom = content.custom) !== null && _content$custom !== void 0 && (_content$custom = _content$custom.data) !== null && _content$custom !== void 0 && _content$custom.documents)) {
+            continue;
+          }
+          for (const doc of content.custom.data.documents) {
+            data.documents.push({
+              title: doc.title,
+              url: doc.url
+            });
+          }
+        }
+        if (data.documents.length) {
+          responseMessage.bubble.addTile('documents', data);
         }
       });
     })();

package/dist/withAIStream.d.ts

@@ -1,4 +1,4 @@
-import { ChatAgent, ChatMessage, GetChatPluginHandler, InputBlock } from '@ray-js/t-agent';
+import { ChatAgent, ChatCardObject, ChatMessage, GetChatPluginHandler, InputBlock } from '@ray-js/t-agent';
 import { ConnectClientType, ReceivedTextSkillPacketBody } from './AIStreamTypes';
 import { ChatHistoryLocalStore, StoredMessageObject } from './ChatHistoryStore';
 export interface AIStreamOptions {
@@ -40,6 +40,9 @@ export interface AIStreamHooks {
     onSkillsEnd: (skills: ReceivedTextSkillPacketBody[], respMsg: ChatMessage, result: {
         messages: ChatMessage[];
     }) => void;
+    onCardsReceived: (skills: ReceivedTextSkillPacketBody[], result: {
+        cards: ChatCardObject[];
+    }) => void;
 }
 export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAgent) => {
     hooks: import("hookable").Hookable<any, string>;
@@ -58,6 +61,7 @@ export declare function withAIStream(options?: AIStreamOptions): (agent: ChatAge
         clearAllMessages: () => Promise<void>;
         onSkillCompose: (fn: AIStreamHooks['onSkillCompose']) => () => void;
         onSkillsEnd: (fn: AIStreamHooks['onSkillsEnd']) => () => void;
+        onCardsReceived: (fn: AIStreamHooks['onCardsReceived']) => () => void;
         feedback: ({ requestId, type }: {
             requestId: string;
             type: string;

package/dist/withAIStream.js

@@ -331,12 +331,24 @@ export function withAIStream() {
         await hooks.callHook('onSkillsEnd', skills, message, result);
         await message.update();
       }
+      let valid = false;
       if (message.bubble.text) {
+        valid = true;
         await message.persist();
       } else if (message.bubble.status === BubbleTileStatus.NORMAL) {
-        await message.remove();
+        valid = false;
       } else {
+        valid = true;
+      }
+      if (valid) {
         await message.persist();
+        const [_, ...rest] = result.messages;
+        for (const m of rest) {
+          await m.show();
+          await m.persist();
+        }
+      } else {
+        await message.remove();
       }
       return [userMsg, ...result.messages];
     };
@@ -452,6 +464,43 @@ export function withAIStream() {
         }
       }
     });
+    const onSkillsEnd = fn => {
+      return hooks.hook('onSkillsEnd', fn);
+    };
+    onSkillsEnd(async (skills, respMsg, result) => {
+      const cards = [];
+      for (const skill of skills) {
+        var _skill$custom, _skill$general;
+        if ((_skill$custom = skill.custom) !== null && _skill$custom !== void 0 && (_skill$custom = _skill$custom.data) !== null && _skill$custom !== void 0 && _skill$custom.aiCards) {
+          for (const card of skill.custom.data.aiCards) {
+            cards.push(card);
+          }
+        }
+        if ((_skill$general = skill.general) !== null && _skill$general !== void 0 && (_skill$general = _skill$general.data) !== null && _skill$general !== void 0 && _skill$general.aiCards) {
+          for (const card of skill.custom.data.aiCards) {
+            cards.push(card);
+          }
+        }
+      }
+      const r = {
+        cards: cards
+      };
+      await hooks.callHook('onCardsReceived', skills, r);
+      for (const card of cards) {
+        const m = createMessage({
+          role: respMsg.role,
+          status: ChatMessageStatus.FINISH,
+          meta: {
+            eventId: respMsg.meta.eventId,
+            sessionId: respMsg.meta.sessionId
+          }
+        });
+        m.addTile('card', {
+          card
+        });
+        result.messages.push(m);
+      }
+    });
     return {
       hooks,
       aiStream: {
@@ -472,8 +521,9 @@ export function withAIStream() {
         onSkillCompose: fn => {
           return hooks.hook('onSkillCompose', fn);
         },
-        onSkillsEnd: fn => {
-          return hooks.hook('onSkillsEnd', fn);
+        onSkillsEnd,
+        onCardsReceived: fn => {
+          return hooks.hook('onCardsReceived', fn);
         },
         feedback
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-plugin-aistream",
-  "version": "0.2.2-beta-1",
+  "version": "0.2.2-beta-2",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "0dd513ad93a351ad5c00a1ee8993c7b62f03640f"
+  "gitHead": "33a1985d3a14487fe5f354411b0c46c8a8af19c7"
 }