@asterai/cli 0.3.2 → 0.5.0

package/dist/commands/query.js

@@ -0,0 +1,93 @@
+import { Flags, Command } from "@oclif/core";
+import readline from "node:readline";
+import { AsteraiClient } from "@asterai/client";
+import { v4 as uuidv4 } from "uuid";
+const ANSI_COLORS = {
+    reset: "\x1b[0m",
+    bold: "\u001b[1m",
+};
+const USER_PREFIX = `${ANSI_COLORS.bold}user: ${ANSI_COLORS.reset}`;
+const ASSISTANT_PREFIX = `${ANSI_COLORS.bold}assistant: ${ANSI_COLORS.reset}`;
+const PRODUCTION_BASE_URL = "https://api.asterai.io";
+const STAGING_BASE_URL = "https://staging.api.asterai.io";
+export default class Query extends Command {
+    static args = {};
+    static description = "query an asterai app interactively";
+    static examples = [`<%= config.bin %> <%= command.id %>`];
+    static flags = {
+        app: Flags.string({
+            char: "a",
+            required: true,
+        }),
+        key: Flags.string({
+            char: "k",
+            required: true,
+            description: "app query key",
+        }),
+        staging: Flags.boolean({
+            char: "s",
+        }),
+        endpoint: Flags.string({
+            char: "e",
+            default: PRODUCTION_BASE_URL,
+        }),
+    };
+    async run() {
+        console.clear();
+        const { flags } = await this.parse(Query);
+        let output = "";
+        const addToOutput = (v) => {
+            output += v;
+        };
+        const apiBaseUrl = flags.staging ? STAGING_BASE_URL : flags.endpoint;
+        const client = new AsteraiClient({
+            appId: flags.app,
+            queryKey: flags.key,
+            apiBaseUrl,
+        });
+        const conversationId = uuidv4();
+        // Configure STDIN for when raw mode is enabled.
+        process.stdin.setEncoding("utf8");
+        process.stdin.on("data", key => {
+            if (key.toString() === "\u0003") {
+                process.stdout.write("\n");
+                process.exit();
+            }
+        });
+        const getUserInput = async () => {
+            addToOutput(USER_PREFIX);
+            const rl = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout,
+            });
+            const input = await new Promise(resolve => rl.question(USER_PREFIX, i => resolve(i)));
+            rl.close();
+            // Enable raw mode to prevent STDIN from echoing in STDOUT.
+            process.stdin.setRawMode(true);
+            addToOutput(`${input}\r\n${ASSISTANT_PREFIX}`);
+            console.clear();
+            process.stdout.write(output);
+            const query = {
+                query: input,
+                conversationId,
+            };
+            const response = await client.query(query);
+            response.onToken(token => {
+                addToOutput(token);
+                process.stdout.write(token);
+            });
+            return new Promise(resolve => {
+                response.onEnd(() => {
+                    addToOutput("\n");
+                    process.stdout.write("\n");
+                    // Disable raw mode to prepare for next user input.
+                    process.stdin.setRawMode(false);
+                    resolve(undefined);
+                });
+            });
+        };
+        while (true) {
+            await getUserInput();
+        }
+    }
+}

package/dist/const.d.ts

@@ -0,0 +1,2 @@
+export declare const BASE_API_URL = "https://api.asterai.io";
+export declare const BASE_API_URL_STAGING = "https://staging.api.asterai.io";

package/dist/const.js

@@ -0,0 +1,2 @@
+export const BASE_API_URL = "https://api.asterai.io";
+export const BASE_API_URL_STAGING = "https://staging.api.asterai.io";

package/oclif.manifest.json

@@ -28,24 +28,49 @@
         "auth.js"
       ]
     },
-    "build": {
+    "deploy": {
       "aliases": [],
-      "args": {
-        "input": {
-          "default": "plugin.ts",
-          "name": "input"
-        }
-      },
-      "description": "compiles the plugin",
+      "args": {},
+      "description": "uploads a plugin to asterai",
       "examples": [
-        "<%= config.bin %> <%= command.id %>"
+        "<%= config.bin %> <%= command.id %> --app 66a46b12-b1a7-4b72-a64a-0e4fe21902b6"
       ],
       "flags": {
-        "manifest": {
-          "char": "m",
-          "description": "manifest path",
-          "name": "manifest",
-          "default": "plugin.asterai.proto",
+        "agent": {
+          "char": "a",
+          "description": "agent ID to immediately activate this plugin for",
+          "name": "agent",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "endpoint": {
+          "char": "e",
+          "name": "endpoint",
+          "default": "https://api.asterai.io",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "staging": {
+          "char": "s",
+          "name": "staging",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "plugin": {
+          "description": "plugin WASM path",
+          "name": "plugin",
+          "default": "plugin.wasm",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "pkg": {
+          "description": "package WASM path",
+          "name": "pkg",
+          "default": "package.wasm",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -53,7 +78,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "build",
+      "id": "deploy",
       "pluginAlias": "@asterai/cli",
       "pluginName": "@asterai/cli",
       "pluginType": "core",
@@ -63,66 +88,25 @@
       "relativePath": [
         "dist",
         "commands",
-        "build.js"
+        "deploy.js"
       ]
     },
-    "codegen": {
+    "init": {
       "aliases": [],
-      "args": {},
-      "description": "Generate code from the plugin manifest",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {
-        "manifest": {
-          "char": "m",
-          "description": "manifest path",
-          "name": "manifest",
-          "default": "plugin.asterai.proto",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "outputDir": {
-          "char": "o",
-          "description": "output directory",
-          "name": "outputDir",
-          "default": "generated",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "appId": {
-          "char": "a",
-          "description": "app id",
-          "name": "appId",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "language": {
-          "char": "l",
-          "description": "language of generated typings",
-          "name": "language",
-          "required": false,
-          "default": "js",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "staging": {
-          "char": "s",
-          "description": "use staging endpoint",
-          "name": "staging",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
+      "args": {
+        "outDir": {
+          "default": "plugin",
+          "name": "outDir"
         }
       },
+      "description": "Initialise a new plugin project",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> project-name"
+      ],
+      "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "codegen",
+      "id": "init",
       "pluginAlias": "@asterai/cli",
       "pluginName": "@asterai/cli",
       "pluginType": "core",
@@ -132,36 +116,37 @@
       "relativePath": [
         "dist",
         "commands",
-        "codegen.js"
+        "init.js"
       ]
     },
-    "deploy": {
+    "pkg": {
       "aliases": [],
       "args": {
         "input": {
-          "default": "plugin.ts",
+          "default": "plugin.wit",
+          "description": "path to the plugin's WIT file",
           "name": "input"
         }
       },
-      "description": "compiles and uploads the plugin to asterai",
+      "description": "bundles the WIT into a binary WASM package",
       "examples": [
-        "<%= config.bin %> <%= command.id %> --app 66a46b12-b1a7-4b72-a64a-0e4fe21902b6"
+        "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
-        "app": {
-          "char": "a",
-          "description": "app ID to immediately configure this plugin with",
-          "name": "app",
-          "required": true,
+        "output": {
+          "char": "o",
+          "description": "output file name for the binary WASM package",
+          "name": "output",
+          "default": "package.wasm",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "manifest": {
-          "char": "m",
-          "description": "manifest path",
-          "name": "manifest",
-          "default": "plugin.asterai.proto",
+        "wit": {
+          "char": "w",
+          "description": "output package converted to the WIT format",
+          "name": "wit",
+          "default": "package.wit",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -169,21 +154,15 @@
         "endpoint": {
           "char": "e",
           "name": "endpoint",
-          "default": "https://api.asterai.io/app/plugin",
+          "default": "https://api.asterai.io",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "staging": {
-          "char": "s",
-          "name": "staging",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "deploy",
+      "id": "pkg",
       "pluginAlias": "@asterai/cli",
       "pluginName": "@asterai/cli",
       "pluginType": "core",
@@ -193,25 +172,52 @@
       "relativePath": [
         "dist",
         "commands",
-        "deploy.js"
+        "pkg.js"
       ]
     },
-    "init": {
+    "query": {
       "aliases": [],
-      "args": {
-        "outDir": {
-          "default": "plugin",
-          "name": "outDir"
-        }
-      },
-      "description": "Initialise a new plugin project",
+      "args": {},
+      "description": "query an asterai app interactively",
       "examples": [
-        "<%= config.bin %> <%= command.id %> project-name"
+        "<%= config.bin %> <%= command.id %>"
       ],
-      "flags": {},
+      "flags": {
+        "app": {
+          "char": "a",
+          "name": "app",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "key": {
+          "char": "k",
+          "description": "app query key",
+          "name": "key",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "staging": {
+          "char": "s",
+          "name": "staging",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "endpoint": {
+          "char": "e",
+          "name": "endpoint",
+          "default": "https://api.asterai.io",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "init",
+      "id": "query",
       "pluginAlias": "@asterai/cli",
       "pluginName": "@asterai/cli",
       "pluginType": "core",
@@ -221,9 +227,9 @@
       "relativePath": [
         "dist",
         "commands",
-        "init.js"
+        "query.js"
       ]
     }
   },
-  "version": "0.3.2"
+  "version": "0.5.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asterai/cli",
   "description": "CLI for building and deploying asterai plugins",
-  "version": "0.3.2",
+  "version": "0.5.0",
   "author": "asterai <support@asterai.io>",
   "repository": "asterai-io/asterai-sdk",
   "homepage": "https://github.com/asterai-io/asterai-sdk",
@@ -51,6 +51,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@asterai/as-proto-gen": "^1.4.1",
+    "@asterai/client": "^0.1.1",
     "@oclif/core": "^3",
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-plugins": "^5",
@@ -59,7 +60,8 @@
     "form-data": "^4.0.0",
     "mustache": "^4.2.0",
     "protobufjs": "^7.4.0",
-    "protobufjs-cli": "^1.1.3"
+    "protobufjs-cli": "^1.1.3",
+    "uuid": "^11.0.2"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",

package/asterai-init-plugin/plugin.asterai.proto

@@ -1,22 +0,0 @@
-syntax = "proto3";
-import "node_modules/@asterai/sdk/protobuf/asterai.proto";
-
-service Math {
-  rpc processQuery(PluginContext) returns (ProcessQueryOutput);
-  rpc add(BinaryOperationInput) returns (CalculationOutput);
-  rpc mul(BinaryOperationInput) returns (CalculationOutput);
-  rpc div(BinaryOperationInput) returns (CalculationOutput);
-  rpc pow(BinaryOperationInput) returns (CalculationOutput);
-}
-
-message ProcessQueryOutput {}
-
-message BinaryOperationInput {
-  PluginContext context = 1;
-  double a = 2;
-  double b = 3;
-}
-
-message CalculationOutput {
-  string system_message = 1;
-}

package/dist/commands/build.d.ts

@@ -1,23 +0,0 @@
-import { Command } from "@oclif/core";
-export type BuildArgs = {
-    input: string;
-};
-export type BuildFlags = {
-    manifest: string;
-};
-export type BuildOutput = {
-    outputFile: string;
-    manifestPath: string;
-};
-export default class Build extends Command {
-    static args: {
-        input: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
-    };
-    static description: string;
-    static examples: string[];
-    static flags: {
-        manifest: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-    };
-    run(): Promise<void>;
-}
-export declare const build: (args: BuildArgs, flags: BuildFlags) => Promise<BuildOutput>;

package/dist/commands/build.js

@@ -1,139 +0,0 @@
-import { Args, Command, Flags } from "@oclif/core";
-import path from "path";
-import fs from "fs";
-import { compile } from "../compile.js";
-import Mustache from "mustache";
-import protobuf from "protobufjs";
-import { mergeProtoImports } from "./deploy.js";
-export default class Build extends Command {
-    static args = {
-        input: Args.string({
-            default: "plugin.ts",
-        }),
-    };
-    static description = "compiles the plugin";
-    static examples = [`<%= config.bin %> <%= command.id %>`];
-    static flags = {
-        manifest: Flags.string({
-            char: "m",
-            description: "manifest path",
-            default: "plugin.asterai.proto",
-        }),
-    };
-    async run() {
-        const { args, flags } = await this.parse(Build);
-        await build(args, flags);
-    }
-}
-export const build = async (args, flags) => {
-    const manifestPath = path.resolve(flags.manifest);
-    const inputFile = path.resolve(args.input);
-    if (!fs.existsSync(inputFile)) {
-        throw new Error(`input file not found (${args.input})`);
-    }
-    const inputFileName = path.parse(inputFile).name;
-    const baseDir = path.dirname(manifestPath);
-    const outDir = path.join(baseDir, "build");
-    const outputFile = path.join(outDir, `${inputFileName}.wasm`);
-    const libsDir = path.join(baseDir, "node_modules");
-    if (!fs.existsSync(libsDir)) {
-        throw new Error("no node_modules found in the plugin directory");
-    }
-    const proto = fs.readFileSync(manifestPath, { encoding: "utf8" });
-    const functionDescriptors = getPluginFunctionDescriptors(proto, manifestPath);
-    const inputFileContent = fs.readFileSync(inputFile, { encoding: "utf8" });
-    assertPluginCodeHasAllFunctionsFromManifest(inputFileContent, functionDescriptors);
-    const entryPointCode = generateEntryPointCode(functionDescriptors);
-    const mergedPluginCode = mergeInputPluginCodeWithEntrypoint(inputFileContent, entryPointCode);
-    const mergedTempFilePath = writeMergedPluginCodeTempFile(mergedPluginCode, path.parse(inputFile).dir, inputFileName);
-    const globalFile = path.join(libsDir, "@asterai/sdk/global.ts");
-    const options = {
-        inputFiles: [mergedTempFilePath, globalFile],
-        baseDir,
-        outputFile,
-        libs: libsDir,
-    };
-    try {
-        await compile(options);
-    }
-    finally {
-        fs.unlinkSync(mergedTempFilePath);
-    }
-    return {
-        manifestPath,
-        outputFile,
-    };
-};
-const getPluginFunctionDescriptors = (proto, protoPath) => {
-    const protoMerged = mergeProtoImports(proto, protoPath, false, false);
-    const result = protobuf.parse(protoMerged);
-    const namespace = result.root.resolveAll();
-    const objects = namespace.nestedArray;
-    const serviceObject = objects.find(o => o.methods !== undefined);
-    if (!serviceObject) {
-        throw new Error("no service found in plugin manifest");
-    }
-    const service = serviceObject;
-    return service.methodsArray.map(m => ({
-        functionName: m.name,
-        inputType: m.requestType,
-        outputType: m.responseType,
-    }));
-};
-const generateEntryPointCode = (functionDescriptors) => {
-    const importsCode = `
-    import { Protobuf } from "@asterai/as-proto/assembly";
-    import { readBufferFromPtr, writeBufferToPr } from "@asterai/sdk/buffer";
-  `;
-    let code = "\n// generated plugin entry points\n\n";
-    for (const functionDescriptor of functionDescriptors) {
-        const template = `
-      export function {{func}}_entry_point(ptr: u32): u32 {
-        const inputBuffer = readBufferFromPtr(ptr);
-        const input = Protobuf.decode<{{inpt}}>(
-          inputBuffer,
-          {{inpt}}.decode,
-        );
-        const output = {{func}}(input);
-        const outputBuffer = Protobuf.encode<{{outp}}>(
-          output,
-          {{outp}}.encode,
-        );
-        return writeBufferToPr(outputBuffer);
-      }
-    `;
-        const view = {
-            func: functionDescriptor.functionName,
-            inpt: functionDescriptor.inputType,
-            outp: functionDescriptor.outputType,
-        };
-        const functionEntryPoint = Mustache.render(template, view);
-        code = `${code}\n${functionEntryPoint}`;
-    }
-    return {
-        importsCode,
-        entryPointsCode: code,
-    };
-};
-const mergeInputPluginCodeWithEntrypoint = (pluginCode, entryPoint) => `${entryPoint.importsCode}\n${pluginCode}\n${entryPoint.entryPointsCode}`;
-const writeMergedPluginCodeTempFile = (source, inputFileDir, inputFileName) => {
-    const tempFileName = `.entrypoint.${inputFileName}.ts`;
-    const tempFilePath = path.join(inputFileDir, tempFileName);
-    fs.writeFileSync(tempFilePath, source, { encoding: "utf8" });
-    return tempFilePath;
-};
-/**
- * Throw an error if the plugin WASM source is missing a function from
- * the manifest.
- * The only purpose of this function is to let the user know about
- * the issue in a direct way.
- */
-const assertPluginCodeHasAllFunctionsFromManifest = (source, functionDescriptors) => {
-    for (const functionDescriptor of functionDescriptors) {
-        const includesFunction = source.includes(`function ${functionDescriptor.functionName}`);
-        if (!includesFunction) {
-            throw new Error(`function "${functionDescriptor.functionName}" was defined in plugin ` +
-                "manifest (.proto file) but is missing from plugin code");
-        }
-    }
-};

package/dist/commands/codegen.d.ts

@@ -1,22 +0,0 @@
-import { Command } from "@oclif/core";
-export type CodegenFlags = {
-    manifest: string;
-    outputDir: string;
-    appId?: string;
-    language?: string;
-    staging?: boolean;
-};
-export default class Codegen extends Command {
-    static args: {};
-    static description: string;
-    static examples: string[];
-    static flags: {
-        manifest: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        outputDir: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        appId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        language: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        staging: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-    };
-    run(): Promise<void>;
-}
-export declare const codegen: (flags: CodegenFlags) => Promise<void>;