graphai 2.0.11 → 2.0.13

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export { GraphAI, defaultConcurrency, graphDataLatestVersion } from "./graphai";
 export type { AgentFunction, AgentFunctionInfo, AgentFunctionInfoDictionary, AgentFunctionInfoSample, AgentFunctionContext, GraphData, GraphOptions, ResultDataDictionary, ResultData, AgentFilterFunction, AgentFilterInfo, NodeData, StaticNodeData, ComputedNodeData, DefaultResultData, DefaultInputData, DefaultParamsType, GraphDataLoaderOption, GraphDataLoader, ConfigDataDictionary, ConfigData, DefaultConfigData, CallbackFunction, LoopData, } from "./type";
 export { NodeState } from "./type";
 export type { TransactionLog } from "./transaction_log";
-export { defaultAgentInfo, agentInfoWrapper, defaultTestContext, strIntentionalError, assert, sleep, isObject, parseNodeName, debugResultKey, isComputedNodeData, isStaticNodeData, } from "./utils/utils";
+export { defaultAgentInfo, agentInfoWrapper, defaultTestContext, strIntentionalError, assert, sleep, isObject, parseNodeName, debugResultKey, isComputedNodeData, isStaticNodeData, isNull, } from "./utils/utils";
 export { inputs2dataSources } from "./utils/nodeUtils";
 export { ValidationError } from "./validators/common";
 export { GraphAILogger } from "./utils/GraphAILogger";

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaskManager = exports.GraphAILogger = exports.ValidationError = exports.inputs2dataSources = exports.isStaticNodeData = exports.isComputedNodeData = exports.debugResultKey = exports.parseNodeName = exports.isObject = exports.sleep = exports.assert = exports.strIntentionalError = exports.defaultTestContext = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.NodeState = exports.graphDataLatestVersion = exports.defaultConcurrency = exports.GraphAI = void 0;
+exports.TaskManager = exports.GraphAILogger = exports.ValidationError = exports.inputs2dataSources = exports.isNull = exports.isStaticNodeData = exports.isComputedNodeData = exports.debugResultKey = exports.parseNodeName = exports.isObject = exports.sleep = exports.assert = exports.strIntentionalError = exports.defaultTestContext = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.NodeState = exports.graphDataLatestVersion = exports.defaultConcurrency = exports.GraphAI = void 0;
 var graphai_1 = require("./graphai");
 Object.defineProperty(exports, "GraphAI", { enumerable: true, get: function () { return graphai_1.GraphAI; } });
 Object.defineProperty(exports, "defaultConcurrency", { enumerable: true, get: function () { return graphai_1.defaultConcurrency; } });
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "parseNodeName", { enumerable: true, get: functio
 Object.defineProperty(exports, "debugResultKey", { enumerable: true, get: function () { return utils_1.debugResultKey; } });
 Object.defineProperty(exports, "isComputedNodeData", { enumerable: true, get: function () { return utils_1.isComputedNodeData; } });
 Object.defineProperty(exports, "isStaticNodeData", { enumerable: true, get: function () { return utils_1.isStaticNodeData; } });
+Object.defineProperty(exports, "isNull", { enumerable: true, get: function () { return utils_1.isNull; } });
 var nodeUtils_1 = require("./utils/nodeUtils");
 Object.defineProperty(exports, "inputs2dataSources", { enumerable: true, get: function () { return nodeUtils_1.inputs2dataSources; } });
 var common_1 = require("./validators/common");

package/lib/node.d.ts

@@ -22,6 +22,7 @@ export declare class ComputedNode extends Node {
     readonly nestedGraph?: GraphData | DataSource;
     readonly retryLimit: number;
     retryCount: number;
+    private readonly repeatUntil?;
     private readonly agentId?;
     private agentFunction?;
     readonly timeout?: number;

package/lib/node.js

@@ -15,7 +15,7 @@ class Node {
         this.result = undefined;
         this.nodeId = nodeId;
         this.graph = graph;
-        this.log = new transaction_log_1.TransactionLog(nodeId);
+        this.log = new transaction_log_1.TransactionLog(nodeId, this.graph.mapIndex);
         this.console = {};
     }
     asString() {
@@ -64,6 +64,7 @@ class ComputedNode extends Node {
         this.filterParams = data.filterParams ?? {};
         this.passThrough = data.passThrough;
         this.retryLimit = data.retry ?? graph.retryLimit ?? 0;
+        this.repeatUntil = data.repeatUntil;
         this.timeout = data.timeout;
         this.isResult = data.isResult ?? false;
         this.priority = data.priority ?? 0;
@@ -299,6 +300,14 @@ class ComputedNode extends Node {
                 GraphAILogger_1.GraphAILogger.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
                 return;
             }
+            if (this.repeatUntil?.exists) {
+                const dummyResult = { self: { result: this.getResult(result) } };
+                const repeatResult = (0, result_1.resultsOf)({ data: this.repeatUntil?.exists }, dummyResult, [], true);
+                if ((0, utils_1.isNull)(repeatResult?.data)) {
+                    this.retry(type_1.NodeState.Failed, Error("Repeat Until"));
+                    return;
+                }
+            }
             // after process
             this.afterExecute(result, localLog);
         }

package/lib/transaction_log.d.ts

@@ -19,7 +19,7 @@ export declare class TransactionLog {
     isLoop?: boolean;
     repeatCount?: number;
     log?: TransactionLog[];
-    constructor(nodeId: string);
+    constructor(nodeId: string, mapIndex?: number);
     initForComputedNode(node: ComputedNode, graph: GraphAI): void;
     onInjected(node: StaticNode, graph: GraphAI, injectFrom?: string): void;
     onComplete(node: ComputedNode, graph: GraphAI, localLog: TransactionLog[]): void;

package/lib/transaction_log.js

@@ -5,9 +5,10 @@ const type_1 = require("./type");
 const utils_1 = require("./utils/utils");
 const nodeUtils_1 = require("./utils/nodeUtils");
 class TransactionLog {
-    constructor(nodeId) {
+    constructor(nodeId, mapIndex) {
         this.nodeId = nodeId;
         this.state = type_1.NodeState.Waiting;
+        this.mapIndex = mapIndex;
     }
     initForComputedNode(node, graph) {
         this.agentId = node.getAgentId();

package/lib/type.d.ts

@@ -45,6 +45,9 @@ export type GraphDataLoaderOption = {
     fileName: string;
     option?: any;
 };
+export type RepeatUntil = {
+    exists?: string;
+};
 export type ComputedNodeData = {
     agent: string | AgentAnonymousFunction;
     inputs?: Record<string, any>;
@@ -53,6 +56,7 @@ export type ComputedNodeData = {
     params?: NodeDataParams;
     filterParams?: AgentFilterParams;
     retry?: number;
+    repeatUntil?: RepeatUntil;
     timeout?: number;
     if?: string;
     unless?: string;
@@ -86,6 +90,7 @@ export type GraphOptions = {
     config?: ConfigDataDictionary;
     graphLoader?: GraphDataLoader;
     forceLoop?: boolean;
+    mapIndex?: number;
 };
 export type CacheTypes = "pureAgent" | "impureAgent";
 export type AgentFunctionContextDebugInfo = {

package/lib/utils/data_source.js

@@ -35,7 +35,7 @@ const getNestedData = (result, propId, propFunctions) => {
     return undefined;
 };
 const innerGetDataFromSource = (result, propIds, propFunctions) => {
-    if (!(0, utils_1.isNull)(result) && propIds && propIds.length > 0) {
+    if (propIds && propIds.length > 0) {
         const propId = propIds[0];
         const ret = getNestedData(result, propId, propFunctions);
         if (ret === undefined) {

package/lib/utils/prop_function.js

@@ -116,7 +116,7 @@ const propNumberFunction = (result, propId) => {
         if (match) {
             return Number(result) + Number(match[1]);
         }
-        const equalMatch = propId.match(/^equal\(([A-Za-z0-9!#$%&()*+,\-./:;<=>?@]+)\)/);
+        const equalMatch = propId.match(/^equal\(([A-Za-z0-9!#$%&()*+,\-/:;<=>?@]+)\)/);
         if (equalMatch) {
             return result === Number(equalMatch[1]);
         }
@@ -131,7 +131,20 @@ const propBooleanFunction = (result, propId) => {
     }
     return undefined;
 };
-exports.propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
+const propUndefinrdFunction = (result, propId) => {
+    if (result === undefined) {
+        const equalMatch = propId.match(/^default\(([A-Za-z0-9!#$%&()*+,\-/:;<=>?@]+)\)/);
+        if (equalMatch) {
+            if (equalMatch[1].match(/^[0-9-]+$/)) {
+                return Number(equalMatch[1]);
+            }
+            return equalMatch[1];
+        }
+    }
+    return undefined;
+};
+// TODO if (result === undefined) {default()}
+exports.propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction, propUndefinrdFunction];
 const utilsFunctions = (input, nodes) => {
     if (input === "@now" || input === "@now_ms") {
         return Date.now();

package/lib/validators/common.js

@@ -8,6 +8,7 @@ exports.computedNodeAttributeKeys = [
     "anyInput",
     "params",
     "retry",
+    "repeatUntil",
     "timeout",
     "agent",
     "graph",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/bundle.cjs.js",
   "module": "lib/bundle.esm.js",