@receptron/graphai_express 0.0.22 → 0.0.24

package/lib/{express.d.ts → index.d.ts}

@@ -1,7 +1,10 @@
-import express from "./express";
+import express from "express";
 import type { AgentFunctionInfoDictionary, AgentFilterInfo } from "graphai";
+import { ExpressAgentInfo } from "./type";
+export { ExpressAgentInfo };
 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, 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>;
+export declare const agentRunner: (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[], 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) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<express.Response<any, Record<string, any>> | undefined>;

package/lib/{express.js → index.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentDispatcher = exports.agentDoc = exports.agentsList = void 0;
+exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentRunner = exports.agentDispatcher = exports.agentDoc = exports.agentsList = void 0;
 const agent_filters_1 = require("@graphai/agent_filters");
 // express middleware
 // return agent list
@@ -20,7 +20,7 @@ const agentsList = (agentDictionary, hostName = "https://example.com", urlPath =
                 samples: agent.samples,
                 inputs: agent.inputs,
                 output: agent.output,
-                stream: agent.stream,
+                stream: agent.stream ?? false,
             };
         });
         res.json({ agents: list });
@@ -54,10 +54,11 @@ const agentDoc = (agentDictionary, hostName = "https://example.com", urlPath = "
 };
 exports.agentDoc = agentDoc;
 // express middleware
-// run agent
+// dispatch and run agent
+// app.post(apiPrefix + "/:agentId", agentDispatcher(agentDictionary));
 const agentDispatcher = (agentDictionary, agentFilters = []) => {
-    const nonStram = (0, exports.nonStreamAgentDispatcher)(agentDictionary, agentFilters);
-    const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters);
+    const nonStram = (0, exports.nonStreamAgentDispatcher)(agentDictionary, agentFilters, true);
+    const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters, true);
     return async (req, res, next) => {
         const isStreaming = (req.headers["content-type"] || "").startsWith("text/event-stream");
         if (isStreaming) {
@@ -69,10 +70,25 @@ const agentDispatcher = (agentDictionary, agentFilters = []) => {
 exports.agentDispatcher = agentDispatcher;
 // express middleware
 // run agent
-const nonStreamAgentDispatcher = (agentDictionary, agentFilters = []) => {
+// app.post(agentPrefix, agentRunner(agentDictionary));
+const agentRunner = (agentDictionary, agentFilters = []) => {
+    const nonStram = (0, exports.nonStreamAgentDispatcher)(agentDictionary, agentFilters, false);
+    const stream = (0, exports.streamAgentDispatcher)(agentDictionary, agentFilters, false);
+    return async (req, res, next) => {
+        const isStreaming = (req.headers["content-type"] || "").startsWith("text/event-stream");
+        if (isStreaming) {
+            return await stream(req, res, next);
+        }
+        return await nonStram(req, res, next);
+    };
+};
+exports.agentRunner = agentRunner;
+// express middleware
+// run agent
+const nonStreamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true) => {
     return async (req, res, next) => {
         try {
-            const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters);
+            const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters, isDispatch);
             const result = await dispatcher(req, res);
             return res.json(result);
         }
@@ -84,7 +100,7 @@ const nonStreamAgentDispatcher = (agentDictionary, agentFilters = []) => {
 exports.nonStreamAgentDispatcher = nonStreamAgentDispatcher;
 // express middleware
 // run agent with streaming
-const streamAgentDispatcher = (agentDictionary, agentFilters = []) => {
+const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch = true) => {
     return async (req, res, next) => {
         try {
             res.setHeader("Content-Type", "text/event-stream;charset=utf-8");
@@ -100,7 +116,7 @@ const streamAgentDispatcher = (agentDictionary, agentFilters = []) => {
                 agent: (0, agent_filters_1.streamAgentFilterGenerator)(callback),
             };
             const filterList = [...agentFilters, streamAgentFilter];
-            const dispatcher = agentDispatcherInternal(agentDictionary, filterList);
+            const dispatcher = agentDispatcherInternal(agentDictionary, filterList, isDispatch);
             const result = await dispatcher(req, res);
             const json_data = JSON.stringify(result);
             res.write("___END___");
@@ -114,10 +130,11 @@ const streamAgentDispatcher = (agentDictionary, agentFilters = []) => {
 };
 exports.streamAgentDispatcher = streamAgentDispatcher;
 // dispatcher internal function
-const agentDispatcherInternal = (agentDictionary, agentFilters = []) => {
+const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch = true) => {
     return async (req, res) => {
         const { params } = req;
-        const { agentId } = params;
+        const { agentId } = isDispatch ? params : req.body;
+        console.log(agentId);
         const { nodeId, retry, params: agentParams, inputs, namedInputs } = req.body;
         const agent = agentDictionary[agentId];
         if (agent === undefined) {

package/lib/type.d.ts

@@ -0,0 +1,15 @@
+import type { AgentFunctionInfoSample } from "graphai";
+export type ExpressAgentInfo = {
+    agentId: string;
+    name: string;
+    url: string;
+    description: string;
+    category: string[];
+    author: string;
+    license: string;
+    repository: string;
+    samples: AgentFunctionInfoSample[];
+    inputs: any;
+    output: any;
+    stream: boolean;
+};

package/lib/type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@receptron/graphai_express",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "GraphAI express web server middleware.",
-  "main": "lib/express.js",
+  "main": "lib/index.js",
   "files": [
     "./lib"
   ],
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/receptron/graphai_utils/tree/main/packages/express#readme",
   "devDependencies": {
-    "@graphai/agents": "^0.0.9",
+    "@graphai/agents": "^0.0.14",
     "@types/express": "^4.17.21",
     "@types/node": "^20.8.7",
     "eslint": "^9.3.0",
@@ -38,12 +38,12 @@
     "typescript-eslint": "^7.9.0"
   },
   "dependencies": {
-    "@graphai/agent_filters": "^0.0.5",
+    "@graphai/agent_filters": "^0.0.6",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
-    "graphai": "^0.5.1"
+    "graphai": "^0.5.2"
   },
-  "types": "./lib/express.d.ts",
+  "types": "./lib/index.d.ts",
   "directories": {
     "lib": "lib"
   }