@receptron/graphai_express 0.0.14 → 0.0.16

package/lib/express.d.ts

@@ -2,6 +2,6 @@ import express from "./express";
 import type { AgentFunctionInfoDictionary, AgentFilterInfo } from "graphai";
 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[]) => (req: express.Request, res: express.Response) => Promise<express.Response<any, Record<string, any>>>;
-export declare const nonStreamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[]) => (req: express.Request, res: express.Response) => Promise<express.Response<any, Record<string, any>>>;
-export declare const streamAgentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[]) => (req: express.Request, res: express.Response) => Promise<express.Response<any, Record<string, any>>>;
+export declare const agentDispatcher: (agentDictionary: AgentFunctionInfoDictionary, agentFilters?: AgentFilterInfo[]) => (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[]) => (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[]) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;

package/lib/express.js

@@ -55,48 +55,58 @@ exports.agentDoc = agentDoc;
 const agentDispatcher = (agentDictionary, agentFilters = []) => {
     const nonStram = (0, exports.nonStreamAgentDispatcher)(agentDictionary, agentFilters);
     const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters);
-    return async (req, res) => {
+    return async (req, res, next) => {
         const isStreaming = (req.headers["content-type"] || "").startsWith("text/event-stream");
         if (isStreaming) {
-            return await stream(req, res);
+            return await stream(req, res, next);
         }
-        return await nonStram(req, res);
+        return await nonStram(req, res, next);
     };
 };
 exports.agentDispatcher = agentDispatcher;
 // express middleware
 // run agent
 const nonStreamAgentDispatcher = (agentDictionary, agentFilters = []) => {
-    return async (req, res) => {
-        const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters);
-        const result = await dispatcher(req, res);
-        return res.json(result);
+    return async (req, res, next) => {
+        try {
+            const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters);
+            const result = await dispatcher(req, res);
+            return res.json(result);
+        }
+        catch (e) {
+            next(e);
+        }
     };
 };
 exports.nonStreamAgentDispatcher = nonStreamAgentDispatcher;
 // express middleware
 // run agent with streaming
 const streamAgentDispatcher = (agentDictionary, agentFilters = []) => {
-    return async (req, res) => {
-        res.setHeader("Content-Type", "text/event-stream;charset=utf-8");
-        res.setHeader("Cache-Control", "no-cache, no-transform");
-        res.setHeader("X-Accel-Buffering", "no");
-        const callback = (context, token) => {
-            if (token) {
-                res.write(token);
-            }
-        };
-        const streamAgentFilter = {
-            name: "streamAgentFilter",
-            agent: (0, agent_filters_1.streamAgentFilterGenerator)(callback),
-        };
-        const filterList = [...agentFilters, streamAgentFilter];
-        const dispatcher = agentDispatcherInternal(agentDictionary, filterList);
-        const result = await dispatcher(req, res);
-        const json_data = JSON.stringify(result);
-        res.write("___END___");
-        res.write(json_data);
-        return res.end();
+    return async (req, res, next) => {
+        try {
+            res.setHeader("Content-Type", "text/event-stream;charset=utf-8");
+            res.setHeader("Cache-Control", "no-cache, no-transform");
+            res.setHeader("X-Accel-Buffering", "no");
+            const callback = (context, token) => {
+                if (token) {
+                    res.write(token);
+                }
+            };
+            const streamAgentFilter = {
+                name: "streamAgentFilter",
+                agent: (0, agent_filters_1.streamAgentFilterGenerator)(callback),
+            };
+            const filterList = [...agentFilters, streamAgentFilter];
+            const dispatcher = agentDispatcherInternal(agentDictionary, filterList);
+            const result = await dispatcher(req, res);
+            const json_data = JSON.stringify(result);
+            res.write("___END___");
+            res.write(json_data);
+            return res.end();
+        }
+        catch (e) {
+            next(e);
+        }
     };
 };
 exports.streamAgentDispatcher = streamAgentDispatcher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_express",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "GraphAI express web server middleware.",
   "main": "lib/express.js",
   "files": [
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/receptron/graphai_utils/tree/main/packages/express#readme",
   "devDependencies": {
-    "@graphai/agents": "^0.0.4",
+    "@graphai/agents": "^0.0.5",
     "@types/express": "^4.17.21",
     "@types/node": "^20.8.7",
     "eslint": "^9.3.0",