graphai 0.4.0 → 0.4.2

package/README.md

@@ -418,7 +418,7 @@ Step 1. Install git, node and yarn
 Step 2. Clone the project and install necessary node modules
 
 ```
-git clone git@github.com:snakajima/graphai.git
+git clone git@github.com:receptron/graphai.git
 cd graphai
 yarn install
 ```

package/lib/experimental_agents/array_agents/pop_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const popAgent: AgentFunction<Record<string, any>, Record<string, any>, Array<any>>;
 declare const popAgentInfo: {
     name: string;

package/lib/experimental_agents/array_agents/push_agent.d.ts

@@ -1,14 +1,28 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const pushAgent: AgentFunction<Record<string, any>, Record<string, any>, Array<any>>;
 declare const pushAgentInfo: {
     name: string;
     agent: AgentFunction<Record<string, any>, Record<string, any>, any[]>;
     mock: AgentFunction<Record<string, any>, Record<string, any>, any[]>;
-    samples: {
+    samples: ({
         inputs: (number | number[])[];
         params: {};
         result: number[];
-    }[];
+    } | {
+        inputs: ({
+            apple: number;
+        }[] | {
+            lemon: number;
+        })[];
+        params: {};
+        result: ({
+            apple: number;
+            lemon?: undefined;
+        } | {
+            lemon: number;
+            apple?: undefined;
+        })[];
+    })[];
     description: string;
     category: never[];
     author: string;

package/lib/experimental_agents/array_agents/push_agent.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushAgent = void 0;
 const pushAgent = async ({ inputs }) => {
     const array = inputs[0].map((item) => item); // shallow copy
-    array.push(inputs[1]);
+    inputs.forEach((input, index) => {
+        if (index > 0) {
+            array.push(input);
+        }
+    });
     return array;
 };
 exports.pushAgent = pushAgent;
@@ -17,6 +21,16 @@ const pushAgentInfo = {
             params: {},
             result: [1, 2, 3],
         },
+        {
+            inputs: [[1, 2], 3, 4, 5],
+            params: {},
+            result: [1, 2, 3, 4, 5],
+        },
+        {
+            inputs: [[{ apple: 1 }], { lemon: 2 }],
+            params: {},
+            result: [{ apple: 1 }, { lemon: 2 }],
+        },
     ],
     description: "push Agent",
     category: [],

package/lib/experimental_agents/array_agents/shift_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const shiftAgent: AgentFunction<Record<string, any>, Record<string, any>, Array<any>>;
 declare const shiftAgentInfo: {
     name: string;

package/lib/experimental_agents/data_agents/copy_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const copyAgent: AgentFunction;
 declare const copyAgentInfo: {
     name: string;

package/lib/experimental_agents/data_agents/data_object_merge_template_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const dataObjectMergeTemplateAgent: AgentFunction;
 declare const dataObjectMergeTemplateAgentInfo: {
     name: string;

package/lib/experimental_agents/data_agents/data_sum_template_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const dataSumTemplateAgent: AgentFunction<Record<string, any>, number, number>;
 declare const dataSumTemplateAgentInfo: {
     name: string;

package/lib/experimental_agents/data_agents/property_filter_agent.d.ts

@@ -1,9 +1,10 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const propertyFilterAgent: AgentFunction<{
     include?: Array<string>;
     exclude?: Array<string>;
     alter?: Record<string, Record<string, string>>;
-    inject?: Record<string, Record<string, any>>;
+    inject?: Array<Record<string, any>>;
+    swap?: Record<string, string>;
 }>;
 declare const propertyFilterAgentInfo: {
     name: string;
@@ -11,13 +12,15 @@ declare const propertyFilterAgentInfo: {
         include?: string[] | undefined;
         exclude?: string[] | undefined;
         alter?: Record<string, Record<string, string>> | undefined;
-        inject?: Record<string, Record<string, any>> | undefined;
+        inject?: Record<string, any>[] | undefined;
+        swap?: Record<string, string> | undefined;
     }>;
     mock: AgentFunction<{
         include?: string[] | undefined;
         exclude?: string[] | undefined;
         alter?: Record<string, Record<string, string>> | undefined;
-        inject?: Record<string, Record<string, any>> | undefined;
+        inject?: Record<string, any>[] | undefined;
+        swap?: Record<string, string> | undefined;
     }>;
     samples: ({
         inputs: (string | {
@@ -32,6 +35,7 @@ declare const propertyFilterAgentInfo: {
             exclude?: undefined;
             alter?: undefined;
             inject?: undefined;
+            swap?: undefined;
         };
         result: {
             color: string;
@@ -50,6 +54,7 @@ declare const propertyFilterAgentInfo: {
             exclude?: undefined;
             alter?: undefined;
             inject?: undefined;
+            swap?: undefined;
         };
         result: {
             color: string;
@@ -68,6 +73,7 @@ declare const propertyFilterAgentInfo: {
             include?: undefined;
             alter?: undefined;
             inject?: undefined;
+            swap?: undefined;
         };
         result: {
             type: string;
@@ -92,6 +98,7 @@ declare const propertyFilterAgentInfo: {
             include?: undefined;
             exclude?: undefined;
             inject?: undefined;
+            swap?: undefined;
         };
         result: {
             color: string;
@@ -110,14 +117,13 @@ declare const propertyFilterAgentInfo: {
         }[])[];
         params: {
             inject: {
-                maker: {
-                    from: number;
-                    index?: undefined;
-                };
-            };
+                propId: string;
+                from: number;
+            }[];
             include?: undefined;
             exclude?: undefined;
             alter?: undefined;
+            swap?: undefined;
         };
         result: {
             color: string;
@@ -136,14 +142,38 @@ declare const propertyFilterAgentInfo: {
         }[])[];
         params: {
             inject: {
-                maker: {
-                    index: number;
-                    from: number;
-                };
+                propId: string;
+                from: number;
+                index: number;
+            }[];
+            include?: undefined;
+            exclude?: undefined;
+            alter?: undefined;
+            swap?: undefined;
+        };
+        result: {
+            color: string;
+            model: string;
+            type: string;
+            maker: string;
+            range: number;
+        }[];
+    } | {
+        inputs: (string | {
+            color: string;
+            model: string;
+            type: string;
+            maker: string;
+            range: number;
+        }[])[];
+        params: {
+            swap: {
+                maker: string;
             };
             include?: undefined;
             exclude?: undefined;
             alter?: undefined;
+            inject?: undefined;
         };
         result: {
             color: string;

package/lib/experimental_agents/data_agents/property_filter_agent.js

@@ -1,17 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.propertyFilterAgent = void 0;
-const applyFilter = (input, index, inputs, include, exclude, alter, inject) => {
+const applyFilter = (input, index, inputs, include, exclude, alter, inject, swap) => {
     const propIds = include ? include : Object.keys(input);
     const excludeSet = new Set(exclude ?? []);
-    return propIds.reduce((tmp, propId) => {
+    const result = propIds.reduce((tmp, propId) => {
         if (!excludeSet.has(propId)) {
-            const injection = inject && inject[propId];
             const mapping = alter && alter[propId];
-            if (injection && (injection.index === undefined || injection.index === index)) {
-                tmp[propId] = inputs[injection.from];
-            }
-            else if (mapping && mapping[input[propId]]) {
+            if (mapping && mapping[input[propId]]) {
                 tmp[propId] = mapping[input[propId]];
             }
             else {
@@ -20,14 +16,29 @@ const applyFilter = (input, index, inputs, include, exclude, alter, inject) => {
         }
         return tmp;
     }, {});
+    if (inject) {
+        inject.forEach((item) => {
+            if (item.index === undefined || item.index === index) {
+                result[item.propId] = inputs[item.from];
+            }
+        });
+    }
+    if (swap) {
+        Object.keys(swap).forEach((key) => {
+            const tmp = result[key];
+            result[key] = result[swap[key]];
+            result[swap[key]] = tmp;
+        });
+    }
+    return result;
 };
 const propertyFilterAgent = async ({ inputs, params }) => {
     const [input] = inputs;
-    const { include, exclude, alter, inject } = params;
+    const { include, exclude, alter, inject, swap } = params;
     if (Array.isArray(input)) {
-        return input.map((item, index) => applyFilter(item, index, inputs, include, exclude, alter, inject));
+        return input.map((item, index) => applyFilter(item, index, inputs, include, exclude, alter, inject, swap));
     }
-    return applyFilter(input, 0, inputs, include, exclude, alter);
+    return applyFilter(input, 0, inputs, include, exclude, alter, inject, swap);
 };
 exports.propertyFilterAgent = propertyFilterAgent;
 const testInputs = [
@@ -73,7 +84,7 @@ const propertyFilterAgentInfo = {
         },
         {
             inputs: testInputs,
-            params: { inject: { maker: { from: 1 } } },
+            params: { inject: [{ propId: "maker", from: 1 }] },
             result: [
                 { color: "red", model: "Model 3", type: "EV", maker: "Tesla Motors", range: 300 },
                 { color: "blue", model: "Model Y", type: "EV", maker: "Tesla Motors", range: 400 },
@@ -81,12 +92,20 @@ const propertyFilterAgentInfo = {
         },
         {
             inputs: testInputs,
-            params: { inject: { maker: { index: 0, from: 1 } } },
+            params: { inject: [{ propId: "maker", from: 1, index: 0 }] },
             result: [
                 { color: "red", model: "Model 3", type: "EV", maker: "Tesla Motors", range: 300 },
                 { color: "blue", model: "Model Y", type: "EV", maker: "Tesla", range: 400 },
             ],
         },
+        {
+            inputs: testInputs,
+            params: { swap: { maker: "model" } },
+            result: [
+                { color: "red", model: "Tesla", type: "EV", maker: "Model 3", range: 300 },
+                { color: "blue", model: "Tesla", type: "EV", maker: "Model Y", range: 400 },
+            ],
+        },
     ],
     description: "Filter properties based on property name either with 'include' or 'exclude'",
     category: ["data"],

package/lib/experimental_agents/data_agents/total_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const totalAgent: AgentFunction<Record<never, never>, Record<string, number>>;
 declare const totalAgentInfo: {
     name: string;

package/lib/experimental_agents/embedding_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../graphai";
+import { AgentFunction } from "../index";
 export declare const stringEmbeddingsAgent: AgentFunction<{
     model?: string;
 }, any, Array<string> | string>;

package/lib/experimental_agents/function_agent.d.ts

@@ -1,4 +1,4 @@
-import { AgentFunction } from "../graphai";
+import { AgentFunction } from "../index";
 export declare const functionAgent: AgentFunction<{
     function: (...args: any[]) => any;
 }>;

package/lib/experimental_agents/graph_agents/map_agent.d.ts

@@ -1,16 +1,16 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 export declare const mapAgent: AgentFunction<{
-    injectionTo?: Array<string>;
+    namedInputs?: Array<string>;
     limit?: number;
 }, Record<string, Array<any>>, any>;
 declare const mapAgentInfo: {
     name: string;
     agent: AgentFunction<{
-        injectionTo?: string[] | undefined;
+        namedInputs?: string[] | undefined;
         limit?: number | undefined;
     }, Record<string, any[]>, any>;
     mock: AgentFunction<{
-        injectionTo?: string[] | undefined;
+        namedInputs?: string[] | undefined;
         limit?: number | undefined;
     }, Record<string, any[]>, any>;
     samples: never[];

package/lib/experimental_agents/graph_agents/map_agent.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapAgent = void 0;
-const graphai_1 = require("../../graphai");
+const index_1 = require("../../index");
 const utils_1 = require("../../utils/utils");
 const nested_agent_1 = require("./nested_agent");
 const mapAgent = async ({ params, inputs, agents, log, taskManager, graphData, agentFilters }) => {
@@ -14,20 +14,20 @@ const mapAgent = async ({ params, inputs, agents, log, taskManager, graphData, a
     if (params.limit && params.limit < input.length) {
         input.length = params.limit; // trim
     }
-    const injectionTo = params.injectionTo ??
+    const namedInputs = params.namedInputs ??
         inputs.map((__input, index) => {
             return `$${index}`;
         });
-    injectionTo.forEach((nodeId) => {
+    namedInputs.forEach((nodeId) => {
         if (nestedGraphData.nodes[nodeId] === undefined) {
             // If the input node does not exist, automatically create a static node
             nestedGraphData.nodes[nodeId] = { value: {} };
         }
     });
     const graphs = input.map((data) => {
-        const graphAI = new graphai_1.GraphAI(nestedGraphData, agents || {}, { taskManager, agentFilters: agentFilters || [] });
+        const graphAI = new index_1.GraphAI(nestedGraphData, agents || {}, { taskManager, agentFilters: agentFilters || [] });
         // Only the first input will be mapped
-        injectionTo.forEach((injectToNodeId, index) => {
+        namedInputs.forEach((injectToNodeId, index) => {
             graphAI.injectValue(injectToNodeId, index === 0 ? data : inputs[index], "__mapAgent_inputs__");
         });
         return graphAI;

package/lib/experimental_agents/graph_agents/nested_agent.d.ts

@@ -1,16 +1,16 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 import { GraphData } from "../../type";
 export declare const getNestedGraphData: (graphData: GraphData | string | undefined, inputs: Array<any>) => GraphData;
 export declare const nestedAgent: AgentFunction<{
-    injectionTo?: Array<string>;
+    namedInputs?: Array<string>;
 }>;
 declare const nestedAgentInfo: {
     name: string;
     agent: AgentFunction<{
-        injectionTo?: string[] | undefined;
+        namedInputs?: string[] | undefined;
     }>;
     mock: AgentFunction<{
-        injectionTo?: string[] | undefined;
+        namedInputs?: string[] | undefined;
     }>;
     samples: never[];
     description: string;

package/lib/experimental_agents/graph_agents/nested_agent.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nestedAgent = exports.getNestedGraphData = void 0;
-const graphai_1 = require("../../graphai");
+const index_1 = require("../../index");
 const utils_1 = require("../../utils/utils");
 // This function allows us to use one of inputs as the graph data for this nested agent,
 // which is equivalent to "eval" of JavaScript.
@@ -27,8 +27,8 @@ const nestedAgent = async ({ params, inputs, agents, log, taskManager, graphData
         (0, utils_1.assert)(status.concurrency > status.running, `nestedAgent: Concurrency is too low: ${status.concurrency}`);
     }
     const nestedGraphData = (0, exports.getNestedGraphData)(graphData, inputs);
-    const injectionTo = params.injectionTo ?? inputs.map((__input, index) => `$${index}`);
-    injectionTo.forEach((nodeId, index) => {
+    const namedInputs = params.namedInputs ?? inputs.map((__input, index) => `$${index}`);
+    namedInputs.forEach((nodeId, index) => {
         if (nestedGraphData.nodes[nodeId] === undefined) {
             // If the input node does not exist, automatically create a static node
             nestedGraphData.nodes[nodeId] = { value: inputs[index] };
@@ -38,7 +38,7 @@ const nestedAgent = async ({ params, inputs, agents, log, taskManager, graphData
             nestedGraphData.nodes[nodeId]["value"] = inputs[index];
         }
     });
-    const graphAI = new graphai_1.GraphAI(nestedGraphData, agents || {}, { taskManager, agentFilters });
+    const graphAI = new index_1.GraphAI(nestedGraphData, agents || {}, { taskManager, agentFilters });
     const results = await graphAI.run(false);
     log?.push(...graphAI.transactionLogs());
     return results;

package/lib/experimental_agents/index.d.ts

@@ -7,6 +7,7 @@ export * from "./data_agents";
 export * from "./sleeper_agents";
 export * from "./llm_agents";
 export * from "./service_agents";
+export * from "./input_agents";
 import functionAgent from "./function_agent";
 import stringEmbeddingsAgent from "./embedding_agent";
 import tokenBoundStringsAgent from "./token_agent";

package/lib/experimental_agents/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./data_agents"), exports);
 __exportStar(require("./sleeper_agents"), exports);
 __exportStar(require("./llm_agents"), exports);
 __exportStar(require("./service_agents"), exports);
+__exportStar(require("./input_agents"), exports);
 //  TODO sub folder
 const function_agent_1 = __importDefault(require("./function_agent"));
 exports.functionAgent = function_agent_1.default;

package/lib/experimental_agents/input_agents/index.d.ts

@@ -0,0 +1,2 @@
+import textInputAgent from "../../experimental_agents/input_agents/text_input_agent";
+export { textInputAgent };

package/lib/experimental_agents/input_agents/index.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.textInputAgent = void 0;
+const text_input_agent_1 = __importDefault(require("../../experimental_agents/input_agents/text_input_agent"));
+exports.textInputAgent = text_input_agent_1.default;

package/lib/experimental_agents/input_agents/packages.d.ts

@@ -0,0 +1,2 @@
+import textInputAgent from "../../experimental_agents/input_agents/text_input_agent";
+export { textInputAgent };

package/lib/experimental_agents/input_agents/packages.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.textInputAgent = void 0;
+const text_input_agent_1 = __importDefault(require("../../experimental_agents/input_agents/text_input_agent"));
+exports.textInputAgent = text_input_agent_1.default;

package/lib/experimental_agents/input_agents/text_input_agent.d.ts

@@ -0,0 +1,26 @@
+import { AgentFunction } from "../../index";
+export declare const textInputAgent: AgentFunction<{
+    message?: string;
+}, string | {
+    [x: string]: string;
+}>;
+declare const textInputAgentInfo: {
+    name: string;
+    agent: AgentFunction<{
+        message?: string | undefined;
+    }, string | {
+        [x: string]: string;
+    }>;
+    mock: AgentFunction<{
+        message?: string | undefined;
+    }, string | {
+        [x: string]: string;
+    }>;
+    samples: never[];
+    description: string;
+    category: string[];
+    author: string;
+    repository: string;
+    license: string;
+};
+export default textInputAgentInfo;

package/lib/experimental_agents/input_agents/text_input_agent.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.textInputAgent = void 0;
+const input_1 = __importDefault(require("@inquirer/input"));
+const textInputAgent = async ({ params }) => {
+    return await (0, input_1.default)({ message: params.message ?? "Enter" });
+};
+exports.textInputAgent = textInputAgent;
+const textInputAgentInfo = {
+    name: "textInputAgent",
+    agent: exports.textInputAgent,
+    mock: exports.textInputAgent,
+    samples: [],
+    description: "Text Input Agent",
+    category: ["array"],
+    author: "Receptron team",
+    repository: "https://github.com/receptron/graphai",
+    license: "MIT",
+};
+exports.default = textInputAgentInfo;

package/lib/experimental_agents/llm_agents/groq_agent.d.ts

@@ -1,15 +1,16 @@
-import { AgentFunction } from "../../graphai";
+import { AgentFunction } from "../../index";
 import { Groq } from "groq-sdk";
 export declare const groqAgent: AgentFunction<{
     model: string;
     query?: string;
     system?: string;
     verbose?: boolean;
-    tools?: Record<string, Groq.Chat.CompletionCreateParams.Tool>;
+    tools?: Groq.Chat.CompletionCreateParams.Tool[];
     temperature?: number;
     max_tokens?: number;
-    tool_choice?: string | Record<string, Groq.Chat.CompletionCreateParams.ToolChoice>;
-}, Groq.Chat.ChatCompletion, string | Array<Groq.Chat.CompletionCreateParams.Message>>;
+    tool_choice?: Groq.Chat.CompletionCreateParams.ToolChoice;
+    isStreaming?: boolean;
+}, any, string | Array<Groq.Chat.CompletionCreateParams.Message>>;
 declare const groqAgentInfo: {
     name: string;
     agent: AgentFunction<{
@@ -17,21 +18,23 @@ declare const groqAgentInfo: {
         query?: string | undefined;
         system?: string | undefined;
         verbose?: boolean | undefined;
-        tools?: Record<string, Groq.Chat.Completions.CompletionCreateParams.Tool> | undefined;
+        tools?: Groq.Chat.Completions.CompletionCreateParams.Tool[] | undefined;
         temperature?: number | undefined;
         max_tokens?: number | undefined;
-        tool_choice?: string | Record<string, Groq.Chat.Completions.CompletionCreateParams.ToolChoice> | undefined;
-    }, Groq.Chat.Completions.ChatCompletion, string | Groq.Chat.Completions.CompletionCreateParams.Message[]>;
+        tool_choice?: Groq.Chat.Completions.CompletionCreateParams.ToolChoice | undefined;
+        isStreaming?: boolean | undefined;
+    }, any, string | Groq.Chat.Completions.CompletionCreateParams.Message[]>;
     mock: AgentFunction<{
         model: string;
         query?: string | undefined;
         system?: string | undefined;
         verbose?: boolean | undefined;
-        tools?: Record<string, Groq.Chat.Completions.CompletionCreateParams.Tool> | undefined;
+        tools?: Groq.Chat.Completions.CompletionCreateParams.Tool[] | undefined;
         temperature?: number | undefined;
         max_tokens?: number | undefined;
-        tool_choice?: string | Record<string, Groq.Chat.Completions.CompletionCreateParams.ToolChoice> | undefined;
-    }, Groq.Chat.Completions.ChatCompletion, string | Groq.Chat.Completions.CompletionCreateParams.Message[]>;
+        tool_choice?: Groq.Chat.Completions.CompletionCreateParams.ToolChoice | undefined;
+        isStreaming?: boolean | undefined;
+    }, any, string | Groq.Chat.Completions.CompletionCreateParams.Message[]>;
     samples: never[];
     description: string;
     category: string[];