@agentscope-ai/agentscope 0.0.5 → 0.0.6

package/dist/agent/index.d.mts

@@ -1,13 +1,13 @@
 import { z } from 'zod';
-import { M as Msg } from '../message-D-LObC06.mjs';
+import { M as Msg } from '../message-COpNEf0G.mjs';
 import { b as ToolCallBlock, C as ContentBlock, d as ToolResultBlock } from '../block-BqWf-Qcb.mjs';
-import { C as ChatModelBase, a as ChatUsage, b as ChatResponse } from '../base-BDyDUIhj.mjs';
+import { C as ChatModelBase, a as ChatUsage, b as ChatResponse } from '../base-L72wZVx8.mjs';
 import { a as ToolResponse } from '../index-DpRGxYeT.mjs';
 import { T as Toolkit } from '../toolkit-DvER4yhm.mjs';
 import { UserConfirmResultEvent, ExternalExecutionResultEvent, AgentEvent, EventType, ToolResultTextDeltaEvent, ToolResultDataDeltaEvent, ToolResultEndEvent } from '../event/index.mjs';
 import { a as ToolChoice } from '../index-CAxQAkiP.mjs';
-import { S as StorageBase } from '../base-BB9eTlit.mjs';
-import '../base-BI5s2ksj.mjs';
+import { S as StorageBase } from '../base-Ps8E0j1_.mjs';
+import '../base-Bc3GkNS7.mjs';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/client/sse.js';
 import '@modelcontextprotocol/sdk/client/streamableHttp.js';

package/dist/agent/index.d.ts

@@ -1,13 +1,13 @@
 import { z } from 'zod';
-import { M as Msg } from '../message-DU0_qm3u.js';
+import { M as Msg } from '../message-DbCMy5tM.js';
 import { b as ToolCallBlock, C as ContentBlock, d as ToolResultBlock } from '../block-BqWf-Qcb.js';
-import { C as ChatModelBase, a as ChatUsage, b as ChatResponse } from '../base-qmU135_k.js';
+import { C as ChatModelBase, a as ChatUsage, b as ChatResponse } from '../base-13VLaOvY.js';
 import { a as ToolResponse } from '../index-9YC8onn7.js';
 import { T as Toolkit } from '../toolkit-CLGa-xW0.js';
 import { UserConfirmResultEvent, ExternalExecutionResultEvent, AgentEvent, EventType, ToolResultTextDeltaEvent, ToolResultDataDeltaEvent, ToolResultEndEvent } from '../event/index.js';
 import { a as ToolChoice } from '../index-CAxQAkiP.js';
-import { S as StorageBase } from '../base-DHtZCg94.js';
-import '../base-CFDeoJRe.js';
+import { S as StorageBase } from '../base-CJkm56kB.js';
+import '../base-Dfizi3RB.js';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/client/sse.js';
 import '@modelcontextprotocol/sdk/client/streamableHttp.js';

package/dist/agent/index.js

@@ -38,6 +38,21 @@ module.exports = __toCommonJS(agent_exports);
 var import_zod9 = require("zod");
 
 // src/message/message.ts
+function assertContentBlocksForRole(role, content) {
+  if (role === "user") {
+    for (const block of content) {
+      if (block.type !== "text" && block.type !== "data") {
+        throw new Error("User message can only contain text blocks or data blocks.");
+      }
+    }
+  } else if (role === "system") {
+    for (const block of content) {
+      if (block.type !== "text") {
+        throw new Error("System message can only contain text blocks.");
+      }
+    }
+  }
+}
 function createMsg({
   name,
   content,
@@ -49,6 +64,7 @@ function createMsg({
   usage
 }) {
   const contentBlocks = typeof content === "string" ? [{ id: crypto.randomUUID(), type: "text", text: content }] : content;
+  assertContentBlocksForRole(role, contentBlocks);
   return { id, name, role, content: contentBlocks, metadata, created_at, finished_at, usage };
 }
 function getContentBlocks(msg, blockType) {
@@ -768,26 +784,37 @@ var Agent = class {
    * @param usage
    */
   _saveToContext(blocks, usage) {
+    const msgUsage = usage ? { input_tokens: usage.inputTokens, output_tokens: usage.outputTokens } : void 0;
     const lastMsg = this.context.at(-1);
     if (this.context.length === 0) {
       this.context.push(
-        createMsg({ name: this.name, content: blocks, role: "assistant", usage })
+        createMsg({
+          name: this.name,
+          content: blocks,
+          role: "assistant",
+          usage: msgUsage
+        })
       );
     } else if (lastMsg && lastMsg.role === "assistant" && lastMsg.name === this.name) {
       lastMsg.content.push(...blocks);
-      if (usage) {
+      if (msgUsage) {
         if (!lastMsg.usage) {
           lastMsg.usage = {
-            inputTokens: 0,
-            outputTokens: 0
+            input_tokens: 0,
+            output_tokens: 0
           };
         }
-        lastMsg.usage.inputTokens = lastMsg.usage.inputTokens + usage.inputTokens;
-        lastMsg.usage.outputTokens = lastMsg.usage.outputTokens + usage.outputTokens;
+        lastMsg.usage.input_tokens = lastMsg.usage.input_tokens + msgUsage.input_tokens;
+        lastMsg.usage.output_tokens = lastMsg.usage.output_tokens + msgUsage.output_tokens;
       }
     } else {
       this.context.push(
-        createMsg({ name: this.name, content: blocks, role: "assistant", usage })
+        createMsg({
+          name: this.name,
+          content: blocks,
+          role: "assistant",
+          usage: msgUsage
+        })
       );
     }
   }