@ray-js/t-agent-plugin-aistream 0.2.0-beta-2 → 0.2.0-beta-4

package/dist/withAIStream.js

@@ -2,19 +2,18 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["message"];
 import "core-js/modules/es.array.flat.js";
+import "core-js/modules/es.array.reverse.js";
 import "core-js/modules/es.array.unscopables.flat.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { BubbleTileStatus, ChatMessageStatus, createHooks } from '@ray-js/t-agent';
-import { getAccountInfo } from './utils/ttt';
-import { tAgentMessageAppraise } from './utils/apis';
-import { AIStreamObserver, getCurrentHomeInfo, sendBlocksToAIStream } from './utils';
-import { ConnectClientType, ConnectState } from './AIStreamTypes';
-import { ChatHistoryLocalStore, ChatHistoryStore } from './ChatHistoryStore';
+import { messageAppraise } from './utils/apis';
+import { AIStreamObserver, getAccountInfo, getCurrentHomeInfo, runTTTAction, sendBlocksToAIStream } from './utils';
+import { BizCode, ConnectClientType, ConnectState } from './AIStreamTypes';
+import { ChatHistoryLocalStore } from './ChatHistoryStore';
 import { DEFAULT_TOKEN_API, DEFAULT_TOKEN_API_VERSION, globalAIStreamClient } from './global';
-import { runTTTAction } from '@ray-js/t-agent-plugin-assistant';
 import logger from './utils/logger';
 export function withAIStream() {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -32,6 +31,7 @@ export function withAIStream() {
       onAgentDispose,
       onTileEvent
     } = agent;
+    agent.session.initValue('multiModal', options.multiModal);
     const ui = agent.plugins.ui;
     onAgentStart(async () => {
       /**
@@ -40,8 +40,10 @@ export function withAIStream() {
       const {
         deviceId,
         agentId,
-        tokenApi,
-        tokenApiVersion
+        tokenOptions = {
+          api: DEFAULT_TOKEN_API,
+          version: DEFAULT_TOKEN_API_VERSION
+        }
       } = options;
       let homeId = options.homeId;
       if (!homeId) {
@@ -59,32 +61,30 @@ export function withAIStream() {
       let historyStore = null;
       if (typeof options.createChatHistoryStore === 'function') {
         historyStore = options.createChatHistoryStore(agent);
-        if (!(historyStore instanceof ChatHistoryStore)) {
-          throw new Error('createChatHistoryStore must return an instance of ChatHistoryStore');
-        }
       } else {
         historyStore = new ChatHistoryLocalStore({
+          bizCode: BizCode.CHAT,
           agentId,
           deviceId,
           homeId,
           indexId
         });
       }
-      await agent.session.set('AIStream.historyStore', historyStore);
-      const {
-        records: historyMsgList
-      } = await historyStore.queryBy({
-        solutionCode: options.agentId ? [options.agentId] : null,
-        devId: options.deviceId ? [options.deviceId] : null,
-        homeId: [homeId],
-        index: [indexId]
-      }, {
-        sort: 'asc',
-        pageSize: options.historySize || 1000,
-        pageNo: 0
-      });
-      await session.set('AIStream.rawMessages', historyMsgList);
-      session.isNewChat = historyMsgList.length === 0;
+      if (historyStore) {
+        await agent.session.set('AIStream.historyStore', historyStore);
+        const {
+          records
+        } = await historyStore.queryAll({
+          sort: 'desc',
+          // id 倒序去获取最新的消息list，然后再reverse，保证最新的消息在最前面
+          limit: options.historySize || 1000,
+          offset: 0
+        });
+        await session.set('AIStream.rawMessages', records.reverse());
+        session.isNewChat = records.length === 0;
+      } else {
+        session.isNewChat = true;
+      }
       session.sessionId = indexId;
 
       // 创建 streamSession
@@ -92,12 +92,23 @@ export function withAIStream() {
         clientType: options.clientType || ConnectClientType.APP,
         deviceId: options.deviceId
       });
+      if (options.clientType === ConnectClientType.DEVICE && !options.deviceId) {
+        throw new Error('deviceId is required when clientType is device');
+      }
       const streamSession = connection.createSession({
-        api: tokenApi || DEFAULT_TOKEN_API,
-        apiVersion: tokenApiVersion || DEFAULT_TOKEN_API_VERSION,
-        solutionCode: agentId
+        ownerId: options.clientType === ConnectClientType.DEVICE ? options.deviceId : "".concat(homeId),
+        api: tokenOptions.api,
+        apiVersion: tokenOptions.version,
+        solutionCode: agentId,
+        extParams: tokenOptions.extParams
       });
       await session.set('AIStream.streamSession', streamSession);
+      if (options.earlyStart) {
+        // 故意异步，不阻塞消息列表加载
+        streamSession.ensureSession().catch(error => {
+          logger.error('earlyStart failed', error);
+        });
+      }
       const observer = new AIStreamObserver(data => {
         if (data.type === 'amplitudes') {
           ui.emitEvent('amplitudes', data);
@@ -113,22 +124,16 @@ export function withAIStream() {
       });
       await session.set('AIStream.observer', observer);
     });
-    onAgentDispose(async () => {
-      const observer = session.get('AIStream.observer');
-      if (observer) {
-        observer.disconnect();
-      }
-      const streamSession = session.get('AIStream.streamSession');
-
-      /**
-       * 关闭session
-       */
-      await streamSession.close();
-    });
+    const getHistoryStore = () => {
+      const historyStore = session.get('AIStream.historyStore');
+      return historyStore || null;
+    };
     const persist = async message => {
-      console.log('persist', message);
       // 对消息进行持久化，已存在的数据进行更新
-      const historyStore = await session.get('AIStream.historyStore');
+      const historyStore = getHistoryStore();
+      if (!historyStore) {
+        return;
+      }
       const storeId = message.meta.id;
       const messageObj = message.toObject();
       if (storeId) {
@@ -177,7 +182,10 @@ export function withAIStream() {
       if (!storeId) {
         return;
       }
-      const historyStore = await session.get('AIStream.historyStore');
+      const historyStore = getHistoryStore();
+      if (!historyStore) {
+        return;
+      }
       await historyStore.remove(storeId);
     };
     onMessageChange(async (type, message) => {
@@ -186,13 +194,14 @@ export function withAIStream() {
       }
     });
     const composeHandler = {
-      attachmentCompose: async () => {
-        // if (part.attachmentType === 'extensions') {
-        //   await hooks.callHook('onExtensionCompose', part.attachment, respMsg, result, 'stream');
-        // }
-        return {
+      attachmentCompose: async (respMsg, part) => {
+        const result = {
           messages: []
-        }.messages;
+        };
+        if (part.attachmentType === 'skill') {
+          await hooks.callHook('onSkillCompose', part.attachment, respMsg, result, 'stream');
+        }
+        return result.messages;
       }
     };
     const send = (blocks, signal, extraOptions) => {
@@ -303,7 +312,9 @@ export function withAIStream() {
       });
       const messages = await agent.flushStreamToShow(message, response, composeHandler);
       if (message.bubble.status === BubbleTileStatus.ABORTED) {
-        if (!message.bubble.text) {
+        if (message.bubble.text) {
+          await message.persist();
+        } else {
           await message.remove();
         }
       } else {
@@ -312,6 +323,67 @@ export function withAIStream() {
       return [userMsg, ...messages];
     };
     onInputBlocksPush(chat);
+    const feedback = async _ref => {
+      var _accountInfo$miniProg;
+      let {
+        requestId,
+        type
+      } = _ref;
+      const agentId = session.get('AIStream.agentId');
+      if (!agentId) {
+        throw new Error('agentId is not found');
+      }
+      const accountInfo = await getAccountInfo();
+      const appId = accountInfo === null || accountInfo === void 0 || (_accountInfo$miniProg = accountInfo.miniProgram) === null || _accountInfo$miniProg === void 0 ? void 0 : _accountInfo$miniProg.appId;
+      if (!appId) {
+        throw new Error('appId is not found');
+      }
+      return messageAppraise({
+        aiPtChannel: agentId,
+        miniProgramId: appId,
+        requestId,
+        /** 评价（1-有帮助，2-无帮助） */
+        approveStatus: type === 'like' ? 1 : 2
+      });
+    };
+    ui.hook('onMessageFeedback', async context => {
+      const {
+        payload
+      } = context;
+      const message = session.messages.get(payload.messageId);
+      if (!message) {
+        throw new Error('message not found');
+      }
+      const {
+        eventId,
+        sessionId
+      } = message.meta;
+      if (!eventId || !sessionId) {
+        context.result = {
+          success: true
+        };
+        return;
+      }
+      await feedback({
+        requestId: [eventId, sessionId].join('#'),
+        type: payload.rate
+      });
+      context.result = {
+        success: true
+      };
+    });
+    onAgentDispose(async () => {
+      const observer = session.get('AIStream.observer');
+      if (observer) {
+        observer.disconnect();
+      }
+      const streamSession = session.get('AIStream.streamSession');
+
+      /**
+       * 关闭session
+       */
+      await streamSession.close();
+    });
     const handleTTTAction = async (tile, tttAction) => {
       const result = {
         action: tttAction
@@ -368,7 +440,7 @@ export function withAIStream() {
     });
     return {
       hooks,
-      assistant: {
+      aiStream: {
         send,
         chat,
         composeHandler,
@@ -380,40 +452,13 @@ export function withAIStream() {
           Array.from(messages).forEach(message => {
             message.remove();
           });
-          if (options !== null && options !== void 0 && options.indexId) {
-            return;
-          }
           // 清空缓存的数据
-          const historyStore = await session.get('AIStream.historyStore');
-          historyStore.removeBy({
-            index: [options.indexId]
-          });
-        },
-        feedback: async _ref => {
-          var _accountInfo$miniProg;
-          let {
-            requestId,
-            type
-          } = _ref;
-          const aiPtChannel = session.get('AIStream.aiPtChannel');
-          if (!aiPtChannel) {
-            logger.error('aiPtChannel is not found');
-            return null;
-          }
-          const accountInfo = await getAccountInfo();
-          const appId = accountInfo === null || accountInfo === void 0 || (_accountInfo$miniProg = accountInfo.miniProgram) === null || _accountInfo$miniProg === void 0 ? void 0 : _accountInfo$miniProg.appId;
-          if (!appId) {
-            logger.error('appId is not found');
-            return null;
+          const historyStore = getHistoryStore();
+          if (historyStore) {
+            await historyStore.removeAll();
           }
-          return tAgentMessageAppraise({
-            aiPtChannel,
-            miniProgramId: appId,
-            requestId,
-            /** 评价（1-有帮助，2-无帮助） */
-            approveStatus: type === 'like' ? 1 : 2
-          });
-        }
+        },
+        feedback
       }
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-plugin-aistream",
-  "version": "0.2.0-beta-2",
+  "version": "0.2.0-beta-4",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "0784a0f440b67cc1f766a440dbad5350f633dfb1"
+  "gitHead": "1728f8a1cac6b2ca53e506e06171808fbf38efdc"
 }