@aigne/core 1.0.15 → 1.0.17

package/lib/cjs/llm-agent.d.ts

@@ -2,7 +2,7 @@ import { Agent, type AgentDefinition, type AgentMemories, type AgentPreloads, ty
 import type { Context, ContextState } from "./context";
 import { type SchemaToType } from "./definitions/data-schema";
 import type { LLMModel, LLMModelInputMessage, LLMModelInputs } from "./llm-model";
-import type { RunnableInput, RunnableOutput } from "./runnable";
+import { type RunnableInput, type RunnableOutput } from "./runnable";
 import { OrderedRecord } from "./utils/ordered-map";
 export declare class LLMAgent<I extends RunnableInput = RunnableInput, O extends RunnableOutput = RunnableOutput, State extends ContextState = ContextState, Preloads extends AgentPreloads = AgentPreloads, Memories extends AgentMemories = AgentMemories> extends Agent<I, O, State, Preloads, Memories> {
     definition: LLMAgentDefinition;

package/lib/cjs/llm-agent.js

@@ -20,6 +20,7 @@ const constants_1 = require("./constants");
 const data_schema_1 = require("./definitions/data-schema");
 const memory_1 = require("./definitions/memory");
 const preload_1 = require("./definitions/preload");
+const runnable_1 = require("./runnable");
 const message_utils_1 = require("./utils/message-utils");
 const mustache_utils_1 = require("./utils/mustache-utils");
 const ordered_map_1 = require("./utils/ordered-map");
@@ -47,8 +48,10 @@ let LLMAgent = class LLMAgent extends agent_1.Agent {
         const hasTextOutput = ordered_map_1.OrderedRecord.find(definition.outputs, (i) => i.name === constants_1.StreamTextOutputName);
         if (hasTextOutput) {
             for await (const chunk of await this.runWithTextOutput(llmInputs)) {
-                $text += chunk.$text || "";
-                yield { $text: chunk.$text };
+                if ((0, runnable_1.isRunnableResponseDelta)(chunk)) {
+                    $text += chunk.$text || "";
+                    yield { $text: chunk.$text };
+                }
             }
         }
         const json = await this.runWithStructuredOutput(llmInputs);

package/lib/cjs/pipeline-agent.d.ts

@@ -1,7 +1,7 @@
 import { Agent, type AgentDefinition, type AgentMemories, type AgentPreloads, type AgentProcessInput, type AgentProcessOptions, type CreateAgentInputSchema, type CreateAgentMemoriesSchema, type CreateAgentMemoriesType, type CreateAgentOptions, type CreateAgentOutputSchema, type CreateAgentPreloadsSchema, type CreateAgentPreloadsType } from "./agent";
 import type { Context, ContextState } from "./context";
 import { type SchemaToType } from "./definitions/data-schema";
-import type { Runnable, RunnableInput, RunnableOutput, RunnableOutputType, RunnableResponseDelta } from "./runnable";
+import { type Runnable, type RunnableInput, type RunnableOutput, type RunnableOutputType, type RunnableResponseDelta } from "./runnable";
 import type { MakeNullablePropertyOptional } from "./utils/nullable";
 import { OrderedRecord } from "./utils/ordered-map";
 import type { ExtractRunnableInputType } from "./utils/runnable-type";

package/lib/cjs/pipeline-agent.js

@@ -21,6 +21,7 @@ const constants_1 = require("./constants");
 const data_schema_1 = require("./definitions/data-schema");
 const memory_1 = require("./definitions/memory");
 const preload_1 = require("./definitions/preload");
+const runnable_1 = require("./runnable");
 const is_non_nullable_1 = require("./utils/is-non-nullable");
 const logger_1 = require("./utils/logger");
 const ordered_map_1 = require("./utils/ordered-map");
@@ -90,37 +91,39 @@ let PipelineAgent = class PipelineAgent extends agent_1.Agent {
                         const processResult = {};
                         variables[process.id] = processResult;
                         for await (const chunk of stream) {
-                            if (chunk.$text) {
-                                Object.assign(processResult, {
-                                    $text: (processResult.$text || "") + chunk.$text,
-                                });
-                                if (needRespondTextStream) {
-                                    controller.enqueue({ $text: chunk.$text });
-                                }
-                            }
-                            if (chunk.delta) {
-                                Object.assign(processResult, chunk.delta);
-                                // TODO: 这里需要考虑上层 agent 直接输出了 {$text: 'xxx'} 没有用 chunk 的方式返回的情况
-                                // if (needRespondJsonStream) {
-                                result = Object.fromEntries(ordered_map_1.OrderedRecord.map(definition.outputs, (output) => {
-                                    if (!output.name)
-                                        return null;
-                                    if (output.name === constants_1.StreamTextOutputName)
-                                        return null;
-                                    let value;
-                                    if (output.from === "variable") {
-                                        const v = variables[output.fromVariableId];
-                                        value = output.fromVariablePropPath?.length
-                                            ? (0, lodash_1.get)(v, output.fromVariablePropPath)
-                                            : v;
-                                    }
-                                    else {
-                                        throw new Error(`Unsupported output source ${output.from}`);
+                            if ((0, runnable_1.isRunnableResponseDelta)(chunk)) {
+                                if (chunk.$text) {
+                                    Object.assign(processResult, {
+                                        $text: (processResult.$text || "") + chunk.$text,
+                                    });
+                                    if (needRespondTextStream) {
+                                        controller.enqueue({ $text: chunk.$text });
                                     }
-                                    return [output.name, value];
-                                }).filter(is_non_nullable_1.isNonNullable));
-                                controller.enqueue({ delta: result });
-                                // }
+                                }
+                                if (chunk.delta) {
+                                    Object.assign(processResult, chunk.delta);
+                                    // TODO: 这里需要考虑上层 agent 直接输出了 {$text: 'xxx'} 没有用 chunk 的方式返回的情况
+                                    // if (needRespondJsonStream) {
+                                    result = Object.fromEntries(ordered_map_1.OrderedRecord.map(definition.outputs, (output) => {
+                                        if (!output.name)
+                                            return null;
+                                        if (output.name === constants_1.StreamTextOutputName)
+                                            return null;
+                                        let value;
+                                        if (output.from === "variable") {
+                                            const v = variables[output.fromVariableId];
+                                            value = output.fromVariablePropPath?.length
+                                                ? (0, lodash_1.get)(v, output.fromVariablePropPath)
+                                                : v;
+                                        }
+                                        else {
+                                            throw new Error(`Unsupported output source ${output.from}`);
+                                        }
+                                        return [output.name, value];
+                                    }).filter(is_non_nullable_1.isNonNullable));
+                                    controller.enqueue({ delta: result });
+                                    // }
+                                }
                             }
                         }
                     }

package/lib/cjs/runnable.d.ts

@@ -41,13 +41,36 @@ export interface RunnableResponseDelta<T> {
     $text?: string;
     delta?: Partial<T>;
 }
+export interface RunnableResponseProgress {
+    progress: {
+        taskId: string;
+        time: string;
+        agent: {
+            id: string;
+            name?: string;
+            description?: string;
+        };
+        payload: {
+            type: "start";
+            input: {
+                [key: string]: any;
+            };
+        } | {
+            type: "end";
+            output: {
+                [key: string]: any;
+            };
+        };
+    };
+}
 export interface RunnableResponseError {
     error: {
         message: string;
     };
 }
-export type RunnableResponseChunk<T> = RunnableResponseDelta<T>;
+export type RunnableResponseChunk<T> = RunnableResponseDelta<T> | RunnableResponseProgress;
 export type RunnableResponseChunkWithError<T> = RunnableResponseChunk<T> | RunnableResponseError;
 export declare function isRunnableResponseDelta<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseDelta<T>;
+export declare function isRunnableResponseProgress<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseProgress;
 export declare function isRunnableResponseError<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseError;
 export type RunnableResponseStream<T> = ReadableStream<RunnableResponseChunk<T>>;

package/lib/cjs/runnable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Runnable = void 0;
 exports.isRunnableResponseDelta = isRunnableResponseDelta;
+exports.isRunnableResponseProgress = isRunnableResponseProgress;
 exports.isRunnableResponseError = isRunnableResponseError;
 const ordered_map_1 = require("./utils/ordered-map");
 class Runnable {
@@ -25,8 +26,12 @@ class Runnable {
 }
 exports.Runnable = Runnable;
 function isRunnableResponseDelta(chunk) {
-    return "$text" in chunk || "delta" in chunk;
+    return (("$text" in chunk && typeof chunk.$text === "string") ||
+        ("delta" in chunk && typeof chunk.delta === "object"));
+}
+function isRunnableResponseProgress(chunk) {
+    return "progress" in chunk && typeof chunk.progress === "object";
 }
 function isRunnableResponseError(chunk) {
-    return "error" in chunk;
+    return "error" in chunk && typeof chunk.error === "object";
 }

package/lib/cjs/utils/stream-utils.js

@@ -43,8 +43,8 @@ async function extractOutputsFromRunnableOutput(output, resolve) {
                     const result = {};
                     let $text = "";
                     for await (const value of output) {
+                        controller.enqueue(value);
                         if ((0, runnable_1.isRunnableResponseDelta)(value)) {
-                            controller.enqueue(value);
                             $text += value.$text || "";
                             Object.assign(result, value.delta);
                         }

package/lib/dts/llm-agent.d.ts

@@ -2,7 +2,7 @@ import { Agent, type AgentDefinition, type AgentMemories, type AgentPreloads, ty
 import type { Context, ContextState } from "./context";
 import { type SchemaToType } from "./definitions/data-schema";
 import type { LLMModel, LLMModelInputMessage, LLMModelInputs } from "./llm-model";
-import type { RunnableInput, RunnableOutput } from "./runnable";
+import { type RunnableInput, type RunnableOutput } from "./runnable";
 import { OrderedRecord } from "./utils/ordered-map";
 export declare class LLMAgent<I extends RunnableInput = RunnableInput, O extends RunnableOutput = RunnableOutput, State extends ContextState = ContextState, Preloads extends AgentPreloads = AgentPreloads, Memories extends AgentMemories = AgentMemories> extends Agent<I, O, State, Preloads, Memories> {
     definition: LLMAgentDefinition;

package/lib/dts/pipeline-agent.d.ts

@@ -1,7 +1,7 @@
 import { Agent, type AgentDefinition, type AgentMemories, type AgentPreloads, type AgentProcessInput, type AgentProcessOptions, type CreateAgentInputSchema, type CreateAgentMemoriesSchema, type CreateAgentMemoriesType, type CreateAgentOptions, type CreateAgentOutputSchema, type CreateAgentPreloadsSchema, type CreateAgentPreloadsType } from "./agent";
 import type { Context, ContextState } from "./context";
 import { type SchemaToType } from "./definitions/data-schema";
-import type { Runnable, RunnableInput, RunnableOutput, RunnableOutputType, RunnableResponseDelta } from "./runnable";
+import { type Runnable, type RunnableInput, type RunnableOutput, type RunnableOutputType, type RunnableResponseDelta } from "./runnable";
 import type { MakeNullablePropertyOptional } from "./utils/nullable";
 import { OrderedRecord } from "./utils/ordered-map";
 import type { ExtractRunnableInputType } from "./utils/runnable-type";

package/lib/dts/runnable.d.ts

@@ -41,13 +41,36 @@ export interface RunnableResponseDelta<T> {
     $text?: string;
     delta?: Partial<T>;
 }
+export interface RunnableResponseProgress {
+    progress: {
+        taskId: string;
+        time: string;
+        agent: {
+            id: string;
+            name?: string;
+            description?: string;
+        };
+        payload: {
+            type: "start";
+            input: {
+                [key: string]: any;
+            };
+        } | {
+            type: "end";
+            output: {
+                [key: string]: any;
+            };
+        };
+    };
+}
 export interface RunnableResponseError {
     error: {
         message: string;
     };
 }
-export type RunnableResponseChunk<T> = RunnableResponseDelta<T>;
+export type RunnableResponseChunk<T> = RunnableResponseDelta<T> | RunnableResponseProgress;
 export type RunnableResponseChunkWithError<T> = RunnableResponseChunk<T> | RunnableResponseError;
 export declare function isRunnableResponseDelta<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseDelta<T>;
+export declare function isRunnableResponseProgress<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseProgress;
 export declare function isRunnableResponseError<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseError;
 export type RunnableResponseStream<T> = ReadableStream<RunnableResponseChunk<T>>;

package/lib/esm/llm-agent.d.ts

@@ -2,7 +2,7 @@ import { Agent, type AgentDefinition, type AgentMemories, type AgentPreloads, ty
 import type { Context, ContextState } from "./context";
 import { type SchemaToType } from "./definitions/data-schema";
 import type { LLMModel, LLMModelInputMessage, LLMModelInputs } from "./llm-model";
-import type { RunnableInput, RunnableOutput } from "./runnable";
+import { type RunnableInput, type RunnableOutput } from "./runnable";
 import { OrderedRecord } from "./utils/ordered-map";
 export declare class LLMAgent<I extends RunnableInput = RunnableInput, O extends RunnableOutput = RunnableOutput, State extends ContextState = ContextState, Preloads extends AgentPreloads = AgentPreloads, Memories extends AgentMemories = AgentMemories> extends Agent<I, O, State, Preloads, Memories> {
     definition: LLMAgentDefinition;

package/lib/esm/llm-agent.js

@@ -17,6 +17,7 @@ import { StreamTextOutputName, TYPES } from "./constants";
 import { schemaToDataType } from "./definitions/data-schema";
 import { toRunnableMemories } from "./definitions/memory";
 import { preloadCreatorsToPreloads } from "./definitions/preload";
+import { isRunnableResponseDelta, } from "./runnable";
 import { prepareMessages } from "./utils/message-utils";
 import { renderMessage } from "./utils/mustache-utils";
 import { OrderedRecord } from "./utils/ordered-map";
@@ -44,8 +45,10 @@ let LLMAgent = class LLMAgent extends Agent {
         const hasTextOutput = OrderedRecord.find(definition.outputs, (i) => i.name === StreamTextOutputName);
         if (hasTextOutput) {
             for await (const chunk of await this.runWithTextOutput(llmInputs)) {
-                $text += chunk.$text || "";
-                yield { $text: chunk.$text };
+                if (isRunnableResponseDelta(chunk)) {
+                    $text += chunk.$text || "";
+                    yield { $text: chunk.$text };
+                }
             }
         }
         const json = await this.runWithStructuredOutput(llmInputs);

package/lib/esm/pipeline-agent.d.ts

@@ -1,7 +1,7 @@
 import { Agent, type AgentDefinition, type AgentMemories, type AgentPreloads, type AgentProcessInput, type AgentProcessOptions, type CreateAgentInputSchema, type CreateAgentMemoriesSchema, type CreateAgentMemoriesType, type CreateAgentOptions, type CreateAgentOutputSchema, type CreateAgentPreloadsSchema, type CreateAgentPreloadsType } from "./agent";
 import type { Context, ContextState } from "./context";
 import { type SchemaToType } from "./definitions/data-schema";
-import type { Runnable, RunnableInput, RunnableOutput, RunnableOutputType, RunnableResponseDelta } from "./runnable";
+import { type Runnable, type RunnableInput, type RunnableOutput, type RunnableOutputType, type RunnableResponseDelta } from "./runnable";
 import type { MakeNullablePropertyOptional } from "./utils/nullable";
 import { OrderedRecord } from "./utils/ordered-map";
 import type { ExtractRunnableInputType } from "./utils/runnable-type";

package/lib/esm/pipeline-agent.js

@@ -18,6 +18,7 @@ import { StreamTextOutputName, TYPES } from "./constants";
 import { schemaToDataType } from "./definitions/data-schema";
 import { toRunnableMemories } from "./definitions/memory";
 import { preloadCreatorsToPreloads } from "./definitions/preload";
+import { isRunnableResponseDelta, } from "./runnable";
 import { isNonNullable } from "./utils/is-non-nullable";
 import { logger } from "./utils/logger";
 import { OrderedRecord } from "./utils/ordered-map";
@@ -87,37 +88,39 @@ let PipelineAgent = class PipelineAgent extends Agent {
                         const processResult = {};
                         variables[process.id] = processResult;
                         for await (const chunk of stream) {
-                            if (chunk.$text) {
-                                Object.assign(processResult, {
-                                    $text: (processResult.$text || "") + chunk.$text,
-                                });
-                                if (needRespondTextStream) {
-                                    controller.enqueue({ $text: chunk.$text });
-                                }
-                            }
-                            if (chunk.delta) {
-                                Object.assign(processResult, chunk.delta);
-                                // TODO: 这里需要考虑上层 agent 直接输出了 {$text: 'xxx'} 没有用 chunk 的方式返回的情况
-                                // if (needRespondJsonStream) {
-                                result = Object.fromEntries(OrderedRecord.map(definition.outputs, (output) => {
-                                    if (!output.name)
-                                        return null;
-                                    if (output.name === StreamTextOutputName)
-                                        return null;
-                                    let value;
-                                    if (output.from === "variable") {
-                                        const v = variables[output.fromVariableId];
-                                        value = output.fromVariablePropPath?.length
-                                            ? get(v, output.fromVariablePropPath)
-                                            : v;
-                                    }
-                                    else {
-                                        throw new Error(`Unsupported output source ${output.from}`);
+                            if (isRunnableResponseDelta(chunk)) {
+                                if (chunk.$text) {
+                                    Object.assign(processResult, {
+                                        $text: (processResult.$text || "") + chunk.$text,
+                                    });
+                                    if (needRespondTextStream) {
+                                        controller.enqueue({ $text: chunk.$text });
                                     }
-                                    return [output.name, value];
-                                }).filter(isNonNullable));
-                                controller.enqueue({ delta: result });
-                                // }
+                                }
+                                if (chunk.delta) {
+                                    Object.assign(processResult, chunk.delta);
+                                    // TODO: 这里需要考虑上层 agent 直接输出了 {$text: 'xxx'} 没有用 chunk 的方式返回的情况
+                                    // if (needRespondJsonStream) {
+                                    result = Object.fromEntries(OrderedRecord.map(definition.outputs, (output) => {
+                                        if (!output.name)
+                                            return null;
+                                        if (output.name === StreamTextOutputName)
+                                            return null;
+                                        let value;
+                                        if (output.from === "variable") {
+                                            const v = variables[output.fromVariableId];
+                                            value = output.fromVariablePropPath?.length
+                                                ? get(v, output.fromVariablePropPath)
+                                                : v;
+                                        }
+                                        else {
+                                            throw new Error(`Unsupported output source ${output.from}`);
+                                        }
+                                        return [output.name, value];
+                                    }).filter(isNonNullable));
+                                    controller.enqueue({ delta: result });
+                                    // }
+                                }
                             }
                         }
                     }

package/lib/esm/runnable.d.ts

@@ -41,13 +41,36 @@ export interface RunnableResponseDelta<T> {
     $text?: string;
     delta?: Partial<T>;
 }
+export interface RunnableResponseProgress {
+    progress: {
+        taskId: string;
+        time: string;
+        agent: {
+            id: string;
+            name?: string;
+            description?: string;
+        };
+        payload: {
+            type: "start";
+            input: {
+                [key: string]: any;
+            };
+        } | {
+            type: "end";
+            output: {
+                [key: string]: any;
+            };
+        };
+    };
+}
 export interface RunnableResponseError {
     error: {
         message: string;
     };
 }
-export type RunnableResponseChunk<T> = RunnableResponseDelta<T>;
+export type RunnableResponseChunk<T> = RunnableResponseDelta<T> | RunnableResponseProgress;
 export type RunnableResponseChunkWithError<T> = RunnableResponseChunk<T> | RunnableResponseError;
 export declare function isRunnableResponseDelta<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseDelta<T>;
+export declare function isRunnableResponseProgress<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseProgress;
 export declare function isRunnableResponseError<T>(chunk: RunnableResponseChunkWithError<T>): chunk is RunnableResponseError;
 export type RunnableResponseStream<T> = ReadableStream<RunnableResponseChunk<T>>;

package/lib/esm/runnable.js

@@ -19,8 +19,12 @@ export class Runnable {
     outputs;
 }
 export function isRunnableResponseDelta(chunk) {
-    return "$text" in chunk || "delta" in chunk;
+    return (("$text" in chunk && typeof chunk.$text === "string") ||
+        ("delta" in chunk && typeof chunk.delta === "object"));
+}
+export function isRunnableResponseProgress(chunk) {
+    return "progress" in chunk && typeof chunk.progress === "object";
 }
 export function isRunnableResponseError(chunk) {
-    return "error" in chunk;
+    return "error" in chunk && typeof chunk.error === "object";
 }

package/lib/esm/utils/stream-utils.js

@@ -36,8 +36,8 @@ export async function extractOutputsFromRunnableOutput(output, resolve) {
                     const result = {};
                     let $text = "";
                     for await (const value of output) {
+                        controller.enqueue(value);
                         if (isRunnableResponseDelta(value)) {
-                            controller.enqueue(value);
                             $text += value.$text || "";
                             Object.assign(result, value.delta);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "AIGNE core library",
   "publishConfig": {
     "access": "public"