@aigne/aigne-hub 0.4.8 → 0.4.9

package/lib/esm/{constants.js → util/model.js}

@@ -8,11 +8,13 @@ import { OpenAIChatModel } from "@aigne/openai";
 import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
 import { XAIChatModel } from "@aigne/xai";
 import { NodeHttpHandler, streamCollector } from "@smithy/node-http-handler";
+import boxen from "boxen";
+import chalk from "chalk";
 import { HttpsProxyAgent } from "https-proxy-agent";
-import { joinURL } from "ufo";
-import { CliAIGNEHubChatModel } from "./cli-aigne-hub-model.js";
-const AIGNE_HUB_DID = "z8ia3xzq2tMq8CRHfaXj1BTYJyYnEcHbqP8cJ";
-export const AIGNE_HUB_URL = "https://hub.aigne.io/";
+import { AIGNEHubChatModel } from "../index.js";
+import { AGENT_HUB_PROVIDER, DEFAULT_AIGNE_HUB_PROVIDER_MODEL, DEFAULT_MODEL_PROVIDER, } from "./constants.js";
+import { loadCredential } from "./credential.js";
+const { MODEL_PROVIDER, MODEL_NAME } = nodejs.env;
 export function availableModels() {
     const proxy = ["HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy", "ALL_PROXY", "all_proxy"]
         .map((i) => process.env[i])
@@ -72,9 +74,9 @@ export function availableModels() {
             create: (params) => new XAIChatModel({ ...params, clientOptions }),
         },
         {
-            name: CliAIGNEHubChatModel.name,
+            name: AIGNEHubChatModel.name,
             apiKeyEnvName: "AIGNE_HUB_API_KEY",
-            create: (params) => new CliAIGNEHubChatModel({ ...params, clientOptions }),
+            create: (params) => new AIGNEHubChatModel({ ...params, clientOptions }),
         },
     ];
 }
@@ -86,9 +88,85 @@ export function findModel(models, provider) {
         return m.name.some((n) => n.toLowerCase().includes(provider.toLowerCase()));
     });
 }
-const { MODEL_PROVIDER, MODEL_NAME } = nodejs.env;
-const DEFAULT_MODEL_PROVIDER = "openai";
-export async function loadModel(model, modelOptions, credential) {
+export const parseModelOption = (model) => {
+    const { provider, name } = (model || process.env.MODEL)?.match(/(?<provider>[^:]*)(:(?<name>(\S+)))?/)?.groups ?? {};
+    return { provider, name };
+};
+export const formatModelName = async (model, inquirerPrompt) => {
+    const models = availableModels();
+    if (!model)
+        return DEFAULT_AIGNE_HUB_PROVIDER_MODEL;
+    const { provider, name } = parseModelOption(model);
+    if (!provider) {
+        return DEFAULT_AIGNE_HUB_PROVIDER_MODEL;
+    }
+    const providerName = provider.replace(/-/g, "");
+    if (providerName.includes(AGENT_HUB_PROVIDER)) {
+        return model;
+    }
+    const m = findModel(models, providerName);
+    if (!m)
+        throw new Error(`Unsupported model: ${provider} ${name}`);
+    const apiKeyEnvName = Array.isArray(m.apiKeyEnvName) ? m.apiKeyEnvName : [m.apiKeyEnvName];
+    if (apiKeyEnvName.some((name) => name && process.env[name])) {
+        return model;
+    }
+    const result = await inquirerPrompt({
+        type: "list",
+        name: "useAigneHub",
+        message: `Seems no API Key configured for ${provider}/${name}, select your preferred way to continue:`,
+        choices: [
+            {
+                name: `Connect to AIGNE Hub to use ${name} (Recommended since free credits available)`,
+                value: true,
+            },
+            {
+                name: `Exit and bring my owner API Key by set ${apiKeyEnvName.join(", ")}`,
+                value: false,
+            },
+        ],
+        default: true,
+    });
+    if (!result.useAigneHub) {
+        console.log(chalk.yellow(`You can use command "export ${apiKeyEnvName[0]}=xxx" to set API Key in your shell. Or you can set environment variables in .env file.`));
+        process.exit(0);
+    }
+    return `${AGENT_HUB_PROVIDER}:${provider}/${name}`;
+};
+export function maskApiKey(apiKey) {
+    if (!apiKey || apiKey.length <= 8)
+        return apiKey;
+    const start = apiKey.slice(0, 4);
+    const end = apiKey.slice(-4);
+    return `${start}${"*".repeat(8)}${end}`;
+}
+function printChatModelInfoBox({ provider, model, credential, m, }) {
+    const lines = [
+        `${chalk.cyan("Provider")}: ${chalk.green(provider)}`,
+        `${chalk.cyan("Model")}: ${chalk.green(model)}`,
+    ];
+    if (provider.includes(AGENT_HUB_PROVIDER)) {
+        lines.push(`${chalk.cyan("API URL")}: ${chalk.green(credential?.url || "N/A")}`, `${chalk.cyan("API Key")}: ${chalk.green(maskApiKey(credential?.apiKey))}`);
+    }
+    else {
+        const apiKeyEnvName = Array.isArray(m.apiKeyEnvName) ? m.apiKeyEnvName : [m.apiKeyEnvName];
+        const envKeyName = apiKeyEnvName.find((name) => name && process.env[name]);
+        if (envKeyName) {
+            lines.push(`${chalk.cyan("API Key")}: ${chalk.green(maskApiKey(process.env[envKeyName]))}`);
+        }
+        else {
+            lines.push(`${chalk.cyan("API Key")}: ${chalk.yellow("Not found")}`);
+        }
+    }
+    console.log("\n");
+    console.log(boxen(lines.join("\n"), {
+        padding: 1,
+        borderStyle: "classic",
+        borderColor: "cyan",
+    }));
+    console.log("\n");
+}
+export async function loadModel(model, modelOptions, options) {
     const params = {
         model: MODEL_NAME ?? model?.name ?? undefined,
         temperature: model?.temperature ?? undefined,
@@ -97,20 +175,15 @@ export async function loadModel(model, modelOptions, credential) {
         presencePenalty: model?.presencePenalty ?? undefined,
     };
     const provider = (MODEL_PROVIDER ?? model?.provider ?? DEFAULT_MODEL_PROVIDER).replace(/-/g, "");
-    const m = findModel(availableModels(), provider);
+    const models = availableModels();
+    const m = findModel(models, provider);
     if (!m)
         throw new Error(`Unsupported model: ${model?.provider} ${model?.name}`);
+    const credential = await loadCredential({ ...options, model: `${provider}:${params.model}` });
+    printChatModelInfoBox({ provider, model: params.model || "", credential, m });
     return m.create({
         ...(credential || {}),
         model: params.model,
         modelOptions: { ...params, ...modelOptions },
     });
 }
-export async function getAIGNEHubMountPoint(url) {
-    const { origin } = new URL(url);
-    const BLOCKLET_JSON_PATH = "__blocklet__.js?type=json";
-    const blockletInfo = await fetch(joinURL(origin, BLOCKLET_JSON_PATH));
-    const blocklet = await blockletInfo.json();
-    const aigneHubMount = (blocklet?.componentMountPoints || []).find((m) => m.did === AIGNE_HUB_DID);
-    return joinURL(origin, aigneHubMount?.mountPoint || "");
-}

package/lib/esm/util/type.d.ts

@@ -0,0 +1,58 @@
+import type { ChatModel, ChatModelOptions } from "@aigne/core/agents/chat-model.js";
+export type Model = {
+    provider?: string | null;
+    name?: string | null;
+    temperature?: number | null;
+    topP?: number | null;
+    frequencyPenalty?: number | null;
+    presencePenalty?: number | null;
+} | undefined;
+type InquirerPromptFn = (prompt: {
+    type: string;
+    name: string;
+    message: string;
+    choices: {
+        name: string;
+        value: any;
+    }[];
+    default: any;
+}) => Promise<any>;
+export type LoadCredentialOptions = {
+    model?: string;
+    aigneHubUrl?: string;
+    inquirerPromptFn?: InquirerPromptFn;
+};
+export interface LoadableModel {
+    name: string | string[];
+    apiKeyEnvName?: string | string[];
+    create: (options: {
+        model?: string;
+        modelOptions?: ChatModelOptions;
+        apiKey?: string;
+        url?: string;
+    }) => ChatModel;
+}
+export type FetchResult = {
+    accessKeyId: string;
+    accessKeySecret: string;
+};
+export type BaseWrapSpinner = (_: string, waiting: () => Promise<FetchResult>) => Promise<FetchResult>;
+export interface CreateConnectOptions {
+    connectUrl: string;
+    openPage?: (url: string) => void;
+    fetchInterval?: number;
+    retry?: number;
+    source?: string;
+    connectAction?: string;
+    appName?: string;
+    appLogo?: string;
+    wrapSpinner?: BaseWrapSpinner;
+    prettyUrl?: (url: string) => string;
+    closeOnSuccess?: boolean;
+    intervalFetchConfig?: (options: {
+        sessionId: string;
+        fetchInterval: number;
+        fetchTimeout: number;
+    }) => Promise<FetchResult>;
+}
+export {};

package/lib/esm/util/type.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/aigne-hub",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "AIGNE Hub SDK for integrating with Hub AI models",
   "publishConfig": {
     "access": "public"
@@ -40,23 +40,30 @@
     }
   },
   "dependencies": {
+    "@ocap/mcrypto": "^1.21.0",
     "@smithy/node-http-handler": "^4.1.0",
+    "boxen": "^8.0.1",
+    "chalk": "^5.4.1",
     "https-proxy-agent": "^7.0.6",
+    "inquirer": "^12.7.0",
+    "open": "^10.2.0",
     "openai": "^5.8.3",
+    "p-wait-for": "^5.0.2",
     "ufo": "^1.6.1",
+    "yaml": "^2.8.0",
     "zod": "^3.25.67",
-    "@aigne/anthropic": "^0.10.13",
-    "@aigne/bedrock": "^0.8.17",
-    "@aigne/core": "^1.48.0",
-    "@aigne/deepseek": "^0.7.17",
-    "@aigne/default-memory": "^1.0.17",
-    "@aigne/ollama": "^0.7.17",
-    "@aigne/open-router": "^0.7.17",
-    "@aigne/gemini": "^0.8.17",
-    "@aigne/openai": "^0.10.17",
-    "@aigne/xai": "^0.7.17",
-    "@aigne/transport": "^0.12.5",
-    "@aigne/platform-helpers": "^0.6.0"
+    "@aigne/anthropic": "^0.11.0",
+    "@aigne/core": "^1.49.0",
+    "@aigne/bedrock": "^0.9.0",
+    "@aigne/deepseek": "^0.7.18",
+    "@aigne/default-memory": "^1.1.0",
+    "@aigne/gemini": "^0.9.0",
+    "@aigne/openai": "^0.11.0",
+    "@aigne/ollama": "^0.7.18",
+    "@aigne/open-router": "^0.7.18",
+    "@aigne/platform-helpers": "^0.6.1",
+    "@aigne/transport": "^0.13.0",
+    "@aigne/xai": "^0.7.18"
   },
   "devDependencies": {
     "@types/bun": "^1.2.18",
@@ -65,8 +72,8 @@
     "npm-run-all": "^4.1.5",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "@aigne/openai": "^0.10.17",
-    "@aigne/test-utils": "^0.5.25"
+    "@aigne/test-utils": "^0.5.26",
+    "@aigne/openai": "^0.11.0"
   },
   "scripts": {
     "lint": "tsc --noEmit",

package/lib/cjs/constants.d.ts

@@ -1,28 +0,0 @@
-import type { ChatModel, ChatModelOptions } from "@aigne/core/agents/chat-model.js";
-export declare const AIGNE_HUB_URL = "https://hub.aigne.io/";
-export declare function availableModels(): LoadableModel[];
-export interface LoadableModel {
-    name: string | string[];
-    apiKeyEnvName?: string | string[];
-    create: (options: {
-        model?: string;
-        modelOptions?: ChatModelOptions;
-        apiKey?: string;
-        url?: string;
-    }) => ChatModel;
-}
-export declare function findModel(models: LoadableModel[], provider: string): LoadableModel | undefined;
-type Model = {
-    provider?: string | null;
-    name?: string | null;
-    temperature?: number | null;
-    topP?: number | null;
-    frequencyPenalty?: number | null;
-    presencePenalty?: number | null;
-} | undefined;
-export declare function loadModel(model?: Model, modelOptions?: ChatModelOptions, credential?: {
-    apiKey?: string;
-    url?: string;
-}): Promise<ChatModel | undefined>;
-export declare function getAIGNEHubMountPoint(url: string): Promise<string>;
-export {};

package/lib/cjs/constants.js

@@ -1,123 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AIGNE_HUB_URL = void 0;
-exports.availableModels = availableModels;
-exports.findModel = findModel;
-exports.loadModel = loadModel;
-exports.getAIGNEHubMountPoint = getAIGNEHubMountPoint;
-const anthropic_1 = require("@aigne/anthropic");
-const bedrock_1 = require("@aigne/bedrock");
-const deepseek_1 = require("@aigne/deepseek");
-const gemini_1 = require("@aigne/gemini");
-const ollama_1 = require("@aigne/ollama");
-const open_router_1 = require("@aigne/open-router");
-const openai_1 = require("@aigne/openai");
-const index_js_1 = require("@aigne/platform-helpers/nodejs/index.js");
-const xai_1 = require("@aigne/xai");
-const node_http_handler_1 = require("@smithy/node-http-handler");
-const https_proxy_agent_1 = require("https-proxy-agent");
-const ufo_1 = require("ufo");
-const cli_aigne_hub_model_js_1 = require("./cli-aigne-hub-model.js");
-const AIGNE_HUB_DID = "z8ia3xzq2tMq8CRHfaXj1BTYJyYnEcHbqP8cJ";
-exports.AIGNE_HUB_URL = "https://hub.aigne.io/";
-function availableModels() {
-    const proxy = ["HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy", "ALL_PROXY", "all_proxy"]
-        .map((i) => process.env[i])
-        .filter(Boolean)[0];
-    const httpAgent = proxy ? new https_proxy_agent_1.HttpsProxyAgent(proxy) : undefined;
-    const clientOptions = {
-        fetchOptions: {
-            // @ts-ignore
-            agent: httpAgent,
-        },
-    };
-    return [
-        {
-            name: openai_1.OpenAIChatModel.name,
-            apiKeyEnvName: "OPENAI_API_KEY",
-            create: (params) => new openai_1.OpenAIChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: anthropic_1.AnthropicChatModel.name,
-            apiKeyEnvName: "ANTHROPIC_API_KEY",
-            create: (params) => new anthropic_1.AnthropicChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: bedrock_1.BedrockChatModel.name,
-            apiKeyEnvName: "AWS_ACCESS_KEY_ID",
-            create: (params) => new bedrock_1.BedrockChatModel({
-                ...params,
-                clientOptions: {
-                    requestHandler: node_http_handler_1.NodeHttpHandler.create({ httpAgent, httpsAgent: httpAgent }),
-                    streamCollector: node_http_handler_1.streamCollector,
-                },
-            }),
-        },
-        {
-            name: deepseek_1.DeepSeekChatModel.name,
-            apiKeyEnvName: "DEEPSEEK_API_KEY",
-            create: (params) => new deepseek_1.DeepSeekChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: [gemini_1.GeminiChatModel.name, "google"],
-            apiKeyEnvName: ["GEMINI_API_KEY", "GOOGLE_API_KEY"],
-            create: (params) => new gemini_1.GeminiChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: ollama_1.OllamaChatModel.name,
-            apiKeyEnvName: "OLLAMA_API_KEY",
-            create: (params) => new ollama_1.OllamaChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: open_router_1.OpenRouterChatModel.name,
-            apiKeyEnvName: "OPEN_ROUTER_API_KEY",
-            create: (params) => new open_router_1.OpenRouterChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: xai_1.XAIChatModel.name,
-            apiKeyEnvName: "XAI_API_KEY",
-            create: (params) => new xai_1.XAIChatModel({ ...params, clientOptions }),
-        },
-        {
-            name: cli_aigne_hub_model_js_1.CliAIGNEHubChatModel.name,
-            apiKeyEnvName: "AIGNE_HUB_API_KEY",
-            create: (params) => new cli_aigne_hub_model_js_1.CliAIGNEHubChatModel({ ...params, clientOptions }),
-        },
-    ];
-}
-function findModel(models, provider) {
-    return models.find((m) => {
-        if (typeof m.name === "string") {
-            return m.name.toLowerCase().includes(provider.toLowerCase());
-        }
-        return m.name.some((n) => n.toLowerCase().includes(provider.toLowerCase()));
-    });
-}
-const { MODEL_PROVIDER, MODEL_NAME } = index_js_1.nodejs.env;
-const DEFAULT_MODEL_PROVIDER = "openai";
-async function loadModel(model, modelOptions, credential) {
-    const params = {
-        model: MODEL_NAME ?? model?.name ?? undefined,
-        temperature: model?.temperature ?? undefined,
-        topP: model?.topP ?? undefined,
-        frequencyPenalty: model?.frequencyPenalty ?? undefined,
-        presencePenalty: model?.presencePenalty ?? undefined,
-    };
-    const provider = (MODEL_PROVIDER ?? model?.provider ?? DEFAULT_MODEL_PROVIDER).replace(/-/g, "");
-    const m = findModel(availableModels(), provider);
-    if (!m)
-        throw new Error(`Unsupported model: ${model?.provider} ${model?.name}`);
-    return m.create({
-        ...(credential || {}),
-        model: params.model,
-        modelOptions: { ...params, ...modelOptions },
-    });
-}
-async function getAIGNEHubMountPoint(url) {
-    const { origin } = new URL(url);
-    const BLOCKLET_JSON_PATH = "__blocklet__.js?type=json";
-    const blockletInfo = await fetch((0, ufo_1.joinURL)(origin, BLOCKLET_JSON_PATH));
-    const blocklet = await blockletInfo.json();
-    const aigneHubMount = (blocklet?.componentMountPoints || []).find((m) => m.did === AIGNE_HUB_DID);
-    return (0, ufo_1.joinURL)(origin, aigneHubMount?.mountPoint || "");
-}

package/lib/dts/constants.d.ts

@@ -1,28 +0,0 @@
-import type { ChatModel, ChatModelOptions } from "@aigne/core/agents/chat-model.js";
-export declare const AIGNE_HUB_URL = "https://hub.aigne.io/";
-export declare function availableModels(): LoadableModel[];
-export interface LoadableModel {
-    name: string | string[];
-    apiKeyEnvName?: string | string[];
-    create: (options: {
-        model?: string;
-        modelOptions?: ChatModelOptions;
-        apiKey?: string;
-        url?: string;
-    }) => ChatModel;
-}
-export declare function findModel(models: LoadableModel[], provider: string): LoadableModel | undefined;
-type Model = {
-    provider?: string | null;
-    name?: string | null;
-    temperature?: number | null;
-    topP?: number | null;
-    frequencyPenalty?: number | null;
-    presencePenalty?: number | null;
-} | undefined;
-export declare function loadModel(model?: Model, modelOptions?: ChatModelOptions, credential?: {
-    apiKey?: string;
-    url?: string;
-}): Promise<ChatModel | undefined>;
-export declare function getAIGNEHubMountPoint(url: string): Promise<string>;
-export {};

package/lib/esm/constants.d.ts

@@ -1,28 +0,0 @@
-import type { ChatModel, ChatModelOptions } from "@aigne/core/agents/chat-model.js";
-export declare const AIGNE_HUB_URL = "https://hub.aigne.io/";
-export declare function availableModels(): LoadableModel[];
-export interface LoadableModel {
-    name: string | string[];
-    apiKeyEnvName?: string | string[];
-    create: (options: {
-        model?: string;
-        modelOptions?: ChatModelOptions;
-        apiKey?: string;
-        url?: string;
-    }) => ChatModel;
-}
-export declare function findModel(models: LoadableModel[], provider: string): LoadableModel | undefined;
-type Model = {
-    provider?: string | null;
-    name?: string | null;
-    temperature?: number | null;
-    topP?: number | null;
-    frequencyPenalty?: number | null;
-    presencePenalty?: number | null;
-} | undefined;
-export declare function loadModel(model?: Model, modelOptions?: ChatModelOptions, credential?: {
-    apiKey?: string;
-    url?: string;
-}): Promise<ChatModel | undefined>;
-export declare function getAIGNEHubMountPoint(url: string): Promise<string>;
-export {};