npm - @receptron/graphai_express - Versions diffs - 1.0.3 → 3.0.0 - Mend

@receptron/graphai_express 1.0.3 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/agents.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import express from "express";
-import type { AgentFunctionInfoDictionary, AgentFilterInfo } from "graphai";
+import type { AgentFunctionInfoDictionary, AgentFilterInfo, ConfigDataDictionary } 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>;
-export declare const agentRunner: (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>;
-export declare const nonStreamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], isDispatch?: boolean) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;
-export declare const streamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], isDispatch?: boolean, streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback, endOfStreamDelimiter?: string) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;
+export declare const agentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, config?: ConfigDataDictionary, contentCallback?: ContentCallback) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+export declare const agentRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, config?: ConfigDataDictionary, contentCallback?: ContentCallback) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+export declare const nonStreamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], isDispatch?: boolean, config?: ConfigDataDictionary) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+export declare const streamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], isDispatch?: boolean, streamChunkCallback?: StreamChunkCallback, config?: ConfigDataDictionary, contentCallback?: ContentCallback, endOfStreamDelimiter?: string) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;

package/lib/agents.js CHANGED Viewed

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 stream_agent_filter_1 = require("@graphai/stream_agent_filter");
+const agent_filter_utils_1 = require("@graphai/agent_filter_utils");
 const type_1 = require("./type");
 const utils_1 = require("./utils");
 let graphaiExpressVerbose = false;
@@ -60,9 +61,9 @@ const agentDoc = (agentDictionary, hostName = "https://example.com", urlPath = "
     };
 };
 exports.agentDoc = agentDoc;
-const __agentDispatcher = (agentDictionary, agentFilters = [], streamChunkCallback, contentCallback = utils_1.defaultContentCallback, isDispatch = true) => {
-    const nonStram = (0, exports.nonStreamAgentDispatcher)(agentDictionary, agentFilters, isDispatch);
-    const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters, isDispatch, streamChunkCallback, contentCallback);
+const __agentDispatcher = (agentDictionary, agentFilters = [], streamChunkCallback, contentCallback = utils_1.defaultContentCallback, isDispatch = true, config = {}) => {
+    const nonStram = (0, exports.nonStreamAgentDispatcher)(agentDictionary, agentFilters, isDispatch, config);
+    const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters, isDispatch, streamChunkCallback, config, contentCallback, type_1.DefaultEndOfStreamDelimiter);
     return async (req, res, next) => {
         const isStreaming = (req.headers["content-type"] || "").startsWith("text/event-stream");
         if (graphaiExpressVerbose) {
@@ -77,28 +78,28 @@ const __agentDispatcher = (agentDictionary, agentFilters = [], streamChunkCallba
 // express middleware
 // dispatch and run agent
 // app.post(apiPrefix + "/:agentId", agentDispatcher(agentDictionary));
-const agentDispatcher = (agentDictionary, agentFilters = [], streamChunkCallback, contentCallback = utils_1.defaultContentCallback) => {
-    return __agentDispatcher(agentDictionary, agentFilters, streamChunkCallback, contentCallback, true);
+const agentDispatcher = (agentDictionary, agentFilters = [], streamChunkCallback, config = {}, contentCallback = utils_1.defaultContentCallback) => {
+    return __agentDispatcher(agentDictionary, agentFilters, streamChunkCallback, contentCallback, true, config);
 };
 exports.agentDispatcher = agentDispatcher;
 // express middleware
 // run agent
 // app.post(agentPrefix, agentRunner(agentDictionary));
-const agentRunner = (agentDictionary, agentFilters = [], streamChunkCallback, contentCallback = utils_1.defaultContentCallback) => {
-    return __agentDispatcher(agentDictionary, agentFilters, streamChunkCallback, contentCallback, false);
+const agentRunner = (agentDictionary, agentFilters = [], streamChunkCallback, config = {}, contentCallback = utils_1.defaultContentCallback) => {
+    return __agentDispatcher(agentDictionary, agentFilters, streamChunkCallback, contentCallback, false, config);
 };
 exports.agentRunner = agentRunner;
 // express middleware
 // run agent
-const nonStreamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true) => {
+const nonStreamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true, config = {}) => {
     return async (req, res, next) => {
         if (graphaiExpressVerbose) {
             console.log("nonStreamAgentDispatcher");
         }
         try {
-            const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters, isDispatch);
+            const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters, isDispatch, config);
             const result = await dispatcher(req, res);
-            return res.json(result);
+            res.json(result);
         }
         catch (e) {
             next(e);
@@ -108,7 +109,7 @@ const nonStreamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch
 exports.nonStreamAgentDispatcher = nonStreamAgentDispatcher;
 // express middleware
 // run agent with streaming
-const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true, streamChunkCallback, contentCallback = utils_1.defaultContentCallback, endOfStreamDelimiter = type_1.DefaultEndOfStreamDelimiter) => {
+const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true, streamChunkCallback, config = {}, contentCallback = utils_1.defaultContentCallback, endOfStreamDelimiter = type_1.DefaultEndOfStreamDelimiter) => {
     return async (req, res, next) => {
         if (graphaiExpressVerbose) {
             console.log("streamAgentDispatcher");
@@ -129,16 +130,16 @@ const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch =
             };
             const streamAgentFilter = {
                 name: "streamAgentFilter",
-                agent: (0, agent_filters_1.streamAgentFilterGenerator)(callback),
+                agent: (0, stream_agent_filter_1.streamAgentFilterGenerator)(callback),
             };
             const filterList = [...agentFilters, streamAgentFilter];
-            const dispatcher = agentDispatcherInternal(agentDictionary, filterList, isDispatch);
+            const dispatcher = agentDispatcherInternal(agentDictionary, filterList, isDispatch, config);
             const result = await dispatcher(req, res);
             if (endOfStreamDelimiter !== "") {
                 res.write(endOfStreamDelimiter);
             }
             res.write(contentCallback(result));
-            return res.end();
+            res.end();
         }
         catch (e) {
             next(e);
@@ -146,8 +147,17 @@ const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch =
     };
 };
 exports.streamAgentDispatcher = streamAgentDispatcher;
+const getConfig = (config, agentId) => {
+    if (agentId) {
+        return {
+            ...(config["global"] ?? {}),
+            ...(config[agentId] ?? {}),
+        };
+    }
+    return {};
+};
 // dispatcher internal function
-const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch = true) => {
+const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch = true, config = {}) => {
     return async (req, res) => {
         if (graphaiExpressVerbose) {
             console.log("agentDispatcherInternal");
@@ -166,12 +176,13 @@ const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch
             debugInfo,
             agents: agentDictionary,
             filterParams,
+            config: getConfig(config, agentId),
         };
         if (graphaiExpressVerbose) {
             const { agents: __nonLog, ...logContext } = context;
             console.log("agentDispatcherInternal(context): ", logContext);
         }
-        const agentFilterRunner = (0, agent_filters_1.agentFilterRunnerBuilder)(agentFilters);
+        const agentFilterRunner = (0, agent_filter_utils_1.agentFilterRunnerBuilder)(agentFilters);
         const result = await agentFilterRunner(context, agent.agent);
         return result;
     };

package/lib/completions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import express from "express";
 import type { AgentFunctionInfoDictionary, AgentFilterInfo, TransactionLog } from "graphai";
 import type { Model2GraphData } from "./type";
-export declare const completionRunner: (agentDictionary: AgentFunctionInfoDictionary, model2GraphData: Model2GraphData, agentFilters?: AgentFilterInfo[], onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;
+export declare const completionRunner: (agentDictionary: AgentFunctionInfoDictionary, model2GraphData: Model2GraphData, agentFilters?: AgentFilterInfo[], onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;

package/lib/completions.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completionRunner = void 0;
 const graphai_1 = require("graphai");
-const agent_filters_1 = require("@graphai/agent_filters");
+const stream_agent_filter_1 = require("@graphai/stream_agent_filter");
 const crypto_1 = require("crypto");
 // TODO choise graph(done)
 // stream flag(done);
@@ -38,7 +38,7 @@ const completionRunner = (agentDictionary, model2GraphData, agentFilters = [], o
         const { stream, model, messages } = req.body;
         // validation
         if (!model || typeof model !== "string") {
-            return res.status(400).json({
+            res.status(400).json({
                 error: {
                     message: "`model` is required and must be a string",
                     type: "invalid_request_error",
@@ -46,9 +46,10 @@ const completionRunner = (agentDictionary, model2GraphData, agentFilters = [], o
                     code: "invalid_model",
                 },
             });
+            return;
         }
         if (!messages || !Array.isArray(messages) || messages.length === 0) {
-            return res.status(400).json({
+            res.status(400).json({
                 error: {
                     message: "`messages` must be an array of objects with `role` and `content` as strings",
                     type: "invalid_request_error",
@@ -56,6 +57,7 @@ const completionRunner = (agentDictionary, model2GraphData, agentFilters = [], o
                     code: "invalid_messages",
                 },
             });
+            return;
         }
         // const isStreaming = (req.headers["content-type"] || "").startsWith("text/event-stream")
         if (stream) {
@@ -84,7 +86,7 @@ const streamGraphRunner = (agentDictionary, model2GraphData, agentFilters = [],
             };
             const streamAgentFilter = {
                 name: "streamAgentFilter",
-                agent: (0, agent_filters_1.streamAgentFilterGenerator)(streamCallback),
+                agent: (0, stream_agent_filter_1.streamAgentFilterGenerator)(streamCallback),
             };
             const filterList = [...agentFilters, streamAgentFilter];
             res.write(streamCompletionChunkCallback(baseData, "start"));
@@ -97,7 +99,7 @@ const streamGraphRunner = (agentDictionary, model2GraphData, agentFilters = [],
             catch (__err) {
                 res.write(`data: ${JSON.stringify({ error: "GraphAI Something went wrong" })}\n\n`);
             }
-            return res.end();
+            res.end();
         }
         catch (e) {
             next(e);
@@ -109,7 +111,7 @@ const nonStreamGraphRunner = (agentDictionary, model2GraphData, agentFilters = [
         try {
             const dispatcher = streamGraphRunnerInternal(agentDictionary, model2GraphData, agentFilters, onLogCallback);
             const result = await dispatcher(req);
-            return res.json(result);
+            res.json(result);
         }
         catch (e) {
             next(e);

package/lib/graph.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import express from "express";
 import type { AgentFunctionInfoDictionary, AgentFilterInfo, TransactionLog } from "graphai";
 import type { StreamChunkCallback, ContentCallback } from "./type";
-export declare const graphRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback, endOfStreamDelimiter?: string, onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;
-export declare const streamGraphRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback, endOfStreamDelimiter?: string, onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;
-export declare const nonStreamGraphRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;
+export declare const graphRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback, endOfStreamDelimiter?: string, onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+export declare const streamGraphRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback, endOfStreamDelimiter?: string, onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+export declare const nonStreamGraphRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], onLogCallback?: (__log: TransactionLog, __isUpdate: boolean) => void) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;

package/lib/graph.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nonStreamGraphRunner = exports.streamGraphRunner = exports.graphRunner = void 0;
 const graphai_1 = require("graphai");
-const agent_filters_1 = require("@graphai/agent_filters");
+const stream_agent_filter_1 = require("@graphai/stream_agent_filter");
 const type_1 = require("./type");
 const utils_1 = require("./utils");
 const graphRunner = (agentDictionary, agentFilters = [], streamChunkCallback, contentCallback = utils_1.defaultContentCallback, endOfStreamDelimiter = type_1.DefaultEndOfStreamDelimiter, onLogCallback = (__log, __isUpdate) => { }) => {
@@ -35,7 +35,7 @@ const streamGraphRunner = (agentDictionary, agentFilters = [], streamChunkCallba
             };
             const streamAgentFilter = {
                 name: "streamAgentFilter",
-                agent: (0, agent_filters_1.streamAgentFilterGenerator)(streamCallback),
+                agent: (0, stream_agent_filter_1.streamAgentFilterGenerator)(streamCallback),
             };
             const filterList = [...agentFilters, streamAgentFilter];
             const dispatcher = streamGraphRunnerInternal(agentDictionary, filterList, onLogCallback);
@@ -44,7 +44,7 @@ const streamGraphRunner = (agentDictionary, agentFilters = [], streamChunkCallba
                 res.write(endOfStreamDelimiter);
             }
             res.write(contentCallback(result));
-            return res.end();
+            res.end();
         }
         catch (e) {
             next(e);
@@ -57,7 +57,7 @@ const nonStreamGraphRunner = (agentDictionary, agentFilters = [], onLogCallback
         try {
             const dispatcher = streamGraphRunnerInternal(agentDictionary, agentFilters, onLogCallback);
             const result = await dispatcher(req);
-            return res.json(result);
+            res.json(result);
         }
         catch (e) {
             next(e);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_express",
-  "version": "1.0.3",
+  "version": "3.0.0",
   "description": "GraphAI express web server middleware.",
   "main": "lib/index.js",
   "files": [
@@ -27,15 +27,21 @@
   },
   "homepage": "https://github.com/receptron/graphai_utils/tree/main/packages/express#readme",
   "devDependencies": {
-    "@types/cors": "^2.8.17",
-    "sinon": "^19.0.2",
+    "@types/cors": "^2.8.18",
+    "@types/express": "^5.0.3",
+    "@types/express-serve-static-core": "^5.0.6",
+    "@types/node": "^24.0.3",
+    "eslint": "^9.29.0",
+    "graphai": "^2.0.6",
+    "sinon": "^20.0.0",
     "sinon-express-mock": "^2.2.1"
   },
   "dependencies": {
-    "@graphai/agent_filters": "^1.0.0",
+    "@graphai/agent_filter_utils": "^2.0.0",
+    "@graphai/stream_agent_filter": "^2.0.2",
     "cors": "^2.8.5",
-    "dotenv": "^16.4.7",
-    "express": "^4.21.2"
+    "dotenv": "^16.5.0",
+    "express": "^5.1.0"
   },
   "types": "./lib/index.d.ts",
   "directories": {