graphai 1.0.10 → 1.0.12

package/lib/node.js

@@ -7,6 +7,7 @@ const type_1 = require("./type");
 const utils_2 = require("./utils/utils");
 const transaction_log_1 = require("./transaction_log");
 const result_1 = require("./utils/result");
+const GraphAILogger_1 = require("./utils/GraphAILogger");
 class Node {
     constructor(nodeId, graph) {
         this.waitlist = new Set(); // List of nodes which need data from this node.
@@ -36,14 +37,14 @@ class Node {
             return;
         }
         else if (this.console === true || this.console.after === true) {
-            console.log(typeof result === "string" ? result : JSON.stringify(result, null, 2));
+            GraphAILogger_1.GraphAILogger.log(typeof result === "string" ? result : JSON.stringify(result, null, 2));
         }
         else if (this.console.after) {
             if ((0, utils_2.isObject)(this.console.after)) {
-                console.log(JSON.stringify((0, result_1.resultsOf)(this.console.after, { self: { result } }, this.graph.propFunctions, true), null, 2));
+                GraphAILogger_1.GraphAILogger.log(JSON.stringify((0, result_1.resultsOf)(this.console.after, { self: { result } }, this.graph.propFunctions, true), null, 2));
             }
             else {
-                console.log(this.console.after);
+                GraphAILogger_1.GraphAILogger.log(this.console.after);
             }
         }
     }
@@ -202,7 +203,7 @@ class ComputedNode extends Node {
     // and attempt to retry (if specified).
     executeTimeout(transactionId) {
         if (this.state === type_1.NodeState.Executing && this.isCurrentTransaction(transactionId)) {
-            console.warn(`-- timeout ${this.timeout} with ${this.nodeId}`);
+            GraphAILogger_1.GraphAILogger.warn(`-- timeout ${this.timeout} with ${this.nodeId}`);
             this.retry(type_1.NodeState.TimedOut, Error("Timeout"));
         }
     }
@@ -295,7 +296,7 @@ class ComputedNode extends Node {
             if (!this.isCurrentTransaction(transactionId)) {
                 // This condition happens when the agent function returns
                 // after the timeout (either retried or not).
-                console.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
+                GraphAILogger_1.GraphAILogger.log(`-- transactionId mismatch with ${this.nodeId} (probably timeout)`);
                 return;
             }
             // after process
@@ -333,20 +334,20 @@ class ComputedNode extends Node {
     // the retry if specified.
     errorProcess(error, transactionId, namedInputs) {
         if (error instanceof Error && error.message !== utils_1.strIntentionalError) {
-            console.error(`<-- NodeId: ${this.nodeId}, Agent: ${this.agentId}`);
-            console.error({ namedInputs });
-            console.error(error);
-            console.error("-->");
+            GraphAILogger_1.GraphAILogger.error(`<-- NodeId: ${this.nodeId}, Agent: ${this.agentId}`);
+            GraphAILogger_1.GraphAILogger.error({ namedInputs });
+            GraphAILogger_1.GraphAILogger.error(error);
+            GraphAILogger_1.GraphAILogger.error("-->");
         }
         if (!this.isCurrentTransaction(transactionId)) {
-            console.warn(`-- transactionId mismatch with ${this.nodeId} (not timeout)`);
+            GraphAILogger_1.GraphAILogger.warn(`-- transactionId mismatch with ${this.nodeId} (not timeout)`);
             return;
         }
         if (error instanceof Error) {
             this.retry(type_1.NodeState.Failed, error);
         }
         else {
-            console.error(`-- NodeId: ${this.nodeId}: Unknown error was caught`);
+            GraphAILogger_1.GraphAILogger.error(`-- NodeId: ${this.nodeId}: Unknown error was caught`);
             this.retry(type_1.NodeState.Failed, Error("Unknown"));
         }
     }
@@ -394,10 +395,10 @@ class ComputedNode extends Node {
             return;
         }
         else if (this.console === true || this.console.before === true) {
-            console.log(JSON.stringify(context.namedInputs, null, 2));
+            GraphAILogger_1.GraphAILogger.log(JSON.stringify(context.namedInputs, null, 2));
         }
         else if (this.console.before) {
-            console.log(this.console.before);
+            GraphAILogger_1.GraphAILogger.log(this.console.before);
         }
     }
 }

package/lib/utils/GraphAILogger.d.ts

@@ -0,0 +1,19 @@
+type LogLevel = "debug" | "info" | "log" | "warn" | "error";
+type LoggerFunction = (level: LogLevel, ...args: any[]) => void;
+declare function setLevelEnabled(level: LogLevel, enabled: boolean): void;
+declare function setLogger(logger: LoggerFunction): void;
+declare function debug(...args: any[]): void;
+declare function info(...args: any[]): void;
+declare function log(...args: any[]): void;
+declare function warn(...args: any[]): void;
+declare function error(...args: any[]): void;
+export declare const GraphAILogger: {
+    setLevelEnabled: typeof setLevelEnabled;
+    setLogger: typeof setLogger;
+    debug: typeof debug;
+    info: typeof info;
+    log: typeof log;
+    warn: typeof warn;
+    error: typeof error;
+};
+export {};

package/lib/utils/GraphAILogger.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphAILogger = void 0;
+const enabledLevels = {
+    debug: true,
+    info: true,
+    log: true,
+    warn: true,
+    error: true,
+};
+let customLogger = null;
+function setLevelEnabled(level, enabled) {
+    enabledLevels[level] = enabled;
+}
+function setLogger(logger) {
+    customLogger = logger;
+}
+function output(level, ...args) {
+    if (!enabledLevels[level])
+        return;
+    if (customLogger) {
+        customLogger(level, ...args);
+    }
+    else {
+        (console[level] || console.log)(...args);
+    }
+}
+function debug(...args) {
+    output("debug", ...args);
+}
+function info(...args) {
+    output("info", ...args);
+}
+function log(...args) {
+    output("log", ...args);
+}
+function warn(...args) {
+    output("warn", ...args);
+}
+function error(...args) {
+    output("error", ...args);
+}
+exports.GraphAILogger = {
+    setLevelEnabled,
+    setLogger,
+    debug,
+    info,
+    log,
+    warn,
+    error,
+};

package/lib/utils/data_source.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDataFromSource = void 0;
 const utils_1 = require("./utils");
 const prop_function_1 = require("./prop_function");
+const GraphAILogger_1 = require("./GraphAILogger");
 const getNestedData = (result, propId, propFunctions) => {
     const match = propId.match(prop_function_1.propFunctionRegex);
     if (match) {
@@ -38,7 +39,7 @@ const innerGetDataFromSource = (result, propIds, propFunctions) => {
         const propId = propIds[0];
         const ret = getNestedData(result, propId, propFunctions);
         if (ret === undefined) {
-            console.error(`prop: ${propIds.join(".")} is not hit`);
+            GraphAILogger_1.GraphAILogger.error(`prop: ${propIds.join(".")} is not hit`);
         }
         if (propIds.length > 1) {
             return innerGetDataFromSource(ret, propIds.slice(1), propFunctions);

package/lib/utils/prop_function.d.ts

@@ -1,4 +1,5 @@
 import { PropFunction } from "../type";
+import { GraphNodes } from "../node";
 export declare const propFunctionRegex: RegExp;
 export declare const propFunctions: PropFunction[];
-export declare const utilsFunctions: (input: string) => number | "";
+export declare const utilsFunctions: (input: string, nodes: GraphNodes) => string | number;

package/lib/utils/prop_function.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.utilsFunctions = exports.propFunctions = exports.propFunctionRegex = void 0;
 const utils_1 = require("./utils");
+const GraphAILogger_1 = require("./GraphAILogger");
 exports.propFunctionRegex = /^[a-zA-Z]+\([^)]*\)$/;
 const propArrayFunction = (result, propId) => {
     if (Array.isArray(result)) {
@@ -73,7 +74,7 @@ const propStringFunction = (result, propId) => {
             if (sliceMatch[1] !== undefined) {
                 return result.slice(Number(sliceMatch[1]));
             }
-            console.log(sliceMatch);
+            GraphAILogger_1.GraphAILogger.warn("slice is not valid format: " + sliceMatch);
         }
         const splitMatch = propId.match(/^split\(([-_:;.,\s\n]+)\)$/);
         if (splitMatch) {
@@ -104,15 +105,18 @@ const propBooleanFunction = (result, propId) => {
     return undefined;
 };
 exports.propFunctions = [propArrayFunction, propObjectFunction, propStringFunction, propNumberFunction, propBooleanFunction];
-const utilsFunctions = (input) => {
+const utilsFunctions = (input, nodes) => {
     if (input === "@now" || input === "@now_ms") {
         return Date.now();
     }
     if (input === "@now_s") {
         return Math.floor(Date.now() / 1000);
     }
+    if (input === "@loop") {
+        return nodes[utils_1.loopCounterKey].result;
+    }
     // If a placeholder does not match any key, replace it with an empty string.
-    console.warn("not match template utility function: ${" + input + "}");
+    GraphAILogger_1.GraphAILogger.warn("not match template utility function: ${" + input + "}");
     return "";
 };
 exports.utilsFunctions = utilsFunctions;

package/lib/utils/result.js

@@ -11,7 +11,7 @@ const replaceTemplatePlaceholders = (input, templateMatch, nodes, propFunctions,
     const utilsFuncResult = templateMatch
         .filter((text) => text.startsWith("@"))
         .reduce((tmp, key) => {
-        tmp[key] = (0, prop_function_1.utilsFunctions)(key);
+        tmp[key] = (0, prop_function_1.utilsFunctions)(key, nodes);
         return tmp;
     }, {});
     return Array.from(templateMatch.keys()).reduce((tmp, key) => {

package/lib/utils/utils.d.ts

@@ -37,3 +37,4 @@ export declare const defaultTestContext: {
 export declare const isNamedInputs: <Values = unknown>(namedInputs: unknown) => namedInputs is Record<string, Values>;
 export declare const isComputedNodeData: (node: NodeData) => node is ComputedNodeData;
 export declare const isStaticNodeData: (node: NodeData) => node is StaticNodeData;
+export declare const loopCounterKey: string;

package/lib/utils/utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStaticNodeData = exports.isComputedNodeData = exports.isNamedInputs = exports.defaultTestContext = exports.isLogicallyTrue = exports.debugResultKey = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.strIntentionalError = exports.isNull = exports.isObject = exports.parseNodeName = exports.sleep = void 0;
+exports.loopCounterKey = exports.isStaticNodeData = exports.isComputedNodeData = exports.isNamedInputs = exports.defaultTestContext = exports.isLogicallyTrue = exports.debugResultKey = exports.agentInfoWrapper = exports.defaultAgentInfo = exports.strIntentionalError = exports.isNull = exports.isObject = exports.parseNodeName = exports.sleep = void 0;
 exports.assert = assert;
 const type_1 = require("../type");
+const GraphAILogger_1 = require("./GraphAILogger");
 const sleep = async (milliseconds) => {
     return await new Promise((resolve) => setTimeout(resolve, milliseconds));
 };
@@ -35,7 +36,7 @@ function assert(condition, message, isWarn = false) {
         if (!isWarn) {
             throw new Error(message);
         }
-        console.warn("warn: " + message);
+        GraphAILogger_1.GraphAILogger.warn("warn: " + message);
     }
 }
 const isObject = (x) => {
@@ -139,3 +140,4 @@ const isStaticNodeData = (node) => {
     return !("agent" in node);
 };
 exports.isStaticNodeData = isStaticNodeData;
+exports.loopCounterKey = "__loopIndex";

package/package.json

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