@receptron/graphai_express 2.0.0 → 3.0.1

package/lib/agents.d.ts

@@ -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<void>;
-export declare const agentRunner: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], streamChunkCallback?: StreamChunkCallback, contentCallback?: ContentCallback) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
-export declare const nonStreamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[], isDispatch?: boolean) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
-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<void>;
+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

@@ -61,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) {
@@ -78,26 +78,26 @@ 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);
             res.json(result);
         }
@@ -109,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");
@@ -133,7 +133,7 @@ const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch =
                 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);
@@ -147,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");
@@ -167,6 +176,7 @@ const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch
             debugInfo,
             agents: agentDictionary,
             filterParams,
+            config: getConfig(config, agentId),
         };
         if (graphaiExpressVerbose) {
             const { agents: __nonLog, ...logContext } = context;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_express",
-  "version": "2.0.0",
+  "version": "3.0.1",
   "description": "GraphAI express web server middleware.",
   "main": "lib/index.js",
   "files": [
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@graphai/agent_filter_utils": "^2.0.0",
-    "@graphai/stream_agent_filter": "^2.0.1",
+    "@graphai/stream_agent_filter": "^2.0.2",
     "cors": "^2.8.5",
     "dotenv": "^16.5.0",
     "express": "^5.1.0"