graphai 0.0.9 → 0.0.10

package/lib/experimental_agents/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./string_agent";
+export * from "./slashgpt_agent";

package/lib/experimental_agents/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./string_agent"), exports);
+__exportStar(require("./slashgpt_agent"), exports);

package/lib/experimental_agents/slashgpt_agent.d.ts

@@ -0,0 +1,9 @@
+import { AgentFunction } from "../graphai";
+import { ManifestData } from "slashgpt";
+export declare const slashGPTAgent: AgentFunction<{
+    manifest: ManifestData;
+    query?: string;
+    function_result?: boolean;
+}, {
+    content: string;
+}>;

package/lib/experimental_agents/slashgpt_agent.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.slashGPTAgent = void 0;
+const path_1 = __importDefault(require("path"));
+const slashgpt_1 = require("slashgpt");
+const config = new slashgpt_1.ChatConfig(path_1.default.resolve(__dirname));
+const slashGPTAgent = async (context) => {
+    console.log("executing", context.nodeId, context.params);
+    const session = new slashgpt_1.ChatSession(config, context.params.manifest ?? {});
+    const query = context.params?.query ? [context.params.query] : [];
+    const contents = query.concat(context.inputs.map((input) => {
+        return input.content;
+    }));
+    session.append_user_question(contents.join("\n"));
+    await session.call_loop(() => { });
+    const message = (() => {
+        if (context.params?.function_result) {
+            return session.history.messages().find((m) => m.role === "function_result");
+        }
+        return session.history.last_message();
+    })();
+    if (message === undefined) {
+        throw new Error("No message in the history");
+    }
+    return message;
+};
+exports.slashGPTAgent = slashGPTAgent;

package/lib/experimental_agents/string_agent.d.ts

@@ -0,0 +1,7 @@
+import { AgentFunction } from "../graphai";
+export declare const stringTemplateAgent: AgentFunction<{
+    template: string;
+    inputKey?: string;
+}, {
+    content: string;
+}>;

package/lib/experimental_agents/string_agent.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringTemplateAgent = void 0;
+const stringTemplateAgent = async (context) => {
+    console.log("executing", context.nodeId, context.params);
+    const content = context.inputs.reduce((template, input, index) => {
+        return template.replace("${" + index + "}", input[context.params.inputKey ?? "content"]);
+    }, context.params.template);
+    return { content };
+};
+exports.stringTemplateAgent = stringTemplateAgent;

package/lib/graphai.d.ts

@@ -89,7 +89,7 @@ export declare class GraphAI {
     asString(): string;
     results(): ResultDataDictonary<Record<string, any>>;
     errors(): Record<string, Error>;
-    run(): Promise<unknown>;
+    run(): Promise<ResultDataDictonary>;
     private runNode;
     pushQueue(node: Node): void;
     removeRunning(node: Node): void;

package/lib/graphai_cli.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const graphai_1 = require("./graphai");
+const experimental_agents_1 = require("./experimental_agents");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
@@ -25,7 +26,7 @@ const main = async () => {
     try {
         const graph_data_file = fs_1.default.readFileSync(file_path, "utf8");
         const graph_data = yaml_1.default.parse(graph_data_file);
-        const graph = new graphai_1.GraphAI(graph_data, { test: testAgent });
+        const graph = new graphai_1.GraphAI(graph_data, { testAgent, slashGPTAgent: experimental_agents_1.slashGPTAgent, stringTemplateAgent: experimental_agents_1.stringTemplateAgent });
         const results = await graph.run();
         console.log(results);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphai",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Asynchronous data flow execution engine to make it simple to build LLM apps.",
   "main": "lib/index.js",
   "bin": "lib/graphai_cli.js",

package/samples/agents/arxiv_agent.ts

@@ -34,12 +34,12 @@ export const arxivAgent: AgentFunction<{ keywords: string[]; limit: number }, ar
   return result;
 };
 
-export const arxiv2TextAgent: AgentFunction<{}, string, string[]> = async (context) => {
+export const arxiv2TextAgent: AgentFunction<{}, Record<string, any>, string[]> = async (context) => {
   const result = (context.inputs[0] || [])
     .map((r: any) => {
       const { id, title, summary } = r;
       return ["id:", id, "title:", title, "summary:", summary].join("\n");
     })
     .join("\n\n\n");
-  return result;
+  return { content: result };
 };

package/samples/agents/slashgpt_agent.ts

@@ -6,7 +6,7 @@ const config = new ChatConfig(path.resolve(__dirname));
 
 export const slashGPTFuncitons2TextAgent: AgentFunction<
   { function_data_key: string; result_key: number },
-  string,
+  Record<string, string>,
   { function_data: { [key: string]: string[] } }
 > = async (context) => {
   const { params } = context;
@@ -15,36 +15,5 @@ export const slashGPTFuncitons2TextAgent: AgentFunction<
     return ["title:", title, "description:", description].join("\n");
   });
 
-  return result[context.forkIndex ?? 0];
-};
-
-export const slashGPTAgent: AgentFunction<
-  { manifest: ManifestData; prompt: string; function_result?: boolean; debug?: boolean },
-  { answer: string },
-  string
-> = async (context) => {
-  const { params } = context;
-  if (params.debug) {
-    console.log("executing", context.nodeId, context);
-  }
-  const session = new ChatSession(config, params?.manifest ?? {});
-
-  const prompt = params?.prompt ?? [context.inputs].filter((a) => a !== undefined).join("\n\n");
-  // console.log(prompt);
-  session.append_user_question(prompt);
-
-  await session.call_loop(() => {});
-
-  // console.log(session.history)
-  const message = (() => {
-    if (params.function_result) {
-      return session.history.messages().find((m) => m.role === "function_result");
-    }
-    return session.history.last_message();
-  })();
-  if (message === undefined) {
-    throw new Error("No message in the history");
-  }
-  const result = { answer: message.content, function_data: message.function_data };
-  return result;
+  return { content: result[context.forkIndex ?? 0] };
 };

package/samples/graphs/arxiv.yml

@@ -13,7 +13,7 @@ nodes:
     inputs: [arxiv2TextAgent]
     agentId: slashGPTAgent
     params:
-      prompt: |
+      query: |
         与えられたそれぞれの論文の要点をまとめ、以下の項目で日本語で出力せよ。それぞれの項目は最大でも180文字以内に要約せよ。
         ```
         論文名:タイトルの日本語訳

package/samples/graphs/slash_gpt.yml

@@ -1,19 +1,28 @@
 nodes:
   node1:
+    agentId: slashgpt
     params:
-      prompt: Come up with ten business ideas for AI startup
+      query: Come up with ten business ideas for AI startup
   node2:
+    agentId: stringTemplate
     inputs: [node1]
     params:
-      prompt: |
+      template: |
         Please evaluate following business ideas.
         ${0}
   node3:
-    inputs: [node1, node2]
+    agentId: slashgpt
+    inputs: [node2]
+  node4:
+    agentId: stringTemplate
+    inputs: [node1, node3]
     params:
-      prompt:  |
+      template:  |
         Please pick the winner of this business idea contest.
         [ideas]
         ${0}
         [evalutations]
         ${1}
+  node5:
+    agentId: slashgpt
+    inputs: [node4]

package/samples/home.json

@@ -0,0 +1,112 @@
+[
+  {
+      "name": "fill_bath",
+      "description": "Fill the bath tub",
+      "parameters": {
+          "type": "object",
+          "properties": {
+              "temperature": {
+                  "type": "number",
+                  "description": "Water temperature in celsius. If omitted, 41 degree"
+              },
+              "at": {
+                  "type": "string",
+                  "description": "Time to fill. If omitted immediately."
+              }
+          },
+          "required": []
+      }
+  },
+  {
+      "name": "set_temperature",
+      "description": "Set the temperature",
+      "parameters": {
+          "type": "object",
+          "properties": {
+              "temperature": {
+                  "type": "number",
+                  "description": "Room temperature in celsius."
+              },
+              "location": {
+                  "type": "string",
+                  "enum": ["kitchen", "living room", "master bedroom", "bedroom 2", "bedroom 3", "all bedrooms"],
+                  "description": "The room to set the temperature."
+              }
+          },
+          "required": ["temperature", "location"]
+      }
+  },
+  {
+      "name": "start_sprinkler",
+      "description": "Start the sprinkler system",
+      "parameters": {
+          "type": "object",
+          "properties": {
+              "location": {
+                  "type": "string",
+                  "enum": ["all", "lawn", "vegetable garden", "front yard"],
+                  "description": "Specify the location to water."
+              }
+          },
+          "required": ["location"]
+      }
+  },
+  {
+      "name": "take_picture",
+      "description": "Take a picture and send it",
+      "parameters": {
+          "type": "object",
+          "properties": {
+              "location": {
+                  "type": "string",
+                  "enum": ["entrance", "backyard", "kitchen", "living room"],
+                  "description": "Specify the camera location to use."
+              }
+          },
+          "required": ["location"]
+      }
+  },
+  {
+      "name": "play_music",
+      "description": "Play music",
+      "parameters": {
+          "type": "object",
+          "properties": {
+              "location": {
+                  "type": "string",
+                  "enum": ["living room", "master bedroom"],
+                  "description": "Location to play a music."
+              },
+              "music": {
+                  "type": "string",
+                  "description": "Music to play, such as artist, title and playlist."
+              }
+          },
+          "required": ["location"]
+      }
+  },
+  {
+      "name": "control_light",
+      "description": "Turn on/off various lights",
+      "parameters": {
+          "type": "object",
+          "properties": {
+              "location": {
+                  "type": "string",
+                  "enum": ["kitchen", "living room", "master bedroom", "bedroom 2", "bedroom 3", "front gate"],
+                  "description": "Specify the location to control the light."
+              },
+              "switch": {
+                  "type": "string",
+                  "enum": ["on", "off"],
+                  "description": "Specify the light switch."
+              },
+              "dim": {
+                  "type": "number",
+                  "description": "Specify the dim level between 0 and 1.0. The 'switch' parameter must be 'on'."
+              }
+          },
+          "required": ["location", "switch"]
+      }
+  }
+]

package/samples/home.ts

@@ -0,0 +1,51 @@
+import { GraphAI, GraphData } from "@/graphai";
+import path from "path";
+import * as fs from "fs";
+import { slashGPTAgent } from "@/experimental_agents";
+
+const home_actions = {
+  fill_bath: { type: "message_template", message: "Success. I started filling the bath tab." },
+  set_temperature: { type: "message_template", message: "Success. I set the temperature to {temperature} for {location}" },
+  start_sprinkler: { type: "message_template", message: "Success. I started the sprinkler for {location}" },
+  take_picture: { type: "message_template", message: "Success. I took a picture of {location}" },
+  play_music: { type: "message_template", message: "Success. I started playing {music} in {location}" },
+  control_light: { type: "message_template", message: "Success. The light switch of {location} is now {switch}." },
+};
+
+const fileName = path.resolve(__dirname) + "/home.json";
+const json_file = fs.readFileSync(fileName, "utf8");
+const home_functions = JSON.parse(json_file);
+
+const graph_data: GraphData = {
+  nodes: {
+    node1: {
+      source: true,
+      result: { content: "Turn on the light in the kitchen" },
+    },
+    node2: {
+      inputs: ["node1"],
+      params: {
+        manifest: {
+          skip_function_result: true,
+          actions: home_actions,
+          functions: home_functions,
+        },
+      },
+    },
+  },
+};
+
+const runAgent = async () => {
+  const graph = new GraphAI(graph_data, slashGPTAgent);
+  const result = await graph.run();
+  const log_path = path.resolve(__dirname) + "/../tests/logs/home.log";
+  fs.writeFileSync(log_path, JSON.stringify(graph.transactionLogs(), null, 2));
+  console.log(result["node2"]!.content);
+};
+
+const main = async () => {
+  await runAgent();
+  console.log("COMPLETE 1");
+};
+
+main();

package/samples/interaction.ts

@@ -1,8 +1,7 @@
 import { GraphAI, GraphData } from "@/graphai";
 import * as readline from "readline";
-import path from "path";
-import * as fs from "fs";
 import { testAgent } from "~/agents/agents";
+import { graphDataTestRunner } from "~/utils/runner";
 
 const getUserInput = async (question: string): Promise<string> => {
   return new Promise((resolve, reject) => {
@@ -29,20 +28,14 @@ const graph_data: GraphData = {
   },
 };
 
-const runAgent = async (query: string) => {
+const main = async () => {
+  const query = await getUserInput("Please enter your question: ");
   console.log("query=", query);
   graph_data.nodes.node1.result = { query };
-  const graph = new GraphAI(graph_data, testAgent);
-  // graph.injectResult("node1", { query });
-  const result = await graph.run();
-  const log_path = path.resolve(__dirname) + "/../tests/logs/interaction.log";
-  fs.writeFileSync(log_path, JSON.stringify(graph.transactionLogs(), null, 2));
+
+  const result = await graphDataTestRunner("interaction.yaml", graph_data, testAgent);
   console.log(result);
-};
 
-const main = async () => {
-  const query = await getUserInput("Please enter your question: ");
-  await runAgent(query);
   console.log("COMPLETE 1");
 };
 

package/samples/runner.ts

@@ -0,0 +1,15 @@
+import path from "path";
+
+import { GraphAI, AgentFunctionDictonary, AgentFunction } from "@/graphai";
+import { readGraphaiData } from "~/utils/file_utils";
+import { graphDataTestRunner } from "~/utils/runner";
+
+export const fileTestRunner = async (
+  file: string,
+  callbackDictonary: AgentFunctionDictonary | AgentFunction<any, any, any>,
+  callback: (graph: GraphAI) => void = () => {},
+) => {
+  const file_path = path.resolve(__dirname) + file;
+  const graph_data = readGraphaiData(file_path);
+  return await graphDataTestRunner(file, graph_data, callbackDictonary, callback);
+};

package/samples/sample_co2.ts

@@ -1,7 +1,7 @@
-import { GraphAI, AgentFunction } from "@/graphai";
-import { readGraphaiData } from "~/utils/file_utils";
+import { slashGPTFuncitons2TextAgent } from "./agents/slashgpt_agent";
+import { slashGPTAgent } from "@/experimental_agents";
 
-import { slashGPTAgent, slashGPTFuncitons2TextAgent } from "./agents/slashgpt_agent";
+import { graphDataTestRunner } from "~/utils/runner";
 
 const graph_data = {
   nodes: {
@@ -9,7 +9,7 @@ const graph_data = {
       agentId: "slashGPTAgent",
       params: {
         function_result: true,
-        prompt: "世界で協力してco2を減らす方法を教えて下さい",
+        query: "世界で協力してco2を減らす方法を教えて下さい",
         manifest: {
           prompt: "あなたは世界経済の専門家です。ユーザの問い合わせについて考え、10この結果をfunctionsの結果に返してください。",
           skip_function_result: true,
@@ -72,14 +72,9 @@ const graph_data = {
     },
   },
 };
-const runAgent = async () => {
-  const graph = new GraphAI(graph_data, { slashGPTAgent, slashGPTFuncitons2TextAgent });
-  const result = await graph.run();
-  console.log(result);
-};
 
 const main = async () => {
-  await runAgent();
+  const result = await graphDataTestRunner("sample_co2.yaml", graph_data, { slashGPTAgent, slashGPTFuncitons2TextAgent });
   console.log("COMPLETE 1");
 };
 main();

package/samples/sample_gpt.ts

@@ -1,40 +1,8 @@
-import path from "path";
-import * as fs from "fs";
-import { GraphAI, AgentFunction } from "@/graphai";
-import { ChatSession, ChatConfig, ManifestData } from "slashgpt";
-import { readGraphaiData } from "~/utils/file_utils";
+import { fileTestRunner } from "./runner";
 
-const config = new ChatConfig(path.resolve(__dirname));
-
-const slashGPTAgent: AgentFunction<{ manifest: ManifestData; prompt: string }, { content: string }> = async (context) => {
-  console.log("executing", context.nodeId, context.params);
-  const session = new ChatSession(config, context.params.manifest ?? {});
-  const prompt = context.inputs.reduce((prompt, input, index) => {
-    return prompt.replace("${" + index + "}", input["content"]);
-  }, context.params.prompt);
-  session.append_user_question(prompt);
-
-  await session.call_loop(() => {});
-  const message = session.history.last_message();
-  if (message === undefined) {
-    throw new Error("No message in the history");
-  }
-  return message;
-};
-
-const runAgent = async (file: string) => {
-  const file_path = path.resolve(__dirname) + file;
-  const graph_data = readGraphaiData(file_path);
-  const graph = new GraphAI(graph_data, slashGPTAgent);
-  const results = (await graph.run()) as Record<string, any>;
-
-  const log_path = path.resolve(__dirname) + "/../tests/logs/" + path.basename(file_path).replace(/\.yml$/, ".log");
-  console.log(log_path);
-  fs.writeFileSync(log_path, JSON.stringify(graph.transactionLogs(), null, 2));
-  console.log(results["node3"]["content"]);
-};
+import { stringTemplateAgent, slashGPTAgent } from "@/experimental_agents";
 
 const main = async () => {
-  await runAgent("/graphs/slash_gpt.yml");
+  await fileTestRunner("/graphs/slash_gpt.yml", { slashgpt: slashGPTAgent, stringTemplate: stringTemplateAgent });
 };
 main();

package/samples/sample_paper_ai.ts

@@ -1,22 +1,10 @@
-import path from "path";
-import search from "arXiv-api-ts";
+import { fileTestRunner } from "./runner";
 
-import { GraphAI, AgentFunction } from "@/graphai";
-import { readGraphaiData } from "~/utils/file_utils";
-
-import { slashGPTAgent } from "./agents/slashgpt_agent";
+import { slashGPTAgent } from "@/experimental_agents";
 import { arxivAgent, arxiv2TextAgent } from "./agents/arxiv_agent";
 
-const runAgent = async (file: string) => {
-  const file_path = path.resolve(__dirname) + file;
-  const graph_data = readGraphaiData(file_path);
-  const graph = new GraphAI(graph_data, { arxivAgent: arxivAgent, arxiv2TextAgent, slashGPTAgent });
-  const result = await graph.run();
-  console.log(result);
-};
-
 const main = async () => {
-  await runAgent("/graphs/arxiv.yml");
+  await fileTestRunner("/graphs/arxiv.yml", { arxivAgent: arxivAgent, arxiv2TextAgent, slashGPTAgent });
   console.log("COMPLETE 1");
 };
 main();

package/src/experimental_agents/index.ts

@@ -0,0 +1,2 @@
+export * from "./string_agent";
+export * from "./slashgpt_agent";

package/src/experimental_agents/slashgpt_agent.ts

@@ -0,0 +1,30 @@
+import path from "path";
+import { AgentFunction } from "@/graphai";
+import { ChatSession, ChatConfig, ManifestData } from "slashgpt";
+
+const config = new ChatConfig(path.resolve(__dirname));
+
+export const slashGPTAgent: AgentFunction<{ manifest: ManifestData; query?: string; function_result?: boolean }, { content: string }> = async (context) => {
+  console.log("executing", context.nodeId, context.params);
+  const session = new ChatSession(config, context.params.manifest ?? {});
+
+  const query = context.params?.query ? [context.params.query] : [];
+  const contents = query.concat(
+    context.inputs.map((input) => {
+      return input.content;
+    }),
+  );
+
+  session.append_user_question(contents.join("\n"));
+  await session.call_loop(() => {});
+  const message = (() => {
+    if (context.params?.function_result) {
+      return session.history.messages().find((m) => m.role === "function_result");
+    }
+    return session.history.last_message();
+  })();
+  if (message === undefined) {
+    throw new Error("No message in the history");
+  }
+  return message;
+};

package/src/experimental_agents/string_agent.ts

@@ -0,0 +1,10 @@
+import { AgentFunction } from "@/graphai";
+
+export const stringTemplateAgent: AgentFunction<{ template: string; inputKey?: string }, { content: string }> = async (context) => {
+  console.log("executing", context.nodeId, context.params);
+  const content = context.inputs.reduce((template, input, index) => {
+    return template.replace("${" + index + "}", input[context.params.inputKey ?? "content"]);
+  }, context.params.template);
+
+  return { content };
+};

package/src/graphai.ts

@@ -341,7 +341,7 @@ export class GraphAI {
     }, {});
   }
 
-  public async run() {
+  public async run(): Promise<ResultDataDictonary> {
     if (this.isRunning) {
       console.error("-- Already Running");
     }

package/src/graphai_cli.ts

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
 import { GraphAI, AgentFunction } from "./graphai";
+import { slashGPTAgent, stringTemplateAgent } from "./experimental_agents";
+
 import fs from "fs";
 import path from "path";
 import YAML from "yaml";
@@ -24,7 +26,7 @@ const main = async () => {
     const graph_data_file = fs.readFileSync(file_path, "utf8");
     const graph_data = YAML.parse(graph_data_file);
 
-    const graph = new GraphAI(graph_data, { test: testAgent });
+    const graph = new GraphAI(graph_data, { testAgent, slashGPTAgent, stringTemplateAgent });
     const results = await graph.run();
     console.log(results);
   } catch (e) {

package/tests/agents/test_string_agent.ts

@@ -0,0 +1,28 @@
+import { stringTemplateAgent } from "@/experimental_agents";
+
+import test from "node:test";
+import assert from "node:assert";
+
+test("test stringTemplateAgent simple", async () => {
+  const result = await stringTemplateAgent({
+    nodeId: "test",
+    retry: 0,
+    params: { template: "${0}: ${1}" },
+    inputs: [{ content: "hello" }, { content: "test" }] as any,
+  });
+  assert.deepStrictEqual(result, {
+    content: "hello: test",
+  });
+});
+
+test("test stringTemplateAgent simple", async () => {
+  const result = await stringTemplateAgent({
+    nodeId: "test",
+    retry: 0,
+    params: { template: "${0}: ${1}", inputKey: "key" },
+    inputs: [{ key: "hello" }, { key: "test" }],
+  });
+  assert.deepStrictEqual(result, {
+    content: "hello: test",
+  });
+});