@receptron/graphai_express 1.0.2 → 2.0.0

package/README.md

@@ -36,6 +36,8 @@ app.post(apiAgentPrefix + "/stream/:agentId", streamAgentDispatcher(agentDiction
 // non stream and stream agent server
 app.post(apiGraphPrefix + "/", graphRunner(agentDictionary));
 
+// OpenAI completions Compatible API
+app.post("/api/chat/completions", completionRunner(agentDictionary, model2graphData, [], onLogCallback));
 
 ```
 

package/lib/agents.d.ts

@@ -4,7 +4,7 @@ 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, 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>;

package/lib/agents.js

@@ -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;
@@ -98,7 +99,7 @@ const nonStreamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch
         try {
             const dispatcher = agentDispatcherInternal(agentDictionary, agentFilters, isDispatch);
             const result = await dispatcher(req, res);
-            return res.json(result);
+            res.json(result);
         }
         catch (e) {
             next(e);
@@ -129,7 +130,7 @@ 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);
@@ -138,7 +139,7 @@ const streamAgentDispatcher = (agentDictionary, agentFilters = [], isDispatch =
                 res.write(endOfStreamDelimiter);
             }
             res.write(contentCallback(result));
-            return res.end();
+            res.end();
         }
         catch (e) {
             next(e);
@@ -171,7 +172,7 @@ const agentDispatcherInternal = (agentDictionary, agentFilters = [], isDispatch
             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

@@ -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

@@ -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

@@ -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

@@ -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/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { agentsList, agentDoc, agentDispatcher, agentRunner, nonStreamAgentDispatcher, streamAgentDispatcher, updateAgentVerbose } from "./agents";
 export { graphRunner, streamGraphRunner, nonStreamGraphRunner } from "./graph";
 export { completionRunner } from "./completions";
-export { ExpressAgentInfo, StreamChunkCallback, ContentCallback, Model2GraphData } from "./type";
+export { modelList } from "./models";
+export { ExpressAgentInfo, StreamChunkCallback, StreamCompletionChunkCallback, Model2GraphData, GraphDictionary, ContentCallback, DefaultEndOfStreamDelimiter, } from "./type";

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.completionRunner = exports.nonStreamGraphRunner = exports.streamGraphRunner = exports.graphRunner = exports.updateAgentVerbose = exports.streamAgentDispatcher = exports.nonStreamAgentDispatcher = exports.agentRunner = exports.agentDispatcher = exports.agentDoc = exports.agentsList = void 0;
+exports.DefaultEndOfStreamDelimiter = exports.modelList = exports.completionRunner = 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; } });
@@ -15,3 +15,7 @@ Object.defineProperty(exports, "streamGraphRunner", { enumerable: true, get: fun
 Object.defineProperty(exports, "nonStreamGraphRunner", { enumerable: true, get: function () { return graph_1.nonStreamGraphRunner; } });
 var completions_1 = require("./completions");
 Object.defineProperty(exports, "completionRunner", { enumerable: true, get: function () { return completions_1.completionRunner; } });
+var models_1 = require("./models");
+Object.defineProperty(exports, "modelList", { enumerable: true, get: function () { return models_1.modelList; } });
+var type_1 = require("./type");
+Object.defineProperty(exports, "DefaultEndOfStreamDelimiter", { enumerable: true, get: function () { return type_1.DefaultEndOfStreamDelimiter; } });

package/lib/models.d.ts

@@ -0,0 +1,3 @@
+import express from "express";
+import type { GraphDictionary } from "./type";
+export declare const modelList: (modelDictionary: GraphDictionary) => (req: express.Request, res: express.Response) => Promise<void>;

package/lib/models.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelList = void 0;
+const modelList = (modelDictionary) => {
+    return async (req, res) => {
+        const data = Object.keys(modelDictionary).map((id) => {
+            // const model = modelDictionary[id];
+            return {
+                id,
+                object: "model",
+                created: 1686935002,
+                owned_by: "graphai",
+            };
+        });
+        res.json({ object: "list", data });
+    };
+};
+exports.modelList = modelList;

package/lib/type.d.ts

@@ -21,6 +21,7 @@ type BaseData = {
 export type StreamChunkCallback = <T = string | Record<string, string>>(context: AgentFunctionContext, token: T) => void;
 export type StreamCompletionChunkCallback = <T = string | Record<string, string>>(data: BaseData, status: string, token?: T) => void;
 export type Model2GraphData = (model: string) => GraphData;
+export type GraphDictionary = Record<string, GraphData>;
 export type ContentCallback = <T = string | Record<string, string>>(token: T) => void;
 export declare const DefaultEndOfStreamDelimiter = "___END___";
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_express",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "GraphAI express web server middleware.",
   "main": "lib/index.js",
   "files": [
@@ -27,15 +27,17 @@
   },
   "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-serve-static-core": "^5.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.1",
     "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": {