@receptron/graphai_express 0.1.2 → 0.2.0

package/lib/agents.d.ts

@@ -1,6 +1,7 @@
 import express from "express";
 import type { AgentFunctionInfoDictionary, AgentFilterInfo } from "graphai";
 import { StreamChunkCallback, ContentCallback } from "./type";
+export declare const updateAgentVerbose: (val: boolean) => void;
 export declare const agentsList: (agentDictionary: AgentFunctionInfoDictionary, hostName?: string, urlPath?: string) => (req: express.Request, res: express.Response) => Promise<void>;
 export declare const agentDoc: (agentDictionary: AgentFunctionInfoDictionary, hostName?: string, urlPath?: string) => (req: express.Request, res: express.Response) => Promise<void>;
 export declare const agentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;

package/lib/agents.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentRunner = exports.agentDispatcher = exports.agentDoc = exports.agentsList = void 0;
+exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentRunner = exports.agentDispatcher = exports.agentDoc = exports.agentsList = exports.updateAgentVerbose = void 0;
 const agent_filters_1 = require("@graphai/agent_filters");
 const type_1 = require("./type");
 const utils_1 = require("./utils");
+let graphaiExpressVerbose = false;
+const updateAgentVerbose = (val) => {
+    graphaiExpressVerbose = val;
+};
+exports.updateAgentVerbose = updateAgentVerbose;
 // express middleware
 // return agent list
 const agentsList = (agentDictionary, hostName = "https://example.com", urlPath = "/agent") => {
@@ -60,6 +65,9 @@ const __agentDispatcher = (agentDictionary, agentFilters = [], streamChunkCallba
     const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters, isDispatch, streamChunkCallback, contentCallback);
     return async (req, res, next) => {
         const isStreaming = (req.headers["content-type"] || "").startsWith("text/event-stream");
+        if (graphaiExpressVerbose) {
+            console.log("__agentDispatcher(isStreaming): ", isStreaming);
+        }
         if (isStreaming) {
             return await stream(req, res, next);
         }
@@ -84,6 +92,9 @@ exports.agentRunner = agentRunner;
 // run agent
 const nonStreamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true) => {
     return async (req, res, next) => {
+        if (graphaiExpressVerbose) {
+            console.log("nonStreamAgentDispatcher");
+        }
         try {
             const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters, isDispatch);
             const result = await dispatcher(req, res);
@@ -99,6 +110,9 @@ exports.nonStreamAgentDispatcher = nonStreamAgentDispatcher;
 // run agent with streaming
 const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true, streamChunkCallback, contentCallback = utils_1.defaultContentCallback, endOfStreamDelimiter = type_1.DefaultEndOfStreamDelimiter) => {
     return async (req, res, next) => {
+        if (graphaiExpressVerbose) {
+            console.log("streamAgentDispatcher");
+        }
         try {
             res.setHeader("Content-Type", "text/event-stream;charset=utf-8");
             res.setHeader("Cache-Control", "no-cache, no-transform");
@@ -135,9 +149,12 @@ exports.streamAgentDispatcher = streamAgentDispatcher;
 // dispatcher internal function
 const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch = true) => {
     return async (req, res) => {
+        if (graphaiExpressVerbose) {
+            console.log("agentDispatcherInternal");
+        }
         const { params } = req;
-        const { agentId } = isDispatch ? params : req.body;
-        const { nodeId, retry, params: agentParams, inputs, namedInputs } = req.body;
+        const { agentId } = isDispatch ? params : req.body.debugInfo;
+        const { params: agentParams, debugInfo, filterParams, namedInputs /* graphData */ } = req.body;
         const agent = agentDictionary[agentId];
         if (agent === undefined) {
             res.status(404).send("Not found");
@@ -145,16 +162,14 @@ const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch
         }
         const context = {
             params: agentParams || {},
-            inputs,
             namedInputs,
-            debugInfo: {
-                nodeId,
-                retry,
-                verbose: false,
-            },
+            debugInfo,
             agents: agentDictionary,
-            filterParams: {},
+            filterParams,
         };
+        if (graphaiExpressVerbose) {
+            console.log("agentDispatcherInternal(context): ", context);
+        }
         const agentFilterRunner = (0, agent_filters_1.agentFilterRunnerBuilder)(agentFilters);
         const result = await agentFilterRunner(context, agent.agent);
         return result;

package/lib/index.d.ts

@@ -1,3 +1,3 @@
-export { agentsList, agentDoc, agentDispatcher, agentRunner, nonStreamAgentDispatcher, streamAgentDispatcher } from "./agents";
+export { agentsList, agentDoc, agentDispatcher, agentRunner, nonStreamAgentDispatcher, streamAgentDispatcher, updateAgentVerbose } from "./agents";
 export { graphRunner, streamGraphRunner, nonStreamGraphRunner } from "./graph";
 export { ExpressAgentInfo, StreamChunkCallback, ContentCallback } from "./type";

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nonStreamGraphRunner = exports.streamGraphRunner = exports.graphRunner = exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentRunner = exports.agentDispatcher = exports.agentDoc = exports.agentsList = void 0;
+exports.nonStreamGraphRunner = exports.streamGraphRunner = exports.graphRunner = exports.updateAgentVerbose = exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentRunner = exports.agentDispatcher = exports.agentDoc = exports.agentsList = void 0;
 var agents_1 = require("./agents");
 Object.defineProperty(exports, "agentsList", { enumerable: true, get: function () { return agents_1.agentsList; } });
 Object.defineProperty(exports, "agentDoc", { enumerable: true, get: function () { return agents_1.agentDoc; } });
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "agentDispatcher", { enumerable: true, get: funct
 Object.defineProperty(exports, "agentRunner", { enumerable: true, get: function () { return agents_1.agentRunner; } });
 Object.defineProperty(exports, "nonStreamAgentDispatcher", { enumerable: true, get: function () { return agents_1.nonStreamAgentDispatcher; } });
 Object.defineProperty(exports, "streamAgentDispatcher", { enumerable: true, get: function () { return agents_1.streamAgentDispatcher; } });
+Object.defineProperty(exports, "updateAgentVerbose", { enumerable: true, get: function () { return agents_1.updateAgentVerbose; } });
 var graph_1 = require("./graph");
 Object.defineProperty(exports, "graphRunner", { enumerable: true, get: function () { return graph_1.graphRunner; } });
 Object.defineProperty(exports, "streamGraphRunner", { enumerable: true, get: function () { return graph_1.streamGraphRunner; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_express",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "GraphAI express web server middleware.",
   "main": "lib/index.js",
   "files": [
@@ -27,17 +27,15 @@
   },
   "homepage": "https://github.com/receptron/graphai_utils/tree/main/packages/express#readme",
   "devDependencies": {
-    "eslint": "^9.17.0",
-    "graphai": "^0.6.7",
+    "@types/cors": "^2.8.17",
     "sinon": "^19.0.2",
-    "sinon-express-mock": "^2.2.1",
-    "typescript-eslint": "^8.18.1"
+    "sinon-express-mock": "^2.2.1"
   },
   "dependencies": {
-    "@graphai/agent_filters": "^0.0.8",
+    "@graphai/agent_filters": "^0.2.2",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.7",
-    "express": "^4.21.2",
-    "graphai": "^0.6.7"
+    "express": "^4.21.2"
   },
   "types": "./lib/index.d.ts",
   "directories": {