@ray-js/t-agent 0.0.8 → 0.0.9-beta-2

package/README-zh_CN.md

@@ -702,6 +702,12 @@ Hooks：
   - `extension` 扩展数据
   - `responseMessage` 响应消息
   - `result.messages` 消息列表
+- `onTTTAction` tile 使用 `sendAction` 时触发
+  - `tile` 触发的 tile
+  - `action` TTTAction
+- `onCardsReceived` 当收到卡片时触发
+  - `extension` 扩展数据
+  - `result.cards` 卡片列表
 
 ### withBuildIn 插件
 
@@ -1229,9 +1235,11 @@ import {
 } from '@ray-js/t-agent-ui-ray';
 import { View, Text, Button } from '@ray-js/ray';
 
-function MyCard(props: { card: ChatCardObject }) {
+const MyCard: ChatCardComponent<{ title: string }, { clicked: boolean }> = props => {
   // 如果你需要拿到 agent、message、tile、emitEvent 等属性，可以使用 useTileProps
   const { message, agent, tile, emitEvent } = useTileProps();
+  const { card, setCardState } = props;
+  const { cardData, cardState, cardCode } = card as ChatCardObject<{ title: string }>;
 
   // 如果你需要发送一个 TTTAction，可以使用 useSendAction
   const sendAction = useSendAction();
@@ -1240,15 +1248,18 @@ function MyCard(props: { card: ChatCardObject }) {
     <View>
       <Text>My Card</Text>
       <Button
-        onClick={() =>
-          sendAction({ type: 'sendMessage', blocks: [{ type: 'text', text: 'hello' }] })
-        }
+        onClick={() => {
+          sendAction({ type: 'sendMessage', blocks: [{ type: 'text', text: 'hello' }] });
+          // 如果需要更新卡片状态，可以使用 setCardState
+          // 第二个参数表示是否持久化状态
+          setCardState({ clicked: true }, { persist: true });
+        }}
       >
         填充文本到输入框
       </Button>
     </View>
   );
-}
+};
 
 const renderOptions = {
   ...defaultRenderOptions,
@@ -1388,3 +1399,4 @@ const renderOptions = {
 | t-agent.input.voice.require-permission             | MessageInput 切换语音输入 | 需要授权录音权限     |
 | t-agent.input.upload.failed                        | MessageInput 上传文件     | 文件上传失败         |
 | t-agent.message.feedback.success                   | BubbleTile 消息评价       | 反馈成功             |
+| t-agent-bubble-tile-aborted                        | BubbleTile 消息           | 用户中断             |

package/README.md

@@ -696,6 +696,12 @@ Hooks:
   - `extension`: Extension data
   - `responseMessage`: Response message
   - `result.messages`: Message list
+- `onTTTAction` When using `sendAction` in the tile, this hook triggers.
+  - `tile` Tile object
+  - `action` TTTAction
+- `onCardsReceived` When receiving cards, this hook triggers.
+  - `extension` Extension data
+  - `result.cards` Card list
 
 ### withBuildIn Plugin
 
@@ -1224,9 +1230,11 @@ import {
 } from '@ray-js/t-agent-ui-ray';
 import { View, Text, Button } from '@ray-js/ray';
 
-function MyCard(props: { card: ChatCardObject }) {
+const MyCard: ChatCardComponent<{ title: string }, { clicked: boolean }> = props => {
   // If you need to access attributes like agent, message, tile, emitEvent, use useTileProps
   const { message, agent, tile, emitEvent } = useTileProps();
+  const { card, setCardState } = props;
+  const { cardData, cardState, cardCode } = card as ChatCardObject<{ title: string }>;
 
   // If you need to send a TTTAction, use useSendAction
   const sendAction = useSendAction();
@@ -1235,15 +1243,18 @@ function MyCard(props: { card: ChatCardObject }) {
     <View>
       <Text>My Card</Text>
       <Button
-        onClick={() =>
-          sendAction({ type: 'sendMessage', blocks: [{ type: 'text', text: 'hello' }] })
-        }
+        onClick={() => {
+          sendAction({ type: 'sendMessage', blocks: [{ type: 'text', text: 'hello' }] });
+          // If you want to set the card state, use setCardState
+          // The second parameter is used to determine whether to persist the card state, default is false
+          setCardState({ clicked: true }, { persist: true });
+        }}
       >
         Fill text into input
       </Button>
     </View>
   );
-}
+};
 
 const renderOptions = {
   ...defaultRenderOptions,
@@ -1383,3 +1394,4 @@ Below are the built-in multilingual keys:
 | t-agent.input.voice.require-permission             | MessageInput switch to voice input | Need to grant recording permission |
 | t-agent.input.upload.failed                        | MessageInput file upload           | File upload failed                 |
 | t-agent.message.feedback.success                   | BubbleTile message feedback        | Feedback successful                |
+| t-agent-bubble-tile-aborted                        | BubbleTile message                 | User aborted                       |

package/dist/chat/ChatAgent.js

@@ -213,8 +213,7 @@ export default class ChatAgent {
                   await message.set({
                     status: ChatMessageStatus.UPDATING
                   }).bubble.setText(text).update();
-                }
-                if (part.type === 'attachment' && attachmentCompose) {
+                } else if (part.type === 'attachment' && attachmentCompose) {
                   const list = (await attachmentCompose(message, part)) || [];
                   for (const m of list) {
                     m.set({
@@ -223,12 +222,23 @@ export default class ChatAgent {
                     await m.show();
                     messages.push(m);
                   }
-                }
-                if (part.type === 'error') {
+                } else if (part.type === 'error') {
                   if (!message.bubble.text) {
                     message.bubble.setText(part.error.message);
                   }
                   await message.bubble.setStatus(part.level === 'error' ? BubbleTileStatus.ERROR : BubbleTileStatus.WARNING).setInfo(part.error.message).update();
+                } else if (part.type === 'abort') {
+                  // 如果只有一条响应消息，则直接设置为中断状态
+                  if (messages.length === 1) {
+                    if (message.status === ChatMessageStatus.UPDATING) {
+                      await message.bubble.setStatus(BubbleTileStatus.ABORTED).update();
+                    } else {
+                      await message.remove();
+                      messages.pop();
+                    }
+                  }
+                  // stop update
+                  break;
                 }
               }
             }

package/dist/chat/StreamResponse.d.ts

@@ -1,6 +1,8 @@
 import { MessagePart, StreamResponseInstance } from './types';
 export default class StreamResponse implements StreamResponseInstance {
     private partStream;
+    private reader;
+    private aborted;
     /**
      * Create a new StreamResponse instance.
      *

package/dist/chat/StreamResponse.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _awaitAsyncGenerator from "@babel/runtime/helpers/esm/awaitAsyncGenerator";
 import _wrapAsyncGenerator from "@babel/runtime/helpers/esm/wrapAsyncGenerator";
 import "core-js/modules/es.symbol.async-iterator.js";
@@ -8,6 +9,8 @@ export default class StreamResponse {
    * @param partStream
    */
   constructor(partStream) {
+    _defineProperty(this, "reader", null);
+    _defineProperty(this, "aborted", false);
     this.partStream = partStream;
   }
 
@@ -15,16 +18,41 @@ export default class StreamResponse {
    * Get all parts of the response as an async iterator.
    */
   parts() {
+    if (this.reader) {
+      throw new Error('parts() can only be called once');
+    }
     const reader = this.partStream.getReader();
+    this.reader = reader;
+
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const resp = this;
     return {
       [Symbol.asyncIterator]() {
         return _wrapAsyncGenerator(function* () {
           try {
             while (true) {
+              if (resp.aborted) {
+                yield {
+                  type: 'abort',
+                  level: 'warn',
+                  error: new Error('User aborted'),
+                  meta: {}
+                };
+                break;
+              }
               const {
                 done,
                 value
               } = yield _awaitAsyncGenerator(reader.read());
+              if (resp.aborted) {
+                yield {
+                  type: 'abort',
+                  level: 'warn',
+                  error: new Error('User aborted'),
+                  meta: {}
+                };
+                break;
+              }
               if (done) break;
               yield value;
             }
@@ -42,6 +70,10 @@ export default class StreamResponse {
    * @param reason
    */
   cancel(reason) {
-    return this.partStream.cancel(reason);
+    this.aborted = true;
+    if (this.reader) {
+      return this.reader.cancel(reason);
+    }
+    throw new Error('cancel() can only be called after parts()');
   }
 }

package/dist/chat/index.d.ts

@@ -3,10 +3,10 @@ import StreamResponse from './StreamResponse';
 import ChatTile from './ChatTile';
 import ChatBubbleTile from './ChatBubbleTile';
 import ChatMessage from './ChatMessage';
-import { generateId, safeParseJSON, sleep, generateInt, isAbortError, debounce, shuffleWithSeed } from './utils';
+import { generateId, safeParseJSON, isAbortError, shuffleWithSeed } from './utils';
 import Logger, { getLogger } from './Logger';
 import { Emitter, EmitterEvent } from './Emitter';
 export { createHooks, Hookable } from 'hookable';
-export { ChatAgent, StreamResponse, ChatTile, ChatBubbleTile, ChatMessage, generateId, generateInt, safeParseJSON, getLogger, Logger, Emitter, EmitterEvent, isAbortError, sleep, debounce, shuffleWithSeed, };
+export { ChatAgent, StreamResponse, ChatTile, ChatBubbleTile, ChatMessage, generateId, safeParseJSON, getLogger, Logger, Emitter, EmitterEvent, isAbortError, shuffleWithSeed, };
 export * from './createChatAgent';
 export * from './types';

package/dist/chat/index.js

@@ -3,10 +3,10 @@ import StreamResponse from './StreamResponse';
 import ChatTile from './ChatTile';
 import ChatBubbleTile from './ChatBubbleTile';
 import ChatMessage from './ChatMessage';
-import { generateId, safeParseJSON, sleep, generateInt, isAbortError, debounce, shuffleWithSeed } from './utils';
+import { generateId, safeParseJSON, isAbortError, shuffleWithSeed } from './utils';
 import Logger, { getLogger } from './Logger';
 import { Emitter, EmitterEvent } from './Emitter';
 export { createHooks, Hookable } from 'hookable';
-export { ChatAgent, StreamResponse, ChatTile, ChatBubbleTile, ChatMessage, generateId, generateInt, safeParseJSON, getLogger, Logger, Emitter, EmitterEvent, isAbortError, sleep, debounce, shuffleWithSeed };
+export { ChatAgent, StreamResponse, ChatTile, ChatBubbleTile, ChatMessage, generateId, safeParseJSON, getLogger, Logger, Emitter, EmitterEvent, isAbortError, shuffleWithSeed };
 export * from './createChatAgent';
 export * from './types';

package/dist/chat/types.d.ts

@@ -97,7 +97,8 @@ export interface InputBlock {
 export declare enum BubbleTileStatus {
     NORMAL = "normal",
     WARNING = "warning",
-    ERROR = "error"
+    ERROR = "error",
+    ABORTED = "aborted"
 }
 export interface AbortSignalObject {
     aborted: boolean;
@@ -143,7 +144,7 @@ export type ChatAgentPluginHandler = {
 export type ChatAgentPlugin<T extends ChatAgentPluginHandler = Record<string, any>> = (agent: ChatAgent) => T;
 export type AddHookCallback<H, T extends keyof H> = (fn: H[T], type?: 'before' | 'after' | undefined) => () => void;
 export interface ErrorPart {
-    type: 'error';
+    type: 'error' | 'abort';
     level: 'error' | 'warn';
     error: Error;
     meta: Record<string, any>;

package/dist/chat/types.js

@@ -19,6 +19,7 @@ export let BubbleTileStatus = /*#__PURE__*/function (BubbleTileStatus) {
   BubbleTileStatus["NORMAL"] = "normal";
   BubbleTileStatus["WARNING"] = "warning";
   BubbleTileStatus["ERROR"] = "error";
+  BubbleTileStatus["ABORTED"] = "aborted";
   return BubbleTileStatus;
 }({});
 export let FinishReason = /*#__PURE__*/function (FinishReason) {

package/dist/chat/utils.d.ts

@@ -1,32 +1,6 @@
 export declare function generateId(length?: number): string;
-export declare function generateInt(min: number, max: number): number;
 export declare function deepCloneToPlainObject(obj: any): any;
 export declare function safeParseJSON<T = any>(str: any): T | undefined;
 export declare function deepMerge(target: any, source: any): any;
-export declare const sleep: (ms: number) => Promise<unknown>;
 export declare function isAbortError(reason: any): any;
-type AnyFunction = (...arguments_: readonly any[]) => unknown;
-/**
- * Creates a debounced function that delays execution until `wait` milliseconds have passed since its last invocation.
- *
- * Set the `immediate` option to `true` to execute the function immediately at the start of the `wait` interval, preventing issues such as double-clicks on a button.
- *
- * The returned function has the following methods:
- *
- * - `.isPending` indicates whether the debounce delay is currently active.
- * - `.clear()` cancels any scheduled executions.
- * - `.flush()` if an execution is scheduled then it will be immediately executed and the timer will be cleared.
- * - `.trigger()` executes the function immediately and clears the timer if it was previously set.
- */
-export declare function debounce<F extends AnyFunction>(function_: F, wait?: number, options?: {
-    immediate?: boolean;
-}): DebouncedFunction<F>;
-interface DebouncedFunction<F extends AnyFunction> {
-    (...arguments_: Parameters<F>): ReturnType<F> | undefined;
-    readonly isPending: boolean;
-    clear(): void;
-    flush(): void;
-    trigger(): void;
-}
 export declare function shuffleWithSeed<T>(array: T[], seed: string): T[];
-export {};

package/dist/chat/utils.js

@@ -14,9 +14,6 @@ export function generateId() {
   }
   return result;
 }
-export function generateInt(min, max) {
-  return Math.floor(Math.random() * (max - min + 1) + min);
-}
 export function deepCloneToPlainObject(obj) {
   // 判断是否是对象或数组
   if (obj === null || typeof obj !== 'object') {
@@ -83,101 +80,9 @@ export function deepMerge(target, source) {
   }
   return target;
 }
-export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 export function isAbortError(reason) {
   return reason && typeof Error !== 'undefined' && reason instanceof Error && reason.name === 'AbortError';
 }
-/**
- * Creates a debounced function that delays execution until `wait` milliseconds have passed since its last invocation.
- *
- * Set the `immediate` option to `true` to execute the function immediately at the start of the `wait` interval, preventing issues such as double-clicks on a button.
- *
- * The returned function has the following methods:
- *
- * - `.isPending` indicates whether the debounce delay is currently active.
- * - `.clear()` cancels any scheduled executions.
- * - `.flush()` if an execution is scheduled then it will be immediately executed and the timer will be cleared.
- * - `.trigger()` executes the function immediately and clears the timer if it was previously set.
- */
-export function debounce(function_) {
-  let wait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  if (typeof function_ !== 'function') {
-    throw new TypeError("Expected the first parameter to be a function, got `".concat(typeof function_, "`."));
-  }
-  if (wait < 0) {
-    throw new RangeError('`wait` must not be negative.');
-  }
-  const {
-    immediate = false
-  } = options;
-  let storedContext;
-  let storedArguments;
-  let timeoutId;
-  let timestamp;
-  let result;
-  function run() {
-    const callContext = storedContext;
-    const callArguments = storedArguments;
-    storedContext = undefined;
-    storedArguments = undefined;
-    result = function_.apply(callContext, callArguments);
-    return result;
-  }
-  function later() {
-    const last = Date.now() - timestamp;
-    if (last < wait && last >= 0) {
-      timeoutId = setTimeout(later, wait - last);
-    } else {
-      timeoutId = undefined;
-      if (!immediate) {
-        result = run();
-      }
-    }
-  }
-  const debounced = function () {
-    if (storedContext && this !== storedContext && Object.getPrototypeOf(this) === Object.getPrototypeOf(storedContext)) {
-      throw new Error('Debounced method called with different contexts of the same prototype.');
-    }
-    storedContext = this;
-    for (var _len = arguments.length, arguments_ = new Array(_len), _key = 0; _key < _len; _key++) {
-      arguments_[_key] = arguments[_key];
-    }
-    storedArguments = arguments_;
-    timestamp = Date.now();
-    const callNow = immediate && !timeoutId;
-    if (!timeoutId) {
-      timeoutId = setTimeout(later, wait);
-    }
-    if (callNow) {
-      result = run();
-    }
-    return result;
-  };
-  Object.defineProperty(debounced, 'isPending', {
-    get() {
-      return timeoutId !== undefined;
-    }
-  });
-  debounced.clear = () => {
-    if (!timeoutId) {
-      return;
-    }
-    clearTimeout(timeoutId);
-    timeoutId = undefined;
-  };
-  debounced.flush = () => {
-    if (!timeoutId) {
-      return;
-    }
-    debounced.trigger();
-  };
-  debounced.trigger = () => {
-    result = run();
-    debounced.clear();
-  };
-  return debounced;
-}
 function seedRandom(seed) {
   let h = 0;
   // 将字符串种子转化为哈希值

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent",
-  "version": "0.0.8",
+  "version": "0.0.9-beta-2",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -26,5 +26,5 @@
     "build": "ray build --type=component --output dist",
     "clean": "rimraf ./dist"
   },
-  "gitHead": "686e9d17bd1a96074d3ac16ac2a3d73e1aa17f8f"
+  "gitHead": "45f4f153fe2ce1e218a74f9bd3df726cf4e06d63"
 }