graphai 1.0.12 → 1.0.14

package/lib/graphai.js

@@ -86,6 +86,7 @@ class GraphAI {
         bypassAgentIds: [],
         config: {},
         graphLoader: undefined,
+        forceLoop: false,
     }) {
         this.logs = [];
         this.config = {};
@@ -108,6 +109,7 @@ class GraphAI {
         this.bypassAgentIds = options.bypassAgentIds ?? [];
         this.config = options.config;
         this.graphLoader = options.graphLoader;
+        this.forceLoop = options.forceLoop ?? false;
         this.loop = graphData.loop;
         this.verbose = graphData.verbose === true;
         this.onComplete = (__isAbort) => {
@@ -148,9 +150,9 @@ class GraphAI {
             .join("\n");
     }
     // Public API
-    results(all) {
+    results(all, internalUse = false) {
         return Object.keys(this.nodes)
-            .filter((nodeId) => (all && nodeId !== utils_1.loopCounterKey) || this.nodes[nodeId].isResult)
+            .filter((nodeId) => (all && (internalUse || nodeId !== utils_1.loopCounterKey)) || this.nodes[nodeId].isResult)
             .reduce((results, nodeId) => {
             const node = this.nodes[nodeId];
             if (node.result !== undefined) {
@@ -216,9 +218,9 @@ class GraphAI {
         return new Promise((resolve, reject) => {
             this.onComplete = (isAbort = false) => {
                 const errors = this.errors();
-                const nodeIds = Object.keys(errors);
-                if (nodeIds.length > 0 || isAbort) {
-                    reject(errors[nodeIds[0]]);
+                const errorNodeIds = Object.keys(errors);
+                if (errorNodeIds.length > 0 || isAbort) {
+                    reject(errors[errorNodeIds[0]]);
                 }
                 else {
                     resolve(this.results(all));
@@ -259,18 +261,22 @@ class GraphAI {
     // Check if there is any running computed nodes.
     // In case of no running computed note, start the another iteration if ncessary (loop)
     processLoopIfNecessary() {
+        //
+        if (!this.forceLoop && Object.keys(this.errors()).length > 0) {
+            return false;
+        }
         this.repeatCount++;
         const loop = this.loop;
         if (!loop) {
             return false;
         }
         // We need to update static nodes, before checking the condition
-        const previousResults = this.results(true); // results from previous loop
+        const previousResults = this.results(true, true); // results from previous loop
         this.updateStaticNodes(previousResults);
         if (loop.count === undefined || this.repeatCount < loop.count) {
             if (loop.while) {
                 const source = (0, utils_1.parseNodeName)(loop.while);
-                const value = this.getValueFromResults(source, this.results(true));
+                const value = this.getValueFromResults(source, this.results(true, true));
                 // NOTE: We treat an empty array as false.
                 if (!(0, utils_1.isLogicallyTrue)(value)) {
                     return false; // while condition is not met

package/lib/type.d.ts

@@ -85,6 +85,7 @@ export type GraphOptions = {
     bypassAgentIds?: string[] | undefined;
     config?: ConfigDataDictionary;
     graphLoader?: GraphDataLoader;
+    forceLoop?: boolean;
 };
 export type CacheTypes = "pureAgent" | "impureAgent";
 export type AgentFunctionContextDebugInfo = {

package/lib/utils/nodeUtils.js

@@ -21,6 +21,7 @@ const inputs2dataSources = (inputs) => {
     return (0, utils_1.parseNodeName)(inputs);
 };
 exports.inputs2dataSources = inputs2dataSources;
+// TODO: Maybe it's a remnant of old array inputs. Check and delete.
 const dataSourceNodeIds = (sources) => {
     if (!Array.isArray(sources)) {
         throw new Error("sources must be array!! maybe inputs is invalid");

package/lib/utils/result.js

@@ -34,7 +34,8 @@ const resultsOfInner = (input, nodes, propFunctions, isSelfNode = false) => {
             return replaceTemplatePlaceholders(input, templateMatch, nodes, propFunctions, isSelfNode);
         }
     }
-    return (0, exports.resultOf)((0, utils_1.parseNodeName)(input, isSelfNode), nodes, propFunctions);
+    // :node.prod
+    return (0, exports.resultOf)((0, utils_1.parseNodeName)(input, isSelfNode, nodes), nodes, propFunctions);
 };
 const resultsOf = (inputs, nodes, propFunctions, isSelfNode = false) => {
     return Object.keys(inputs).reduce((tmp, key) => {

package/lib/utils/utils.d.ts

@@ -1,6 +1,7 @@
 import { DataSource, AgentFunction, AgentFunctionInfo, NodeData, StaticNodeData, ComputedNodeData, NodeState } from "../type";
+import type { GraphNodes } from "../node";
 export declare const sleep: (milliseconds: number) => Promise<unknown>;
-export declare const parseNodeName: (inputNodeId: any, isSelfNode?: boolean) => DataSource;
+export declare const parseNodeName: (inputNodeId: any, isSelfNode?: boolean, nodes?: GraphNodes) => DataSource;
 export declare function assert(condition: boolean, message: string, isWarn?: boolean): asserts condition;
 export declare const isObject: <Values = unknown>(x: unknown) => x is Record<string, Values>;
 export declare const isNull: (data: unknown) => data is null | undefined;

package/lib/utils/utils.js

@@ -4,11 +4,12 @@ exports.loopCounterKey = exports.isStaticNodeData = exports.isComputedNodeData =
 exports.assert = assert;
 const type_1 = require("../type");
 const GraphAILogger_1 = require("./GraphAILogger");
+const prop_function_1 = require("./prop_function");
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
 exports.sleep = sleep;
-const parseNodeName = (inputNodeId, isSelfNode = false) => {
+const parseNodeName = (inputNodeId, isSelfNode = false, nodes) => {
     if (isSelfNode) {
         if (typeof inputNodeId === "string" && inputNodeId[0] === ".") {
             const parts = inputNodeId.split(".");
@@ -19,14 +20,19 @@ const parseNodeName = (inputNodeId, isSelfNode = false) => {
     if (typeof inputNodeId === "string") {
         const regex = /^:(.*)$/;
         const match = inputNodeId.match(regex);
-        if (!match) {
-            return { value: inputNodeId }; // string literal
+        if (match) {
+            const parts = match[1].split(/(?<!\()\.(?!\))/);
+            if (parts.length == 1) {
+                return { nodeId: parts[0] };
+            }
+            return { nodeId: parts[0], propIds: parts.slice(1) };
         }
-        const parts = match[1].split(/(?<!\()\.(?!\))/);
-        if (parts.length == 1) {
-            return { nodeId: parts[0] };
+        const regexUtil = /^@(.*)$/;
+        const matchUtil = inputNodeId.match(regexUtil);
+        // Only when just called from resultsOfInner
+        if (nodes && matchUtil) {
+            return { value: (0, prop_function_1.utilsFunctions)(inputNodeId, nodes) };
         }
-        return { nodeId: parts[0], propIds: parts.slice(1) };
     }
     return { value: inputNodeId }; // non-string literal
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Asynchronous data flow execution engine for agentic AI apps.",
   "main": "lib/bundle.cjs.js",
   "module": "lib/bundle.esm.js",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/receptron/graphai#readme",
   "devDependencies": {
-    "typedoc": "^0.28.3",
+    "typedoc": "^0.28.4",
     "typedoc-plugin-markdown": "^4.6.3"
   },
   "types": "./lib/index.d.ts",