@receptron/graphai_cli 2.0.4 → 2.0.6

package/lib/args.js

@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.args = exports.hasOption = void 0;
-const yargs_1 = __importDefault(require("yargs"));
+const yargs_1 = __importDefault(require("yargs/yargs"));
+const helpers_1 = require("yargs/helpers");
 exports.hasOption = ["-l", "--list", "-d", "--detail", "-s", "--sample"].some((o) => process.argv.includes(o));
-exports.args = yargs_1.default
+exports.args = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .scriptName("graphai")
     .option("list", {
     alias: "l",

package/lib/docs.js

@@ -5,7 +5,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDoc = exports.readTemplate = void 0;
 const utils_1 = require("graphai/lib/utils/utils");
-const json_schema_generator_1 = __importDefault(require("json-schema-generator"));
+// json-schema-generator was unmaintained, replace with a simple schema generator
+const generateSchema = (value) => {
+    if (Array.isArray(value)) {
+        if (value.length === 0) {
+            return { type: "array" };
+        }
+        return { type: "array", items: generateSchema(value[0]) };
+    }
+    if (value === null) {
+        return { type: "null" };
+    }
+    if (typeof value === "object") {
+        const properties = {};
+        const required = [];
+        for (const key of Object.keys(value)) {
+            properties[key] = generateSchema(value[key]);
+            required.push(key);
+        }
+        return { type: "object", properties, required };
+    }
+    if (typeof value === "string") {
+        return { type: "string" };
+    }
+    if (typeof value === "number") {
+        return { type: "number" };
+    }
+    if (typeof value === "boolean") {
+        return { type: "boolean" };
+    }
+    return { type: "any" };
+};
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const agentAttribute = (agentInfo, key) => {
@@ -47,7 +77,7 @@ const agentAttribute = (agentInfo, key) => {
         }
         if (agentInfo.samples && agentInfo.samples[0]) {
             const sample = agentInfo.samples[0];
-            return ["#### inputs", "```json", JSON.stringify((0, json_schema_generator_1.default)(sample.inputs), null, 2), "````"].join("\n\n");
+            return ["#### inputs", "```json", JSON.stringify(generateSchema(sample.inputs), null, 2), "````"].join("\n\n");
         }
         return "";
     }

package/lib/graphai_cli.js

@@ -106,7 +106,7 @@ const main = async () => {
             try {
                 fd.write(data);
             }
-            catch (e) {
+            catch (__e) {
                 // nothinfg
             }
             process.stdout.write(data);

package/lib/mermaid.d.ts

@@ -1,2 +1,2 @@
-import { GraphData } from "graphai";
+import { type GraphData } from "graphai";
 export declare const mermaid: (graphData: GraphData) => void;

package/lib/mermaid.js

@@ -2,31 +2,88 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mermaid = void 0;
 const graphai_1 = require("graphai");
-const mapData = (nodeId, inputs) => {
-    (0, graphai_1.inputs2dataSources)(inputs).map((source) => {
+const BASE_INDENT = "  ";
+const sanitizeNodeId = (nodeId) => {
+    return `n_${nodeId.replace(/\./g, "_")}`;
+};
+const getFullNodeId = (nodeId, parentPath) => {
+    return parentPath ? `${parentPath}.${nodeId}` : nodeId;
+};
+const getIndentLevel = (parentPath) => {
+    return parentPath.split(".").filter(Boolean).length;
+};
+const formatLine = (content, depth = 0) => {
+    return BASE_INDENT + BASE_INDENT.repeat(depth) + content;
+};
+const processConnections = (inputs, targetNodeId, parentPath, state) => {
+    const depth = getIndentLevel(parentPath);
+    let sources = (0, graphai_1.inputs2dataSources)(inputs);
+    if (!Array.isArray(sources)) {
+        sources = [sources];
+    }
+    sources.forEach((source) => {
         if (source.nodeId) {
-            if (source.propIds) {
-                console.log(` ${source.nodeId}(${source.nodeId}) -- ${source.propIds.join(".")} --> ${nodeId}`);
-            }
-            else {
-                console.log(` ${source.nodeId}(${source.nodeId}) --> ${nodeId}`);
-            }
+            const sourceFullId = getFullNodeId(source.nodeId, parentPath);
+            const sourceMermaidId = sanitizeNodeId(sourceFullId);
+            const targetMermaidId = sanitizeNodeId(targetNodeId);
+            const connection = source.propIds
+                ? `${sourceMermaidId} -- ${source.propIds.join(".")} --> ${targetMermaidId}`
+                : `${sourceMermaidId} --> ${targetMermaidId}`;
+            state.lines.push(formatLine(connection, depth));
         }
     });
 };
-const mermaid = (graphData) => {
-    console.log("flowchart TD");
-    Object.keys(graphData.nodes).forEach((nodeId) => {
-        const node = graphData.nodes[nodeId];
-        // label / name
-        if ("agent" in node) {
-            if (node.inputs) {
-                mapData(nodeId, node.inputs);
-            }
-        }
-        if ("update" in node) {
-            mapData(nodeId, { update: node.update });
+const processNode = (nodeId, node, parentPath, state) => {
+    const fullNodeId = getFullNodeId(nodeId, parentPath);
+    const mermaidNodeId = sanitizeNodeId(fullNodeId);
+    const depth = getIndentLevel(parentPath);
+    if ("graph" in node) {
+        state.lines.push(formatLine(`subgraph ${mermaidNodeId}[${nodeId}: ${node.agent || ""}]`, depth));
+        if (node.graph && typeof node.graph === "object" && node.graph.nodes) {
+            Object.entries(node.graph.nodes).forEach(([subNodeId, subNode]) => {
+                processNode(subNodeId, subNode, fullNodeId, state);
+            });
         }
+        state.lines.push(formatLine("end", depth));
+        state.nestedGraphNodes.push(mermaidNodeId);
+    }
+    else if ("agent" in node) {
+        state.lines.push(formatLine(`${mermaidNodeId}(${nodeId}<br/>${node.agent})`, depth));
+        state.computedNodes.push(mermaidNodeId);
+    }
+    else {
+        state.lines.push(formatLine(`${mermaidNodeId}(${nodeId})`, depth));
+        state.staticNodes.push(mermaidNodeId);
+    }
+    if (node.inputs) {
+        processConnections(node.inputs, fullNodeId, parentPath, state);
+    }
+    if ("update" in node) {
+        processConnections({ update: node.update }, fullNodeId, parentPath, state);
+    }
+};
+const addNodeClasses = (state) => {
+    if (state.staticNodes.length > 0) {
+        state.lines.push(formatLine(`class ${state.staticNodes.join(",")} staticNode`));
+    }
+    if (state.computedNodes.length > 0) {
+        state.lines.push(formatLine(`class ${state.computedNodes.join(",")} computedNode`));
+    }
+    if (state.nestedGraphNodes.length > 0) {
+        state.lines.push(formatLine(`class ${state.nestedGraphNodes.join(",")} nestedGraph`));
+    }
+};
+const mermaid = (graphData) => {
+    const state = {
+        lines: ["flowchart TD"],
+        staticNodes: [],
+        computedNodes: [],
+        nestedGraphNodes: [],
+    };
+    Object.entries(graphData.nodes).forEach(([nodeId, node]) => {
+        processNode(nodeId, node, "", state);
     });
+    addNodeClasses(state);
+    console.log(state.lines.join("\n"));
 };
 exports.mermaid = mermaid;

package/lib/options.d.ts

@@ -1,3 +1,3 @@
-import { Arguments } from "yargs";
+import type { Arguments } from "yargs";
 import { AgentFunctionInfo } from "graphai";
 export declare const option: (args: Arguments, packages: Record<string, AgentFunctionInfo>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@receptron/graphai_cli",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "GraphAI command line tools.",
   "main": "lib/graphai_cli.js",
   "bin": {
@@ -10,14 +10,14 @@
     "./lib"
   ],
   "scripts": {
-    "build": "tsc && tsc-alias",
+    "build": "tsc",
     "eslint": "eslint --fix",
     "doc": "echo nothing",
     "format": "prettier --write '{src,test_yaml,samples}/**/*.{yaml,ts,json}'",
     "test": "yarn run test_sh",
     "test_sh": "./scripts/test.sh",
-    "test_node": "node --test  -r tsconfig-paths/register --require ts-node/register ./test_yaml/test_*.ts",
-    "cli": "node --require ts-node/register  -r tsconfig-paths/register ./src/graphai_cli.ts",
+    "test_node": "node --test --require ts-node/register ./test_yaml/test_*.ts",
+    "cli": "node --require ts-node/register ./src/graphai_cli.ts",
     "b": "yarn run format && yarn run eslint && yarn run build"
   },
   "repository": {
@@ -34,15 +34,14 @@
     "@types/yargs": "^17.0.33"
   },
   "dependencies": {
-    "@graphai/agents": "^2.0.4",
+    "@graphai/agents": "^2.0.8",
     "@graphai/stream_agent_filter": "^2.0.1",
     "@graphai/token_bound_string_agent": "^1.0.1",
-    "@graphai/vanilla_node_agents": "^2.0.0",
-    "@receptron/graphai_cli": "./receptron-graphai_cli-2.0.3-alpha.tgz",
+    "@graphai/vanilla_node_agents": "^2.0.1",
     "@receptron/test_utils": "^2.0.0",
-    "dotenv": "^16.5.0",
-    "graphai": "^2.0.5",
-    "yargs": "^17.7.2"
+    "dotenv": "^17.2.1",
+    "graphai": "^2.0.13",
+    "yargs": "^18.0.0"
   },
   "types": "./lib/graphai_cli.d.ts",
   "directories": {