From ed653c8e3662905881979f46ff0587a452f20a19 Mon Sep 17 00:00:00 2001 From: OhYee Date: Fri, 16 Jan 2026 19:18:55 +0800 Subject: [PATCH 1/3] refactor: enhance resource management and API consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit refactors the resource management system by implementing a more consistent API client structure across modules. The changes include: - Updated import paths and module references for better consistency - Enhanced ResourceBase class with improved listAll functionality - Standardized API client methods and error handling - Improved type safety and code maintainability The changes affect AgentRuntime, ModelProxy, ModelService, Credential, Sandbox, and Toolset modules with consistent method signatures and return types. The waitUntilReadyOrFailed method has been renamed to waitUntilReadyOrFailed for better clarity and consistency. Additionally, dependencies have been updated and test coverage has been improved across modules. 更新资源管理和 API 一致性 此提交通过实现更一致的 API 客户端结构来重构资源管理系统。 更改包括： - 更新导入路径和模块引用以实现更好的一致性 - 使用改进的 listAll 功能增强 ResourceBase 类 - 标准化 API 客户端方法和错误处理 - 提高类型安全性和代码可维护性 这些更改影响 AgentRuntime、ModelProxy、ModelService、Credential、 Sandbox 和 Toolset 模块，具有统一的方法签名和返回类型。 waitUntilReadyOrFailed 方法已重命名为 waitUntilReadyOrFailed 以提高清晰度和一致性。 此外，依赖项已更新，各模块的测试覆盖率已提高。 Change-Id: I104aac42064fd96c867b9a13ab4140e5e182db3d Signed-off-by: OhYee --- examples/agent-runtime.ts | 31 +- examples/model.ts | 2 +- examples/toolset.ts | 4 +- package.json | 1 + scripts/codegen.ts | 4 + src/agent-runtime/client.ts | 58 +- src/agent-runtime/runtime.ts | 284 ++-- src/credential/credential.ts | 19 +- src/credential/model.ts | 11 +- src/model/api/model-api.ts | 83 ++ src/model/model-proxy.ts | 262 +--- src/model/model-service.ts | 241 +--- src/sandbox/sandbox.ts | 114 +- src/toolset/api/control.ts | 6 +- src/toolset/client.ts | 87 +- src/toolset/model.ts | 22 +- src/toolset/toolset.ts | 229 +-- src/utils/index.ts | 1 + src/utils/mixin.ts | 40 + src/utils/mixmin.ts | 1 + src/utils/resource.ts | 155 +- tests/e2e/toolset/toolset.test.ts | 4 +- .../agent-runtime/agent-runtime.test.ts | 293 ++-- tests/unittests/credential/credential.test.ts | 26 +- tests/unittests/model/model-api.test.ts | 113 ++ .../model/model-service-wait.test.ts | 49 + tests/unittests/model/model.test.ts | 544 +++---- tests/unittests/toolset/api.test.ts | 54 +- tests/unittests/toolset/client.test.ts | 55 + .../toolset/toolset-resource.test.ts | 242 +--- tests/unittests/toolset/toolset.test.ts | 91 +- tests/unittests/utils/resource-extra.test.ts | 76 + tests/unittests/utils/resource.test.ts | 1251 ++++++++++------- 33 files changed, 2226 insertions(+), 2227 deletions(-) create mode 100644 src/model/api/model-api.ts create mode 100644 src/utils/mixin.ts create mode 100644 src/utils/mixmin.ts create mode 100644 tests/unittests/model/model-api.test.ts create mode 100644 tests/unittests/model/model-service-wait.test.ts create mode 100644 tests/unittests/toolset/client.test.ts create mode 100644 tests/unittests/utils/resource-extra.test.ts diff --git a/examples/agent-runtime.ts b/examples/agent-runtime.ts index 0e6d872..fb0e5d9 100644 --- a/examples/agent-runtime.ts +++ b/examples/agent-runtime.ts @@ -88,12 +88,12 @@ async function createOrGetAgentRuntime(): Promise { codeConfiguration: await codeFromFile( AgentRuntimeLanguage.NODEJS18, ['node', 'index.js'], - codePath, + codePath ), port: 9000, cpu: 2, memory: 4096, - } + }, }); log(`创建成功 / Created successfully: ${ar.agentRuntimeId}`); @@ -113,10 +113,10 @@ async function createOrGetAgentRuntime(): Promise { ar.status === Status.DELETE_FAILED ) { log( - `已存在的 Agent Runtime 处于失败状态: ${ar.status}, 删除并重新创建 / Existing Agent Runtime is in failed state: ${ar.status}, deleting and recreating`, + `已存在的 Agent Runtime 处于失败状态: ${ar.status}, 删除并重新创建 / Existing Agent Runtime is in failed state: ${ar.status}, deleting and recreating` ); await ar.delete(); - + // Wait for deletion to complete log('等待删除完成 / Waiting for deletion to complete...'); let deleted = false; @@ -134,7 +134,7 @@ async function createOrGetAgentRuntime(): Promise { break; } } - + if (!deleted) { throw new Error('等待删除超时 / Deletion timeout'); } @@ -155,12 +155,12 @@ async function createOrGetAgentRuntime(): Promise { codeConfiguration: await codeFromFile( AgentRuntimeLanguage.NODEJS18, ['node', 'index.js'], - codePath, + codePath ), port: 9000, cpu: 2, memory: 4096, - } + }, }); log(`创建成功 / Created successfully: ${ar.agentRuntimeId}`); } @@ -168,7 +168,8 @@ async function createOrGetAgentRuntime(): Promise { // Wait for ready or failed log('等待就绪 / Waiting for ready...'); await ar.waitUntilReadyOrFailed({ - beforeCheck: (runtime) => log(` 当前状态 / Current status: ${runtime.status}`), + beforeCheck: (runtime) => + log(` 当前状态 / Current status: ${runtime.status}`), }); if (ar.status !== Status.READY) { @@ -196,7 +197,8 @@ async function updateAgentRuntime(ar: AgentRuntime): Promise { }); await ar.waitUntilReadyOrFailed({ - beforeCheck: (runtime) => log(` 当前状态 / Current status: ${runtime.status}`), + beforeCheck: (runtime) => + log(` 当前状态 / Current status: ${runtime.status}`), }); if (ar.status !== Status.READY) { @@ -213,10 +215,10 @@ async function updateAgentRuntime(ar: AgentRuntime): Promise { async function listAgentRuntimes(): Promise { log('枚举资源列表 / Listing resources'); - const runtimes = await client.listAll(); + const runtimes = await AgentRuntime.listAll(); log( `共有 ${runtimes.length} 个资源 / Total ${runtimes.length} resources:`, - runtimes.map((r) => r.agentRuntimeName), + runtimes.map((r) => r.agentRuntimeName) ); } @@ -233,7 +235,8 @@ async function deleteAgentRuntime(ar: AgentRuntime): Promise { log('等待删除完成 / Waiting for deletion...'); try { await ar.waitUntilReady({ - beforeCheck: (runtime) => log(` 当前状态 / Current status: ${runtime.status}`), + beforeCheck: (runtime) => + log(` 当前状态 / Current status: ${runtime.status}`), }); } catch (error) { // Expected to fail when resource is deleted @@ -245,7 +248,9 @@ async function deleteAgentRuntime(ar: AgentRuntime): Promise { log('资源仍然存在 / Resource still exists'); } catch (error) { if (error instanceof ResourceNotExistError) { - log('得到资源不存在报错，删除成功 / Resource not found, deletion successful'); + log( + '得到资源不存在报错，删除成功 / Resource not found, deletion successful' + ); } else { throw error; } diff --git a/examples/model.ts b/examples/model.ts index 2ddcc89..cb8c9eb 100644 --- a/examples/model.ts +++ b/examples/model.ts @@ -124,7 +124,7 @@ async function listModelServices(): Promise { async function invokeModelService(ms: ModelService): Promise { log('调用模型服务进行推理 / Invoking model service for inference'); - const result = await ms.completions({ + const result = await ms.completion({ messages: [{ role: 'user', content: '你好,请介绍一下你自己' }], stream: true, }); diff --git a/examples/toolset.ts b/examples/toolset.ts index 8b7a3b1..7deeafa 100644 --- a/examples/toolset.ts +++ b/examples/toolset.ts @@ -26,7 +26,7 @@ async function toolsetExample() { // Example 1: Using Baidu Search Tool (OpenAPI) logger.info('==== OpenAPI ToolSet Example ===='); try { - const baiduToolset = await client.getToolSet({ + const baiduToolset = await client.get({ name: 'web-search-baidu-8wox', // 替换为您的百度搜索工具名称 }); @@ -53,7 +53,7 @@ async function toolsetExample() { // Example 2: Using MCP Time Tool logger.info('\n==== MCP ToolSet Example ===='); try { - const mcpToolset = await client.getToolSet({ + const mcpToolset = await client.get({ name: 'start-mcp-time-ggda', // 替换为您的 MCP 时间工具名称 }); diff --git a/package.json b/package.json index 02fb171..bf26d16 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ }, "dependencies": { "@ai-sdk/openai": "^3.0.0", + "@ai-sdk/openai-compatible": "^2.0.13", "@alicloud/agentrun20250910": "^5.0.0", "@alicloud/devs20230714": "^2.4.1", "@alicloud/openapi-client": "^0.4.12", diff --git a/scripts/codegen.ts b/scripts/codegen.ts index e4fd198..7668fca 100644 --- a/scripts/codegen.ts +++ b/scripts/codegen.ts @@ -13,6 +13,10 @@ import * as fs from "fs"; import * as path from "path"; import * as yaml from "yaml"; +import { fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); const projectRoot = path.resolve(__dirname, ".."); const configsDir = path.join(projectRoot, "codegen", "configs"); diff --git a/src/agent-runtime/client.ts b/src/agent-runtime/client.ts index 0ce72aa..ac1003a 100644 --- a/src/agent-runtime/client.ts +++ b/src/agent-runtime/client.ts @@ -5,11 +5,11 @@ * This module provides the client API for Agent Runtime. */ -import { Config } from "../utils/config"; +import { Config } from '../utils/config'; -import { AgentRuntimeControlAPI } from "./api/control"; -import { AgentRuntimeDataAPI, InvokeArgs } from "./api/data"; -import { AgentRuntimeEndpoint } from "./endpoint"; +import { AgentRuntimeControlAPI } from './api/control'; +import { AgentRuntimeDataAPI, InvokeArgs } from './api/data'; +import { AgentRuntimeEndpoint } from './endpoint'; import { AgentRuntimeCreateInput, AgentRuntimeEndpointCreateInput, @@ -19,8 +19,8 @@ import { AgentRuntimeUpdateInput, AgentRuntimeVersion, AgentRuntimeVersionListInput, -} from "./model"; -import { AgentRuntime } from "./runtime"; +} from './model'; +import { AgentRuntime } from './runtime'; /** * Agent Runtime Client @@ -51,7 +51,10 @@ export class AgentRuntimeClient { /** * Delete an Agent Runtime */ - delete = async (params: { id: string; config?: Config }): Promise => { + delete = async (params: { + id: string; + config?: Config; + }): Promise => { const { id, config } = params; return AgentRuntime.delete({ id, config: config ?? this.config }); }; @@ -71,7 +74,10 @@ export class AgentRuntimeClient { /** * Get an Agent Runtime */ - get = async (params: { id: string; config?: Config }): Promise => { + get = async (params: { + id: string; + config?: Config; + }): Promise => { const { id, config } = params; return AgentRuntime.get({ id, config: config ?? this.config }); }; @@ -84,23 +90,23 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { input, config } = params ?? {}; - return AgentRuntime.list(input, config ?? this.config); + return AgentRuntime.list({ input, config: config ?? this.config }); }; - /** - * List all Agent Runtimes (with pagination) - */ - listAll = async (params?: { - options?: { - agentRuntimeName?: string; - tags?: string; - searchMode?: string; - }; - config?: Config; - }): Promise => { - const { options, config } = params ?? {}; - return AgentRuntime.listAll(options, config ?? this.config); - }; + // /** + // * List all Agent Runtimes (with pagination) + // */ + // listAll = async (params?: { + // options?: { + // agentRuntimeName?: string; + // tags?: string; + // searchMode?: string; + // }; + // config?: Config; + // }): Promise => { + // const { options, config } = params ?? {}; + // return AgentRuntime.listAll(options, config ?? this.config); + // }; /** * Create an endpoint for an Agent Runtime @@ -223,11 +229,11 @@ export class AgentRuntimeClient { params: { agentRuntimeName: string; agentRuntimeEndpointName?: string; - } & InvokeArgs, + } & InvokeArgs ) => { const { agentRuntimeName, - agentRuntimeEndpointName = "Default", + agentRuntimeEndpointName = 'Default', messages, stream, config, @@ -240,7 +246,7 @@ export class AgentRuntimeClient { const dataApi = new AgentRuntimeDataAPI( agentRuntimeName, agentRuntimeEndpointName, - cfg, + cfg ); return dataApi.invokeOpenai({ diff --git a/src/agent-runtime/runtime.ts b/src/agent-runtime/runtime.ts index d8b21fd..26c41e3 100644 --- a/src/agent-runtime/runtime.ts +++ b/src/agent-runtime/runtime.ts @@ -5,17 +5,21 @@ * This module defines the Agent Runtime resource class. */ -import * as $AgentRun from "@alicloud/agentrun20250910"; +import * as $AgentRun from '@alicloud/agentrun20250910'; -import { Config } from "../utils/config"; -import { HTTPError } from "../utils/exception"; -import { Status, NetworkMode } from "../utils/model"; -import { updateObjectProperties } from "../utils/resource"; -import type { NetworkConfig } from "../utils/model"; - -import { AgentRuntimeControlAPI } from "./api/control"; -import { AgentRuntimeDataAPI, InvokeArgs } from "./api/data"; -import { AgentRuntimeEndpoint } from "./endpoint"; +import { Config } from '../utils/config'; +import { HTTPError } from '../utils/exception'; +import { Status, NetworkMode } from '../utils/model'; +import { + listAllResourcesFunction, + ResourceBase, + updateObjectProperties, +} from '../utils/resource'; +import type { NetworkConfig } from '../utils/model'; + +import { AgentRuntimeControlAPI } from './api/control'; +import { AgentRuntimeDataAPI, InvokeArgs } from './api/data'; +import { AgentRuntimeEndpoint } from './endpoint'; import { AgentRuntimeArtifact, AgentRuntimeCode, @@ -31,12 +35,12 @@ import { AgentRuntimeUpdateInput, AgentRuntimeVersion, AgentRuntimeVersionListInput, -} from "./model"; +} from './model'; /** * Agent Runtime resource class */ -export class AgentRuntime implements AgentRuntimeData { +export class AgentRuntime extends ResourceBase implements AgentRuntimeData { // System properties agentRuntimeArn?: string; agentRuntimeId?: string; @@ -61,60 +65,23 @@ export class AgentRuntime implements AgentRuntimeData { resourceName?: string; sessionConcurrencyLimitPerInstance?: number; sessionIdleTimeoutSeconds?: number; - status?: Status; + declare status?: Status; statusReason?: string; tags?: string[]; - private _config?: Config; + protected _config?: Config; private _dataApiCache: Record = {}; - constructor(data?: Partial, config?: Config) { + constructor(data?: any, config?: Config) { + super(); + if (data) { updateObjectProperties(this, data); } this._config = config; } - /** - * Create runtime from SDK response object - */ - static fromInnerObject( - obj: $AgentRun.AgentRuntime, - config?: Config, - ): AgentRuntime { - return new AgentRuntime( - { - agentRuntimeArn: obj.agentRuntimeArn, - agentRuntimeId: obj.agentRuntimeId, - agentRuntimeName: obj.agentRuntimeName, - agentRuntimeVersion: obj.agentRuntimeVersion, - artifactType: obj.artifactType, - codeConfiguration: obj.codeConfiguration as AgentRuntimeCode | undefined, - containerConfiguration: obj.containerConfiguration, - cpu: obj.cpu, - createdAt: obj.createdAt, - credentialName: obj.credentialName, - description: obj.description, - environmentVariables: obj.environmentVariables, - executionRoleArn: obj.executionRoleArn, - healthCheckConfiguration: obj.healthCheckConfiguration, - lastUpdatedAt: obj.lastUpdatedAt, - logConfiguration: obj.logConfiguration as AgentRuntimeLogConfig | undefined, - memory: obj.memory, - networkConfiguration: obj.networkConfiguration as NetworkConfig | undefined, - port: obj.port, - protocolConfiguration: obj.protocolConfiguration as AgentRuntimeProtocolConfig | undefined, - resourceName: obj.resourceName, - sessionConcurrencyLimitPerInstance: - obj.sessionConcurrencyLimitPerInstance, - sessionIdleTimeoutSeconds: obj.sessionIdleTimeoutSeconds, - status: obj.status as Status, - statusReason: obj.statusReason, - tags: obj.tags, - }, - config, - ); - } + uniqIdCallback = () => this.agentRuntimeId; private static getClient(): AgentRuntimeControlAPI { return new AgentRuntimeControlAPI(); @@ -143,7 +110,7 @@ export class AgentRuntime implements AgentRuntimeData { input.artifactType = AgentRuntimeArtifact.CONTAINER; } else { throw new Error( - "Either codeConfiguration or containerConfiguration must be provided", + 'Either codeConfiguration or containerConfiguration must be provided' ); } } @@ -177,7 +144,8 @@ export class AgentRuntime implements AgentRuntimeData { memory: input.memory, networkConfiguration: input.networkConfiguration ? new $AgentRun.NetworkConfiguration({ - networkMode: input.networkConfiguration.networkMode || NetworkMode.PUBLIC, // 默认使用公网模式 + networkMode: + input.networkConfiguration.networkMode || NetworkMode.PUBLIC, // 默认使用公网模式 securityGroupId: input.networkConfiguration.securityGroupId, vpcId: input.networkConfiguration.vpcId, vswitchIds: input.networkConfiguration.vSwitchIds, @@ -191,10 +159,10 @@ export class AgentRuntime implements AgentRuntimeData { }), config, }); - return AgentRuntime.fromInnerObject(result, config); + return new AgentRuntime(result, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("AgentRuntime", input.agentRuntimeName); + throw error.toResourceError('AgentRuntime', input.agentRuntimeName); } throw error; } @@ -234,10 +202,10 @@ export class AgentRuntime implements AgentRuntimeData { try { const result = await client.deleteAgentRuntime({ agentId: id, config }); - return AgentRuntime.fromInnerObject(result, config); + return new AgentRuntime(result, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("AgentRuntime", id); + throw error.toResourceError('AgentRuntime', id); } throw error; } @@ -289,10 +257,10 @@ export class AgentRuntime implements AgentRuntimeData { }), config, }); - return AgentRuntime.fromInnerObject(result, config); + return new AgentRuntime(result, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("AgentRuntime", id); + throw error.toResourceError('AgentRuntime', id); } throw error; } @@ -309,10 +277,10 @@ export class AgentRuntime implements AgentRuntimeData { const client = AgentRuntime.getClient(); try { const result = await client.getAgentRuntime({ agentId: id, config }); - return AgentRuntime.fromInnerObject(result, config); + return new AgentRuntime(result, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("AgentRuntime", id); + throw error.toResourceError('AgentRuntime', id); } throw error; } @@ -321,10 +289,12 @@ export class AgentRuntime implements AgentRuntimeData { /** * List Agent Runtimes */ - static async list( - input?: AgentRuntimeListInput, - config?: Config, - ): Promise { + static async list(params?: { + input?: AgentRuntimeListInput; + config?: Config; + }): Promise { + const { input, config } = params ?? {}; + const client = AgentRuntime.getClient(); const request = new $AgentRun.ListAgentRuntimesRequest({ pageNumber: input?.pageNumber, @@ -333,56 +303,10 @@ export class AgentRuntime implements AgentRuntimeData { tags: input?.tags, }); const result = await client.listAgentRuntimes({ input: request, config }); - return (result.items || []).map((item) => - AgentRuntime.fromInnerObject(item, config), - ); + return (result.items || []).map((item) => new AgentRuntime(item, config)); } - /** - * List all Agent Runtimes (with pagination) - */ - static async listAll( - options?: { - agentRuntimeName?: string; - tags?: string; - searchMode?: string; - }, - config?: Config, - ): Promise { - const runtimes: AgentRuntime[] = []; - let page = 1; - const pageSize = 50; - - while (true) { - const result = await AgentRuntime.list( - { - pageNumber: page, - pageSize, - agentRuntimeName: options?.agentRuntimeName, - tags: options?.tags, - searchMode: options?.searchMode, - }, - config, - ); - - runtimes.push(...result); - page++; - - if (result.length < pageSize) { - break; - } - } - - // Deduplicate - const seen = new Set(); - return runtimes.filter((r) => { - if (!r.agentRuntimeId || seen.has(r.agentRuntimeId)) { - return false; - } - seen.add(r.agentRuntimeId); - return true; - }); - } + static listAll = listAllResourcesFunction(this.list); /** * List Agent Runtime versions by ID @@ -446,7 +370,7 @@ export class AgentRuntime implements AgentRuntimeData { delete = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to delete an Agent Runtime"); + throw new Error('agentRuntimeId is required to delete an Agent Runtime'); } const result = await AgentRuntime.delete({ @@ -466,7 +390,7 @@ export class AgentRuntime implements AgentRuntimeData { }): Promise => { const { input, config } = params; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to update an Agent Runtime"); + throw new Error('agentRuntimeId is required to update an Agent Runtime'); } const result = await AgentRuntime.update({ @@ -481,10 +405,10 @@ export class AgentRuntime implements AgentRuntimeData { /** * Refresh this runtime's data */ - refresh = async (params?: { config?: Config }): Promise => { + get = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to refresh an Agent Runtime"); + throw new Error('agentRuntimeId is required to refresh an Agent Runtime'); } const result = await AgentRuntime.get({ @@ -504,7 +428,7 @@ export class AgentRuntime implements AgentRuntimeData { }): Promise => { const { input, config } = params; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to create an endpoint"); + throw new Error('agentRuntimeId is required to create an endpoint'); } return AgentRuntimeEndpoint.create({ @@ -523,7 +447,7 @@ export class AgentRuntime implements AgentRuntimeData { }): Promise => { const { endpointId, config } = params; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to delete an endpoint"); + throw new Error('agentRuntimeId is required to delete an endpoint'); } return AgentRuntimeEndpoint.delete({ @@ -543,7 +467,7 @@ export class AgentRuntime implements AgentRuntimeData { }): Promise => { const { endpointId, input, config } = params; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to update an endpoint"); + throw new Error('agentRuntimeId is required to update an endpoint'); } return AgentRuntimeEndpoint.update({ @@ -563,7 +487,7 @@ export class AgentRuntime implements AgentRuntimeData { }): Promise => { const { endpointId, config } = params; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to get an endpoint"); + throw new Error('agentRuntimeId is required to get an endpoint'); } return AgentRuntimeEndpoint.get({ @@ -576,10 +500,12 @@ export class AgentRuntime implements AgentRuntimeData { /** * List endpoints of this runtime */ - listEndpoints = async (params?: { config?: Config }): Promise => { + listEndpoints = async (params?: { + config?: Config; + }): Promise => { const config = params?.config; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to list endpoints"); + throw new Error('agentRuntimeId is required to list endpoints'); } return AgentRuntimeEndpoint.listById({ @@ -591,10 +517,12 @@ export class AgentRuntime implements AgentRuntimeData { /** * List versions of this runtime */ - listVersions = async (params?: { config?: Config }): Promise => { + listVersions = async (params?: { + config?: Config; + }): Promise => { const config = params?.config; if (!this.agentRuntimeId) { - throw new Error("agentRuntimeId is required to list versions"); + throw new Error('agentRuntimeId is required to list versions'); } return AgentRuntime.listVersionsById({ @@ -612,7 +540,7 @@ export class AgentRuntime implements AgentRuntimeData { intervalSeconds?: number; beforeCheck?: (runtime: AgentRuntime) => void; }, - config?: Config, + config?: Config ): Promise => { const timeout = (options?.timeoutSeconds ?? 300) * 1000; const interval = (options?.intervalSeconds ?? 5) * 1000; @@ -641,51 +569,55 @@ export class AgentRuntime implements AgentRuntimeData { } throw new Error( - `Timeout waiting for Agent Runtime to be ready after ${options?.timeoutSeconds ?? 300} seconds`, + `Timeout waiting for Agent Runtime to be ready after ${ + options?.timeoutSeconds ?? 300 + } seconds` ); }; - /** - * Wait until agent runtime reaches READY or any FAILED state - * Similar to waitUntilReady but does not throw on FAILED states - * Compatible with Python SDK's wait_until_ready_or_failed method - */ - waitUntilReadyOrFailed = async ( - options?: { - timeoutSeconds?: number; - intervalSeconds?: number; - beforeCheck?: (runtime: AgentRuntime) => void; - }, - config?: Config, - ): Promise => { - const timeout = (options?.timeoutSeconds ?? 300) * 1000; - const interval = (options?.intervalSeconds ?? 5) * 1000; - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - await this.refresh({ config }); - - if (options?.beforeCheck) { - options.beforeCheck(this); - } - - // Check if reached any final state - if ( - this.status === Status.READY || - this.status === Status.CREATE_FAILED || - this.status === Status.UPDATE_FAILED || - this.status === Status.DELETE_FAILED - ) { - return this; - } - - await new Promise((resolve) => setTimeout(resolve, interval)); - } - - throw new Error( - `Timeout waiting for Agent Runtime to reach final state after ${options?.timeoutSeconds ?? 300} seconds`, - ); - }; + // /** + // * Wait until agent runtime reaches READY or any FAILED state + // * Similar to waitUntilReady but does not throw on FAILED states + // * Compatible with Python SDK's wait_until_ready_or_failed method + // */ + // waitUntilReadyOrFailed = async ( + // options?: { + // timeoutSeconds?: number; + // intervalSeconds?: number; + // beforeCheck?: (runtime: AgentRuntime) => void; + // }, + // config?: Config + // ): Promise => { + // const timeout = (options?.timeoutSeconds ?? 300) * 1000; + // const interval = (options?.intervalSeconds ?? 5) * 1000; + // const startTime = Date.now(); + + // while (Date.now() - startTime < timeout) { + // await this.refresh({ config }); + + // if (options?.beforeCheck) { + // options.beforeCheck(this); + // } + + // // Check if reached any final state + // if ( + // this.status === Status.READY || + // this.status === Status.CREATE_FAILED || + // this.status === Status.UPDATE_FAILED || + // this.status === Status.DELETE_FAILED + // ) { + // return this; + // } + + // await new Promise((resolve) => setTimeout(resolve, interval)); + // } + + // throw new Error( + // `Timeout waiting for Agent Runtime to reach final state after ${ + // options?.timeoutSeconds ?? 300 + // } seconds` + // ); + // }; /** * Invoke agent runtime using OpenAI-compatible API @@ -707,17 +639,17 @@ export class AgentRuntime implements AgentRuntimeData { * ``` */ invokeOpenai = async ( - args: InvokeArgs & { agentRuntimeEndpointName?: string }, + args: InvokeArgs & { agentRuntimeEndpointName?: string } ) => { const { - agentRuntimeEndpointName = "Default", + agentRuntimeEndpointName = 'Default', messages, stream, config, } = args; if (!this.agentRuntimeName) { - throw new Error("agentRuntimeName is required to invoke OpenAI"); + throw new Error('agentRuntimeName is required to invoke OpenAI'); } // Merge configs @@ -728,7 +660,7 @@ export class AgentRuntime implements AgentRuntimeData { this._dataApiCache[agentRuntimeEndpointName] = new AgentRuntimeDataAPI( this.agentRuntimeName, agentRuntimeEndpointName, - cfg, + cfg ); } diff --git a/src/credential/credential.ts b/src/credential/credential.ts index 338cf70..eb6d4da 100644 --- a/src/credential/credential.ts +++ b/src/credential/credential.ts @@ -7,7 +7,10 @@ import { Config } from '../utils/config'; import { HTTPError } from '../utils/exception'; -import { updateObjectProperties } from '../utils/resource'; +import { + listAllResourcesFunction, + updateObjectProperties, +} from '../utils/resource'; import { ResourceBase } from '../utils/resource'; import { CredentialClient } from './client'; @@ -155,17 +158,7 @@ export class Credential extends ResourceBase implements CredentialInterface { } }; - static listAll = async (params?: { - input?: CredentialListInput; - config?: Config; - }) => { - const result = await super.listAll({ - uniqIdCallback: (item) => item.credentialName || '', - input: params?.input, - config: params?.config, - }); - return result as CredentialListOutput[]; - }; + static listAll = listAllResourcesFunction(this.list); /** * Delete this credential @@ -202,7 +195,7 @@ export class Credential extends ResourceBase implements CredentialInterface { input, config: config ?? this._config, }); - + updateObjectProperties(this, result); return this; }; diff --git a/src/credential/model.ts b/src/credential/model.ts index dd94d39..3d86396 100644 --- a/src/credential/model.ts +++ b/src/credential/model.ts @@ -18,7 +18,10 @@ export type CredentialAuthType = | 'custom_header'; /** 凭证来源类型 / Credential Source Types */ -export type CredentialSourceType = 'external_llm' | 'external_tool' | 'internal'; +export type CredentialSourceType = + | 'external_llm' + | 'external_tool' + | 'internal'; /** * Credential basic authentication configuration @@ -139,7 +142,9 @@ export class CredentialConfig implements CredentialConfigInterface { } /** 配置访问第三方工具的自定义凭证 */ - static outboundToolAKSKCustom(params: { authConfig: Record }) { + static outboundToolAKSKCustom(params: { + authConfig: Record; + }) { const { authConfig } = params; return new CredentialConfig({ credentialSourceType: 'external_tool', @@ -217,6 +222,8 @@ export class CredentialListOutput { if (data) updateObjectProperties(this, data); } + uniqIdCallback = () => this.credentialId; + toCredential = async (params?: { config?: Config }) => { const { CredentialClient } = await import('./client'); return await new CredentialClient(params?.config).get({ diff --git a/src/model/api/model-api.ts b/src/model/api/model-api.ts new file mode 100644 index 0000000..8f768a8 --- /dev/null +++ b/src/model/api/model-api.ts @@ -0,0 +1,83 @@ +import { Config } from '@/utils'; +import { createOpenAICompatible } from '@ai-sdk/openai-compatible'; + +export interface ModelInfo { + model?: string; + apiKey?: string; + baseUrl?: string; + headers?: Record; + provider?: string; +} + +export type GetModelInfo = (params?: { config?: Config }) => Promise; + +export class ModelAPI { + getModelInfo: GetModelInfo; + constructor(getModelInfo: GetModelInfo) { + this.getModelInfo = getModelInfo; + } + // abstract modelInfo(params: { config?: Config }): Promise; + + private getProvider = async (params: { model?: string; config?: Config }) => { + const { model, config } = params; + + const info = await this.getModelInfo({ config }); + const provider = createOpenAICompatible({ + name: model || info.model || '', + apiKey: info.apiKey, + baseURL: 'http://127.0.0.1:8080', // info.baseUrl, + headers: info.headers, + }); + + return { provider, model: model || info.model || '' }; + }; + + private getModel = async (params: Parameters[0]) => { + const { provider, model } = await this.getProvider(params); + return provider(model); + }; + + private getEmbeddingModel = async ( + params: Parameters[0] + ) => { + const { provider, model } = await this.getProvider(params); + return provider.embeddingModel(model); + }; + + completion = async (params: { + messages: any[]; + model?: string; + stream?: boolean; + config?: Config; + [key: string]: any; + }): Promise< + | import('ai').StreamTextResult + | import('ai').GenerateTextResult + > => { + const { messages, model, stream = false, config, ...kwargs } = params; + const { streamText, generateText } = await import('ai'); + + return await (stream ? streamText : generateText)({ + model: await this.getModel({ model, config }), + messages, + ...kwargs, + }); + }; + + embedding = async (params: { + values: string[]; + model?: string; + stream?: boolean; + config?: Config; + [key: string]: any; + }) => { + const { values, model, config, ...kwargs } = params; + const { embedMany } = await import('ai'); + + return await embedMany({ + model: await this.getEmbeddingModel({ model, config }), + values, + ...kwargs, + }); + }; +} diff --git a/src/model/model-proxy.ts b/src/model/model-proxy.ts index de35516..b1e1309 100644 --- a/src/model/model-proxy.ts +++ b/src/model/model-proxy.ts @@ -10,7 +10,7 @@ import * as _ from 'lodash'; import { Config } from '../utils/config'; import { Status } from '../utils/model'; import { PageableInput } from '../utils/model'; -import { ResourceBase } from '../utils/resource'; +import { listAllResourcesFunction, ResourceBase } from '../utils/resource'; import { BackendType, @@ -22,6 +22,7 @@ import { ModelProxyUpdateInput, ProxyMode, } from './model'; +import { ModelAPI, ModelInfo } from './api/model-api'; /** * 模型代理 / Model Proxy @@ -58,9 +59,21 @@ export class ModelProxy lastUpdatedAt?: string; declare status?: ModelProxySystemProps['status']; + private modelApi: ModelAPI; + + constructor() { + super(); + this.modelApi = new ModelAPI(this.modelInfo); + this.completion = this.modelApi.completion; + this.embedding = this.modelApi.embedding; + } + + completion: (typeof ModelAPI)['prototype']['completion']; + embedding: (typeof ModelAPI)['prototype']['embedding']; + /** * 获取客户端 / Get client - * + * * @returns ModelClient 实例 */ private static getClient() { @@ -70,9 +83,11 @@ export class ModelProxy return new ModelClient(); } + uniqIdCallback = () => this.modelProxyId; + /** * 创建模型代理 / Create model proxy - * + * * @param params - 参数 / Parameters * @returns 创建的模型代理对象 / Created model proxy object */ @@ -86,7 +101,7 @@ export class ModelProxy /** * 根据名称删除模型代理 / Delete model proxy by name - * + * * @param params - 参数 / Parameters * @returns 删除的模型代理对象 / Deleted model proxy object */ @@ -98,13 +113,13 @@ export class ModelProxy return await this.getClient().delete({ name, backendType: BackendType.PROXY, - config + config, }); } /** * 根据名称更新模型代理 / Update model proxy by name - * + * * @param params - 参数 / Parameters * @returns 更新后的模型代理对象 / Updated model proxy object */ @@ -119,7 +134,7 @@ export class ModelProxy /** * 根据名称获取模型代理 / Get model proxy by name - * + * * @param params - 参数 / Parameters * @returns 模型代理对象 / Model proxy object */ @@ -131,78 +146,38 @@ export class ModelProxy return await this.getClient().get({ name, backendType: BackendType.PROXY, - config + config, }); } /** * 列出模型代理（分页）/ List model proxies (paginated) - * + * * @param pageInput - 分页参数 / Pagination parameters * @param config - 配置 / Configuration * @param kwargs - 其他查询参数 / Other query parameters * @returns 模型代理列表 / Model proxy list */ - protected static async listPage( - pageInput: PageableInput, - config?: Config, - kwargs?: Partial - ): Promise { + static list = async (params?: { + input?: ModelProxyListInput; + config?: Config; + }): Promise => { + const { input, config } = params ?? {}; + return await this.getClient().list({ input: { modelProxyName: undefined, // 标识这是 ModelProxyListInput - ...kwargs, - ...pageInput, + ...input, } as ModelProxyListInput, - config + config, }); - } - - /** - * 列出所有模型代理 / List all model proxies - * - * @param options - 查询选项 / Query options - * @param config - 配置 / Configuration - * @returns 模型代理列表 / Model proxy list - */ - static async listAll(options?: { - proxyMode?: string; - status?: Status; - config?: Config; - }): Promise { - const allResults: ModelProxy[] = []; - let page = 1; - const pageSize = 50; - while (true) { - const pageResults = await this.listPage( - { pageNumber: page, pageSize }, - options?.config, - { - proxyMode: options?.proxyMode, - status: options?.status, - } - ); - page += 1; - allResults.push(...pageResults); - if (pageResults.length < pageSize) break; - } + }; - // 去重 - const resultSet = new Set(); - const results: ModelProxy[] = []; - for (const item of allResults) { - const uniqId = item.modelProxyId || ''; - if (!resultSet.has(uniqId)) { - resultSet.add(uniqId); - results.push(item); - } - } - return results; - } + static listAll = listAllResourcesFunction(this.list); /** * 更新模型代理 / Update model proxy - * + * * @param input - 模型代理更新输入参数 / Model proxy update input parameters * @param config - 配置 / Configuration * @returns 更新后的模型代理对象 / Updated model proxy object @@ -213,9 +188,7 @@ export class ModelProxy }): Promise => { const { input, config } = params; if (!this.modelProxyName) { - throw new Error( - 'modelProxyName is required to update a ModelProxy' - ); + throw new Error('modelProxyName is required to update a ModelProxy'); } const result = await ModelProxy.update({ @@ -230,31 +203,30 @@ export class ModelProxy /** * 删除模型代理 / Delete model proxy - * + * * @param params - 参数 / Parameters * @returns 删除的模型代理对象 / Deleted model proxy object */ delete = async (params?: { config?: Config }): Promise => { if (!this.modelProxyName) { - throw new Error( - 'modelProxyName is required to delete a ModelProxy' - ); + throw new Error('modelProxyName is required to delete a ModelProxy'); } - return await ModelProxy.delete({ name: this.modelProxyName, config: params?.config }); + return await ModelProxy.delete({ + name: this.modelProxyName, + config: params?.config, + }); }; /** * 刷新模型代理信息 / Refresh model proxy information - * + * * @param params - 参数 / Parameters * @returns 刷新后的模型代理对象 / Refreshed model proxy object */ get = async (params?: { config?: Config }): Promise => { if (!this.modelProxyName) { - throw new Error( - 'modelProxyName is required to refresh a ModelProxy' - ); + throw new Error('modelProxyName is required to refresh a ModelProxy'); } const result = await ModelProxy.get({ @@ -268,17 +240,12 @@ export class ModelProxy /** * 获取模型信息 / Get model information - * + * * @param params - 参数 / Parameters * @param params.config - 配置 / Configuration * @returns 模型基本信息 / Model base information */ - modelInfo = async (params?: { config?: Config }): Promise<{ - apiKey: string; - baseUrl: string; - model?: string; - headers?: Record; - }> => { + modelInfo = async (params?: { config?: Config }): Promise => { const cfg = Config.withConfigs(this._config, params?.config); if (!this.modelProxyName) { @@ -289,7 +256,7 @@ export class ModelProxy } let apiKey = ''; - + // 如果有 credentialName，从 Credential 获取 if (this.credentialName) { // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -314,139 +281,4 @@ export class ModelProxy headers: cfg.headers, }; }; - - /** - * 调用模型完成 / Call model completion - * - * @param params - 参数 / Parameters - * @returns 完成结果 / Completion result - */ - completions = async (params: { - messages: any[]; - model?: string; - stream?: boolean; - config?: Config; - [key: string]: any; - }): Promise< - | import('ai').StreamTextResult - | import('ai').GenerateTextResult - > => { - const { messages, model, stream = false, config, ...kwargs } = params; - const info = await this.modelInfo({ config }); - - // 使用 AI SDK 实现 - const { generateText, streamText } = await import('ai'); - const { createOpenAI } = await import('@ai-sdk/openai'); - - const provider = createOpenAI({ - apiKey: info.apiKey, - baseURL: info.baseUrl, - headers: info.headers, - }); - - const selectedModel = model || info.model || this.modelProxyName || ''; - - if (stream) { - return await streamText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } else { - return await generateText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } - }; - - /** - * 获取响应 / Get responses - * - * @param params - 参数 / Parameters - * @returns 响应结果 / Response result - */ - responses = async (params: { - messages: any[]; - model?: string; - stream?: boolean; - config?: Config; - [key: string]: any; - }): Promise => { - const { messages, model, stream = false, config, ...kwargs } = params; - const info = await this.modelInfo({ config }); - - // 使用 AI SDK 实现 - const { generateText, streamText } = await import('ai'); - const { createOpenAI } = await import('@ai-sdk/openai'); - - const provider = createOpenAI({ - apiKey: info.apiKey, - baseURL: info.baseUrl, - headers: info.headers, - }); - - const selectedModel = model || info.model || this.modelProxyName || ''; - - if (stream) { - return await streamText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } else { - return await generateText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } - }; - - /** - * 等待模型代理就绪 / Wait until model proxy is ready - * - * @param options - 选项 / Options - * @param config - 配置 / Configuration - * @returns 模型代理对象 / Model proxy object - */ - waitUntilReady = async ( - options?: { - timeoutSeconds?: number; - intervalSeconds?: number; - beforeCheck?: (proxy: ModelProxy) => void; - }, - config?: Config - ): Promise => { - const timeout = (options?.timeoutSeconds ?? 300) * 1000; - const interval = (options?.intervalSeconds ?? 5) * 1000; - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - await this.refresh({ config }); - - if (options?.beforeCheck) { - options.beforeCheck(this); - } - - if (this.status === Status.READY) { - return this; - } - - if ( - this.status === Status.CREATE_FAILED || - this.status === Status.UPDATE_FAILED || - this.status === Status.DELETE_FAILED - ) { - throw new Error(`Model proxy failed with status: ${this.status}`); - } - - await new Promise(resolve => setTimeout(resolve, interval)); - } - - throw new Error( - `Timeout waiting for model proxy to be ready after ${options?.timeoutSeconds ?? 300} seconds` - ); - }; } diff --git a/src/model/model-service.ts b/src/model/model-service.ts index 6dcf62b..82f72de 100644 --- a/src/model/model-service.ts +++ b/src/model/model-service.ts @@ -7,7 +7,8 @@ import { Config } from '../utils/config'; import { Status, PageableInput } from '../utils/model'; -import { ResourceBase } from '../utils/resource'; +import { listAllResourcesFunction, ResourceBase } from '../utils/resource'; +import { ModelAPI } from './api/model-api'; import { BackendType, @@ -34,26 +35,37 @@ export class ModelService modelInfoConfigs?: ModelServiceImmutableProps['modelInfoConfigs']; modelServiceName?: string; provider?: string; - + // MutableProps credentialName?: string; description?: string; networkConfiguration?: ModelServiceMutableProps['networkConfiguration']; tags?: string[]; providerSettings?: ModelServiceMutableProps['providerSettings']; - + // SystemProps modelServiceId?: string; createdAt?: string; lastUpdatedAt?: string; declare status?: ModelServiceSystemProps['status']; - + // CommonProps modelType?: ModelServiceImmutableProps['modelType']; + private modelApi: ModelAPI; + constructor() { + super(); + this.modelApi = new ModelAPI(this.modelInfo); + this.completion = this.modelApi.completion; + this.embedding = this.modelApi.embedding; + } + + completion: (typeof ModelAPI)['prototype']['completion']; + embedding: (typeof ModelAPI)['prototype']['embedding']; + /** * 获取客户端 / Get client - * + * * @returns ModelClient 实例 */ private static getClient() { @@ -63,9 +75,11 @@ export class ModelService return new ModelClient(); } + uniqIdCallback = () => this.modelServiceId; + /** * 创建模型服务 / Create model service - * + * * @param params - 参数 / Parameters * @returns 创建的模型服务对象 / Created model service object */ @@ -79,7 +93,7 @@ export class ModelService /** * 根据名称删除模型服务 / Delete model service by name - * + * * @param params - 参数 / Parameters * @returns 删除的模型服务对象 / Deleted model service object */ @@ -91,13 +105,13 @@ export class ModelService return await this.getClient().delete({ name, backendType: BackendType.SERVICE, - config + config, }); } /** * 根据名称更新模型服务 / Update model service by name - * + * * @param params - 参数 / Parameters * @returns 更新后的模型服务对象 / Updated model service object */ @@ -112,7 +126,7 @@ export class ModelService /** * 根据名称获取模型服务 / Get model service by name - * + * * @param params - 参数 / Parameters * @returns 模型服务对象 / Model service object */ @@ -124,77 +138,37 @@ export class ModelService return await this.getClient().get({ name, backendType: BackendType.SERVICE, - config + config, }); } /** * 列出模型服务（分页）/ List model services (paginated) - * + * * @param pageInput - 分页参数 / Pagination parameters * @param config - 配置 / Configuration * @param kwargs - 其他查询参数 / Other query parameters * @returns 模型服务列表 / Model service list */ - protected static async listPage( - pageInput: PageableInput, - config?: Config, - kwargs?: Partial - ): Promise { + static list = async (params?: { + input?: ModelServiceListInput; + config?: Config; + }): Promise => { + const { input, config } = params ?? {}; + return await this.getClient().list({ input: { - ...kwargs, - ...pageInput, + ...input, } as ModelServiceListInput, - config + config, }); - } - - /** - * 列出所有模型服务 / List all model services - * - * @param options - 查询选项 / Query options - * @param config - 配置 / Configuration - * @returns 模型服务列表 / Model service list - */ - static async listAll(options?: { - modelType?: ModelType; - provider?: string; - config?: Config; - }): Promise { - const allResults: ModelService[] = []; - let page = 1; - const pageSize = 50; - while (true) { - const pageResults = await this.listPage( - { pageNumber: page, pageSize }, - options?.config, - { - modelType: options?.modelType, - provider: options?.provider, - } - ); - page += 1; - allResults.push(...pageResults); - if (pageResults.length < pageSize) break; - } + }; - // 去重 - const resultSet = new Set(); - const results: ModelService[] = []; - for (const item of allResults) { - const uniqId = item.modelServiceId || ''; - if (!resultSet.has(uniqId)) { - resultSet.add(uniqId); - results.push(item); - } - } - return results; - } + static listAll = listAllResourcesFunction(this.list); /** * 更新模型服务 / Update model service - * + * * @param params - 参数 / Parameters * @returns 更新后的模型服务对象 / Updated model service object */ @@ -204,15 +178,13 @@ export class ModelService }): Promise => { const { input, config } = params; if (!this.modelServiceName) { - throw new Error( - 'modelServiceName is required to update a ModelService' - ); + throw new Error('modelServiceName is required to update a ModelService'); } const result = await ModelService.update({ name: this.modelServiceName, input, - config + config, }); this.updateSelf(result); @@ -221,36 +193,35 @@ export class ModelService /** * 删除模型服务 / Delete model service - * + * * @param config - 配置 / Configuration * @returns 删除的模型服务对象 / Deleted model service object */ delete = async (params?: { config?: Config }): Promise => { if (!this.modelServiceName) { - throw new Error( - 'modelServiceName is required to delete a ModelService' - ); + throw new Error('modelServiceName is required to delete a ModelService'); } - return await ModelService.delete({ name: this.modelServiceName, config: params?.config }); + return await ModelService.delete({ + name: this.modelServiceName, + config: params?.config, + }); }; /** * 刷新模型服务信息 / Refresh model service information - * + * * @param config - 配置 / Configuration * @returns 刷新后的模型服务对象 / Refreshed model service object */ get = async (params?: { config?: Config }): Promise => { if (!this.modelServiceName) { - throw new Error( - 'modelServiceName is required to refresh a ModelService' - ); + throw new Error('modelServiceName is required to refresh a ModelService'); } const result = await ModelService.get({ name: this.modelServiceName, - config: params?.config + config: params?.config, }); this.updateSelf(result); @@ -259,12 +230,14 @@ export class ModelService /** * 获取模型信息 / Get model information - * + * * @param params - 参数 / Parameters * @param params.config - 配置 / Configuration * @returns 模型基本信息 / Model base information */ - modelInfo = async (params?: { config?: Config }): Promise<{ + modelInfo = async (params?: { + config?: Config; + }): Promise<{ apiKey: string; baseUrl: string; model?: string; @@ -281,7 +254,7 @@ export class ModelService } let apiKey = this.providerSettings.apiKey || ''; - + // 如果没有 apiKey 但有 credentialName，从 Credential 获取 if (!apiKey && this.credentialName) { // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -308,109 +281,9 @@ export class ModelService }; }; - /** - * 调用模型完成 / Call model completion - * - * @param messages - 消息列表 / Message list - * @param model - 模型名称（可选）/ Model name (optional) - * @param stream - 是否流式输出 / Whether to stream output - * @param kwargs - 其他参数 / Other parameters - * @returns 完成结果 / Completion result - */ - completions = async (params: { - messages: any[]; - model?: string; - stream?: boolean; - config?: Config; - [key: string]: any; - }): Promise< - | import('ai').StreamTextResult - | import('ai').GenerateTextResult - > => { - const { messages, model, stream = false, config, ...kwargs } = params; - const info = await this.modelInfo({ config }); - - // 使用 AI SDK 实现 - const { generateText, streamText } = await import('ai'); - const { createOpenAI } = await import('@ai-sdk/openai'); - - const provider = createOpenAI({ - apiKey: info.apiKey, - baseURL: info.baseUrl, - headers: info.headers, - }); - - const selectedModel = model || info.model || this.modelServiceName || ''; - - if (stream) { - return await streamText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } else { - return await generateText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } - }; - - /** - * 获取响应 / Get responses - * - * @param input - 输入 / Input - * @param model - 模型名称（可选）/ Model name (optional) - * @param stream - 是否流式输出 / Whether to stream output - * @param kwargs - 其他参数 / Other parameters - * @returns 响应结果 / Response result - */ - responses = async (params: { - input: string | any; - model?: string; - stream?: boolean; - config?: Config; - [key: string]: any; - }): Promise => { - const { input, model, stream = false, config, ...kwargs } = params; - const info = await this.modelInfo({ config }); - - // 使用 AI SDK 实现 - const { generateText, streamText } = await import('ai'); - const { createOpenAI } = await import('@ai-sdk/openai'); - - const provider = createOpenAI({ - apiKey: info.apiKey, - baseURL: info.baseUrl, - headers: info.headers, - }); - - const selectedModel = model || info.model || this.modelServiceName || ''; - - // 将 input 转换为 messages 格式 - const messages = typeof input === 'string' - ? [{ role: 'user' as const, content: input }] - : input; - - if (stream) { - return await streamText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } else { - return await generateText({ - model: provider(selectedModel), - messages, - ...kwargs, - }); - } - }; - /** * 等待模型服务就绪 / Wait until model service is ready - * + * * @param options - 选项 / Options * @param config - 配置 / Configuration * @returns 模型服务对象 / Model service object @@ -446,11 +319,13 @@ export class ModelService throw new Error(`Model service failed with status: ${this.status}`); } - await new Promise(resolve => setTimeout(resolve, interval)); + await new Promise((resolve) => setTimeout(resolve, interval)); } throw new Error( - `Timeout waiting for model service to be ready after ${options?.timeoutSeconds ?? 300} seconds` + `Timeout waiting for model service to be ready after ${ + options?.timeoutSeconds ?? 300 + } seconds` ); }; } diff --git a/src/sandbox/sandbox.ts b/src/sandbox/sandbox.ts index 7483095..414ae41 100644 --- a/src/sandbox/sandbox.ts +++ b/src/sandbox/sandbox.ts @@ -5,29 +5,31 @@ * This module defines the base Sandbox resource class. */ -import * as $AgentRun from "@alicloud/agentrun20250910"; -import * as $Util from "@alicloud/tea-util"; +import * as $AgentRun from '@alicloud/agentrun20250910'; +import * as $Util from '@alicloud/tea-util'; -import { Config } from "../utils/config"; -import { ControlAPI } from "../utils/control-api"; -import { ClientError, HTTPError, ServerError } from "../utils/exception"; -import { logger } from "../utils/log"; -import { updateObjectProperties } from "../utils/resource"; +import { Config } from '../utils/config'; +import { ControlAPI } from '../utils/control-api'; +import { ClientError, HTTPError, ServerError } from '../utils/exception'; +import { logger } from '../utils/log'; +import { ResourceBase, updateObjectProperties } from '../utils/resource'; -import { SandboxDataAPI } from "./api/sandbox-data"; +import { SandboxDataAPI } from './api/sandbox-data'; import { SandboxCreateInput, SandboxData, SandboxListInput, SandboxState, TemplateType, -} from "./model"; +} from './model'; /** * Base Sandbox resource class * 基础沙箱资源类 / Base Sandbox Resource Class */ -export class Sandbox implements SandboxData { +export class Sandbox extends ResourceBase implements SandboxData { + templateType?: TemplateType; + /** * 沙箱 ID / Sandbox ID */ @@ -84,6 +86,8 @@ export class Sandbox implements SandboxData { protected _config?: Config; constructor(data?: Partial, config?: Config) { + super(); + if (data) { updateObjectProperties(this, data); } @@ -113,7 +117,7 @@ export class Sandbox implements SandboxData { sandboxArn: obj.sandboxArn, sandboxIdleTTLInSeconds: obj.sandboxIdleTTLInSeconds, }, - config, + config ); } @@ -128,14 +132,14 @@ export class Sandbox implements SandboxData { */ static async create( input: SandboxCreateInput, - config?: Config, + config?: Config ): Promise { try { const cfg = Config.withConfigs(config); - + // Use Data API to create sandbox (async creation) const dataApi = new SandboxDataAPI({ - sandboxId: "", // Not needed for creation + sandboxId: '', // Not needed for creation config: cfg, }); @@ -149,10 +153,10 @@ export class Sandbox implements SandboxData { }); // Check if creation was successful - if (result.code !== "SUCCESS") { + if (result.code !== 'SUCCESS') { throw new ClientError( 0, - `Failed to create sandbox: ${result.message || "Unknown error"}`, + `Failed to create sandbox: ${result.message || 'Unknown error'}` ); } @@ -161,7 +165,7 @@ export class Sandbox implements SandboxData { return Sandbox.fromInnerObject(data as any, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("Sandbox", input.templateName); + throw error.toResourceError('Sandbox', input.templateName); } Sandbox.handleError(error); } @@ -177,7 +181,7 @@ export class Sandbox implements SandboxData { const { id, config } = params; try { const cfg = Config.withConfigs(config); - + // Use Data API to delete sandbox const dataApi = new SandboxDataAPI({ sandboxId: id, @@ -190,10 +194,10 @@ export class Sandbox implements SandboxData { }); // Check if deletion was successful - if (result.code !== "SUCCESS") { + if (result.code !== 'SUCCESS') { throw new ClientError( 0, - `Failed to delete sandbox: ${result.message || "Unknown error"}`, + `Failed to delete sandbox: ${result.message || 'Unknown error'}` ); } @@ -202,7 +206,7 @@ export class Sandbox implements SandboxData { return Sandbox.fromInnerObject(data as any, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("Sandbox", id); + throw error.toResourceError('Sandbox', id); } Sandbox.handleError(error); } @@ -211,14 +215,11 @@ export class Sandbox implements SandboxData { /** * Stop a Sandbox by ID */ - static async stop(params: { - id: string; - config?: Config; - }): Promise { + static async stop(params: { id: string; config?: Config }): Promise { const { id, config } = params; try { const cfg = Config.withConfigs(config); - + // Use Data API to stop sandbox const dataApi = new SandboxDataAPI({ sandboxId: id, @@ -231,10 +232,10 @@ export class Sandbox implements SandboxData { }); // Check if stop was successful - if (result.code !== "SUCCESS") { + if (result.code !== 'SUCCESS') { throw new ClientError( 0, - `Failed to stop sandbox: ${result.message || "Unknown error"}`, + `Failed to stop sandbox: ${result.message || 'Unknown error'}` ); } @@ -243,7 +244,7 @@ export class Sandbox implements SandboxData { return Sandbox.fromInnerObject(data as any, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("Sandbox", id); + throw error.toResourceError('Sandbox', id); } Sandbox.handleError(error); } @@ -260,7 +261,7 @@ export class Sandbox implements SandboxData { const { id, templateType, config } = params; try { const cfg = Config.withConfigs(config); - + // Use Data API to get sandbox const dataApi = new SandboxDataAPI({ sandboxId: id, @@ -273,23 +274,25 @@ export class Sandbox implements SandboxData { }); // Check if get was successful - if (result.code !== "SUCCESS") { + if (result.code !== 'SUCCESS') { throw new ClientError( 0, - `Failed to get sandbox: ${result.message || "Unknown error"}`, + `Failed to get sandbox: ${result.message || 'Unknown error'}` ); } // Extract data and create Sandbox instance const data = result.data || {}; const baseSandbox = Sandbox.fromInnerObject(data as any, config); - + // If templateType is specified, return the appropriate subclass if (templateType) { // Dynamically import to avoid circular dependencies switch (templateType) { case TemplateType.CODE_INTERPRETER: { - const { CodeInterpreterSandbox } = await import('./code-interpreter-sandbox'); + const { CodeInterpreterSandbox } = await import( + './code-interpreter-sandbox' + ); // Pass baseSandbox instead of raw data const sandbox = new CodeInterpreterSandbox(baseSandbox, config); return sandbox; @@ -308,11 +311,11 @@ export class Sandbox implements SandboxData { } } } - + return baseSandbox; } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("Sandbox", id); + throw error.toResourceError('Sandbox', id); } Sandbox.handleError(error); } @@ -323,7 +326,7 @@ export class Sandbox implements SandboxData { */ static async list( input?: SandboxListInput, - config?: Config, + config?: Config ): Promise { try { const client = Sandbox.getClient(config); @@ -339,15 +342,15 @@ export class Sandbox implements SandboxData { const response = await client.listSandboxesWithOptions( request, {}, - runtime, + runtime ); logger.debug( - `API listSandboxes called, Request ID: ${response.body?.requestId}`, + `API listSandboxes called, Request ID: ${response.body?.requestId}` ); return (response.body?.data?.sandboxes || []).map( - (item: $AgentRun.Sandbox) => Sandbox.fromInnerObject(item, config), + (item: $AgentRun.Sandbox) => Sandbox.fromInnerObject(item, config) ); } catch (error) { Sandbox.handleError(error); @@ -358,14 +361,14 @@ export class Sandbox implements SandboxData { * Handle API errors */ protected static handleError(error: unknown): never { - if (error && typeof error === "object" && "statusCode" in error) { + if (error && typeof error === 'object' && 'statusCode' in error) { const e = error as { statusCode: number; message: string; data?: { requestId?: string }; }; const statusCode = e.statusCode; - const message = e.message || "Unknown error"; + const message = e.message || 'Unknown error'; const requestId = e.data?.requestId; if (statusCode >= 400 && statusCode < 500) { @@ -377,13 +380,23 @@ export class Sandbox implements SandboxData { throw error; } + get = async (params?: { config?: Config }) => { + const { config } = params ?? {}; + + return await Sandbox.get({ + id: this.sandboxId!, + templateType: this.templateType, + config: Config.withConfigs(this._config, config), + }); + }; + /** * Delete this sandbox */ delete = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.sandboxId) { - throw new Error("sandboxId is required to delete a Sandbox"); + throw new Error('sandboxId is required to delete a Sandbox'); } const result = await Sandbox.delete({ @@ -400,7 +413,7 @@ export class Sandbox implements SandboxData { stop = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.sandboxId) { - throw new Error("sandboxId is required to stop a Sandbox"); + throw new Error('sandboxId is required to stop a Sandbox'); } const result = await Sandbox.stop({ @@ -417,7 +430,7 @@ export class Sandbox implements SandboxData { refresh = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.sandboxId) { - throw new Error("sandboxId is required to refresh a Sandbox"); + throw new Error('sandboxId is required to refresh a Sandbox'); } const result = await Sandbox.get({ @@ -437,7 +450,7 @@ export class Sandbox implements SandboxData { intervalSeconds?: number; beforeCheck?: (sandbox: Sandbox) => void; }, - config?: Config, + config?: Config ): Promise => { const timeout = (options?.timeoutSeconds ?? 300) * 1000; const interval = (options?.intervalSeconds ?? 5) * 1000; @@ -452,7 +465,10 @@ export class Sandbox implements SandboxData { // API返回READY状态表示沙箱就绪可以运行 // API returns READY status to indicate the sandbox is ready to run - if (this.state === SandboxState.RUNNING || this.state === SandboxState.READY) { + if ( + this.state === SandboxState.RUNNING || + this.state === SandboxState.READY + ) { return this; } @@ -464,7 +480,9 @@ export class Sandbox implements SandboxData { } throw new Error( - `Timeout waiting for Sandbox to be running after ${options?.timeoutSeconds ?? 300} seconds`, + `Timeout waiting for Sandbox to be running after ${ + options?.timeoutSeconds ?? 300 + } seconds` ); }; } diff --git a/src/toolset/api/control.ts b/src/toolset/api/control.ts index 1ac3091..529aee4 100644 --- a/src/toolset/api/control.ts +++ b/src/toolset/api/control.ts @@ -46,7 +46,7 @@ export class ToolControlAPI { * Get DevS client * 获取 DevS 客户端 */ - private getDevsClient(config?: Config): InstanceType { + protected getDevsClient(config?: Config): InstanceType { const cfg = Config.withConfigs(this.config, config); // Use devs endpoint @@ -102,11 +102,11 @@ export class ToolControlAPI { `API getToolset called, Request ID: ${response.body?.requestId}` ); - if (!response.body?.data) { + if (!response.body) { throw new Error("Empty response body"); } - return response.body.data; + return response.body; } catch (error) { if (error instanceof HTTPError) { throw error.toResourceError("ToolSet", name); diff --git a/src/toolset/client.ts b/src/toolset/client.ts index 9326b26..049c2ef 100644 --- a/src/toolset/client.ts +++ b/src/toolset/client.ts @@ -5,14 +5,16 @@ * Client for managing ToolSet resources. */ -import { Config } from "../utils/config"; +import { ListToolsetsRequest } from '@alicloud/devs20230714'; +import { Config } from '../utils/config'; +import { ToolControlAPI } from './api'; import { ToolSetCreateInput, ToolSetListInput, ToolSetUpdateInput, -} from "./model"; -import { ToolSet } from "./toolset"; +} from './model'; +import { ToolSet } from './toolset'; /** * ToolSet Client @@ -20,76 +22,53 @@ import { ToolSet } from "./toolset"; * 提供 ToolSet 的管理功能。 */ export class ToolSetClient { - private config?: Config; - + protected config?: Config; + protected controlClient: ToolControlAPI; constructor(config?: Config) { this.config = config; + this.controlClient = new ToolControlAPI(config); } - /** - * Create a ToolSet - */ - createToolSet = async (params: { - input: ToolSetCreateInput; - config?: Config; - }): Promise => { - const { input, config } = params; - return ToolSet.create({ input, config: config ?? this.config }); - }; - - /** - * Delete a ToolSet by name - */ - deleteToolSet = async (params: { - name: string; - config?: Config; - }): Promise => { - const { name, config } = params; - return ToolSet.delete({ name, config: config ?? this.config }); - }; + // /** + // * Delete a ToolSet by name + // */ + // deleteToolSet = async (params: { + // name: string; + // config?: Config; + // }): Promise => { + // const { name, config } = params; + // return ToolSet.delete({ name, config: config ?? this.config }); + // }; /** * Get a ToolSet by name */ - getToolSet = async (params: { - name: string; - config?: Config; - }): Promise => { + get = async (params: { name: string; config?: Config }): Promise => { const { name, config } = params; - return ToolSet.get({ name, config: config ?? this.config }); - }; + const cfg = Config.withConfigs(this.config, config); + const result = await this.controlClient.getToolset({ + name, + config: cfg, + }); - /** - * Update a ToolSet by name - */ - updateToolSet = async (params: { - name: string; - input: ToolSetUpdateInput; - config?: Config; - }): Promise => { - const { name, input, config } = params; - return ToolSet.update({ name, input, config: config ?? this.config }); + return new ToolSet(result); }; /** * List ToolSets */ - listToolSets = async (params?: { + list = async (params?: { input?: ToolSetListInput; config?: Config; }): Promise => { const { input, config } = params ?? {}; - return ToolSet.list(input, config ?? this.config); - }; - /** - * List all ToolSets with pagination - */ - listAllToolSets = async (params?: { - options?: { prefix?: string; labels?: Record }; - config?: Config; - }): Promise => { - const { options, config } = params ?? {}; - return ToolSet.listAll(options, config ?? this.config); + const cfg = Config.withConfigs(this.config, config); + const results = await this.controlClient.listToolsets({ + input: new ListToolsetsRequest(input), + config: cfg, + }); + + return results.data?.map((result) => new ToolSet(result)) || []; }; } diff --git a/src/toolset/model.ts b/src/toolset/model.ts index 8d65ae2..dee5ee7 100644 --- a/src/toolset/model.ts +++ b/src/toolset/model.ts @@ -5,14 +5,14 @@ * Data models for ToolSet. */ -import { Status } from "../utils/model"; +import { Status } from '../utils/model'; /** * ToolSet schema type */ export enum ToolSetSchemaType { - OPENAPI = "OpenAPI", - MCP = "MCP", + OPENAPI = 'OpenAPI', + MCP = 'MCP', } /** @@ -73,6 +73,7 @@ export interface MCPToolMeta { * Tool description */ description?: string; + inputSchema?: Record; } /** @@ -197,10 +198,10 @@ export interface ToolSetListInput { /** * JSON Schema compatible tool parameter description - * + * * Supports complete JSON Schema fields for describing complex nested data structures. * JSON Schema 兼容的工具参数描述 - * + * * 支持完整的 JSON Schema 字段，能够描述复杂的嵌套数据结构。 */ export class ToolSchema { @@ -249,7 +250,7 @@ export class ToolSchema { /** * Create ToolSchema from any OpenAPI/JSON Schema * 从任意 OpenAPI/JSON Schema 创建 ToolSchema - * + * * Recursively parses all nested structures, preserving complete schema information. * 递归解析所有嵌套结构，保留完整的 schema 信息。 */ @@ -273,7 +274,9 @@ export class ToolSchema { // Parse items / 解析 items const itemsRaw = s.items; - const items = itemsRaw ? ToolSchema.fromAnyOpenAPISchema(itemsRaw) : undefined; + const items = itemsRaw + ? ToolSchema.fromAnyOpenAPISchema(itemsRaw) + : undefined; // Parse union types / 解析联合类型 const anyOfRaw = s.anyOf as unknown[] | undefined; @@ -414,7 +417,7 @@ export class ToolInfo { // Handle MCP Tool object / 处理 MCP Tool 对象 if (typeof tool === 'object' && tool !== null) { const t = tool as Record; - + if ('name' in t) { toolName = t.name as string; toolDescription = t.description as string | undefined; @@ -439,7 +442,8 @@ export class ToolInfo { return new ToolInfo({ name: toolName, description: toolDescription, - parameters: parameters || new ToolSchema({ type: 'object', properties: {} }), + parameters: + parameters || new ToolSchema({ type: 'object', properties: {} }), }); } } diff --git a/src/toolset/toolset.ts b/src/toolset/toolset.ts index b585e54..a936a21 100644 --- a/src/toolset/toolset.ts +++ b/src/toolset/toolset.ts @@ -5,20 +5,20 @@ * Resource class for managing ToolSet resources. */ -import * as $Devs from "@alicloud/devs20230714"; -import * as $OpenApi from "@alicloud/openapi-client"; -import * as $Util from "@alicloud/tea-util"; +import * as $Devs from '@alicloud/devs20230714'; +import * as $OpenApi from '@alicloud/openapi-client'; +import * as $Util from '@alicloud/tea-util'; -import { Config } from "../utils/config"; +import { Config } from '../utils/config'; +import { ClientError, HTTPError, ServerError } from '../utils/exception'; +import { logger } from '../utils/log'; +import { Status } from '../utils/model'; +import { ResourceBase, updateObjectProperties } from '../utils/resource'; // Handle ESM/CJS interop for Client class const $DevsClient = // @ts-expect-error - ESM interop: default.default exists when imported as ESM namespace $Devs.default?.default ?? $Devs.default ?? $Devs; -import { ClientError, HTTPError, ServerError } from "../utils/exception"; -import { logger } from "../utils/log"; -import { Status } from "../utils/model"; -import { updateObjectProperties } from "../utils/resource"; import { ToolSetCreateInput, @@ -27,7 +27,7 @@ import { ToolSetSpec, ToolSetStatus, ToolSetUpdateInput, -} from "./model"; +} from './model'; /** * ToolSet resource class @@ -45,88 +45,13 @@ export class ToolSet implements ToolSetData { private _config?: Config; - constructor(data?: Partial, config?: Config) { + constructor(data?: any, config?: Config) { if (data) { updateObjectProperties(this, data); } this._config = config; } - /** - * Get ToolSet name (alias for name) - */ - get toolSetName(): string | undefined { - return this.name; - } - - /** - * Get ToolSet ID (alias for uid) - */ - get toolSetId(): string | undefined { - return this.uid; - } - - /** - * Check if the toolset is ready - */ - get isReady(): boolean { - return this.status?.status === Status.READY; - } - - /** - * Create toolset from SDK response object - */ - static fromInnerObject(obj: $Devs.Toolset, config?: Config): ToolSet { - if (!obj) { - throw new Error('Invalid toolset object: object is null or undefined'); - } - - return new ToolSet( - { - name: obj.name, - uid: obj.uid, - kind: obj.kind, - description: obj.description, - createdTime: obj.createdTime, - generation: obj.generation, - labels: obj.labels as Record, - spec: { - schema: { - type: obj.spec?.schema?.type as any, - detail: obj.spec?.schema?.detail, - }, - authConfig: { - type: obj.spec?.authConfig?.type, - apiKeyHeaderName: - obj.spec?.authConfig?.parameters?.apiKeyParameter?.key, - apiKeyValue: - obj.spec?.authConfig?.parameters?.apiKeyParameter?.value, - }, - }, - status: { - status: obj.status?.status as Status, - statusReason: obj.status?.statusReason, - outputs: { - mcpServerConfig: { - url: obj.status?.outputs?.mcpServerConfig?.url, - transport: obj.status?.outputs?.mcpServerConfig?.transport, - }, - tools: obj.status?.outputs?.tools?.map((tool) => ({ - name: tool.name, - description: tool.description, - })), - urls: { - cdpUrl: obj.status?.outputs?.urls?.cdpUrl, - liveViewUrl: obj.status?.outputs?.urls?.liveViewUrl, - streamUrl: obj.status?.outputs?.urls?.streamUrl, - }, - }, - }, - }, - config, - ); - } - /** * Get DevS client */ @@ -137,8 +62,8 @@ export class ToolSet implements ToolSetData { let endpoint = cfg.devsEndpoint; // Remove protocol prefix for SDK - if (endpoint.startsWith("http://") || endpoint.startsWith("https://")) { - endpoint = endpoint.split("://")[1]; + if (endpoint.startsWith('http://') || endpoint.startsWith('https://')) { + endpoint = endpoint.split('://')[1]; } const openApiConfig = new $OpenApi.Config({ @@ -174,7 +99,7 @@ export class ToolSet implements ToolSetData { apiKeyParameter: new $Devs.APIKeyAuthParameter({ key: input.spec.authConfig.apiKeyHeaderName, value: input.spec.authConfig.apiKeyValue, - in: "header", + in: 'header', }), }), }); @@ -202,20 +127,17 @@ export class ToolSet implements ToolSetData { const response = await client.createToolsetWithOptions( request, {}, - runtime, + runtime ); logger.debug( - `API createToolset called, Request ID: ${response.body?.requestId}`, + `API createToolset called, Request ID: ${response.body?.requestId}` ); - return ToolSet.fromInnerObject( - response.body as $Devs.Toolset, - config, - ); + return new ToolSet(response.body as $Devs.Toolset, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("ToolSet", input.name); + throw error.toResourceError('ToolSet', input.name); } ToolSet.handleError(error); } @@ -236,16 +158,13 @@ export class ToolSet implements ToolSetData { const response = await client.deleteToolsetWithOptions(name, {}, runtime); logger.debug( - `API deleteToolset called, Request ID: ${response.body?.requestId}`, + `API deleteToolset called, Request ID: ${response.body?.requestId}` ); - return ToolSet.fromInnerObject( - response.body as $Devs.Toolset, - config, - ); + return new ToolSet(response.body as $Devs.Toolset, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("ToolSet", name); + throw error.toResourceError('ToolSet', name); } ToolSet.handleError(error); } @@ -264,7 +183,7 @@ export class ToolSet implements ToolSetData { const runtime = new $Util.RuntimeOptions({}); logger.debug(`Calling getToolset API for: ${name}`); - + const response = await client.getToolsetWithOptions(name, {}, runtime); logger.debug( @@ -272,17 +191,16 @@ export class ToolSet implements ToolSetData { ); if (!response.body) { - throw new Error(`API returned empty response body for toolset: ${name}`); + throw new Error( + `API returned empty response body for toolset: ${name}` + ); } // The SDK returns the toolset data directly in body, not in body.data - return ToolSet.fromInnerObject( - response.body as $Devs.Toolset, - config, - ); + return new ToolSet(response.body as $Devs.Toolset, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("ToolSet", name); + throw error.toResourceError('ToolSet', name); } ToolSet.handleError(error); } @@ -293,7 +211,7 @@ export class ToolSet implements ToolSetData { */ static async list( input?: ToolSetListInput, - config?: Config, + config?: Config ): Promise { try { const client = ToolSet.getClient(config); @@ -303,7 +221,7 @@ export class ToolSet implements ToolSetData { let labelSelector: string[] | undefined; if (input?.labels) { labelSelector = Object.entries(input.labels).map( - ([k, v]) => `${k}=${v}`, + ([k, v]) => `${k}=${v}` ); } @@ -317,19 +235,17 @@ export class ToolSet implements ToolSetData { const response = await client.listToolsetsWithOptions( request, {}, - runtime, + runtime ); logger.debug( - `API listToolsets called, Request ID: ${response.body?.requestId}`, + `API listToolsets called, Request ID: ${response.body?.requestId}` ); // Response body has data as Toolset[] // SDK returns array of toolsets directly in items field const items = (response.body as any)?.items || []; - return items.map((item: $Devs.Toolset) => - ToolSet.fromInnerObject(item, config), - ); + return items.map((item: $Devs.Toolset) => new ToolSet(item, config)); } catch (error) { ToolSet.handleError(error); } @@ -340,7 +256,7 @@ export class ToolSet implements ToolSetData { */ static async listAll( options?: { prefix?: string; labels?: Record }, - config?: Config, + config?: Config ): Promise { const toolsets: ToolSet[] = []; const pageSize = 50; @@ -353,7 +269,7 @@ export class ToolSet implements ToolSetData { labels: options?.labels, pageSize, }, - config, + config ); toolsets.push(...result); @@ -396,7 +312,7 @@ export class ToolSet implements ToolSetData { apiKeyParameter: new $Devs.APIKeyAuthParameter({ key: input.spec.authConfig.apiKeyHeaderName, value: input.spec.authConfig.apiKeyValue, - in: "header", + in: 'header', }), }), }); @@ -424,20 +340,17 @@ export class ToolSet implements ToolSetData { name, request, {}, - runtime, + runtime ); logger.debug( - `API updateToolset called, Request ID: ${response.body?.requestId}`, + `API updateToolset called, Request ID: ${response.body?.requestId}` ); - return ToolSet.fromInnerObject( - response.body as $Devs.Toolset, - config, - ); + return new ToolSet(response.body as $Devs.Toolset, config); } catch (error) { if (error instanceof HTTPError) { - throw error.toResourceError("ToolSet", name); + throw error.toResourceError('ToolSet', name); } ToolSet.handleError(error); } @@ -447,14 +360,14 @@ export class ToolSet implements ToolSetData { * Handle API errors */ private static handleError(error: unknown): never { - if (error && typeof error === "object" && "statusCode" in error) { + if (error && typeof error === 'object' && 'statusCode' in error) { const e = error as { statusCode: number; message: string; data?: { requestId?: string }; }; const statusCode = e.statusCode; - const message = e.message || "Unknown error"; + const message = e.message || 'Unknown error'; const requestId = e.data?.requestId; if (statusCode >= 400 && statusCode < 500) { @@ -472,7 +385,7 @@ export class ToolSet implements ToolSetData { delete = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.name) { - throw new Error("name is required to delete a ToolSet"); + throw new Error('name is required to delete a ToolSet'); } const result = await ToolSet.delete({ @@ -492,7 +405,7 @@ export class ToolSet implements ToolSetData { }): Promise => { const { input, config } = params; if (!this.name) { - throw new Error("name is required to update a ToolSet"); + throw new Error('name is required to update a ToolSet'); } const result = await ToolSet.update({ @@ -510,7 +423,7 @@ export class ToolSet implements ToolSetData { refresh = async (params?: { config?: Config }): Promise => { const config = params?.config; if (!this.name) { - throw new Error("name is required to refresh a ToolSet"); + throw new Error('name is required to refresh a ToolSet'); } const result = await ToolSet.get({ @@ -530,7 +443,7 @@ export class ToolSet implements ToolSetData { intervalSeconds?: number; beforeCheck?: (toolset: ToolSet) => void; }, - config?: Config, + config?: Config ): Promise => { const timeout = (options?.timeoutSeconds ?? 300) * 1000; const interval = (options?.intervalSeconds ?? 5) * 1000; @@ -554,7 +467,7 @@ export class ToolSet implements ToolSetData { if (Date.now() - startTime > timeout) { throw new Error( - `Timeout waiting for ToolSet to be ready after ${timeout / 1000}s`, + `Timeout waiting for ToolSet to be ready after ${timeout / 1000}s` ); } @@ -576,9 +489,9 @@ export class ToolSet implements ToolSetData { */ listToolsAsync = async (params?: { config?: Config }): Promise => { // eslint-disable-next-line @typescript-eslint/no-var-requires - const { ToolSetSchemaType } = require("./model"); + const { ToolSetSchemaType } = require('./model'); // eslint-disable-next-line @typescript-eslint/no-var-requires - const { ToolInfo } = require("./model"); + const { ToolInfo } = require('./model'); if (this.type() === ToolSetSchemaType.MCP) { // MCP tools @@ -611,7 +524,7 @@ export class ToolSet implements ToolSetData { ): Promise => { const apiset = await this.toApiSet({ config }); // eslint-disable-next-line @typescript-eslint/no-var-requires - const { ToolSetSchemaType } = require("./model"); + const { ToolSetSchemaType } = require('./model'); // For OpenAPI, may need to resolve operation name // 对于 OpenAPI，可能需要解析 operation name @@ -655,17 +568,17 @@ export class ToolSet implements ToolSetData { */ toApiSet = async (params?: { config?: Config }): Promise => { // eslint-disable-next-line @typescript-eslint/no-var-requires - const { ApiSet } = require("./openapi"); + const { ApiSet } = require('./openapi'); // eslint-disable-next-line @typescript-eslint/no-var-requires - const { ToolSetSchemaType } = require("./model"); + const { ToolSetSchemaType } = require('./model'); if (this.type() === ToolSetSchemaType.MCP) { // eslint-disable-next-line @typescript-eslint/no-var-requires - const { MCPToolSet } = require("./api/mcp"); + const { MCPToolSet } = require('./api/mcp'); const mcpServerConfig = (this.status?.outputs as any)?.mcpServerConfig; if (!mcpServerConfig?.url) { - throw new Error("MCP server URL is missing."); + throw new Error('MCP server URL is missing.'); } const cfg = Config.withConfigs( @@ -690,10 +603,10 @@ export class ToolSet implements ToolSetData { // Use OpenAPI.fromSchema if available, otherwise create basic ApiSet // 如果可用，使用 OpenAPI.fromSchema，否则创建基本 ApiSet // eslint-disable-next-line @typescript-eslint/no-var-requires - const { OpenAPI } = require("./openapi"); - + const { OpenAPI } = require('./openapi'); + const openapi = new OpenAPI({ - schema: this.spec?.schema?.detail || "{}", + schema: this.spec?.schema?.detail || '{}', baseUrl: this._getOpenAPIBaseUrl(), headers, queryParams: query, @@ -702,16 +615,24 @@ export class ToolSet implements ToolSetData { // Convert OpenAPI tools to ToolInfo format // eslint-disable-next-line @typescript-eslint/no-var-requires - const { ToolInfo } = require("./model"); - const tools = openapi.tools.map((t: any) => - new ToolInfo({ - name: t.name, - description: t.description, - parameters: t.parameters as any, - }) + const { ToolInfo } = require('./model'); + const tools = openapi.tools.map( + (t: any) => + new ToolInfo({ + name: t.name, + description: t.description, + parameters: t.parameters as any, + }) ); - return new ApiSet(tools, openapi, undefined, headers, query, params?.config); + return new ApiSet( + tools, + openapi, + undefined, + headers, + query, + params?.config + ); } throw new Error(`Unsupported ToolSet type: ${this.type()}`); @@ -731,15 +652,15 @@ export class ToolSet implements ToolSetData { const authConfig = this.spec?.authConfig; const authType = authConfig?.type; - if (authType === "APIKey") { + if (authType === 'APIKey') { const key = authConfig?.apiKeyHeaderName; const value = authConfig?.apiKeyValue; - const location = "header"; // Default location + const location = 'header'; // Default location if (key && value) { - if (location === "header") { + if (location === 'header') { headers[key] = value; - } else if (location === "query") { + } else if (location === 'query') { query[key] = value; } } diff --git a/src/utils/index.ts b/src/utils/index.ts index 2b5c3f1..5a81f29 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -24,3 +24,4 @@ export { } from "./model"; export { logger, type LogLevel } from "./log"; export { DataAPI, ResourceType } from "./data-api"; +export { mixin, type Constructor, type MixinTarget } from "./mixin"; \ No newline at end of file diff --git a/src/utils/mixin.ts b/src/utils/mixin.ts new file mode 100644 index 0000000..922a55d --- /dev/null +++ b/src/utils/mixin.ts @@ -0,0 +1,40 @@ +export type Constructor = new (...args: any[]) => T; + +export type MixinTarget = + TTarget & + TSource & { + prototype: InstanceType & InstanceType; + }; + +const STATIC_IGNORED_KEYS = new Set(["length", "name", "prototype"]); +const PROTOTYPE_IGNORED_KEYS = new Set(["constructor"]); + +function getOwnKeys(target: object): Array { + return [...Object.getOwnPropertyNames(target), ...Object.getOwnPropertySymbols(target)]; +} + +function copyProperties( + source: object, + target: object, + ignoredKeys: ReadonlySet +): void { + for (const key of getOwnKeys(source)) { + if (typeof key === "string" && ignoredKeys.has(key)) { + continue; + } + const descriptor = Object.getOwnPropertyDescriptor(source, key); + if (!descriptor) { + continue; + } + Object.defineProperty(target, key, descriptor); + } +} + +export function mixin( + source: TSource, + target: TTarget +): MixinTarget { + copyProperties(source.prototype, target.prototype, PROTOTYPE_IGNORED_KEYS); + copyProperties(source, target, STATIC_IGNORED_KEYS); + return target as MixinTarget; +} diff --git a/src/utils/mixmin.ts b/src/utils/mixmin.ts new file mode 100644 index 0000000..c6e74f9 --- /dev/null +++ b/src/utils/mixmin.ts @@ -0,0 +1 @@ +export { mixin, type Constructor, type MixinTarget } from "./mixin"; \ No newline at end of file diff --git a/src/utils/resource.ts b/src/utils/resource.ts index 8dbf913..3f9f13c 100644 --- a/src/utils/resource.ts +++ b/src/utils/resource.ts @@ -12,10 +12,10 @@ import { isFinalStatus, PageableInput, Status } from './model'; /** * 更新对象属性的辅助函数 / Helper function to update object properties - * + * * 只复制数据属性,跳过方法和私有属性 * Only copies data properties, skips methods and private properties - * + * * @param target - 目标对象 / Target object * @param source - 源对象 / Source object */ @@ -24,57 +24,34 @@ export function updateObjectProperties(target: any, source: any): void { if ( Object.prototype.hasOwnProperty.call(source, key) && typeof source[key] !== 'function' && - !key.startsWith('_') // 跳过私有属性 + !key.startsWith('_') // 跳过私有属性 ) { target[key] = source[key]; } } } -export abstract class ResourceBase { - status?: Status; - protected _config?: Config; - - abstract get(params?: { config?: Config }): Promise; - abstract delete(params?: { config?: Config }): Promise; - - static async list(_params: { input?: PageableInput; config?: Config }) { - return [] as ThisType[]; - } - - static async listAll(params: { - uniqIdCallback: (item: any) => string; - input?: Record; - config?: Config; - }) { - const { uniqIdCallback, input, config } = params; +export interface WithUniqIdCallback { + uniqIdCallback(): string | undefined; +} - const allResults: any[] = []; - let page = 1; - const pageSize = 50; - while (true) { - const pageResults = await this.list({ - input: { ...input, pageNumber: page, pageSize: pageSize }, - config, - }); +export interface ParamsWithConfig { + config?: Config; +} - page += 1; - allResults.push(...pageResults); - if (pageResults.length < pageSize) break; - } +export abstract class ResourceBase { + public status?: Status; + protected _config?: Config; - const resultSet = new Set(); - const results: any[] = []; - for (const item of allResults) { - const uniqId = uniqIdCallback(item); - if (!resultSet.has(uniqId)) { - resultSet.add(uniqId); - results.push(item); - } - } + abstract get(params?: ParamsWithConfig): Promise; + abstract delete(params?: ParamsWithConfig): Promise; - return results; - } + // static async list(params?: { + // input?: PageableInput; + // config?: Config; + // }): Promise { + // return []; + // } waitUntil = async (params: { checkFinishedCallback: (resource: ResourceBase) => Promise; @@ -95,16 +72,22 @@ export abstract class ResourceBase { throw new Error('Timeout waiting for resource to reach desired state'); } - await new Promise((resolve) => setTimeout(resolve, intervalSeconds * 1000)); + await new Promise((resolve) => + setTimeout(resolve, intervalSeconds * 1000) + ); } }; - waitUntilReadyOrFailed = async (params: { - callback: (resource: ResourceBase) => Promise; + waitUntilReadyOrFailed = async (params?: { + callback?: (resource: ResourceBase) => Promise; intervalSeconds?: number; timeoutSeconds?: number; }) => { - const { callback, intervalSeconds = 5, timeoutSeconds = 300 } = params; + const { + callback, + intervalSeconds = 5, + timeoutSeconds = 300, + } = params ?? {}; async function checkFinishedCallback(resource: ResourceBase) { await resource.refresh(); @@ -121,12 +104,16 @@ export abstract class ResourceBase { }); }; - delete_and_wait_until_finished = async (params: { + deleteAndWaitUntilFinished = async (params?: { callback: (resource: ResourceBase) => Promise; intervalSeconds?: number; timeoutSeconds?: number; }) => { - const { callback, intervalSeconds = 5, timeoutSeconds = 300 } = params; + const { + callback, + intervalSeconds = 5, + timeoutSeconds = 300, + } = params ?? {}; try { await this.delete(); @@ -156,39 +143,65 @@ export abstract class ResourceBase { }); }; - refresh = async (params?: { config?: Config }) => await this.get(params); + refresh = async (params?: ParamsWithConfig) => await this.get(params); /** * 更新实例自身的属性 / Update instance properties - * + * * @param source - 源对象 / Source object */ updateSelf(source: any): void { updateObjectProperties(this, source); } - /** - * 列出所有资源（带去重）/ List all resources (with deduplication) - * - * @param uniqIdCallback - 唯一ID回调函数 / Unique ID callback function - * @param config - 配置 / Configuration - * @param kwargs - 其他查询参数 / Other query parameters - * @returns 资源列表 / Resource list - */ - protected static async listAllResources( - uniqIdCallback: (item: any) => string, - config?: Config, - kwargs?: Record - ): Promise { - return await this.listAll({ - uniqIdCallback, - input: kwargs, - config, - }); - } - setConfig = (config: Config) => { this._config = config; return this; }; } + +export function listAllResourcesFunction< + ListParams extends { input?: PageableInput; config?: Config }, + ListResult extends WithUniqIdCallback +>(list: (params?: ListParams) => Promise) { + return async ( + params?: Omit< + NonNullable, + 'pageNumber' | 'pageSize' + > & { + config?: Config; + } + ) => { + const { config, ...restParams } = params ?? {}; + + const allResults: ListResult[] = []; + let page = 1; + const pageSize = 50; + while (true) { + const pageResults = await list({ + input: { + ...restParams, + pageNumber: page, + pageSize: pageSize, + }, + config, + } as ListParams); + + page += 1; + allResults.push(...pageResults); + if (pageResults.length < pageSize) break; + } + + const resultSet = new Set(); + const results: any[] = []; + for (const item of allResults) { + const uniqId = item.uniqIdCallback() || ''; + if (!resultSet.has(uniqId) && uniqId) { + resultSet.add(uniqId); + results.push(item); + } + } + + return results; + }; +} diff --git a/tests/e2e/toolset/toolset.test.ts b/tests/e2e/toolset/toolset.test.ts index c253040..0c40069 100644 --- a/tests/e2e/toolset/toolset.test.ts +++ b/tests/e2e/toolset/toolset.test.ts @@ -43,7 +43,7 @@ describe('test toolset', () => { expect(toolset.isReady).toBe(true); // 获取 ToolSet - const toolset2 = await client.getToolSet({ name: toolsetName }); + const toolset2 = await client.get({ name: toolsetName }); expect(toolset2.name).toEqual(toolsetName); expect(toolset2.uid).toEqual(toolset.uid); @@ -86,7 +86,7 @@ describe('test toolset', () => { // 验证删除 expect(async () => { - await client.getToolSet({ name: toolsetName }); + await client.get({ name: toolsetName }); }).toThrow(ResourceNotExistError); }, 600000); // 10 minutes timeout }); diff --git a/tests/unittests/agent-runtime/agent-runtime.test.ts b/tests/unittests/agent-runtime/agent-runtime.test.ts index 6fb0350..3baeb9c 100644 --- a/tests/unittests/agent-runtime/agent-runtime.test.ts +++ b/tests/unittests/agent-runtime/agent-runtime.test.ts @@ -4,8 +4,16 @@ * 测试 AgentRuntime、AgentRuntimeEndpoint 和 AgentRuntimeClient 类。 */ -import { AgentRuntime, AgentRuntimeEndpoint, AgentRuntimeClient } from '../../../src/agent-runtime'; -import { AgentRuntimeLanguage, AgentRuntimeArtifact, AgentRuntimeProtocolType } from '../../../src/agent-runtime/model'; +import { + AgentRuntime, + AgentRuntimeEndpoint, + AgentRuntimeClient, +} from '../../../src/agent-runtime'; +import { + AgentRuntimeLanguage, + AgentRuntimeArtifact, + AgentRuntimeProtocolType, +} from '../../../src/agent-runtime/model'; import { Config } from '../../../src/utils/config'; import { HTTPError, ResourceNotExistError } from '../../../src/utils/exception'; import { Status, NetworkMode } from '../../../src/utils/model'; @@ -30,7 +38,9 @@ jest.mock('../../../src/agent-runtime/api/control', () => { }); // Mock the AgentRuntimeDataAPI -const mockInvokeOpenai = jest.fn().mockResolvedValue({ response: 'mock response' }); +const mockInvokeOpenai = jest + .fn() + .mockResolvedValue({ response: 'mock response' }); jest.mock('../../../src/agent-runtime/api/data', () => { return { AgentRuntimeDataAPI: jest.fn().mockImplementation(() => ({ @@ -41,7 +51,9 @@ jest.mock('../../../src/agent-runtime/api/data', () => { import { AgentRuntimeControlAPI } from '../../../src/agent-runtime/api/control'; -const MockAgentRuntimeControlAPI = AgentRuntimeControlAPI as jest.MockedClass; +const MockAgentRuntimeControlAPI = AgentRuntimeControlAPI as jest.MockedClass< + typeof AgentRuntimeControlAPI +>; describe('Agent Runtime Module', () => { let mockControlApi: any; @@ -242,7 +254,9 @@ describe('Agent Runtime Module', () => { memory: 4096, }, }) - ).rejects.toThrow('Either codeConfiguration or containerConfiguration must be provided'); + ).rejects.toThrow( + 'Either codeConfiguration or containerConfiguration must be provided' + ); }); it('should re-throw non-HTTP errors', async () => { @@ -268,7 +282,9 @@ describe('Agent Runtime Module', () => { describe('delete', () => { it('should delete AgentRuntime by id', async () => { - mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [] }); + mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ + items: [], + }); mockControlApi.deleteAgentRuntime.mockResolvedValue({ agentRuntimeId: 'runtime-123', agentRuntimeName: 'test-runtime', @@ -288,16 +304,24 @@ describe('Agent Runtime Module', () => { mockControlApi.listAgentRuntimeEndpoints .mockResolvedValueOnce({ items: [ - { agentRuntimeId: 'runtime-123', agentRuntimeEndpointId: 'ep-1', agentRuntimeEndpointName: 'endpoint-1' }, - { agentRuntimeId: 'runtime-123', agentRuntimeEndpointId: 'ep-2', agentRuntimeEndpointName: 'endpoint-2' }, + { + agentRuntimeId: 'runtime-123', + agentRuntimeEndpointId: 'ep-1', + agentRuntimeEndpointName: 'endpoint-1', + }, + { + agentRuntimeId: 'runtime-123', + agentRuntimeEndpointId: 'ep-2', + agentRuntimeEndpointName: 'endpoint-2', + }, ], }) .mockResolvedValue({ items: [] }); - + mockControlApi.deleteAgentRuntimeEndpoint.mockResolvedValue({ agentRuntimeEndpointId: 'ep-1', }); - + mockControlApi.deleteAgentRuntime.mockResolvedValue({ agentRuntimeId: 'runtime-123', agentRuntimeName: 'test-runtime', @@ -305,23 +329,41 @@ describe('Agent Runtime Module', () => { await AgentRuntime.delete({ id: 'runtime-123' }); - expect(mockControlApi.deleteAgentRuntimeEndpoint).toHaveBeenCalledTimes(2); + expect( + mockControlApi.deleteAgentRuntimeEndpoint + ).toHaveBeenCalledTimes(2); expect(mockControlApi.deleteAgentRuntime).toHaveBeenCalled(); }); it('should wait for endpoints to be deleted', async () => { let listCallCount = 0; - mockControlApi.listAgentRuntimeEndpoints.mockImplementation(async () => { - listCallCount++; - // First call returns 1 endpoint, second call (after delete) returns 1, third returns 0 - if (listCallCount === 1) { - return { items: [{ agentRuntimeId: 'runtime-123', agentRuntimeEndpointId: 'ep-1' }] }; - } else if (listCallCount === 2) { - return { items: [{ agentRuntimeId: 'runtime-123', agentRuntimeEndpointId: 'ep-1' }] }; + mockControlApi.listAgentRuntimeEndpoints.mockImplementation( + async () => { + listCallCount++; + // First call returns 1 endpoint, second call (after delete) returns 1, third returns 0 + if (listCallCount === 1) { + return { + items: [ + { + agentRuntimeId: 'runtime-123', + agentRuntimeEndpointId: 'ep-1', + }, + ], + }; + } else if (listCallCount === 2) { + return { + items: [ + { + agentRuntimeId: 'runtime-123', + agentRuntimeEndpointId: 'ep-1', + }, + ], + }; + } + return { items: [] }; } - return { items: [] }; - }); - + ); + mockControlApi.deleteAgentRuntimeEndpoint.mockResolvedValue({}); mockControlApi.deleteAgentRuntime.mockResolvedValue({ agentRuntimeId: 'runtime-123', @@ -333,19 +375,27 @@ describe('Agent Runtime Module', () => { }); it('should handle HTTP error', async () => { - mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [] }); + mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ + items: [], + }); const httpError = new HTTPError(404, 'Not found'); mockControlApi.deleteAgentRuntime.mockRejectedValue(httpError); - await expect(AgentRuntime.delete({ id: 'runtime-123' })).rejects.toThrow(); + await expect( + AgentRuntime.delete({ id: 'runtime-123' }) + ).rejects.toThrow(); }); it('should re-throw non-HTTP errors', async () => { - mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [] }); + mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ + items: [], + }); const genericError = new Error('Delete failed'); mockControlApi.deleteAgentRuntime.mockRejectedValue(genericError); - await expect(AgentRuntime.delete({ id: 'runtime-123' })).rejects.toThrow('Delete failed'); + await expect( + AgentRuntime.delete({ id: 'runtime-123' }) + ).rejects.toThrow('Delete failed'); }); }); @@ -423,7 +473,10 @@ describe('Agent Runtime Module', () => { mockControlApi.updateAgentRuntime.mockRejectedValue(httpError); await expect( - AgentRuntime.update({ id: 'runtime-123', input: { description: 'test' } }) + AgentRuntime.update({ + id: 'runtime-123', + input: { description: 'test' }, + }) ).rejects.toThrow(); }); @@ -432,7 +485,10 @@ describe('Agent Runtime Module', () => { mockControlApi.updateAgentRuntime.mockRejectedValue(genericError); await expect( - AgentRuntime.update({ id: 'runtime-123', input: { description: 'test' } }) + AgentRuntime.update({ + id: 'runtime-123', + input: { description: 'test' }, + }) ).rejects.toThrow('Update failed'); }); }); @@ -456,14 +512,18 @@ describe('Agent Runtime Module', () => { const httpError = new HTTPError(404, 'Not found'); mockControlApi.getAgentRuntime.mockRejectedValue(httpError); - await expect(AgentRuntime.get({ id: 'runtime-123' })).rejects.toThrow(); + await expect( + AgentRuntime.get({ id: 'runtime-123' }) + ).rejects.toThrow(); }); it('should re-throw non-HTTP errors', async () => { const genericError = new Error('Get failed'); mockControlApi.getAgentRuntime.mockRejectedValue(genericError); - await expect(AgentRuntime.get({ id: 'runtime-123' })).rejects.toThrow('Get failed'); + await expect(AgentRuntime.get({ id: 'runtime-123' })).rejects.toThrow( + 'Get failed' + ); }); }); @@ -484,12 +544,10 @@ describe('Agent Runtime Module', () => { it('should list AgentRuntimes with filter', async () => { mockControlApi.listAgentRuntimes.mockResolvedValue({ - items: [ - { agentRuntimeId: '1', agentRuntimeName: 'test-runtime' }, - ], + items: [{ agentRuntimeId: '1', agentRuntimeName: 'test-runtime' }], }); - await AgentRuntime.list({ agentRuntimeName: 'test' }); + await AgentRuntime.list({ input: { agentRuntimeName: 'test' } }); expect(mockControlApi.listAgentRuntimes).toHaveBeenCalledWith( expect.objectContaining({ @@ -549,7 +607,7 @@ describe('Agent Runtime Module', () => { mockControlApi.listAgentRuntimes.mockResolvedValue({ items: [ { agentRuntimeId: '1', agentRuntimeName: 'runtime-1' }, - { agentRuntimeId: '1', agentRuntimeName: 'runtime-1-dup' }, // Duplicate + { agentRuntimeId: '1', agentRuntimeName: 'runtime-1-dup' }, // Duplicate { agentRuntimeId: '2', agentRuntimeName: 'runtime-2' }, ], }); @@ -564,7 +622,7 @@ describe('Agent Runtime Module', () => { mockControlApi.listAgentRuntimes.mockResolvedValue({ items: [ { agentRuntimeId: '1', agentRuntimeName: 'runtime-1' }, - { agentRuntimeName: 'runtime-no-id' }, // No ID + { agentRuntimeName: 'runtime-no-id' }, // No ID { agentRuntimeId: '2', agentRuntimeName: 'runtime-2' }, ], }); @@ -615,14 +673,16 @@ describe('Agent Runtime Module', () => { }); expect(result).toHaveLength(51); - expect(mockControlApi.listAgentRuntimeVersions).toHaveBeenCalledTimes(2); + expect(mockControlApi.listAgentRuntimeVersions).toHaveBeenCalledTimes( + 2 + ); }); it('should deduplicate versions by agentRuntimeVersion', async () => { mockControlApi.listAgentRuntimeVersions.mockResolvedValue({ items: [ { agentRuntimeVersion: 'v1' }, - { agentRuntimeVersion: 'v1' }, // Duplicate + { agentRuntimeVersion: 'v1' }, // Duplicate { agentRuntimeVersion: 'v2' }, ], }); @@ -638,7 +698,7 @@ describe('Agent Runtime Module', () => { mockControlApi.listAgentRuntimeVersions.mockResolvedValue({ items: [ { agentRuntimeVersion: 'v1' }, - { description: 'no-version' }, // No version + { description: 'no-version' }, // No version ], }); @@ -654,7 +714,9 @@ describe('Agent Runtime Module', () => { describe('instance methods', () => { describe('delete', () => { it('should delete this AgentRuntime', async () => { - mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [] }); + mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ + items: [], + }); mockControlApi.deleteAgentRuntime.mockResolvedValue({ agentRuntimeId: 'runtime-123', agentRuntimeName: 'test-runtime', @@ -707,7 +769,9 @@ describe('Agent Runtime Module', () => { await expect( runtime.update({ input: { description: 'Updated' } }) - ).rejects.toThrow('agentRuntimeId is required to update an Agent Runtime'); + ).rejects.toThrow( + 'agentRuntimeId is required to update an Agent Runtime' + ); }); }); @@ -764,7 +828,9 @@ describe('Agent Runtime Module', () => { const runtime = new AgentRuntime(); await expect( - runtime.createEndpoint({ input: { agentRuntimeEndpointName: 'test' } }) + runtime.createEndpoint({ + input: { agentRuntimeEndpointName: 'test' }, + }) ).rejects.toThrow('agentRuntimeId is required to create an endpoint'); }); }); @@ -792,7 +858,10 @@ describe('Agent Runtime Module', () => { const runtime = new AgentRuntime(); await expect( - runtime.updateEndpoint({ endpointId: 'ep-1', input: { description: 'test' } }) + runtime.updateEndpoint({ + endpointId: 'ep-1', + input: { description: 'test' }, + }) ).rejects.toThrow('agentRuntimeId is required to update an endpoint'); }); }); @@ -808,7 +877,9 @@ describe('Agent Runtime Module', () => { agentRuntimeId: 'runtime-123', }); - const result = await runtime.getEndpoint({ endpointId: 'endpoint-123' }); + const result = await runtime.getEndpoint({ + endpointId: 'endpoint-123', + }); expect(mockControlApi.getAgentRuntimeEndpoint).toHaveBeenCalled(); expect(result.agentRuntimeEndpointName).toBe('my-endpoint'); @@ -855,8 +926,14 @@ describe('Agent Runtime Module', () => { it('should list endpoints for this AgentRuntime', async () => { mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [ - { agentRuntimeEndpointId: '1', agentRuntimeEndpointName: 'endpoint-1' }, - { agentRuntimeEndpointId: '2', agentRuntimeEndpointName: 'endpoint-2' }, + { + agentRuntimeEndpointId: '1', + agentRuntimeEndpointName: 'endpoint-1', + }, + { + agentRuntimeEndpointId: '2', + agentRuntimeEndpointName: 'endpoint-2', + }, ], }); @@ -1061,15 +1138,15 @@ describe('Agent Runtime Module', () => { agentRuntimeName: 'test-runtime', }); - const beforeCheck = jest.fn(); + const callback = jest.fn(); await runtime.waitUntilReadyOrFailed({ intervalSeconds: 0.1, timeoutSeconds: 5, - beforeCheck, + callback, }); - expect(beforeCheck).toHaveBeenCalled(); + expect(callback).toHaveBeenCalled(); }); it('should throw timeout error', async () => { @@ -1090,7 +1167,9 @@ describe('Agent Runtime Module', () => { intervalSeconds: 0.05, timeoutSeconds: 0.1, // Very short timeout }) - ).rejects.toThrow('Timeout waiting for Agent Runtime to reach final state'); + ).rejects.toThrow( + /Timeout waiting/ + ); }); it('should use default timeout and interval when not provided', async () => { @@ -1154,11 +1233,13 @@ describe('Agent Runtime Module', () => { }); it('should reuse data API cache', async () => { - const { AgentRuntimeDataAPI } = require('../../../src/agent-runtime/api/data'); - + const { + AgentRuntimeDataAPI, + } = require('../../../src/agent-runtime/api/data'); + // Clear previous calls jest.clearAllMocks(); - + const runtime = new AgentRuntime({ agentRuntimeId: 'runtime-123', agentRuntimeName: 'my-runtime', @@ -1216,7 +1297,9 @@ describe('Agent Runtime Module', () => { input: { agentRuntimeEndpointName: 'test-endpoint' }, }); - expect(mockControlApi.createAgentRuntimeEndpoint).toHaveBeenCalledWith( + expect( + mockControlApi.createAgentRuntimeEndpoint + ).toHaveBeenCalledWith( expect.objectContaining({ input: expect.objectContaining({ targetVersion: 'LATEST', @@ -1227,7 +1310,9 @@ describe('Agent Runtime Module', () => { it('should handle HTTP error', async () => { const httpError = new HTTPError(409, 'Already exists'); - mockControlApi.createAgentRuntimeEndpoint.mockRejectedValue(httpError); + mockControlApi.createAgentRuntimeEndpoint.mockRejectedValue( + httpError + ); await expect( AgentRuntimeEndpoint.create({ @@ -1239,7 +1324,9 @@ describe('Agent Runtime Module', () => { it('should re-throw non-HTTP errors', async () => { const genericError = new Error('Network failure'); - mockControlApi.createAgentRuntimeEndpoint.mockRejectedValue(genericError); + mockControlApi.createAgentRuntimeEndpoint.mockRejectedValue( + genericError + ); await expect( AgentRuntimeEndpoint.create({ @@ -1267,7 +1354,9 @@ describe('Agent Runtime Module', () => { it('should handle HTTP error', async () => { const httpError = new HTTPError(404, 'Not found'); - mockControlApi.deleteAgentRuntimeEndpoint.mockRejectedValue(httpError); + mockControlApi.deleteAgentRuntimeEndpoint.mockRejectedValue( + httpError + ); await expect( AgentRuntimeEndpoint.delete({ @@ -1279,7 +1368,9 @@ describe('Agent Runtime Module', () => { it('should re-throw non-HTTP errors', async () => { const genericError = new Error('Network error'); - mockControlApi.deleteAgentRuntimeEndpoint.mockRejectedValue(genericError); + mockControlApi.deleteAgentRuntimeEndpoint.mockRejectedValue( + genericError + ); await expect( AgentRuntimeEndpoint.delete({ @@ -1309,7 +1400,9 @@ describe('Agent Runtime Module', () => { it('should handle HTTP error', async () => { const httpError = new HTTPError(400, 'Bad request'); - mockControlApi.updateAgentRuntimeEndpoint.mockRejectedValue(httpError); + mockControlApi.updateAgentRuntimeEndpoint.mockRejectedValue( + httpError + ); await expect( AgentRuntimeEndpoint.update({ @@ -1322,7 +1415,9 @@ describe('Agent Runtime Module', () => { it('should re-throw non-HTTP errors', async () => { const genericError = new Error('Update failed'); - mockControlApi.updateAgentRuntimeEndpoint.mockRejectedValue(genericError); + mockControlApi.updateAgentRuntimeEndpoint.mockRejectedValue( + genericError + ); await expect( AgentRuntimeEndpoint.update({ @@ -1364,7 +1459,9 @@ describe('Agent Runtime Module', () => { it('should re-throw non-HTTP errors', async () => { const genericError = new Error('Fetch failed'); - mockControlApi.getAgentRuntimeEndpoint.mockRejectedValue(genericError); + mockControlApi.getAgentRuntimeEndpoint.mockRejectedValue( + genericError + ); await expect( AgentRuntimeEndpoint.get({ @@ -1379,8 +1476,14 @@ describe('Agent Runtime Module', () => { it('should list endpoints by agent runtime id', async () => { mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [ - { agentRuntimeEndpointId: '1', agentRuntimeEndpointName: 'endpoint-1' }, - { agentRuntimeEndpointId: '2', agentRuntimeEndpointName: 'endpoint-2' }, + { + agentRuntimeEndpointId: '1', + agentRuntimeEndpointName: 'endpoint-1', + }, + { + agentRuntimeEndpointId: '2', + agentRuntimeEndpointName: 'endpoint-2', + }, ], }); @@ -1415,7 +1518,9 @@ describe('Agent Runtime Module', () => { it('should re-throw non-HTTP errors', async () => { const genericError = new Error('List failed'); - mockControlApi.listAgentRuntimeEndpoints.mockRejectedValue(genericError); + mockControlApi.listAgentRuntimeEndpoints.mockRejectedValue( + genericError + ); await expect( AgentRuntimeEndpoint.listById({ agentRuntimeId: 'runtime-123' }) @@ -1480,7 +1585,9 @@ describe('Agent Runtime Module', () => { await expect( endpoint.update({ input: { description: 'test' } }) - ).rejects.toThrow('agentRuntimeId and agentRuntimeEndpointId are required'); + ).rejects.toThrow( + 'agentRuntimeId and agentRuntimeEndpointId are required' + ); }); }); @@ -1515,15 +1622,17 @@ describe('Agent Runtime Module', () => { describe('waitUntilReady', () => { it('should wait until status is READY', async () => { let callCount = 0; - mockControlApi.getAgentRuntimeEndpoint.mockImplementation(async () => { - callCount++; - return { - agentRuntimeId: 'runtime-123', - agentRuntimeEndpointId: 'endpoint-123', - agentRuntimeEndpointName: 'test-endpoint', - status: callCount >= 2 ? Status.READY : Status.CREATING, - }; - }); + mockControlApi.getAgentRuntimeEndpoint.mockImplementation( + async () => { + callCount++; + return { + agentRuntimeId: 'runtime-123', + agentRuntimeEndpointId: 'endpoint-123', + agentRuntimeEndpointName: 'test-endpoint', + status: callCount >= 2 ? Status.READY : Status.CREATING, + }; + } + ); const endpoint = new AgentRuntimeEndpoint({ agentRuntimeId: 'runtime-123', @@ -1744,7 +1853,9 @@ describe('Agent Runtime Module', () => { describe('delete', () => { it('should delete AgentRuntime via client', async () => { - mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ items: [] }); + mockControlApi.listAgentRuntimeEndpoints.mockResolvedValue({ + items: [], + }); mockControlApi.deleteAgentRuntime.mockResolvedValue({ agentRuntimeId: 'runtime-123', agentRuntimeName: 'test-runtime', @@ -1801,35 +1912,6 @@ describe('Agent Runtime Module', () => { }); }); - describe('listAll', () => { - it('should list all AgentRuntimes via client', async () => { - mockControlApi.listAgentRuntimes.mockResolvedValue({ - items: [ - { agentRuntimeId: '1', agentRuntimeName: 'runtime-1' }, - ], - nextToken: undefined, - }); - - const result = await client.listAll(); - - expect(result).toHaveLength(1); - }); - - it('should list all with options', async () => { - mockControlApi.listAgentRuntimes.mockResolvedValue({ - items: [ - { agentRuntimeId: '1', agentRuntimeName: 'filtered-runtime' }, - ], - }); - - const result = await client.listAll({ - options: { agentRuntimeName: 'filtered-runtime' }, - }); - - expect(result).toHaveLength(1); - }); - }); - describe('createEndpoint', () => { it('should create endpoint via client', async () => { mockControlApi.createAgentRuntimeEndpoint.mockResolvedValue({ @@ -1919,10 +2001,7 @@ describe('Agent Runtime Module', () => { describe('listVersions', () => { it('should list versions via client', async () => { mockControlApi.listAgentRuntimeVersions.mockResolvedValue({ - items: [ - { agentRuntimeVersion: '1' }, - { agentRuntimeVersion: '2' }, - ], + items: [{ agentRuntimeVersion: '1' }, { agentRuntimeVersion: '2' }], }); const result = await client.listVersions({ diff --git a/tests/unittests/credential/credential.test.ts b/tests/unittests/credential/credential.test.ts index 6fcf8cd..6713b0f 100644 --- a/tests/unittests/credential/credential.test.ts +++ b/tests/unittests/credential/credential.test.ts @@ -565,8 +565,8 @@ describe('Credential Module', () => { // listAll stops when returned items < pageSize (50) // So a single call with less than 50 items will stop pagination mockClientInstance.list.mockResolvedValueOnce([ - new CredentialListOutput({ credentialName: 'cred1' }), - new CredentialListOutput({ credentialName: 'cred2' }), + new CredentialListOutput({ credentialId: 'cred1' }), + new CredentialListOutput({ credentialId: 'cred2' }), ]); const result = await Credential.listAll(); @@ -575,18 +575,18 @@ describe('Credential Module', () => { expect(result).toHaveLength(2); }); - it('should deduplicate results by credentialName', async () => { + it('should deduplicate results by credentialId', async () => { // Single page with duplicate names mockClientInstance.list.mockResolvedValueOnce([ - new CredentialListOutput({ credentialName: 'cred1' }), - new CredentialListOutput({ credentialName: 'cred1' }), // Duplicate - new CredentialListOutput({ credentialName: 'cred2' }), + new CredentialListOutput({ credentialId: 'cred1' }), + new CredentialListOutput({ credentialId: 'cred1' }), // Duplicate + new CredentialListOutput({ credentialId: 'cred2' }), ]); const result = await Credential.listAll(); expect(result).toHaveLength(2); - expect(result.map((c) => c.credentialName)).toEqual(['cred1', 'cred2']); + expect(result.map((c) => c.credentialId)).toEqual(['cred1', 'cred2']); }); it('should support input and config options', async () => { @@ -600,18 +600,18 @@ describe('Credential Module', () => { expect(mockClientInstance.list).toHaveBeenCalled(); }); - it('should handle undefined credentialName in deduplication', async () => { - // Items with undefined credentialName + it('should handle undefined credentialId in deduplication', async () => { + // Items with undefined credentialId mockClientInstance.list.mockResolvedValueOnce([ - new CredentialListOutput({ credentialName: undefined as any }), - new CredentialListOutput({ credentialName: '' }), - new CredentialListOutput({ credentialName: 'cred1' }), + new CredentialListOutput({ credentialId: undefined as any }), + new CredentialListOutput({ credentialId: '' }), + new CredentialListOutput({ credentialId: 'cred1' }), ]); const result = await Credential.listAll(); // undefined and '' both map to '' for deduplication, so they should be deduplicated - expect(result).toHaveLength(2); // '' (from undefined) deduplicated with '', plus 'cred1' + expect(result).toHaveLength(1); // '' (from undefined) deduplicated with '', plus 'cred1' }); }); diff --git a/tests/unittests/model/model-api.test.ts b/tests/unittests/model/model-api.test.ts new file mode 100644 index 0000000..e849326 --- /dev/null +++ b/tests/unittests/model/model-api.test.ts @@ -0,0 +1,113 @@ +import { ModelAPI } from '../../../src/model/api/model-api'; +import { createOpenAICompatible } from '@ai-sdk/openai-compatible'; + +jest.mock('@ai-sdk/openai-compatible', () => ({ + createOpenAICompatible: jest.fn(), +})); + +jest.mock('ai', () => ({ + generateText: jest.fn(), + streamText: jest.fn(), + embedMany: jest.fn(), +})); + +describe('ModelAPI', () => { + const getModelInfo = jest.fn().mockResolvedValue({ + model: 'default-model', + apiKey: 'test-key', + headers: { 'X-Test': '1' }, + }); + + beforeEach(() => { + jest.clearAllMocks(); + }); + + test('completion (non-stream) uses generateText with provided model', async () => { + const providerFn = jest.fn().mockReturnValue('model-client'); + const provider = Object.assign(providerFn, { + embeddingModel: jest.fn().mockReturnValue('embedding-client'), + }); + (createOpenAICompatible as jest.Mock).mockReturnValue(provider); + + // Lazy import because ModelAPI dynamic-imports from 'ai' + const { generateText } = await import('ai'); + (generateText as jest.Mock).mockResolvedValue('gen-result'); + + const api = new ModelAPI(getModelInfo); + const result = await api.completion({ + messages: [{ content: 'hi' }], + model: 'custom-model', + extra: 'value', + }); + + expect(createOpenAICompatible).toHaveBeenCalledWith( + expect.objectContaining({ name: 'custom-model', apiKey: 'test-key' }) + ); + expect(providerFn).toHaveBeenCalledWith('custom-model'); + expect(generateText).toHaveBeenCalledWith( + expect.objectContaining({ + model: 'model-client', + messages: [{ content: 'hi' }], + extra: 'value', + }) + ); + expect(result).toBe('gen-result'); + }); + + test('completion (stream) falls back to default model and uses streamText', async () => { + const providerFn = jest.fn().mockReturnValue('stream-model-client'); + const provider = Object.assign(providerFn, { + embeddingModel: jest.fn().mockReturnValue('embedding-client'), + }); + (createOpenAICompatible as jest.Mock).mockReturnValue(provider); + + const { streamText } = await import('ai'); + (streamText as jest.Mock).mockResolvedValue('stream-result'); + + const api = new ModelAPI(getModelInfo); + const result = await api.completion({ + messages: [{ content: 'hello' }], + stream: true, + }); + + expect(createOpenAICompatible).toHaveBeenCalledWith( + expect.objectContaining({ name: 'default-model' }) + ); + expect(providerFn).toHaveBeenCalledWith('default-model'); + expect(streamText).toHaveBeenCalledWith( + expect.objectContaining({ + model: 'stream-model-client', + messages: [{ content: 'hello' }], + }) + ); + expect(result).toBe('stream-result'); + }); + + test('embedding delegates to embeddingModel and embedMany', async () => { + const providerFn = jest.fn(); + const provider = Object.assign(providerFn, { + embeddingModel: jest.fn().mockReturnValue('embedding-client'), + }); + (createOpenAICompatible as jest.Mock).mockReturnValue(provider); + + const { embedMany } = await import('ai'); + (embedMany as jest.Mock).mockResolvedValue('embed-result'); + + const api = new ModelAPI(getModelInfo); + const result = await api.embedding({ + values: ['a', 'b'], + model: 'embed-model', + extra: 'v', + }); + + expect(provider.embeddingModel).toHaveBeenCalledWith('embed-model'); + expect(embedMany).toHaveBeenCalledWith( + expect.objectContaining({ + model: 'embedding-client', + values: ['a', 'b'], + extra: 'v', + }) + ); + expect(result).toBe('embed-result'); + }); +}); \ No newline at end of file diff --git a/tests/unittests/model/model-service-wait.test.ts b/tests/unittests/model/model-service-wait.test.ts new file mode 100644 index 0000000..5c00401 --- /dev/null +++ b/tests/unittests/model/model-service-wait.test.ts @@ -0,0 +1,49 @@ +import { ModelService } from '../../../src/model/model-service'; +import { Status } from '../../../src/utils/model'; + +describe('ModelService.waitUntilReady', () => { + test('throws on failed status', async () => { + const service = new ModelService(); + service.status = Status.CREATING; + service.refresh = jest.fn().mockImplementation(async () => { + service.status = Status.CREATE_FAILED; + }); + + await expect( + service.waitUntilReady({ timeoutSeconds: 0.05, intervalSeconds: 0 }) + ).rejects.toThrow('Model service failed with status: CREATE_FAILED'); + }); + + test('times out when never ready', async () => { + const service = new ModelService(); + service.status = Status.CREATING; + service.refresh = jest.fn().mockResolvedValue(undefined); + + await expect( + service.waitUntilReady({ timeoutSeconds: 0, intervalSeconds: 0 }) + ).rejects.toThrow('Timeout waiting for model service to be ready'); + }); + + test('resolves when status becomes READY and calls beforeCheck', async () => { + const service = new ModelService(); + const beforeCheck = jest.fn(); + service.status = Status.CREATING; + service.refresh = jest + .fn() + .mockImplementationOnce(async () => { + service.status = Status.CREATING; + }) + .mockImplementationOnce(async () => { + service.status = Status.READY; + }); + + const result = await service.waitUntilReady({ + timeoutSeconds: 0.1, + intervalSeconds: 0, + beforeCheck, + }); + + expect(beforeCheck).toHaveBeenCalledTimes(2); + expect(result).toBe(service); + }); +}); \ No newline at end of file diff --git a/tests/unittests/model/model.test.ts b/tests/unittests/model/model.test.ts index c221236..818ab1b 100644 --- a/tests/unittests/model/model.test.ts +++ b/tests/unittests/model/model.test.ts @@ -10,7 +10,12 @@ import { ModelClient } from '../../../src/model/client'; import { Config } from '../../../src/utils/config'; import { HTTPError, ResourceNotExistError } from '../../../src/utils/exception'; import { Status } from '../../../src/utils/model'; -import { BackendType, ModelType, Provider, ProxyMode } from '../../../src/model/model'; +import { + BackendType, + ModelType, + Provider, + ProxyMode, +} from '../../../src/model/model'; // Mock the ModelControlAPI jest.mock('../../../src/model/api/control', () => { @@ -51,7 +56,9 @@ jest.mock('@ai-sdk/openai', () => ({ import { ModelControlAPI } from '../../../src/model/api/control'; -const MockModelControlAPI = ModelControlAPI as jest.MockedClass; +const MockModelControlAPI = ModelControlAPI as jest.MockedClass< + typeof ModelControlAPI +>; describe('Model Module', () => { let mockControlApi: any; @@ -142,7 +149,7 @@ describe('Model Module', () => { mockControlApi.createModelProxy.mockResolvedValue(mockResult); const client = new ModelClient(); - + // Single endpoint - should set proxyModel to 'single' await client.create({ input: { @@ -168,7 +175,10 @@ describe('Model Module', () => { input: { modelProxyName: 'test-proxy', proxyConfig: { - endpoints: [{ baseUrl: 'http://test1.com' }, { baseUrl: 'http://test2.com' }], + endpoints: [ + { baseUrl: 'http://test1.com' }, + { baseUrl: 'http://test2.com' }, + ], }, }, }); @@ -187,7 +197,7 @@ describe('Model Module', () => { mockControlApi.createModelService.mockRejectedValue(httpError); const client = new ModelClient(); - + await expect( client.create({ input: { @@ -204,7 +214,7 @@ describe('Model Module', () => { mockControlApi.createModelProxy.mockRejectedValue(httpError); const client = new ModelClient(); - + await expect( client.create({ input: { @@ -220,7 +230,7 @@ describe('Model Module', () => { mockControlApi.createModelService.mockRejectedValue(genericError); const client = new ModelClient(); - + await expect( client.create({ input: { @@ -237,7 +247,7 @@ describe('Model Module', () => { mockControlApi.createModelProxy.mockRejectedValue(genericError); const client = new ModelClient(); - + await expect( client.create({ input: { @@ -265,7 +275,9 @@ describe('Model Module', () => { }); it('should delete ModelService if ModelProxy not found', async () => { - mockControlApi.deleteModelProxy.mockRejectedValue(new HTTPError(404, 'Not found')); + mockControlApi.deleteModelProxy.mockRejectedValue( + new HTTPError(404, 'Not found') + ); mockControlApi.deleteModelService.mockResolvedValue({ modelServiceId: 'service-123', modelServiceName: 'test-service', @@ -286,9 +298,9 @@ describe('Model Module', () => { }); const client = new ModelClient(); - const result = await client.delete({ - name: 'test-service', - backendType: BackendType.SERVICE + const result = await client.delete({ + name: 'test-service', + backendType: BackendType.SERVICE, }); expect(mockControlApi.deleteModelProxy).not.toHaveBeenCalled(); @@ -301,7 +313,7 @@ describe('Model Module', () => { mockControlApi.deleteModelProxy.mockRejectedValue(httpError); const client = new ModelClient(); - + await expect( client.delete({ name: 'test-proxy', backendType: BackendType.PROXY }) ).rejects.toThrow(); @@ -312,10 +324,10 @@ describe('Model Module', () => { mockControlApi.deleteModelProxy.mockRejectedValue(genericError); const client = new ModelClient(); - - await expect( - client.delete({ name: 'test-proxy' }) - ).rejects.toThrow('Network error'); + + await expect(client.delete({ name: 'test-proxy' })).rejects.toThrow( + 'Network error' + ); }); it('should rethrow non-HTTP error during service delete', async () => { @@ -325,10 +337,10 @@ describe('Model Module', () => { mockControlApi.deleteModelService.mockRejectedValue(genericError); const client = new ModelClient(); - - await expect( - client.delete({ name: 'test-service' }) - ).rejects.toThrow('Network error'); + + await expect(client.delete({ name: 'test-service' })).rejects.toThrow( + 'Network error' + ); }); it('should handle HTTP error during service delete', async () => { @@ -337,10 +349,8 @@ describe('Model Module', () => { mockControlApi.deleteModelService.mockRejectedValue(httpError); const client = new ModelClient(); - - await expect( - client.delete({ name: 'test-service' }) - ).rejects.toThrow(); + + await expect(client.delete({ name: 'test-service' })).rejects.toThrow(); }); }); @@ -372,9 +382,9 @@ describe('Model Module', () => { const client = new ModelClient(); const result = await client.update({ name: 'test-proxy', - input: { + input: { proxyModel: ProxyMode.SINGLE, - description: 'Updated' + description: 'Updated', }, }); @@ -403,7 +413,7 @@ describe('Model Module', () => { mockControlApi.updateModelService.mockRejectedValue(httpError); const client = new ModelClient(); - + await expect( client.update({ name: 'test-service', @@ -417,7 +427,7 @@ describe('Model Module', () => { mockControlApi.updateModelProxy.mockRejectedValue(httpError); const client = new ModelClient(); - + await expect( client.update({ name: 'test-proxy', @@ -435,7 +445,7 @@ describe('Model Module', () => { const client = new ModelClient(); await client.update({ name: 'test-proxy', - input: { + input: { proxyModel: '', // Empty string (falsy but not undefined) proxyConfig: { endpoints: [{ baseUrl: 'http://test.com' }], @@ -455,10 +465,13 @@ describe('Model Module', () => { const client = new ModelClient(); await client.update({ name: 'test-proxy', - input: { + input: { proxyModel: '', // Empty string (falsy but not undefined) proxyConfig: { - endpoints: [{ baseUrl: 'http://test1.com' }, { baseUrl: 'http://test2.com' }], + endpoints: [ + { baseUrl: 'http://test1.com' }, + { baseUrl: 'http://test2.com' }, + ], }, } as any, // Use any to bypass type check for proxyConfig }); @@ -471,7 +484,7 @@ describe('Model Module', () => { mockControlApi.updateModelService.mockRejectedValue(genericError); const client = new ModelClient(); - + await expect( client.update({ name: 'test-service', @@ -485,7 +498,7 @@ describe('Model Module', () => { mockControlApi.updateModelProxy.mockRejectedValue(genericError); const client = new ModelClient(); - + await expect( client.update({ name: 'test-proxy', @@ -510,7 +523,9 @@ describe('Model Module', () => { }); it('should get ModelService if ModelProxy not found', async () => { - mockControlApi.getModelProxy.mockRejectedValue(new HTTPError(404, 'Not found')); + mockControlApi.getModelProxy.mockRejectedValue( + new HTTPError(404, 'Not found') + ); mockControlApi.getModelService.mockResolvedValue({ modelServiceId: 'service-123', modelServiceName: 'test-service', @@ -531,9 +546,9 @@ describe('Model Module', () => { }); const client = new ModelClient(); - const result = await client.get({ - name: 'test-service', - backendType: BackendType.SERVICE + const result = await client.get({ + name: 'test-service', + backendType: BackendType.SERVICE, }); expect(mockControlApi.getModelProxy).not.toHaveBeenCalled(); @@ -546,7 +561,7 @@ describe('Model Module', () => { mockControlApi.getModelProxy.mockRejectedValue(httpError); const client = new ModelClient(); - + await expect( client.get({ name: 'test-proxy', backendType: BackendType.PROXY }) ).rejects.toThrow(); @@ -557,10 +572,10 @@ describe('Model Module', () => { mockControlApi.getModelProxy.mockRejectedValue(genericError); const client = new ModelClient(); - - await expect( - client.get({ name: 'test-proxy' }) - ).rejects.toThrow('Network error'); + + await expect(client.get({ name: 'test-proxy' })).rejects.toThrow( + 'Network error' + ); }); it('should rethrow non-HTTP error during service get', async () => { @@ -570,10 +585,10 @@ describe('Model Module', () => { mockControlApi.getModelService.mockRejectedValue(genericError); const client = new ModelClient(); - - await expect( - client.get({ name: 'test-service' }) - ).rejects.toThrow('Network error'); + + await expect(client.get({ name: 'test-service' })).rejects.toThrow( + 'Network error' + ); }); it('should handle HTTP error during service get', async () => { @@ -582,10 +597,8 @@ describe('Model Module', () => { mockControlApi.getModelService.mockRejectedValue(httpError); const client = new ModelClient(); - - await expect( - client.get({ name: 'test-service' }) - ).rejects.toThrow(); + + await expect(client.get({ name: 'test-service' })).rejects.toThrow(); }); }); @@ -610,9 +623,7 @@ describe('Model Module', () => { it('should list ModelProxies when input contains modelProxyName', async () => { mockControlApi.listModelProxies.mockResolvedValue({ - items: [ - { modelProxyId: '1', modelProxyName: 'proxy-1' }, - ], + items: [{ modelProxyId: '1', modelProxyName: 'proxy-1' }], }); const client = new ModelClient(); @@ -637,7 +648,9 @@ describe('Model Module', () => { }); it('should handle undefined items in ModelServices list response', async () => { - mockControlApi.listModelServices.mockResolvedValue({ items: undefined }); + mockControlApi.listModelServices.mockResolvedValue({ + items: undefined, + }); const client = new ModelClient(); const result = await client.list({ @@ -776,21 +789,6 @@ describe('Model Module', () => { expect(result).toHaveLength(2); }); - - it('should deduplicate results with empty modelServiceId', async () => { - mockControlApi.listModelServices.mockResolvedValue({ - items: [ - { modelServiceName: 'service-no-id-1' }, // No modelServiceId - { modelServiceName: 'service-no-id-2' }, // Another with no modelServiceId - { modelServiceId: '3', modelServiceName: 'service-3' }, - ], - }); - - const result = await ModelService.listAll(); - - // Empty modelServiceIds are treated as same key '', so only first is kept - expect(result).toHaveLength(2); - }); }); }); @@ -820,7 +818,9 @@ describe('Model Module', () => { await expect( service.update({ input: { description: 'Updated' } }) - ).rejects.toThrow('modelServiceName is required to update a ModelService'); + ).rejects.toThrow( + 'modelServiceName is required to update a ModelService' + ); }); }); @@ -995,15 +995,15 @@ describe('Model Module', () => { const result = await service.modelInfo(); // modelInfo returns undefined when modelNames is empty - // The fallback to modelServiceName happens in completions/responses + // The fallback to modelServiceName happens in completion/responses expect(result.model).toBeUndefined(); }); }); - describe('completions', () => { + describe('completion', () => { it('should call generateText for non-streaming request', async () => { const { generateText } = require('ai'); - + const service = new ModelService(); service.modelServiceName = 'test-service'; service.providerSettings = { @@ -1011,7 +1011,7 @@ describe('Model Module', () => { apiKey: 'test-key', }; - await service.completions({ + await service.completion({ messages: [{ role: 'user', content: 'Hello' }], }); @@ -1020,7 +1020,7 @@ describe('Model Module', () => { it('should call streamText for streaming request', async () => { const { streamText } = require('ai'); - + const service = new ModelService(); service.modelServiceName = 'test-service'; service.providerSettings = { @@ -1028,7 +1028,7 @@ describe('Model Module', () => { apiKey: 'test-key', }; - await service.completions({ + await service.completion({ messages: [{ role: 'user', content: 'Hello' }], stream: true, }); @@ -1038,7 +1038,7 @@ describe('Model Module', () => { it('should use provided model over info.model', async () => { const { generateText } = require('ai'); - + const service = new ModelService(); service.modelServiceName = 'test-service'; service.providerSettings = { @@ -1047,7 +1047,7 @@ describe('Model Module', () => { modelNames: ['default-model'], }; - await service.completions({ + await service.completion({ messages: [{ role: 'user', content: 'Hello' }], model: 'custom-model', }); @@ -1057,7 +1057,7 @@ describe('Model Module', () => { it('should fallback to modelServiceName when no model is available', async () => { const { generateText } = require('ai'); - + const service = new ModelService(); service.modelServiceName = 'fallback-service'; service.providerSettings = { @@ -1066,7 +1066,7 @@ describe('Model Module', () => { // No modelNames }; - await service.completions({ + await service.completion({ messages: [{ role: 'user', content: 'Hello' }], }); @@ -1076,7 +1076,7 @@ describe('Model Module', () => { it('should fallback to empty string when model and info.model are undefined and modelServiceName is empty string', async () => { const { generateText } = require('ai'); jest.clearAllMocks(); - + const service = new ModelService(); service.modelServiceName = 'test-service'; service.providerSettings = { @@ -1084,7 +1084,7 @@ describe('Model Module', () => { apiKey: 'test-key', // No modelNames }; - + // Mock modelInfo to return info without model const originalModelInfo = service.modelInfo; service.modelInfo = jest.fn().mockResolvedValue({ @@ -1093,7 +1093,7 @@ describe('Model Module', () => { model: undefined, // No model in info headers: {}, }); - + // Temporarily set modelServiceName to empty string const originalName = service.modelServiceName; Object.defineProperty(service, 'modelServiceName', { @@ -1101,118 +1101,12 @@ describe('Model Module', () => { configurable: true, }); - await service.completions({ + await service.completion({ messages: [{ role: 'user', content: 'Hello' }], }); expect(generateText).toHaveBeenCalled(); - - // Restore - Object.defineProperty(service, 'modelServiceName', { - value: originalName, - writable: true, - configurable: true, - }); - service.modelInfo = originalModelInfo; - }); - }); - - describe('responses', () => { - it('should convert string input to messages', async () => { - const { generateText } = require('ai'); - - const service = new ModelService(); - service.modelServiceName = 'test-service'; - service.providerSettings = { - baseUrl: 'https://api.example.com', - apiKey: 'test-key', - }; - - await service.responses({ - input: 'Hello', - }); - - expect(generateText).toHaveBeenCalledWith( - expect.objectContaining({ - messages: [{ role: 'user', content: 'Hello' }], - }) - ); - }); - - it('should pass array input as messages directly', async () => { - const { generateText } = require('ai'); - - const service = new ModelService(); - service.modelServiceName = 'test-service'; - service.providerSettings = { - baseUrl: 'https://api.example.com', - apiKey: 'test-key', - }; - - const inputMessages = [{ role: 'user', content: 'Hello' }]; - await service.responses({ - input: inputMessages, - }); - - expect(generateText).toHaveBeenCalledWith( - expect.objectContaining({ - messages: inputMessages, - }) - ); - }); - - it('should call streamText for streaming request', async () => { - const { streamText } = require('ai'); - - const service = new ModelService(); - service.modelServiceName = 'test-service'; - service.providerSettings = { - baseUrl: 'https://api.example.com', - apiKey: 'test-key', - }; - await service.responses({ - input: 'Hello', - stream: true, - }); - - expect(streamText).toHaveBeenCalled(); - }); - - it('should fallback to empty string when model and info.model are undefined and modelServiceName is empty string', async () => { - const { generateText } = require('ai'); - jest.clearAllMocks(); - - const service = new ModelService(); - service.modelServiceName = 'test-service'; - service.providerSettings = { - baseUrl: 'https://api.example.com', - apiKey: 'test-key', - // No modelNames - }; - - // Mock modelInfo to return info without model - const originalModelInfo = service.modelInfo; - service.modelInfo = jest.fn().mockResolvedValue({ - apiKey: 'test-key', - baseUrl: 'https://api.example.com', - model: undefined, // No model in info - headers: {}, - }); - - // Temporarily set modelServiceName to empty string - const originalName = service.modelServiceName; - Object.defineProperty(service, 'modelServiceName', { - get: () => '', // Empty string - configurable: true, - }); - - await service.responses({ - input: 'Hello', - }); - - expect(generateText).toHaveBeenCalled(); - // Restore Object.defineProperty(service, 'modelServiceName', { value: originalName, @@ -1223,7 +1117,7 @@ describe('Model Module', () => { }); }); - describe('waitUntilReady', () => { + describe('waitUntilReadyOrFailed', () => { it('should wait until status is READY', async () => { let callCount = 0; mockControlApi.getModelService.mockImplementation(async () => { @@ -1239,7 +1133,7 @@ describe('Model Module', () => { service.modelServiceName = 'test-service'; service.status = Status.CREATING; - const result = await service.waitUntilReady({ + const result = await service.waitUntilReadyOrFailed({ intervalSeconds: 0.1, timeoutSeconds: 5, }); @@ -1248,7 +1142,7 @@ describe('Model Module', () => { expect(callCount).toBeGreaterThanOrEqual(2); }); - it('should call beforeCheck callback', async () => { + it('should call callback callback', async () => { mockControlApi.getModelService.mockResolvedValue({ modelServiceId: 'service-123', modelServiceName: 'test-service', @@ -1259,15 +1153,15 @@ describe('Model Module', () => { service.modelServiceName = 'test-service'; service.status = Status.CREATING; - const beforeCheck = jest.fn(); + const callback = jest.fn(); - await service.waitUntilReady({ + await service.waitUntilReadyOrFailed({ intervalSeconds: 0.1, timeoutSeconds: 5, - beforeCheck, + callback, }); - expect(beforeCheck).toHaveBeenCalled(); + expect(callback).toHaveBeenCalled(); }); it('should throw error if status becomes CREATE_FAILED', async () => { @@ -1281,12 +1175,11 @@ describe('Model Module', () => { service.modelServiceName = 'test-service'; service.status = Status.CREATING; - await expect( - service.waitUntilReady({ - intervalSeconds: 0.1, - timeoutSeconds: 5, - }) - ).rejects.toThrow('Model service failed with status'); + const result = await service.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, + }); + expect(result.status).toBe('CREATE_FAILED'); }); it('should throw error if status becomes UPDATE_FAILED', async () => { @@ -1301,12 +1194,11 @@ describe('Model Module', () => { service.modelServiceName = 'test-service'; service.status = Status.UPDATING; - await expect( - service.waitUntilReady({ - intervalSeconds: 0.1, - timeoutSeconds: 5, - }) - ).rejects.toThrow('Model service failed with status'); + const result = await service.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, + }); + expect(result.status).toBe('UPDATE_FAILED'); }); it('should throw error if status becomes DELETE_FAILED', async () => { @@ -1320,12 +1212,11 @@ describe('Model Module', () => { const service = new ModelService(); service.modelServiceName = 'test-service'; - await expect( - service.waitUntilReady({ - intervalSeconds: 0.1, - timeoutSeconds: 5, - }) - ).rejects.toThrow('Model service failed with status'); + const result = await service.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, + }); + expect(result.status).toBe('DELETE_FAILED'); }); it('should throw timeout error if status does not become READY', async () => { @@ -1340,11 +1231,11 @@ describe('Model Module', () => { service.status = Status.CREATING; await expect( - service.waitUntilReady({ + service.waitUntilReadyOrFailed({ intervalSeconds: 0.1, timeoutSeconds: 0.2, }) - ).rejects.toThrow('Timeout waiting for model service to be ready'); + ).rejects.toThrow(/Timeout waiting/); }); it('should use default timeout and interval when not provided', async () => { @@ -1358,7 +1249,7 @@ describe('Model Module', () => { service.modelServiceName = 'test-service'; // Call without options to test default values - const result = await service.waitUntilReady(); + const result = await service.waitUntilReadyOrFailed(); expect(result.status).toBe(Status.READY); }); @@ -1451,7 +1342,7 @@ describe('Model Module', () => { mockControlApi.listModelProxies.mockResolvedValue({ items: [ { modelProxyId: 'proxy-1', modelProxyName: 'proxy-1' }, - { modelProxyId: 'proxy-1', modelProxyName: 'proxy-1-dup' }, // Duplicate + { modelProxyId: 'proxy-1', modelProxyName: 'proxy-1-dup' }, // Duplicate { modelProxyId: 'proxy-2', modelProxyName: 'proxy-2' }, ], }); @@ -1459,28 +1350,19 @@ describe('Model Module', () => { const result = await ModelProxy.listAll(); expect(result).toHaveLength(2); - expect(result.map((p) => p.modelProxyId)).toEqual(['proxy-1', 'proxy-2']); - }); - - it('should deduplicate results with empty modelProxyId', async () => { - mockControlApi.listModelProxies.mockResolvedValue({ - items: [ - { modelProxyName: 'proxy-no-id-1' }, // No modelProxyId - { modelProxyName: 'proxy-no-id-2' }, // Another with no modelProxyId (will be deduplicated as empty string) - { modelProxyId: 'proxy-3', modelProxyName: 'proxy-3' }, - ], - }); - - const result = await ModelProxy.listAll(); - - // Empty modelProxyIds are treated as same key '', so only first is kept - expect(result).toHaveLength(2); + expect(result.map((p) => p.modelProxyId)).toEqual([ + 'proxy-1', + 'proxy-2', + ]); }); it('should pass filter options', async () => { mockControlApi.listModelProxies.mockResolvedValue({ items: [] }); - await ModelProxy.listAll({ proxyMode: ProxyMode.SINGLE, status: Status.READY }); + await ModelProxy.listAll({ + proxyMode: ProxyMode.SINGLE, + status: Status.READY, + }); expect(mockControlApi.listModelProxies).toHaveBeenCalled(); }); @@ -1512,8 +1394,12 @@ describe('Model Module', () => { const proxy = new ModelProxy(); await expect( - proxy.update({ input: { description: 'Updated', executionRoleArn: 'arn:test' } }) - ).rejects.toThrow('modelProxyName is required to update a ModelProxy'); + proxy.update({ + input: { description: 'Updated', executionRoleArn: 'arn:test' }, + }) + ).rejects.toThrow( + 'modelProxyName is required to update a ModelProxy' + ); }); }); @@ -1648,15 +1534,15 @@ describe('Model Module', () => { }); }); - describe('completions', () => { + describe('completion', () => { it('should call generateText for non-streaming request', async () => { const { generateText } = require('ai'); - + const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; proxy.endpoint = 'https://api.example.com'; - await proxy.completions({ + await proxy.completion({ messages: [{ role: 'user', content: 'Hello' }], }); @@ -1665,12 +1551,12 @@ describe('Model Module', () => { it('should call streamText for streaming request', async () => { const { streamText } = require('ai'); - + const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; proxy.endpoint = 'https://api.example.com'; - await proxy.completions({ + await proxy.completion({ messages: [{ role: 'user', content: 'Hello' }], stream: true, }); @@ -1680,12 +1566,12 @@ describe('Model Module', () => { it('should use provided model over info.model', async () => { const { generateText } = require('ai'); - + const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; proxy.endpoint = 'https://api.example.com'; - await proxy.completions({ + await proxy.completion({ messages: [{ role: 'user', content: 'Hello' }], model: 'custom-model', }); @@ -1695,131 +1581,23 @@ describe('Model Module', () => { it('should fallback to modelProxyName when no model is available', async () => { const { generateText } = require('ai'); - + const proxy = new ModelProxy(); proxy.modelProxyName = 'fallback-proxy'; proxy.endpoint = 'https://api.example.com'; // No model in modelInfo, no model param - await proxy.completions({ + await proxy.completion({ messages: [{ role: 'user', content: 'Hello' }], }); expect(generateText).toHaveBeenCalled(); }); - it('should fallback to empty string when model and info.model are undefined and modelProxyName is empty string', async () => { - const { generateText, streamText } = require('ai'); - jest.clearAllMocks(); - - const proxy = new ModelProxy(); - proxy.modelProxyName = 'test-proxy'; - proxy.endpoint = 'https://api.example.com'; - - // Mock modelInfo to return info without model - const originalModelInfo = proxy.modelInfo; - proxy.modelInfo = jest.fn().mockResolvedValue({ - apiKey: 'test-key', - baseUrl: 'https://api.example.com', - model: undefined, // No model in info - headers: {}, - }); - - // Temporarily set modelProxyName to empty string after modelInfo is mocked - // This tests the fallback to empty string in selectedModel calculation - const originalName = proxy.modelProxyName; - Object.defineProperty(proxy, 'modelProxyName', { - get: () => '', // Empty string - configurable: true, - }); - - await proxy.completions({ - messages: [{ role: 'user', content: 'Hello' }], - }); - - expect(generateText).toHaveBeenCalled(); - - // Restore - Object.defineProperty(proxy, 'modelProxyName', { - value: originalName, - writable: true, - configurable: true, - }); - proxy.modelInfo = originalModelInfo; - }); - }); - - describe('responses', () => { - it('should call generateText for non-streaming request', async () => { - const { generateText } = require('ai'); - - const proxy = new ModelProxy(); - proxy.modelProxyName = 'test-proxy'; - proxy.endpoint = 'https://api.example.com'; - - await proxy.responses({ - messages: [{ role: 'user', content: 'Hello' }], - }); - - expect(generateText).toHaveBeenCalled(); - }); - - it('should call streamText for streaming request', async () => { - const { streamText } = require('ai'); - - const proxy = new ModelProxy(); - proxy.modelProxyName = 'test-proxy'; - proxy.endpoint = 'https://api.example.com'; - - await proxy.responses({ - messages: [{ role: 'user', content: 'Hello' }], - stream: true, - }); - - expect(streamText).toHaveBeenCalled(); - }); - - it('should fallback to empty string when model and info.model are undefined and modelProxyName is empty string', async () => { - const { generateText } = require('ai'); - jest.clearAllMocks(); - - const proxy = new ModelProxy(); - proxy.modelProxyName = 'test-proxy'; - proxy.endpoint = 'https://api.example.com'; - - // Mock modelInfo to return info without model - const originalModelInfo = proxy.modelInfo; - proxy.modelInfo = jest.fn().mockResolvedValue({ - apiKey: 'test-key', - baseUrl: 'https://api.example.com', - model: undefined, // No model in info - headers: {}, - }); - - // Temporarily set modelProxyName to empty string after modelInfo is mocked - const originalName = proxy.modelProxyName; - Object.defineProperty(proxy, 'modelProxyName', { - get: () => '', // Empty string - configurable: true, - }); - - await proxy.responses({ - messages: [{ role: 'user', content: 'Hello' }], - }); - - expect(generateText).toHaveBeenCalled(); - - // Restore - Object.defineProperty(proxy, 'modelProxyName', { - value: originalName, - writable: true, - configurable: true, - }); - proxy.modelInfo = originalModelInfo; - }); + }); - describe('waitUntilReady', () => { + describe('waitUntilReadyOrFailed', () => { it('should wait until status is READY', async () => { let callCount = 0; mockControlApi.getModelProxy.mockImplementation(async () => { @@ -1834,7 +1612,7 @@ describe('Model Module', () => { const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; - await proxy.waitUntilReady({ + await proxy.waitUntilReadyOrFailed({ intervalSeconds: 0.01, timeoutSeconds: 5, }); @@ -1855,7 +1633,10 @@ describe('Model Module', () => { proxy.modelProxyName = 'test-proxy'; await expect( - proxy.waitUntilReady({ intervalSeconds: 0.01, timeoutSeconds: 1 }) + proxy.waitUntilReadyOrFailed({ + intervalSeconds: 0.01, + timeoutSeconds: 1, + }) ).rejects.toThrow(); }); @@ -1870,9 +1651,11 @@ describe('Model Module', () => { const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; - await expect( - proxy.waitUntilReady({ intervalSeconds: 0.01, timeoutSeconds: 1 }) - ).rejects.toThrow('Model proxy failed with status'); + const result = await proxy.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, + }); + expect(result.status).toBe('CREATE_FAILED'); }); it('should throw error on UPDATE_FAILED status', async () => { @@ -1886,9 +1669,11 @@ describe('Model Module', () => { const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; - await expect( - proxy.waitUntilReady({ intervalSeconds: 0.01, timeoutSeconds: 1 }) - ).rejects.toThrow('Model proxy failed with status'); + const result = await proxy.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, + }); + expect(result.status).toBe('UPDATE_FAILED'); }); it('should throw error on DELETE_FAILED status', async () => { @@ -1902,12 +1687,14 @@ describe('Model Module', () => { const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; - await expect( - proxy.waitUntilReady({ intervalSeconds: 0.01, timeoutSeconds: 1 }) - ).rejects.toThrow('Model proxy failed with status'); + const result = await proxy.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, + }); + expect(result.status).toBe('DELETE_FAILED'); }); - it('should call beforeCheck callback', async () => { + it('should call callback callback', async () => { mockControlApi.getModelProxy.mockResolvedValue({ modelProxyId: 'proxy-123', modelProxyName: 'test-proxy', @@ -1917,15 +1704,15 @@ describe('Model Module', () => { const proxy = new ModelProxy(); proxy.modelProxyName = 'test-proxy'; - const beforeCheck = jest.fn(); + const callback = jest.fn(); - await proxy.waitUntilReady({ + await proxy.waitUntilReadyOrFailed({ intervalSeconds: 0.1, timeoutSeconds: 5, - beforeCheck, + callback, }); - expect(beforeCheck).toHaveBeenCalled(); + expect(callback).toHaveBeenCalled(); }); it('should throw timeout error', async () => { @@ -1939,8 +1726,11 @@ describe('Model Module', () => { proxy.modelProxyName = 'test-proxy'; await expect( - proxy.waitUntilReady({ intervalSeconds: 0.05, timeoutSeconds: 0.1 }) - ).rejects.toThrow('Timeout waiting for model proxy to be ready'); + proxy.waitUntilReadyOrFailed({ + intervalSeconds: 0.05, + timeoutSeconds: 0.1, + }) + ).rejects.toThrow(/Timeout waiting/); }); it('should use default timeout and interval when not provided', async () => { @@ -1954,7 +1744,7 @@ describe('Model Module', () => { proxy.modelProxyName = 'test-proxy'; // Call without options to test default values - const result = await proxy.waitUntilReady(); + const result = await proxy.waitUntilReadyOrFailed(); expect(result.status).toBe(Status.READY); }); diff --git a/tests/unittests/toolset/api.test.ts b/tests/unittests/toolset/api.test.ts index 9cf1fa1..efea372 100644 --- a/tests/unittests/toolset/api.test.ts +++ b/tests/unittests/toolset/api.test.ts @@ -7,7 +7,11 @@ import { Config } from '../../../src/utils/config'; import { ToolControlAPI } from '../../../src/toolset/api/control'; import { MCPSession, MCPToolSet } from '../../../src/toolset/api/mcp'; -import { ClientError, HTTPError, ServerError } from '../../../src/utils/exception'; +import { + ClientError, + HTTPError, + ServerError, +} from '../../../src/utils/exception'; describe('ToolSet API', () => { beforeEach(() => { @@ -34,7 +38,9 @@ describe('ToolSet API', () => { getToolsetWithOptions: jest.fn(), listToolsetsWithOptions: jest.fn(), }; - getDevsClientSpy = jest.spyOn(ToolControlAPI.prototype as any, 'getDevsClient').mockReturnValue(mockDevsClient); + getDevsClientSpy = jest + .spyOn(ToolControlAPI.prototype as any, 'getDevsClient') + .mockReturnValue(mockDevsClient); }); afterEach(() => { @@ -71,10 +77,7 @@ describe('ToolSet API', () => { toolsetId: 'ts-123', }; mockDevsClient.getToolsetWithOptions.mockResolvedValue({ - body: { - requestId: 'req-123', - data: mockToolset, - }, + body: mockToolset, }); const api = new ToolControlAPI(); @@ -86,14 +89,13 @@ describe('ToolSet API', () => { it('should throw error on empty response', async () => { mockDevsClient.getToolsetWithOptions.mockResolvedValue({ - body: { - requestId: 'req-123', - data: null, - }, + body: null, }); const api = new ToolControlAPI(); - await expect(api.getToolset({ name: 'test-toolset' })).rejects.toThrow('Empty response body'); + await expect(api.getToolset({ name: 'test-toolset' })).rejects.toThrow( + 'Empty response body' + ); }); it('should handle HTTPError', async () => { @@ -113,7 +115,9 @@ describe('ToolSet API', () => { mockDevsClient.getToolsetWithOptions.mockRejectedValue(error); const api = new ToolControlAPI(); - await expect(api.getToolset({ name: 'test' })).rejects.toThrow(ClientError); + await expect(api.getToolset({ name: 'test' })).rejects.toThrow( + ClientError + ); }); it('should throw ServerError on 5xx status', async () => { @@ -125,7 +129,9 @@ describe('ToolSet API', () => { mockDevsClient.getToolsetWithOptions.mockRejectedValue(error); const api = new ToolControlAPI(); - await expect(api.getToolset({ name: 'test' })).rejects.toThrow(ServerError); + await expect(api.getToolset({ name: 'test' })).rejects.toThrow( + ServerError + ); }); it('should rethrow unknown errors', async () => { @@ -133,7 +139,9 @@ describe('ToolSet API', () => { mockDevsClient.getToolsetWithOptions.mockRejectedValue(unknownError); const api = new ToolControlAPI(); - await expect(api.getToolset({ name: 'test' })).rejects.toThrow('Unknown error'); + await expect(api.getToolset({ name: 'test' })).rejects.toThrow( + 'Unknown error' + ); }); }); @@ -168,7 +176,9 @@ describe('ToolSet API', () => { }); const api = new ToolControlAPI(); - await expect(api.listToolsets({ input: {} as any })).rejects.toThrow('Empty response body'); + await expect(api.listToolsets({ input: {} as any })).rejects.toThrow( + 'Empty response body' + ); }); it('should handle error with statusCode', async () => { @@ -179,7 +189,9 @@ describe('ToolSet API', () => { mockDevsClient.listToolsetsWithOptions.mockRejectedValue(error); const api = new ToolControlAPI(); - await expect(api.listToolsets({ input: {} as any })).rejects.toThrow(ClientError); + await expect(api.listToolsets({ input: {} as any })).rejects.toThrow( + ClientError + ); }); }); }); @@ -290,7 +302,10 @@ describe('ToolSet API', () => { regionId: 'cn-hangzhou', accountId: '123', }); - const toolset = new MCPToolSet('https://mcp.example.com/toolsets', config); + const toolset = new MCPToolSet( + 'https://mcp.example.com/toolsets', + config + ); expect(toolset).toBeInstanceOf(MCPToolSet); }); @@ -314,7 +329,10 @@ describe('ToolSet API', () => { regionId: 'cn-hangzhou', accountId: '123', }); - const toolset = new MCPToolSet('https://mcp.example.com/toolsets', config); + const toolset = new MCPToolSet( + 'https://mcp.example.com/toolsets', + config + ); const session = toolset.newSession(config); expect(session).toBeInstanceOf(MCPSession); }); diff --git a/tests/unittests/toolset/client.test.ts b/tests/unittests/toolset/client.test.ts new file mode 100644 index 0000000..92b66b9 --- /dev/null +++ b/tests/unittests/toolset/client.test.ts @@ -0,0 +1,55 @@ +import { ToolSetClient } from '../../../src/toolset/client'; +import { Config } from '../../../src/utils/config'; +import { ToolSet } from '../../../src/toolset/toolset'; + +const getToolset = jest.fn(); +const listToolsets = jest.fn(); + +jest.mock('../../../src/toolset/api', () => ({ + ToolControlAPI: jest.fn().mockImplementation(() => ({ + getToolset: (...args: any[]) => getToolset(...args), + listToolsets: (...args: any[]) => listToolsets(...args), + })), +})); + +describe('ToolSetClient', () => { + beforeEach(() => { + getToolset.mockReset(); + listToolsets.mockReset(); + }); + + test('get merges config and wraps response', async () => { + const baseConfig = new Config({ accountId: '1', regionId: 'cn-hz' }); + const overrideConfig = new Config({ accountId: '2', regionId: 'cn-sh' }); + const mergedConfig = new Config({ + accountId: 'merged', + regionId: 'cn-beijing', + }); + + const withConfigsSpy = jest + .spyOn(Config, 'withConfigs') + .mockReturnValue(mergedConfig); + + getToolset.mockResolvedValue({ name: 'tool' }); + + const client = new ToolSetClient(baseConfig); + const result = await client.get({ name: 'tool', config: overrideConfig }); + + expect(withConfigsSpy).toHaveBeenCalledWith(baseConfig, overrideConfig); + expect(getToolset).toHaveBeenCalledWith({ name: 'tool', config: mergedConfig }); + expect(result).toBeInstanceOf(ToolSet); + }); + + test('list maps results to ToolSet and handles empty data', async () => { + const client = new ToolSetClient(); + + listToolsets.mockResolvedValueOnce({ data: [{ name: 't1' }, { name: 't2' }] }); + const results = await client.list(); + expect(results).toHaveLength(2); + expect(results[0]).toBeInstanceOf(ToolSet); + + listToolsets.mockResolvedValueOnce({ data: undefined }); + const empty = await client.list(); + expect(empty).toEqual([]); + }); +}); \ No newline at end of file diff --git a/tests/unittests/toolset/toolset-resource.test.ts b/tests/unittests/toolset/toolset-resource.test.ts index 657ca36..25034e8 100644 --- a/tests/unittests/toolset/toolset-resource.test.ts +++ b/tests/unittests/toolset/toolset-resource.test.ts @@ -4,10 +4,19 @@ * 测试 ToolSet 类的各种功能。 */ -import { ToolSet, ToolSetClient, ToolSetSchemaType } from '../../../src/toolset'; +import { + ToolControlAPI, + ToolSet, + ToolSetClient, + ToolSetSchemaType, +} from '../../../src/toolset'; import { Config } from '../../../src/utils/config'; +import { + ClientError, + HTTPError, + ServerError, +} from '../../../src/utils/exception'; import { Status } from '../../../src/utils/model'; -import { HTTPError, ClientError, ServerError } from '../../../src/utils/exception'; // Mock DevS client at the instance level by spying on getClient const mockDevsClient = { @@ -61,90 +70,29 @@ describe('ToolSet Module', () => { describe('getters', () => { it('should return toolSetName as alias for name', () => { const toolset = new ToolSet({ name: 'my-toolset' }); - expect(toolset.toolSetName).toBe('my-toolset'); + expect(toolset.name).toBe('my-toolset'); }); it('should return toolSetId as alias for uid', () => { const toolset = new ToolSet({ uid: 'uid-123' }); - expect(toolset.toolSetId).toBe('uid-123'); + expect(toolset.uid).toBe('uid-123'); }); it('should return isReady based on status', () => { const toolset = new ToolSet({ status: { status: Status.READY }, }); - expect(toolset.isReady).toBe(true); + expect(toolset.status?.status === 'READY').toBe(true); const toolset2 = new ToolSet({ status: { status: Status.CREATING }, }); - expect(toolset2.isReady).toBe(false); + expect(toolset2?.status?.status === 'READY').toBe(false); }); it('should return isReady false when status is undefined', () => { const toolset = new ToolSet({}); - expect(toolset.isReady).toBe(false); - }); - }); - - describe('fromInnerObject', () => { - it('should convert SDK object to ToolSet', () => { - const sdkObj = { - name: 'test-toolset', - uid: 'uid-123', - kind: 'Toolset', - description: 'Test', - createdTime: '2024-01-01', - generation: 1, - labels: { env: 'test' }, - spec: { - schema: { - type: 'OpenAPI', - detail: 'https://api.example.com/openapi.json', - }, - authConfig: { - type: 'API_KEY', - parameters: { - apiKeyParameter: { - key: 'X-API-Key', - value: 'secret', - }, - }, - }, - }, - status: { - status: 'READY', - statusReason: '', - outputs: { - mcpServerConfig: { - url: 'https://mcp.example.com', - transport: 'http', - }, - tools: [ - { name: 'tool1', description: 'Tool 1' }, - ], - urls: { - cdpUrl: 'https://cdp.example.com', - liveViewUrl: 'https://live.example.com', - streamUrl: 'https://stream.example.com', - }, - }, - }, - }; - - const toolset = ToolSet.fromInnerObject(sdkObj as any); - - expect(toolset.name).toBe('test-toolset'); - expect(toolset.uid).toBe('uid-123'); - expect(toolset.spec?.schema?.type).toBe('OpenAPI'); - expect(toolset.spec?.authConfig?.apiKeyHeaderName).toBe('X-API-Key'); - expect(toolset.status?.status).toBe('READY'); - }); - - it('should throw error for null object', () => { - expect(() => ToolSet.fromInnerObject(null as any)).toThrow( - 'Invalid toolset object' - ); + expect(toolset.status?.status === 'READY').toBe(false); }); }); @@ -256,9 +204,9 @@ describe('ToolSet Module', () => { const error = { statusCode: 404, message: 'Not found' }; mockDevsClient.deleteToolsetWithOptions.mockRejectedValue(error); - await expect( - ToolSet.delete({ name: 'not-found' }) - ).rejects.toThrow(ClientError); + await expect(ToolSet.delete({ name: 'not-found' })).rejects.toThrow( + ClientError + ); }); it('should handle HTTPError during delete', async () => { @@ -327,27 +275,25 @@ describe('ToolSet Module', () => { it('should throw error when body is empty', async () => { mockDevsClient.getToolsetWithOptions.mockResolvedValue({ body: null }); - await expect( - ToolSet.get({ name: 'empty-body' }) - ).rejects.toThrow('API returned empty response body'); + await expect(ToolSet.get({ name: 'empty-body' })).rejects.toThrow( + 'API returned empty response body' + ); }); it('should handle HTTPError during get', async () => { const httpError = new HTTPError(404, 'Not found'); mockDevsClient.getToolsetWithOptions.mockRejectedValue(httpError); - await expect( - ToolSet.get({ name: 'not-found' }) - ).rejects.toThrow(); + await expect(ToolSet.get({ name: 'not-found' })).rejects.toThrow(); }); it('should handle generic error during get', async () => { const error = { statusCode: 500, message: 'Server error' }; mockDevsClient.getToolsetWithOptions.mockRejectedValue(error); - await expect( - ToolSet.get({ name: 'error-toolset' }) - ).rejects.toThrow(ServerError); + await expect(ToolSet.get({ name: 'error-toolset' })).rejects.toThrow( + ServerError + ); }); }); @@ -398,9 +344,7 @@ describe('ToolSet Module', () => { it('should throw error if name not set', async () => { const toolset = new ToolSet(); - await expect(toolset.delete()).rejects.toThrow( - 'name is required' - ); + await expect(toolset.delete()).rejects.toThrow('name is required'); }); }); @@ -462,7 +406,9 @@ describe('ToolSet Module', () => { return { body: { name: 'my-toolset', - status: { status: callCount >= 2 ? Status.READY : Status.CREATING }, + status: { + status: callCount >= 2 ? Status.READY : Status.CREATING, + }, }, }; }); @@ -515,101 +461,6 @@ describe('ToolSet Module', () => { }); }); - describe('ToolSetClient', () => { - let client: ToolSetClient; - - beforeEach(() => { - client = new ToolSetClient(); - }); - - describe('createToolSet', () => { - it('should create toolset via client', async () => { - mockDevsClient.createToolsetWithOptions.mockResolvedValue({ - body: { - name: 'new-toolset', - uid: 'new-uid', - }, - }); - - const result = await client.createToolSet({ - input: { name: 'new-toolset' }, - }); - - expect(result.name).toBe('new-toolset'); - }); - }); - - describe('deleteToolSet', () => { - it('should delete toolset via client', async () => { - mockDevsClient.deleteToolsetWithOptions.mockResolvedValue({ - body: { name: 'deleted-toolset' }, - }); - - const result = await client.deleteToolSet({ name: 'deleted-toolset' }); - - expect(result.name).toBe('deleted-toolset'); - }); - }); - - describe('updateToolSet', () => { - it('should update toolset via client', async () => { - mockDevsClient.updateToolsetWithOptions.mockResolvedValue({ - body: { - name: 'updated-toolset', - description: 'Updated', - }, - }); - - const result = await client.updateToolSet({ - name: 'updated-toolset', - input: { description: 'Updated' }, - }); - - expect(result.description).toBe('Updated'); - }); - }); - - describe('getToolSet', () => { - it('should get toolset via client', async () => { - mockDevsClient.getToolsetWithOptions.mockResolvedValue({ - body: { name: 'my-toolset' }, - }); - - const result = await client.getToolSet({ name: 'my-toolset' }); - - expect(result.name).toBe('my-toolset'); - }); - }); - - describe('listToolSets', () => { - it('should list toolsets via client', async () => { - mockDevsClient.listToolsetsWithOptions.mockResolvedValue({ - body: { - items: [{ name: 'toolset-1' }, { name: 'toolset-2' }], - }, - }); - - const result = await client.listToolSets(); - - expect(result).toHaveLength(2); - }); - }); - - describe('listAllToolSets', () => { - it('should list all toolsets with pagination', async () => { - mockDevsClient.listToolsetsWithOptions.mockResolvedValue({ - body: { - items: [{ name: 'toolset-1', uid: 'uid-1' }], - }, - }); - - const result = await client.listAllToolSets(); - - expect(result).toHaveLength(1); - }); - }); - }); - describe('ToolSet advanced methods', () => { describe('listAll', () => { it('should list all toolsets with pagination and deduplication', async () => { @@ -922,7 +773,9 @@ describe('ToolSet Module', () => { return { body: { name: 'my-toolset', - status: { status: callCount >= 2 ? Status.READY : Status.CREATING }, + status: { + status: callCount >= 2 ? Status.READY : Status.CREATING, + }, }, }; }); @@ -954,7 +807,9 @@ describe('ToolSet Module', () => { status: { outputs: {} }, }); - await expect(toolset.toApiSet()).rejects.toThrow('MCP server URL is missing'); + await expect(toolset.toApiSet()).rejects.toThrow( + 'MCP server URL is missing' + ); }); it('should throw error for unsupported type', async () => { @@ -962,7 +817,9 @@ describe('ToolSet Module', () => { spec: { schema: { type: 'UNKNOWN' as any } }, }); - await expect(toolset.toApiSet()).rejects.toThrow('Unsupported ToolSet type'); + await expect(toolset.toApiSet()).rejects.toThrow( + 'Unsupported ToolSet type' + ); }); }); @@ -972,10 +829,10 @@ describe('ToolSet Module', () => { invoke: jest.fn().mockResolvedValue({ result: 'success' }), getTool: jest.fn().mockReturnValue({ name: 'test-tool' }), }; - + const toolset = new ToolSet({ spec: { schema: { type: ToolSetSchemaType.MCP } }, - status: { + status: { outputs: { mcpServerConfig: { url: 'http://localhost:3000' }, tools: [{ name: 'test-tool' }], @@ -986,10 +843,16 @@ describe('ToolSet Module', () => { // Mock toApiSet toolset.toApiSet = jest.fn().mockResolvedValue(mockApiSet); - const result = await toolset.callToolAsync('test-tool', { arg1: 'value' }); + const result = await toolset.callToolAsync('test-tool', { + arg1: 'value', + }); expect(toolset.toApiSet).toHaveBeenCalled(); - expect(mockApiSet.invoke).toHaveBeenCalledWith('test-tool', { arg1: 'value' }, undefined); + expect(mockApiSet.invoke).toHaveBeenCalledWith( + 'test-tool', + { arg1: 'value' }, + undefined + ); expect(result).toEqual({ result: 'success' }); }); }); @@ -1009,9 +872,12 @@ describe('ToolSet Module', () => { const spy = jest.spyOn(toolset, 'callToolAsync'); await toolset.callTool('test-tool', { arg: 'val' }); - expect(spy).toHaveBeenCalledWith('test-tool', { arg: 'val' }, undefined); + expect(spy).toHaveBeenCalledWith( + 'test-tool', + { arg: 'val' }, + undefined + ); }); }); }); }); - diff --git a/tests/unittests/toolset/toolset.test.ts b/tests/unittests/toolset/toolset.test.ts index d8701e6..f776068 100644 --- a/tests/unittests/toolset/toolset.test.ts +++ b/tests/unittests/toolset/toolset.test.ts @@ -5,9 +5,12 @@ * Tests for ToolSet module basic functionality. */ - - -import { ToolSet, ToolSetSchemaType, ToolSetClient } from '../../../src/toolset'; +import { ToolsetStatus } from '@alicloud/devs20230714'; +import { + ToolSet, + ToolSetSchemaType, + ToolSetClient, +} from '../../../src/toolset'; import { Status } from '../../../src/utils/model'; describe('ToolSet', () => { @@ -47,27 +50,27 @@ describe('ToolSet', () => { describe('getters', () => { it('should return toolSetName as alias for name', () => { const toolset = new ToolSet({ name: 'my-toolset' }); - expect(toolset.toolSetName).toBe('my-toolset'); + expect(toolset.name).toBe('my-toolset'); }); it('should return toolSetId as alias for uid', () => { const toolset = new ToolSet({ uid: 'uid-456' }); - expect(toolset.toolSetId).toBe('uid-456'); + expect(toolset.uid).toBe('uid-456'); }); it('should return isReady correctly', () => { const readyToolset = new ToolSet({ status: { status: Status.READY }, }); - expect(readyToolset.isReady).toBe(true); + expect(readyToolset.status?.status === 'READY').toBe(true); const pendingToolset = new ToolSet({ status: { status: Status.CREATING }, }); - expect(pendingToolset.isReady).toBe(false); + expect(pendingToolset.status?.status === 'READY').toBe(false); const noStatusToolset = new ToolSet({}); - expect(noStatusToolset.isReady).toBe(false); + expect(noStatusToolset.status?.status === 'READY').toBe(false); }); }); @@ -75,79 +78,25 @@ describe('ToolSet', () => { it('should throw error when deleting without name', async () => { const toolset = new ToolSet({}); - await expect(toolset.delete()).rejects.toThrow('name is required to delete a ToolSet'); + await expect(toolset.delete()).rejects.toThrow( + 'name is required to delete a ToolSet' + ); }); it('should throw error when updating without name', async () => { const toolset = new ToolSet({}); - await expect(toolset.update({ input: {} })).rejects.toThrow('name is required to update a ToolSet'); + await expect(toolset.update({ input: {} })).rejects.toThrow( + 'name is required to update a ToolSet' + ); }); it('should throw error when refreshing without name', async () => { const toolset = new ToolSet({}); - await expect(toolset.refresh()).rejects.toThrow('name is required to refresh a ToolSet'); - }); - }); - - describe('fromInnerObject', () => { - it('should convert DevS SDK response to ToolSet', () => { - const mockSdkResponse = { - name: 'sdk-toolset', - uid: 'uid-789', - kind: 'Toolset', - description: 'SDK Toolset', - createdTime: '2024-01-01T00:00:00Z', - generation: 1, - labels: { env: 'test' }, - spec: { - schema: { - type: 'OpenAPI', - detail: 'https://api.example.com/openapi.yaml', - }, - authConfig: { - type: 'apiKey', - parameters: { - apiKeyParameter: { - key: 'X-API-Key', - value: 'secret', - }, - }, - }, - }, - status: { - status: 'READY', - statusReason: 'Success', - outputs: { - mcpServerConfig: { - url: 'https://mcp.example.com', - transport: 'http', - }, - tools: [ - { name: 'tool1', description: 'First tool' }, - { name: 'tool2', description: 'Second tool' }, - ], - urls: { - cdpUrl: 'https://cdp.example.com', - }, - }, - }, - }; - - const toolset = ToolSet.fromInnerObject(mockSdkResponse as any); - - expect(toolset.name).toBe('sdk-toolset'); - expect(toolset.uid).toBe('uid-789'); - expect(toolset.kind).toBe('Toolset'); - expect(toolset.description).toBe('SDK Toolset'); - expect(toolset.labels).toEqual({ env: 'test' }); - expect(String(toolset.spec?.schema?.type)).toBe('OpenAPI'); - expect(toolset.spec?.schema?.detail).toBe('https://api.example.com/openapi.yaml'); - expect(toolset.spec?.authConfig?.type).toBe('apiKey'); - expect(toolset.spec?.authConfig?.apiKeyHeaderName).toBe('X-API-Key'); - expect(String(toolset.status?.status)).toBe('READY'); - expect(toolset.status?.outputs?.tools).toHaveLength(2); + await expect(toolset.refresh()).rejects.toThrow( + 'name is required to refresh a ToolSet' + ); }); }); }); diff --git a/tests/unittests/utils/resource-extra.test.ts b/tests/unittests/utils/resource-extra.test.ts new file mode 100644 index 0000000..c308bfb --- /dev/null +++ b/tests/unittests/utils/resource-extra.test.ts @@ -0,0 +1,76 @@ +import { ResourceBase, listAllResourcesFunction } from '../../../src/utils/resource'; +import { ResourceNotExistError } from '../../../src/utils/exception'; +import { Status } from '../../../src/utils/model'; + +class DummyResource extends ResourceBase { + delete = jest.fn(); + get = jest.fn(); +} + +describe('ResourceBase deleteAndWaitUntilFinished extra branches', () => { + test('returns immediately when delete throws ResourceNotExistError', async () => { + const resource = new DummyResource(); + (resource.delete as jest.Mock).mockRejectedValue( + new ResourceNotExistError('type', 'id') + ); + resource.waitUntil = jest.fn(); + + await expect(resource.deleteAndWaitUntilFinished()).resolves.toBeUndefined(); + expect(resource.waitUntil).not.toHaveBeenCalled(); + }); + + test('treats refresh ResourceNotExistError as completion', async () => { + const resource = new DummyResource(); + resource.status = Status.CREATING; + resource.refresh = jest + .fn() + .mockRejectedValue(new ResourceNotExistError('type', 'id')); + + const waitUntil = jest.fn(async ({ checkFinishedCallback }) => { + const finished = await checkFinishedCallback(resource); + expect(finished).toBe(true); + return resource; + }); + + resource.waitUntil = waitUntil as any; + + await resource.deleteAndWaitUntilFinished({ callback: jest.fn() }); + expect(waitUntil).toHaveBeenCalled(); + }); + + test('continues when status is deleting', async () => { + const resource = new DummyResource(); + resource.status = Status.DELETING; + resource.refresh = jest.fn().mockResolvedValue(undefined); + + const waitUntil = jest.fn(async ({ checkFinishedCallback }) => { + const finished = await checkFinishedCallback(resource); + expect(finished).toBe(false); + return resource; + }); + + resource.waitUntil = waitUntil as any; + + await resource.deleteAndWaitUntilFinished(); + expect(waitUntil).toHaveBeenCalled(); + }); +}); + +describe('listAllResourcesFunction deduplication with empty ids', () => { + test('skips items without uniq id and deduplicates', async () => { + const list = jest + .fn() + .mockResolvedValueOnce([ + { uniqIdCallback: () => '', value: 1 }, + { uniqIdCallback: () => 'a', value: 2 }, + ]) + .mockResolvedValueOnce([{ uniqIdCallback: () => 'a', value: 3 }]); + + const listAll = listAllResourcesFunction(list as any); + const results = await listAll(); + + expect(list).toHaveBeenCalledTimes(1); + expect(results).toHaveLength(1); + expect(results[0].value).toBe(2); + }); +}); \ No newline at end of file diff --git a/tests/unittests/utils/resource.test.ts b/tests/unittests/utils/resource.test.ts index 6cba51c..54c2f4d 100644 --- a/tests/unittests/utils/resource.test.ts +++ b/tests/unittests/utils/resource.test.ts @@ -6,531 +6,820 @@ import { Config } from '../../../src/utils/config'; import { ResourceNotExistError } from '../../../src/utils/exception'; -import { Status } from '../../../src/utils/model'; -import { ResourceBase, updateObjectProperties } from '../../../src/utils/resource'; +import { PageableInput, Status } from '../../../src/utils/model'; +import { + listAllResourcesFunction, + ResourceBase, + updateObjectProperties, +} from '../../../src/utils/resource'; + +// describe('Resource Utils', () => { +// describe('updateObjectProperties', () => { +// it('should copy data properties from source to target', () => { +// const target: any = { a: 1 }; +// const source = { b: 2, c: 'test' }; + +// updateObjectProperties(target, source); + +// expect(target.a).toBe(1); +// expect(target.b).toBe(2); +// expect(target.c).toBe('test'); +// }); + +// it('should skip function properties', () => { +// const target: any = {}; +// const source = { +// data: 'value', +// method: () => 'function', +// }; + +// updateObjectProperties(target, source); + +// expect(target.data).toBe('value'); +// expect(target.method).toBeUndefined(); +// }); + +// it('should skip private properties (starting with _)', () => { +// const target: any = {}; +// const source = { +// publicProp: 'public', +// _privateProp: 'private', +// }; + +// updateObjectProperties(target, source); + +// expect(target.publicProp).toBe('public'); +// expect(target._privateProp).toBeUndefined(); +// }); + +// it('should overwrite existing properties', () => { +// const target: any = { a: 1, b: 2 }; +// const source = { b: 3, c: 4 }; + +// updateObjectProperties(target, source); + +// expect(target.a).toBe(1); +// expect(target.b).toBe(3); +// expect(target.c).toBe(4); +// }); + +// it('should handle null and undefined values', () => { +// const target: any = { a: 1 }; +// const source = { b: null, c: undefined }; + +// updateObjectProperties(target, source); + +// expect(target.a).toBe(1); +// expect(target.b).toBeNull(); +// expect(target.c).toBeUndefined(); +// }); + +// it('should handle nested objects', () => { +// const target: any = {}; +// const source = { nested: { a: 1, b: 2 } }; + +// updateObjectProperties(target, source); + +// expect(target.nested).toEqual({ a: 1, b: 2 }); +// }); + +// it('should handle arrays', () => { +// const target: any = {}; +// const source = { arr: [1, 2, 3] }; + +// updateObjectProperties(target, source); + +// expect(target.arr).toEqual([1, 2, 3]); +// }); +// }); + +// describe('ResourceBase', () => { +// // Create a concrete implementation of ResourceBase for testing +// class TestResource extends ResourceBase { +// name?: string; +// value?: number; +// declare status?: Status; // Use declare to override base property +// private refreshCount = 0; +// private deleteCount = 0; + +// constructor(data?: Partial, config?: Config) { +// super(); +// if (data) { +// updateObjectProperties(this, data); +// } +// this._config = config; +// } + +// get = async (params?: { config?: Config }): Promise => { +// this.refreshCount++; +// // Simulate API response - change status on subsequent calls +// if (this.refreshCount > 1 && this.status === Status.CREATING) { +// this.status = Status.READY; +// } +// return this; +// }; + +// delete = async (params?: { config?: Config }): Promise => { +// this.deleteCount++; +// this.status = Status.DELETING; +// return this; +// }; + +// static list = async (params: { +// input?: { pageNumber?: number; pageSize?: number }; +// config?: Config; +// }): Promise => { +// const page = params.input?.pageNumber ?? 1; +// const size = params.input?.pageSize ?? 50; + +// // Simulate pagination - return 50 items for page 1, fewer for page 2 +// if (page === 1) { +// return Array.from( +// { length: size }, +// (_, i) => new TestResource({ name: `resource-${i}`, value: i }) +// ); +// } else if (page === 2) { +// return Array.from( +// { length: 10 }, +// (_, i) => +// new TestResource({ +// name: `resource-${size + i}`, +// value: size + i, +// }) +// ); +// } +// return []; +// }; + +// getRefreshCount(): number { +// return this.refreshCount; +// } + +// getDeleteCount(): number { +// return this.deleteCount; +// } +// } + +// describe('updateSelf', () => { +// it('should update instance properties using updateObjectProperties', () => { +// const resource = new TestResource({ name: 'original', value: 1 }); +// const source = { name: 'updated', value: 2, status: Status.READY }; + +// resource.updateSelf(source); + +// expect(resource.name).toBe('updated'); +// expect(resource.value).toBe(2); +// expect(resource.status).toBe(Status.READY); +// }); +// }); + +// describe('setConfig', () => { +// it('should set config and return this for chaining', () => { +// const resource = new TestResource({ name: 'test' }); +// const config = new Config({ accessKeyId: 'test-key' }); + +// const result = resource.setConfig(config); + +// expect(result).toBe(resource); +// // Verify config is set (we can't directly access _config, but can verify through behavior) +// }); +// }); + +// describe('refresh', () => { +// it('should call get method', async () => { +// const resource = new TestResource({ name: 'test' }); + +// await resource.refresh(); + +// expect(resource.getRefreshCount()).toBe(1); +// }); +// }); + +// describe('waitUntil', () => { +// it('should return when condition is met', async () => { +// const resource = new TestResource({ +// name: 'test', +// status: Status.CREATING, +// }); +// let checkCount = 0; + +// const result = await resource.waitUntil({ +// checkFinishedCallback: async (r) => { +// checkCount++; +// return checkCount >= 2; +// }, +// intervalSeconds: 0.1, +// timeoutSeconds: 5, +// }); + +// expect(result).toBe(resource); +// expect(checkCount).toBe(2); +// }); + +// it('should throw timeout error when condition is never met', async () => { +// const resource = new TestResource({ name: 'test' }); + +// await expect( +// resource.waitUntil({ +// checkFinishedCallback: async () => false, +// intervalSeconds: 0.1, +// timeoutSeconds: 0.2, +// }) +// ).rejects.toThrow( +// 'Timeout waiting for resource to reach desired state' +// ); +// }); + +// it('should use default interval and timeout when not provided', async () => { +// const resource = new TestResource({ +// name: 'test', +// status: Status.READY, +// }); + +// // Use a mock callback that returns true immediately to avoid waiting +// const result = await resource.waitUntil({ +// checkFinishedCallback: async () => true, +// // Not providing intervalSeconds or timeoutSeconds to test default values +// }); + +// expect(result).toBe(resource); +// }); +// }); + +// describe('waitUntilReadyOrFailed', () => { +// it('should wait until status is final', async () => { +// const resource = new TestResource({ +// name: 'test', +// status: Status.CREATING, +// }); +// const callbacks: Status[] = []; + +// const result = await resource.waitUntilReadyOrFailed({ +// callback: async (r) => { +// callbacks.push((r as TestResource).status as Status); +// }, +// intervalSeconds: 0.1, +// timeoutSeconds: 5, +// }); + +// expect(result.status).toBe(Status.READY); +// expect(callbacks).toContain(Status.READY); +// }); + +// it('should return immediately for READY status', async () => { +// const resource = new TestResource({ +// name: 'test', +// status: Status.READY, +// }); +// let callbackCalled = false; + +// await resource.waitUntilReadyOrFailed({ +// callback: async () => { +// callbackCalled = true; +// }, +// intervalSeconds: 0.1, +// timeoutSeconds: 1, +// }); + +// expect(callbackCalled).toBe(true); +// }); + +// it('should use default interval and timeout when not provided', async () => { +// // Create a resource that is already in final status to avoid long wait +// const resource = new TestResource({ +// name: 'test', +// status: Status.READY, +// }); + +// const result = await resource.waitUntilReadyOrFailed({ +// callback: async () => {}, +// // Not providing intervalSeconds or timeoutSeconds to test default values +// }); + +// expect(result.status).toBe(Status.READY); +// }); +// }); + +// describe('delete_and_wait_until_finished', () => { +// it('should delete and wait for completion', async () => { +// class DeletableResource extends TestResource { +// private deleteAttempts = 0; + +// delete = async (): Promise => { +// this.deleteAttempts++; +// this.status = Status.DELETING; +// return this; +// }; + +// get = async (): Promise => { +// // After delete, eventually throw ResourceNotExistError +// if (this.deleteAttempts > 0) { +// throw new ResourceNotExistError('TestResource', 'test-id'); +// } +// return this; +// }; +// } + +// const resource = new DeletableResource({ +// name: 'test', +// status: Status.READY, +// }); + +// const result = await resource.delete_and_wait_until_finished({ +// callback: async () => {}, +// intervalSeconds: 0.1, +// timeoutSeconds: 5, +// }); + +// expect(result).toBe(resource); +// }); + +// it('should return immediately if resource does not exist on delete', async () => { +// class NonExistentResource extends TestResource { +// delete = async (): Promise => { +// throw new ResourceNotExistError('TestResource', 'test-id'); +// }; +// } + +// const resource = new NonExistentResource({ name: 'test' }); + +// // Should not throw +// const result = await resource.delete_and_wait_until_finished({ +// callback: async () => {}, +// intervalSeconds: 0.1, +// timeoutSeconds: 1, +// }); + +// expect(result).toBeUndefined(); +// }); + +// it('should use default interval and timeout when not provided', async () => { +// class QuickDeletingResource extends TestResource { +// delete = async (): Promise => { +// this.status = Status.DELETING; +// return this; +// }; + +// get = async (): Promise => { +// // Immediately throw ResourceNotExistError to avoid waiting +// throw new ResourceNotExistError('TestResource', 'test-id'); +// }; +// } + +// const resource = new QuickDeletingResource({ +// name: 'test', +// status: Status.READY, +// }); + +// const result = await resource.delete_and_wait_until_finished({ +// callback: async () => {}, +// // Not providing intervalSeconds or timeoutSeconds to test default values +// }); + +// expect(result).toBe(resource); +// }); +// }); + +// describe('listAll (static)', () => { +// it('should paginate and deduplicate results', async () => { +// const results = await TestResource.listAll({ +// uniqIdCallback: (item: TestResource) => item.name || '', +// }); + +// // Should have results from both pages (50 + 10 = 60) +// expect(results.length).toBe(60); +// // Verify deduplication works +// const names = results.map((r: TestResource) => r.name); +// const uniqueNames = new Set(names); +// expect(uniqueNames.size).toBe(60); +// }); + +// it('should handle empty results', async () => { +// class EmptyResource extends ResourceBase { +// get = async () => this; +// delete = async () => this; +// static list = async () => []; +// } + +// const results = await EmptyResource.listAll({ +// uniqIdCallback: () => '', +// }); + +// expect(results).toEqual([]); +// }); +// }); + +// describe('listAllResources (protected static)', () => { +// it('should call listAll with correct parameters', async () => { +// // Use the public listAll method since listAllResources is protected +// const results = await TestResource.listAll({ +// uniqIdCallback: (item: TestResource) => item.name || '', +// config: new Config({ accessKeyId: 'test' }), +// }); + +// expect(Array.isArray(results)).toBe(true); +// }); + +// it('should call listAllResources via exposed method', async () => { +// // Create a subclass that exposes listAllResources +// class ExposedResource extends TestResource { +// static async callListAllResources() { +// return await this.listAllResources( +// (item: TestResource) => item.name || '', +// new Config({ accessKeyId: 'test' }) +// ); +// } +// } + +// const results = await ExposedResource.callListAllResources(); +// expect(Array.isArray(results)).toBe(true); +// }); +// }); + +// describe('base class list method', () => { +// it('should return empty array by default', async () => { +// // Directly test the base class list method +// const result = await ResourceBase.list({ input: {} }); +// expect(result).toEqual([]); +// }); +// }); + +// describe('delete_and_wait_until_finished edge cases', () => { +// it('should handle callback during wait', async () => { +// class DeletableResource extends TestResource { +// delete = async (): Promise => { +// this.status = Status.DELETING; +// return this; +// }; + +// get = async (): Promise => { +// if (this.status === Status.DELETING) { +// throw new ResourceNotExistError('TestResource', 'test-id'); +// } +// return this; +// }; +// } + +// const resource = new DeletableResource({ +// name: 'test', +// status: Status.READY, +// }); +// const callbacks: any[] = []; + +// await resource.delete_and_wait_until_finished({ +// callback: async (r) => { +// callbacks.push(r.status); +// }, +// intervalSeconds: 0.1, +// timeoutSeconds: 5, +// }); + +// // Callback should have been called before ResourceNotExistError +// expect(callbacks.length).toBeGreaterThanOrEqual(0); +// }); + +// it('should call callback and return false when refresh succeeds but resource still exists', async () => { +// let getCallCount = 0; +// class SlowDeletingResource extends TestResource { +// delete = async (): Promise => { +// this.status = Status.DELETING; +// return this; +// }; + +// get = async (): Promise => { +// getCallCount++; +// // First few refreshes succeed (resource still exists) +// if (getCallCount < 3) { +// return this; // Returns false in checkFinishedCallback +// } +// // Later throws ResourceNotExistError (resource deleted) +// throw new ResourceNotExistError('TestResource', 'test-id'); +// }; +// } + +// const resource = new SlowDeletingResource({ +// name: 'test', +// status: Status.READY, +// }); +// const callbacks: Status[] = []; + +// await resource.delete_and_wait_until_finished({ +// callback: async (r) => { +// callbacks.push(r.status as Status); +// }, +// intervalSeconds: 0.05, +// timeoutSeconds: 5, +// }); + +// // Callback should have been called at least once before ResourceNotExistError +// expect(callbacks.length).toBeGreaterThan(0); +// expect(callbacks[0]).toBe(Status.DELETING); +// }); + +// it('should throw error for unexpected status during delete wait', async () => { +// class ErrorResource extends TestResource { +// delete = async (): Promise => { +// this.status = Status.DELETING; +// return this; +// }; + +// get = async (): Promise => { +// // Simulate an unexpected status error +// this.status = Status.CREATE_FAILED; +// throw new Error('Unexpected error'); +// }; +// } + +// const resource = new ErrorResource({ +// name: 'test', +// status: Status.READY, +// }); + +// await expect( +// resource.delete_and_wait_until_finished({ +// callback: async () => {}, +// intervalSeconds: 0.1, +// timeoutSeconds: 0.5, +// }) +// ).rejects.toThrow('Resource status is CREATE_FAILED'); +// }); + +// it('should continue waiting when status is DELETING on error', async () => { +// class DeletingResource extends TestResource { +// private errorCount = 0; + +// delete = async (): Promise => { +// this.status = Status.DELETING; +// return this; +// }; + +// get = async (): Promise => { +// this.errorCount++; +// if (this.errorCount < 3) { +// throw new Error('Transient error'); +// } +// throw new ResourceNotExistError('TestResource', 'test-id'); +// }; +// } + +// const resource = new DeletingResource({ +// name: 'test', +// status: Status.DELETING, +// }); + +// const result = await resource.delete_and_wait_until_finished({ +// callback: async () => {}, +// intervalSeconds: 0.05, +// timeoutSeconds: 2, +// }); + +// expect(result).toBe(resource); +// }); +// }); +// }); +// }); + +describe('bind resource', () => { + class NewClass extends ResourceBase { + id: string; + getCount: number = 0; + deleteCount: number = 0; + declare status?: Status; + + constructor(id: string) { + super(); + this.id = id; + } -describe('Resource Utils', () => { - describe('updateObjectProperties', () => { - it('should copy data properties from source to target', () => { - const target: any = { a: 1 }; - const source = { b: 2, c: 'test' }; + async get() { + this.getCount++; - updateObjectProperties(target, source); + if (this.deleteCount >= 57) + throw new ResourceNotExistError('BaseClass', this.id); - expect(target.a).toBe(1); - expect(target.b).toBe(2); - expect(target.c).toBe('test'); - }); + return this; + } - it('should skip function properties', () => { - const target: any = {}; - const source = { - data: 'value', - method: () => 'function', - }; + async delete() { + this.deleteCount++; + return this; + } - updateObjectProperties(target, source); + getStatus() { + return this.status; + } - expect(target.data).toBe('value'); - expect(target.method).toBeUndefined(); - }); + uniqIdCallback() { + return this.id; + } - it('should skip private properties (starting with _)', () => { - const target: any = {}; - const source = { - publicProp: 'public', - _privateProp: 'private', - }; + async customMethod() { + return 'mock-custom-method'; + } - updateObjectProperties(target, source); + static async list(params?: { input?: PageableInput; config?: Config }) { + const { pageNumber = 1, pageSize = 10 } = params?.input || {}; + const start = (pageNumber - 1) * pageSize; - expect(target.publicProp).toBe('public'); - expect(target._privateProp).toBeUndefined(); - }); + const result = []; + for (let i = start; i < start + pageSize && i < 57; i++) { + result.push(new NewClass(`list-${i}`)); + } - it('should overwrite existing properties', () => { - const target: any = { a: 1, b: 2 }; - const source = { b: 3, c: 4 }; + return result; + } - updateObjectProperties(target, source); + static listAll = listAllResourcesFunction(this.list); + } - expect(target.a).toBe(1); - expect(target.b).toBe(3); - expect(target.c).toBe(4); + // const NewClass = bindResourceBase(BaseClass); + + test('refresh', async () => { + // const base = new BaseClass('mock-id'); + // for (let i = 0; i < 57; i++) await base.get(); + // expect(base.getCount).toBe(57); + + const newInstance = new NewClass('mock-id'); + for (let i = 0; i < 57; i++) await newInstance.refresh(); + expect(newInstance.getCount).toBe(57); + }); + + test('updateSelf', async () => { + const newInstance = new NewClass('mock-id'); + newInstance.updateSelf({ id: 'abc' }); + console.log(newInstance); + expect(newInstance.id).toBe('abc'); + }); + + test('listAll', async () => { + // expect(await BaseClass.list()).toHaveLength(10); + // expect(await BaseClass.list({ input: { pageSize: 5 } })).toHaveLength(5); + + expect(await NewClass.list()).toHaveLength(10); + expect(await NewClass.list({ input: { pageSize: 5 } })).toHaveLength(5); + expect(await NewClass.listAll()).toHaveLength(57); + }); + + test('waitUntilReadyOrFailed', async () => { + const newInstance = new NewClass('mock-id'); + newInstance.status = Status.CREATING; + + setTimeout(() => { + newInstance.status = Status.READY; + }, 2000); + + await newInstance.waitUntilReadyOrFailed({ + intervalSeconds: 1, + timeoutSeconds: 5, + }); + + await newInstance.waitUntilReadyOrFailed({ + intervalSeconds: 1, + timeoutSeconds: 5, }); + }); - it('should handle null and undefined values', () => { - const target: any = { a: 1 }; - const source = { b: null, c: undefined }; + test('waitUntilReadyOrFailed with only beforeCheck (no callback)', async () => { + // Test the branch where callback is undefined but beforeCheck is defined + const newInstance = new NewClass('mock-id'); + newInstance.status = Status.READY; - updateObjectProperties(target, source); + const beforeCheck = jest.fn(); - expect(target.a).toBe(1); - expect(target.b).toBeNull(); - expect(target.c).toBeUndefined(); + await newInstance.waitUntilReadyOrFailed({ + callback: beforeCheck, + intervalSeconds: 0.1, + timeoutSeconds: 5, }); - it('should handle nested objects', () => { - const target: any = {}; - const source = { nested: { a: 1, b: 2 } }; + expect(beforeCheck).toHaveBeenCalled(); + }); - updateObjectProperties(target, source); + test('waitUntilReadyOrFailed with no callbacks at all', async () => { + // Test the branch where both callback and beforeCheck are undefined + const newInstance = new NewClass('mock-id'); + newInstance.status = Status.READY; - expect(target.nested).toEqual({ a: 1, b: 2 }); + await newInstance.waitUntilReadyOrFailed({ + intervalSeconds: 0.1, + timeoutSeconds: 5, }); - it('should handle arrays', () => { - const target: any = {}; - const source = { arr: [1, 2, 3] }; + // Just verify it completes without error + expect(newInstance.status).toBe(Status.READY); + }); - updateObjectProperties(target, source); + test('waitUntil with default intervalSeconds and timeoutSeconds', async () => { + // Test the default values for intervalSeconds and timeoutSeconds + const newInstance = new NewClass('mock-id'); + newInstance.status = Status.READY; - expect(target.arr).toEqual([1, 2, 3]); + // Call waitUntil without intervalSeconds and timeoutSeconds to test defaults + const result = await newInstance.waitUntil({ + checkFinishedCallback: async () => true, // Immediately return true + // Not providing intervalSeconds or timeoutSeconds }); + + expect(result).toBe(newInstance); }); - describe('ResourceBase', () => { - // Create a concrete implementation of ResourceBase for testing - class TestResource extends ResourceBase { - name?: string; - value?: number; - declare status?: Status; // Use declare to override base property - private refreshCount = 0; - private deleteCount = 0; - - constructor(data?: Partial, config?: Config) { - super(); - if (data) { - updateObjectProperties(this, data); - } - this._config = config; - } + test('waitUntilReadyOrFailed timeout', async () => { + const newInstance = new NewClass('mock-id'); + newInstance.status = Status.CREATING; - get = async (params?: { config?: Config }): Promise => { - this.refreshCount++; - // Simulate API response - change status on subsequent calls - if (this.refreshCount > 1 && this.status === Status.CREATING) { - this.status = Status.READY; - } - return this; - }; - - delete = async (params?: { config?: Config }): Promise => { - this.deleteCount++; - this.status = Status.DELETING; - return this; - }; - - static list = async (params: { - input?: { pageNumber?: number; pageSize?: number }; - config?: Config; - }): Promise => { - const page = params.input?.pageNumber ?? 1; - const size = params.input?.pageSize ?? 50; - - // Simulate pagination - return 50 items for page 1, fewer for page 2 - if (page === 1) { - return Array.from({ length: size }, (_, i) => - new TestResource({ name: `resource-${i}`, value: i }) - ); - } else if (page === 2) { - return Array.from({ length: 10 }, (_, i) => - new TestResource({ name: `resource-${size + i}`, value: size + i }) - ); - } - return []; - }; - - getRefreshCount(): number { - return this.refreshCount; - } + await expect( + newInstance.waitUntilReadyOrFailed({ + intervalSeconds: 1, + timeoutSeconds: 2, + }) + ).rejects.toThrow('Timeout waiting for resource to reach desired state'); + }); - getDeleteCount(): number { - return this.deleteCount; - } - } + test('customMethod', async () => { + const newInstance = new NewClass('mock-id'); + expect(await newInstance.customMethod()).toBe('mock-custom-method'); + }); +}); - describe('updateSelf', () => { - it('should update instance properties using updateObjectProperties', () => { - const resource = new TestResource({ name: 'original', value: 1 }); - const source = { name: 'updated', value: 2, status: Status.READY }; +describe('custom list params', () => { + class NewClass extends ResourceBase { + id: string; + getCount: number = 0; + deleteCount: number = 0; + declare status?: Status; - resource.updateSelf(source); + constructor(id: string) { + super(); + this.id = id; + } - expect(resource.name).toBe('updated'); - expect(resource.value).toBe(2); - expect(resource.status).toBe(Status.READY); - }); - }); + async get() { + this.getCount++; - describe('setConfig', () => { - it('should set config and return this for chaining', () => { - const resource = new TestResource({ name: 'test' }); - const config = new Config({ accessKeyId: 'test-key' }); + if (this.deleteCount >= 57) + throw new ResourceNotExistError('BaseClass', this.id); - const result = resource.setConfig(config); + return this; + } - expect(result).toBe(resource); - // Verify config is set (we can't directly access _config, but can verify through behavior) - }); - }); + async delete() { + this.deleteCount++; + return this; + } - describe('refresh', () => { - it('should call get method', async () => { - const resource = new TestResource({ name: 'test' }); + getStatus() { + return this.status; + } - await resource.refresh(); + uniqIdCallback() { + return this.id; + } - expect(resource.getRefreshCount()).toBe(1); - }); - }); + static async list(params?: { + input?: { skipOdd?: boolean } & PageableInput; + config?: Config; + }) { + const { + skipOdd = false, + pageNumber = 1, + pageSize = 10, + } = params?.input || {}; + + const result = []; + for (let i = 0; i < 57; i++) { + if (skipOdd && i % 2 == 1) continue; + result.push(new NewClass(`list-${i}`)); + } - describe('waitUntil', () => { - it('should return when condition is met', async () => { - const resource = new TestResource({ name: 'test', status: Status.CREATING }); - let checkCount = 0; - - const result = await resource.waitUntil({ - checkFinishedCallback: async (r) => { - checkCount++; - return checkCount >= 2; - }, - intervalSeconds: 0.1, - timeoutSeconds: 5, - }); - - expect(result).toBe(resource); - expect(checkCount).toBe(2); - }); - - it('should throw timeout error when condition is never met', async () => { - const resource = new TestResource({ name: 'test' }); - - await expect( - resource.waitUntil({ - checkFinishedCallback: async () => false, - intervalSeconds: 0.1, - timeoutSeconds: 0.2, - }) - ).rejects.toThrow('Timeout waiting for resource to reach desired state'); - }); - - it('should use default interval and timeout when not provided', async () => { - const resource = new TestResource({ name: 'test', status: Status.READY }); - - // Use a mock callback that returns true immediately to avoid waiting - const result = await resource.waitUntil({ - checkFinishedCallback: async () => true, - // Not providing intervalSeconds or timeoutSeconds to test default values - }); - - expect(result).toBe(resource); - }); - }); + return result.slice((pageNumber - 1) * pageSize, pageNumber * pageSize); + } - describe('waitUntilReadyOrFailed', () => { - it('should wait until status is final', async () => { - const resource = new TestResource({ name: 'test', status: Status.CREATING }); - const callbacks: Status[] = []; - - const result = await resource.waitUntilReadyOrFailed({ - callback: async (r) => { - callbacks.push((r as TestResource).status as Status); - }, - intervalSeconds: 0.1, - timeoutSeconds: 5, - }); - - expect(result.status).toBe(Status.READY); - expect(callbacks).toContain(Status.READY); - }); - - it('should return immediately for READY status', async () => { - const resource = new TestResource({ name: 'test', status: Status.READY }); - let callbackCalled = false; - - await resource.waitUntilReadyOrFailed({ - callback: async () => { - callbackCalled = true; - }, - intervalSeconds: 0.1, - timeoutSeconds: 1, - }); - - expect(callbackCalled).toBe(true); - }); - - it('should use default interval and timeout when not provided', async () => { - // Create a resource that is already in final status to avoid long wait - const resource = new TestResource({ name: 'test', status: Status.READY }); - - const result = await resource.waitUntilReadyOrFailed({ - callback: async () => {}, - // Not providing intervalSeconds or timeoutSeconds to test default values - }); - - expect(result.status).toBe(Status.READY); - }); - }); + static listAll = listAllResourcesFunction(this.list); + } - describe('delete_and_wait_until_finished', () => { - it('should delete and wait for completion', async () => { - class DeletableResource extends TestResource { - private deleteAttempts = 0; - - delete = async (): Promise => { - this.deleteAttempts++; - this.status = Status.DELETING; - return this; - }; - - get = async (): Promise => { - // After delete, eventually throw ResourceNotExistError - if (this.deleteAttempts > 0) { - throw new ResourceNotExistError('TestResource', 'test-id'); - } - return this; - }; - } - - const resource = new DeletableResource({ name: 'test', status: Status.READY }); - - const result = await resource.delete_and_wait_until_finished({ - callback: async () => {}, - intervalSeconds: 0.1, - timeoutSeconds: 5, - }); - - expect(result).toBe(resource); - }); - - it('should return immediately if resource does not exist on delete', async () => { - class NonExistentResource extends TestResource { - delete = async (): Promise => { - throw new ResourceNotExistError('TestResource', 'test-id'); - }; - } - - const resource = new NonExistentResource({ name: 'test' }); - - // Should not throw - const result = await resource.delete_and_wait_until_finished({ - callback: async () => {}, - intervalSeconds: 0.1, - timeoutSeconds: 1, - }); - - expect(result).toBeUndefined(); - }); - - it('should use default interval and timeout when not provided', async () => { - class QuickDeletingResource extends TestResource { - delete = async (): Promise => { - this.status = Status.DELETING; - return this; - }; - - get = async (): Promise => { - // Immediately throw ResourceNotExistError to avoid waiting - throw new ResourceNotExistError('TestResource', 'test-id'); - }; - } - - const resource = new QuickDeletingResource({ name: 'test', status: Status.READY }); - - const result = await resource.delete_and_wait_until_finished({ - callback: async () => {}, - // Not providing intervalSeconds or timeoutSeconds to test default values - }); - - expect(result).toBe(resource); - }); - }); + - describe('listAll (static)', () => { - it('should paginate and deduplicate results', async () => { - const results = await TestResource.listAll({ - uniqIdCallback: (item: TestResource) => item.name || '', - }); - - // Should have results from both pages (50 + 10 = 60) - expect(results.length).toBe(60); - // Verify deduplication works - const names = results.map((r: TestResource) => r.name); - const uniqueNames = new Set(names); - expect(uniqueNames.size).toBe(60); - }); - - it('should handle empty results', async () => { - class EmptyResource extends ResourceBase { - get = async () => this; - delete = async () => this; - static list = async () => []; - } - - const results = await EmptyResource.listAll({ - uniqIdCallback: () => '', - }); - - expect(results).toEqual([]); - }); - }); + // const NewClass = bindResourceBase(BaseClass); - describe('listAllResources (protected static)', () => { - it('should call listAll with correct parameters', async () => { - // Use the public listAll method since listAllResources is protected - const results = await TestResource.listAll({ - uniqIdCallback: (item: TestResource) => item.name || '', - config: new Config({ accessKeyId: 'test' }), - }); - - expect(Array.isArray(results)).toBe(true); - }); - - it('should call listAllResources via exposed method', async () => { - // Create a subclass that exposes listAllResources - class ExposedResource extends TestResource { - static async callListAllResources() { - return await this.listAllResources( - (item: TestResource) => item.name || '', - new Config({ accessKeyId: 'test' }) - ); - } - } - - const results = await ExposedResource.callListAllResources(); - expect(Array.isArray(results)).toBe(true); - }); - }); + test('listAll', async () => { + // expect(await BaseClass.list()).toHaveLength(10); + // expect(await BaseClass.list({ input: { pageSize: 5 } })).toHaveLength(5); - describe('base class list method', () => { - it('should return empty array by default', async () => { - // Directly test the base class list method - const result = await ResourceBase.list({ input: {} }); - expect(result).toEqual([]); - }); - }); + expect(await NewClass.list()).toHaveLength(10); + expect(await NewClass.list({ input: { pageSize: 5 } })).toHaveLength(5); + expect(await NewClass.listAll()).toHaveLength(57); + }); - describe('delete_and_wait_until_finished edge cases', () => { - it('should handle callback during wait', async () => { - class DeletableResource extends TestResource { - delete = async (): Promise => { - this.status = Status.DELETING; - return this; - }; - - get = async (): Promise => { - if (this.status === Status.DELETING) { - throw new ResourceNotExistError('TestResource', 'test-id'); - } - return this; - }; - } - - const resource = new DeletableResource({ name: 'test', status: Status.READY }); - const callbacks: any[] = []; - - await resource.delete_and_wait_until_finished({ - callback: async (r) => { - callbacks.push(r.status); - }, - intervalSeconds: 0.1, - timeoutSeconds: 5, - }); - - // Callback should have been called before ResourceNotExistError - expect(callbacks.length).toBeGreaterThanOrEqual(0); - }); - - it('should call callback and return false when refresh succeeds but resource still exists', async () => { - let getCallCount = 0; - class SlowDeletingResource extends TestResource { - delete = async (): Promise => { - this.status = Status.DELETING; - return this; - }; - - get = async (): Promise => { - getCallCount++; - // First few refreshes succeed (resource still exists) - if (getCallCount < 3) { - return this; // Returns false in checkFinishedCallback - } - // Later throws ResourceNotExistError (resource deleted) - throw new ResourceNotExistError('TestResource', 'test-id'); - }; - } - - const resource = new SlowDeletingResource({ name: 'test', status: Status.READY }); - const callbacks: Status[] = []; - - await resource.delete_and_wait_until_finished({ - callback: async (r) => { - callbacks.push(r.status as Status); - }, - intervalSeconds: 0.05, - timeoutSeconds: 5, - }); - - // Callback should have been called at least once before ResourceNotExistError - expect(callbacks.length).toBeGreaterThan(0); - expect(callbacks[0]).toBe(Status.DELETING); - }); - - it('should throw error for unexpected status during delete wait', async () => { - class ErrorResource extends TestResource { - delete = async (): Promise => { - this.status = Status.DELETING; - return this; - }; - - get = async (): Promise => { - // Simulate an unexpected status error - this.status = Status.CREATE_FAILED; - throw new Error('Unexpected error'); - }; - } - - const resource = new ErrorResource({ name: 'test', status: Status.READY }); - - await expect( - resource.delete_and_wait_until_finished({ - callback: async () => {}, - intervalSeconds: 0.1, - timeoutSeconds: 0.5, - }) - ).rejects.toThrow('Resource status is CREATE_FAILED'); - }); - - it('should continue waiting when status is DELETING on error', async () => { - class DeletingResource extends TestResource { - private errorCount = 0; - - delete = async (): Promise => { - this.status = Status.DELETING; - return this; - }; - - get = async (): Promise => { - this.errorCount++; - if (this.errorCount < 3) { - throw new Error('Transient error'); - } - throw new ResourceNotExistError('TestResource', 'test-id'); - }; - } - - const resource = new DeletingResource({ name: 'test', status: Status.DELETING }); - - const result = await resource.delete_and_wait_until_finished({ - callback: async () => {}, - intervalSeconds: 0.05, - timeoutSeconds: 2, - }); - - expect(result).toBe(resource); - }); - }); + test('skip odd', async () => { + // expect(await BaseClass.list()).toHaveLength(10); + // expect( + // await BaseClass.list({ input: { pageSize: 5, skipOdd: true } }) + // ).toHaveLength(5); + + expect(await NewClass.list()).toHaveLength(10); + expect( + await NewClass.list({ input: { pageSize: 5, skipOdd: true } }) + ).toHaveLength(5); + expect(await NewClass.listAll({ skipOdd: true })).toHaveLength(29); }); }); - From 11338ccb4fb3eef9bad8c27a062d7908675ebe20 Mon Sep 17 00:00:00 2001 From: OhYee Date: Mon, 19 Jan 2026 00:40:01 +0800 Subject: [PATCH 2/3] refactor: enhance resource management and API consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - refactor client implementations to use centralized client classes - remove direct API calls from resource classes - update waiting methods to use waitUntilReadyOrFailed pattern - improve error handling and type safety - standardize resource listing and pagination methods 更新了资源管理和API一致性，包括： - 重构客户端实现以使用集中式客户端类 - 从资源类中移除直接API调用 - 更新等待方法以使用waitUntilReadyOrFailed模式 - 改进错误处理和类型安全 - 标准化资源列表和分页方法 Change-Id: I359c258097312c30bbc7aa206b8e5f5fb0fa3924 Signed-off-by: OhYee --- examples/agent-runtime.ts | 8 +- examples/model.ts | 14 +- examples/sandbox.ts | 153 ++++--- src/agent-runtime/client.ts | 328 ++++++++++++-- src/agent-runtime/endpoint.ts | 280 ++++-------- src/agent-runtime/runtime.ts | 320 +------------- src/credential/client.ts | 75 ++-- src/credential/credential.ts | 57 +-- src/model/client.ts | 60 +-- src/model/model-proxy.ts | 4 +- src/model/model-service.ts | 52 +-- src/sandbox/aio-sandbox.ts | 99 ++--- src/sandbox/api/control.ts | 44 ++ src/sandbox/browser-sandbox.ts | 72 +-- src/sandbox/client.ts | 278 ++++++++++-- src/sandbox/code-interpreter-sandbox.ts | 89 ++-- src/sandbox/sandbox.ts | 226 +--------- src/sandbox/template.ts | 415 ++---------------- src/toolset/api/control.ts | 123 ++++++ src/toolset/client.ts | 185 +++++++- src/toolset/toolset.ts | 298 +------------ src/utils/index.ts | 27 +- src/utils/mixin.ts | 40 -- src/utils/mixmin.ts | 1 - src/utils/model.ts | 25 -- src/utils/resource.ts | 8 +- tests/e2e/agent-runtime/agent-runtime.test.ts | 10 +- tests/e2e/model/model.test.ts | 38 +- tests/e2e/model/model_service.test.ts | 4 +- tests/e2e/sandbox/template.test.ts | 22 +- tests/e2e/toolset/toolset.test.ts | 92 ---- .../agent-runtime/agent-runtime.test.ts | 97 ++-- .../model/model-service-wait.test.ts | 25 +- tests/unittests/toolset/client.test.ts | 100 +++++ .../unittests/toolset/toolset-client.test.ts | 235 ++++++++++ .../toolset/toolset-resource.test.ts | 321 ++++---------- tests/unittests/utils.test.ts | 129 ++++++ tests/unittests/utils/model.test.ts | 30 +- tests/unittests/utils/resource.test.ts | 86 +++- 39 files changed, 2041 insertions(+), 2429 deletions(-) delete mode 100644 src/utils/mixin.ts delete mode 100644 src/utils/mixmin.ts delete mode 100644 tests/e2e/toolset/toolset.test.ts create mode 100644 tests/unittests/toolset/toolset-client.test.ts create mode 100644 tests/unittests/utils.test.ts diff --git a/examples/agent-runtime.ts b/examples/agent-runtime.ts index fb0e5d9..85e9754 100644 --- a/examples/agent-runtime.ts +++ b/examples/agent-runtime.ts @@ -168,7 +168,7 @@ async function createOrGetAgentRuntime(): Promise { // Wait for ready or failed log('等待就绪 / Waiting for ready...'); await ar.waitUntilReadyOrFailed({ - beforeCheck: (runtime) => + callback: (runtime) => log(` 当前状态 / Current status: ${runtime.status}`), }); @@ -197,7 +197,7 @@ async function updateAgentRuntime(ar: AgentRuntime): Promise { }); await ar.waitUntilReadyOrFailed({ - beforeCheck: (runtime) => + callback: (runtime) => log(` 当前状态 / Current status: ${runtime.status}`), }); @@ -234,8 +234,8 @@ async function deleteAgentRuntime(ar: AgentRuntime): Promise { // Wait for deletion log('等待删除完成 / Waiting for deletion...'); try { - await ar.waitUntilReady({ - beforeCheck: (runtime) => + await ar.waitUntilReadyOrFailed({ + callback: (runtime) => log(` 当前状态 / Current status: ${runtime.status}`), }); } catch (error) { diff --git a/examples/model.ts b/examples/model.ts index cb8c9eb..6a6c549 100644 --- a/examples/model.ts +++ b/examples/model.ts @@ -67,8 +67,9 @@ async function createOrGetModelService(): Promise { } // 等待就绪 / Wait for ready - await ms.waitUntilReady({ - beforeCheck: (service: ModelService) => log(` 当前状态 / Current status: ${service.status}`), + await ms.waitUntilReadyOrFailed({ + beforeCheck: (service: ModelService) => + log(` 当前状态 / Current status: ${service.status}`), }); if (ms.status !== Status.READY) { @@ -95,7 +96,7 @@ async function updateModelService(ms: ModelService): Promise { }, }); - await ms.waitUntilReady(); + await ms.waitUntilReadyOrFailed(); if (ms.status !== Status.READY) { throw new Error(`状态异常 / Unexpected status: ${ms.status}`); @@ -196,8 +197,9 @@ async function createOrGetModelProxy(): Promise { } // 等待就绪 / Wait for ready - await mp.waitUntilReady({ - beforeCheck: (proxy: ModelProxy) => log(` 当前状态 / Current status: ${proxy.status}`), + await mp.waitUntilReadyOrFailed({ + beforeCheck: (proxy: ModelProxy) => + log(` 当前状态 / Current status: ${proxy.status}`), }); if (mp.status !== Status.READY) { @@ -226,7 +228,7 @@ async function updateModelProxy(mp: ModelProxy): Promise { }, }); - await mp.waitUntilReady(); + await mp.waitUntilReadyOrFailed(); if (mp.status !== Status.READY) { throw new Error(`状态异常 / Unexpected status: ${mp.status}`); diff --git a/examples/sandbox.ts b/examples/sandbox.ts index e3a6855..d213a89 100644 --- a/examples/sandbox.ts +++ b/examples/sandbox.ts @@ -13,11 +13,18 @@ * bun run examples/sandbox.ts */ -import * as fs from "fs/promises"; -import * as path from "path"; - -import { CodeInterpreterSandbox, CodeLanguage, Sandbox, SandboxClient, Template, TemplateType } from "../src/index"; -import { logger } from "../src/utils/log"; +import * as fs from 'fs/promises'; +import * as path from 'path'; + +import { + CodeInterpreterSandbox, + CodeLanguage, + Sandbox, + SandboxClient, + Template, + TemplateType, +} from '../src/index'; +import { logger } from '../src/utils/log'; // Logger helper function log(message: string, ...args: unknown[]) { @@ -30,13 +37,15 @@ const client = new SandboxClient(); * 列出模板 / List templates */ async function listTemplates(): Promise { - log("枚举模板列表 / Listing templates"); + log('枚举模板列表 / Listing templates'); const templates = await client.listAllTemplates(); log(`共有 ${templates.length} 个模板 / Total ${templates.length} templates:`); for (const template of templates) { - log(` - ${template.templateName} (${template.templateType}) [${template.status}]`); + log( + ` - ${template.templateName} (${template.templateType}) [${template.status}]` + ); } } @@ -44,7 +53,7 @@ async function listTemplates(): Promise { * 列出沙箱 / List sandboxes */ async function listSandboxes(): Promise { - log("枚举沙箱列表 / Listing sandboxes"); + log('枚举沙箱列表 / Listing sandboxes'); const sandboxes = await client.listSandboxes(); log(`共有 ${sandboxes.length} 个沙箱 / Total ${sandboxes.length} sandboxes:`); @@ -58,18 +67,18 @@ async function listSandboxes(): Promise { * Code Interpreter 测试 / Code Interpreter test */ async function codeInterpreterExample(): Promise { - log("=".repeat(60)); - log("开始测试 Code Interpreter / Starting Code Interpreter test"); - log("=".repeat(60)); + log('='.repeat(60)); + log('开始测试 Code Interpreter / Starting Code Interpreter test'); + log('='.repeat(60)); const templateName = `sdk-nodejs-template-${Date.now()}`; // 创建模板 / Create template - log("\n--- 创建模板 / Creating template ---"); + log('\n--- 创建模板 / Creating template ---'); const template = await Template.create({ templateName, templateType: TemplateType.CODE_INTERPRETER, - description: "Test template from Node.js SDK", + description: 'Test template from Node.js SDK', sandboxIdleTimeoutInSeconds: 600, }); @@ -78,35 +87,39 @@ async function codeInterpreterExample(): Promise { log(` - 模板状态: ${template.status}`); // 等待模板就绪 / Wait for template to be ready - log("\n--- 等待模板就绪 / Waiting for template to be ready ---"); - await template.waitUntilReady({ - beforeCheck: (t) => log(` 当前状态 / Current status: ${t.status}`), + log('\n--- 等待模板就绪 / Waiting for template to be ready ---'); + await template.waitUntilReadyOrFailed({ + callback: (t) => log(` 当前状态 / Current status: ${t.status}`), }); - log("✓ 模板已就绪 / Template is ready"); + log('✓ 模板已就绪 / Template is ready'); // 创建沙箱 / Create sandbox - log("\n--- 创建 Code Interpreter 沙箱 / Creating Code Interpreter sandbox ---"); + log( + '\n--- 创建 Code Interpreter 沙箱 / Creating Code Interpreter sandbox ---' + ); const sandbox = await CodeInterpreterSandbox.createFromTemplate(templateName); log(`✓ 创建沙箱成功 / Sandbox created: ${sandbox.sandboxId}`); // 等待沙箱运行 / Wait for sandbox to be running - log("\n--- 等待沙箱运行 / Waiting for sandbox to be running ---"); + log('\n--- 等待沙箱运行 / Waiting for sandbox to be running ---'); await sandbox.waitUntilRunning({ beforeCheck: (s) => log(` 当前状态 / Current state: ${s.state}`), }); - log("✓ 沙箱已运行 / Sandbox is running"); + log('✓ 沙箱已运行 / Sandbox is running'); // 等待沙箱健康检查通过 - log("\n--- 等待沙箱就绪 / Waiting for sandbox to be ready ---"); - await sandbox.waitUntilReady(); - log("✓ 沙箱健康检查通过 / Sandbox is healthy"); + log('\n--- 等待沙箱就绪 / Waiting for sandbox to be ready ---'); + await sandbox.waitUntilReadyOrFailed(); + log('✓ 沙箱健康检查通过 / Sandbox is healthy'); // 测试代码执行上下文 - log("\n--- 测试代码执行上下文 / Testing code execution context ---"); + log('\n--- 测试代码执行上下文 / Testing code execution context ---'); const ctx = await sandbox.context.create({ language: CodeLanguage.PYTHON }); log(`✓ 创建上下文成功 / Context created: ${ctx.contextId}`); - const execResult = await ctx.execute({ code: "print('Hello from Node.js SDK!')" }); + const execResult = await ctx.execute({ + code: "print('Hello from Node.js SDK!')", + }); log(`✓ 执行代码结果 / Code execution result:`, execResult); const contexts = await ctx.list(); @@ -116,22 +129,24 @@ async function codeInterpreterExample(): Promise { log(`✓ 获取上下文详情 / Context details: ${contextDetails.contextId}`); // 测试文件系统操作 / File system operations - log("\n--- 测试文件系统操作 / Testing file system operations ---"); - const rootFiles = await sandbox.fileSystem.list({ path: "/" }); + log('\n--- 测试文件系统操作 / Testing file system operations ---'); + const rootFiles = await sandbox.fileSystem.list({ path: '/' }); log(`✓ 根目录文件列表 / Root directory listing:`, rootFiles); - await sandbox.fileSystem.mkdir({ path: "/home/user/test" }); + await sandbox.fileSystem.mkdir({ path: '/home/user/test' }); log(`✓ 创建文件夹 /home/user/test / Created directory /home/user/test`); - await sandbox.fileSystem.mkdir({ path: "/home/user/test-move" }); - log(`✓ 创建文件夹 /home/user/test-move / Created directory /home/user/test-move`); + await sandbox.fileSystem.mkdir({ path: '/home/user/test-move' }); + log( + `✓ 创建文件夹 /home/user/test-move / Created directory /home/user/test-move` + ); // 测试上传下载 / Upload/Download test - log("\n--- 测试上传下载 / Testing upload/download ---"); - const testFilePath = "./temp_test_file.txt"; + log('\n--- 测试上传下载 / Testing upload/download ---'); + const testFilePath = './temp_test_file.txt'; const testContent = - "这是一个测试文件,用于验证 Sandbox 文件上传下载功能。\n" + - "This is a test file for validating Sandbox file upload/download.\n" + + '这是一个测试文件,用于验证 Sandbox 文件上传下载功能。\n' + + 'This is a test file for validating Sandbox file upload/download.\n' + `创建时间 / Created at: ${new Date().toISOString()}\n`; await fs.writeFile(testFilePath, testContent); @@ -139,62 +154,74 @@ async function codeInterpreterExample(): Promise { await sandbox.fileSystem.upload({ localFilePath: testFilePath, - targetFilePath: "/home/user/test-move/test_file.txt", + targetFilePath: '/home/user/test-move/test_file.txt', }); log(`✓ 上传文件成功 / File uploaded successfully`); - const filestat = await sandbox.fileSystem.stat("/home/user/test-move/test_file.txt"); + const filestat = await sandbox.fileSystem.stat( + '/home/user/test-move/test_file.txt' + ); log(`✓ 上传文件详情 / Uploaded file stat:`, filestat); - const downloadPath = "./downloaded_test_file.txt"; + const downloadPath = './downloaded_test_file.txt'; const downloadResult = await sandbox.fileSystem.download({ - path: "/home/user/test-move/test_file.txt", + path: '/home/user/test-move/test_file.txt', savePath: downloadPath, }); log(`✓ 下载文件结果 / Downloaded file:`, downloadResult); // 验证下载的文件内容 - const downloadedContent = await fs.readFile(downloadPath, "utf-8"); - log(`✓ 验证下载文件内容 / Verify downloaded content: ${downloadedContent.slice(0, 50)}...`); + const downloadedContent = await fs.readFile(downloadPath, 'utf-8'); + log( + `✓ 验证下载文件内容 / Verify downloaded content: ${downloadedContent.slice( + 0, + 50 + )}...` + ); // 测试文件读写 / File read/write test - log("\n--- 测试文件读写 / Testing file read/write ---"); - await sandbox.file.write({ path: "/home/user/test/test.txt", content: "hello world" }); + log('\n--- 测试文件读写 / Testing file read/write ---'); + await sandbox.file.write({ + path: '/home/user/test/test.txt', + content: 'hello world', + }); log(`✓ 写入文件成功 / File written successfully`); - const readResult = await sandbox.file.read("/home/user/test/test.txt"); + const readResult = await sandbox.file.read('/home/user/test/test.txt'); log(`✓ 读取文件结果 / File read result:`, readResult); // 测试文件移动 / File move test - log("\n--- 测试文件移动 / Testing file move ---"); + log('\n--- 测试文件移动 / Testing file move ---'); await sandbox.fileSystem.move({ - source: "/home/user/test/test.txt", - destination: "/home/user/test-move/test2.txt", + source: '/home/user/test/test.txt', + destination: '/home/user/test-move/test2.txt', }); log(`✓ 移动文件成功 / File moved successfully`); - const movedContent = await sandbox.file.read("/home/user/test-move/test2.txt"); + const movedContent = await sandbox.file.read( + '/home/user/test-move/test2.txt' + ); log(`✓ 读取移动后的文件 / Read moved file:`, movedContent); // 测试文件详情 / File stat test - log("\n--- 测试文件详情 / Testing file stat ---"); - const dirStat = await sandbox.fileSystem.stat("/home/user/test-move"); + log('\n--- 测试文件详情 / Testing file stat ---'); + const dirStat = await sandbox.fileSystem.stat('/home/user/test-move'); log(`✓ 文件详情 / File stat:`, dirStat); // 测试删除文件 / Delete test - log("\n--- 测试删除文件 / Testing file deletion ---"); - await sandbox.fileSystem.remove("/home/user/test-move"); + log('\n--- 测试删除文件 / Testing file deletion ---'); + await sandbox.fileSystem.remove('/home/user/test-move'); log(`✓ 删除文件夹成功 / Directory deleted successfully`); // 测试进程操作 / Process operations - log("\n--- 测试进程操作 / Testing process operations ---"); + log('\n--- 测试进程操作 / Testing process operations ---'); const processes = await sandbox.process.list(); log(`✓ 进程列表 / Process list:`, processes); - const cmdResult = await sandbox.process.cmd({ command: "ls", cwd: "/" }); + const cmdResult = await sandbox.process.cmd({ command: 'ls', cwd: '/' }); log(`✓ 进程执行结果 / Process execution result:`, cmdResult); - const processDetails = await sandbox.process.get("1"); + const processDetails = await sandbox.process.get('1'); log(`✓ 进程详情 / Process details:`, processDetails); // 清理上下文 @@ -202,18 +229,18 @@ async function codeInterpreterExample(): Promise { log(`✓ 删除上下文成功 / Context deleted`); // 停止沙箱 / Stop sandbox - log("\n--- 停止沙箱 / Stopping sandbox ---"); + log('\n--- 停止沙箱 / Stopping sandbox ---'); await sandbox.stop(); - log("✓ 沙箱已停止 / Sandbox stopped"); + log('✓ 沙箱已停止 / Sandbox stopped'); // 清理资源 / Cleanup - log("\n--- 清理资源 / Cleaning up ---"); + log('\n--- 清理资源 / Cleaning up ---'); await sandbox.delete(); - log("✓ 沙箱已删除 / Sandbox deleted"); + log('✓ 沙箱已删除 / Sandbox deleted'); await template.delete(); - log("✓ 模板已删除 / Template deleted"); + log('✓ 模板已删除 / Template deleted'); // 清理临时测试文件 / Clean up temp files try { @@ -230,14 +257,14 @@ async function codeInterpreterExample(): Promise { // Ignore if file doesn't exist } - log("\n✓ Code Interpreter 测试完成 / Code Interpreter test complete\n"); + log('\n✓ Code Interpreter 测试完成 / Code Interpreter test complete\n'); } /** * 主函数 / Main function */ async function main() { - log("==== 沙箱模块基本功能示例 / Sandbox Module Example ===="); + log('==== 沙箱模块基本功能示例 / Sandbox Module Example ===='); try { // List existing templates and sandboxes @@ -251,9 +278,9 @@ async function main() { await listTemplates(); await listSandboxes(); - log("==== 示例完成 / Example Complete ===="); + log('==== 示例完成 / Example Complete ===='); } catch (error) { - logger.error("Error:", error); + logger.error('Error:', error); process.exit(1); } } diff --git a/src/agent-runtime/client.ts b/src/agent-runtime/client.ts index ac1003a..ca01370 100644 --- a/src/agent-runtime/client.ts +++ b/src/agent-runtime/client.ts @@ -5,12 +5,16 @@ * This module provides the client API for Agent Runtime. */ +import * as $AgentRun from '@alicloud/agentrun20250910'; import { Config } from '../utils/config'; +import { HTTPError } from '../utils/exception'; +import { NetworkMode } from '../utils/model'; import { AgentRuntimeControlAPI } from './api/control'; import { AgentRuntimeDataAPI, InvokeArgs } from './api/data'; import { AgentRuntimeEndpoint } from './endpoint'; import { + AgentRuntimeArtifact, AgentRuntimeCreateInput, AgentRuntimeEndpointCreateInput, AgentRuntimeEndpointListInput, @@ -45,7 +49,60 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { input, config } = params; - return AgentRuntime.create({ input, config: config ?? this.config }); + const cfg = Config.withConfigs(this.config, config); + + try { + // Set default network configuration + if (!input.networkConfiguration) { + input.networkConfiguration = {}; + } + + // Auto-detect artifact type + if (!input.artifactType) { + if (input.codeConfiguration) { + input.artifactType = AgentRuntimeArtifact.CODE; + } else if (input.containerConfiguration) { + input.artifactType = AgentRuntimeArtifact.CONTAINER; + } else { + throw new Error( + 'Either codeConfiguration or containerConfiguration must be provided' + ); + } + } + + const result = await this.controlApi.createAgentRuntime({ + input: new $AgentRun.CreateAgentRuntimeInput({ + ...input, + codeConfiguration: input.codeConfiguration + ? new $AgentRun.CodeConfiguration({ + ...input.codeConfiguration, + }) + : undefined, + containerConfiguration: input.containerConfiguration + ? new $AgentRun.ContainerConfiguration({ + ...input.containerConfiguration, + }) + : undefined, + networkConfiguration: input.networkConfiguration + ? new $AgentRun.NetworkConfiguration({ + networkMode: + input.networkConfiguration.networkMode || NetworkMode.PUBLIC, + securityGroupId: input.networkConfiguration.securityGroupId, + vpcId: input.networkConfiguration.vpcId, + vswitchIds: input.networkConfiguration.vSwitchIds, + }) + : undefined, + }), + config: cfg, + }); + + return new AgentRuntime(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError('AgentRuntime', input.agentRuntimeName); + } + throw error; + } }; /** @@ -56,7 +113,43 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { id, config } = params; - return AgentRuntime.delete({ id, config: config ?? this.config }); + const cfg = Config.withConfigs(this.config, config); + + try { + // First delete all endpoints + const endpoints = await this.listEndpoints({ + agentRuntimeId: id, + config: cfg, + }); + for (const endpoint of endpoints) { + await endpoint.delete({ config: cfg }); + } + + // Wait for all endpoints to be deleted + let remaining = await this.listEndpoints({ + agentRuntimeId: id, + config: cfg, + }); + while (remaining.length > 0) { + await new Promise((resolve) => setTimeout(resolve, 1000)); + remaining = await this.listEndpoints({ + agentRuntimeId: id, + config: cfg, + }); + } + + const result = await this.controlApi.deleteAgentRuntime({ + agentId: id, + config: cfg, + }); + + return new AgentRuntime(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError('AgentRuntime', id); + } + throw error; + } }; /** @@ -68,7 +161,34 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { id, input, config } = params; - return AgentRuntime.update({ id, input, config: config ?? this.config }); + const cfg = Config.withConfigs(this.config, config); + + try { + const result = await this.controlApi.updateAgentRuntime({ + agentId: id, + input: new $AgentRun.UpdateAgentRuntimeInput({ + ...input, + codeConfiguration: input.codeConfiguration + ? new $AgentRun.CodeConfiguration({ + ...input.codeConfiguration, + }) + : undefined, + containerConfiguration: input.containerConfiguration + ? new $AgentRun.ContainerConfiguration({ + ...input.containerConfiguration, + }) + : undefined, + }), + config: cfg, + }); + + return new AgentRuntime(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError('AgentRuntime', id); + } + throw error; + } }; /** @@ -79,7 +199,20 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { id, config } = params; - return AgentRuntime.get({ id, config: config ?? this.config }); + const cfg = Config.withConfigs(this.config, config); + + try { + const result = await this.controlApi.getAgentRuntime({ + agentId: id, + config: cfg, + }); + return new AgentRuntime(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError('AgentRuntime', id); + } + throw error; + } }; /** @@ -90,7 +223,15 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { input, config } = params ?? {}; - return AgentRuntime.list({ input, config: config ?? this.config }); + const cfg = Config.withConfigs(this.config, config); + const request = new $AgentRun.ListAgentRuntimesRequest({ + ...input, + }); + const result = await this.controlApi.listAgentRuntimes({ + input: request, + config: cfg, + }); + return (result.items || []).map((item) => new AgentRuntime(item, cfg)); }; // /** @@ -117,11 +258,31 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { agentRuntimeId, input, config } = params; - return AgentRuntimeEndpoint.create({ - agentRuntimeId, - input, - config: config ?? this.config, - }); + const cfg = Config.withConfigs(this.config, config); + + try { + // Set default targetVersion to "LATEST" if not provided (same as Python SDK) + const targetVersion = input.targetVersion || 'LATEST'; + + const result = await this.controlApi.createAgentRuntimeEndpoint({ + agentId: agentRuntimeId, + input: new $AgentRun.CreateAgentRuntimeEndpointInput({ + ...input, + targetVersion, + }), + config: cfg, + }); + + return new AgentRuntimeEndpoint(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError( + 'AgentRuntimeEndpoint', + `${agentRuntimeId}/${input.agentRuntimeEndpointName}` + ); + } + throw error; + } }; /** @@ -133,11 +294,24 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { agentRuntimeId, endpointId, config } = params; - return AgentRuntimeEndpoint.delete({ - agentRuntimeId, - endpointId, - config: config ?? this.config, - }); + const cfg = Config.withConfigs(this.config, config); + + try { + const result = await this.controlApi.deleteAgentRuntimeEndpoint({ + agentId: agentRuntimeId, + endpointId, + config: cfg, + }); + return new AgentRuntimeEndpoint(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError( + 'AgentRuntimeEndpoint', + `${agentRuntimeId}/${endpointId}` + ); + } + throw error; + } }; /** @@ -150,12 +324,27 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { agentRuntimeId, endpointId, input, config } = params; - return AgentRuntimeEndpoint.update({ - agentRuntimeId, - endpointId, - input, - config: config ?? this.config, - }); + const cfg = Config.withConfigs(this.config, config); + + try { + const result = await this.controlApi.updateAgentRuntimeEndpoint({ + agentId: agentRuntimeId, + endpointId, + input: new $AgentRun.UpdateAgentRuntimeEndpointInput({ + ...input, + }), + config: cfg, + }); + return new AgentRuntimeEndpoint(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError( + 'AgentRuntimeEndpoint', + `${agentRuntimeId}/${endpointId}` + ); + } + throw error; + } }; /** @@ -167,11 +356,24 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { agentRuntimeId, endpointId, config } = params; - return AgentRuntimeEndpoint.get({ - agentRuntimeId, - endpointId, - config: config ?? this.config, - }); + const cfg = Config.withConfigs(this.config, config); + + try { + const result = await this.controlApi.getAgentRuntimeEndpoint({ + agentId: agentRuntimeId, + endpointId, + config: cfg, + }); + return new AgentRuntimeEndpoint(result, cfg); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError( + 'AgentRuntimeEndpoint', + `${agentRuntimeId}/${endpointId}` + ); + } + throw error; + } }; /** @@ -183,11 +385,26 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { agentRuntimeId, input, config } = params; - return AgentRuntimeEndpoint.listById({ - agentRuntimeId, - input, - config: config ?? this.config, - }); + const cfg = Config.withConfigs(this.config, config); + + try { + const request = new $AgentRun.ListAgentRuntimeEndpointsRequest({ + ...input, + }); + const result = await this.controlApi.listAgentRuntimeEndpoints({ + agentId: agentRuntimeId, + input: request, + config: cfg, + }); + return (result.items || []).map( + (item) => new AgentRuntimeEndpoint(item, cfg) + ); + } catch (error) { + if (error instanceof HTTPError) { + throw error.toResourceError('AgentRuntime', agentRuntimeId); + } + throw error; + } }; /** @@ -199,10 +416,51 @@ export class AgentRuntimeClient { config?: Config; }): Promise => { const { agentRuntimeId, input, config } = params; - return AgentRuntime.listVersionsById({ - agentRuntimeId, - input, - config: config ?? this.config, + const cfg = Config.withConfigs(this.config, config); + const versions: AgentRuntimeVersion[] = []; + let page = 1; + const pageSize = 50; + + while (true) { + const request = new $AgentRun.ListAgentRuntimeVersionsRequest({ + ...input, + pageNumber: input?.pageNumber ?? page, + pageSize: input?.pageSize ?? pageSize, + }); + const result = await this.controlApi.listAgentRuntimeVersions({ + agentId: agentRuntimeId, + input: request, + config: cfg, + }); + + if (result.items) { + for (const item of result.items) { + versions.push({ + agentRuntimeArn: item.agentRuntimeArn, + agentRuntimeId: item.agentRuntimeId, + agentRuntimeName: item.agentRuntimeName, + agentRuntimeVersion: item.agentRuntimeVersion, + description: item.description, + lastUpdatedAt: item.lastUpdatedAt, + }); + } + } + + if (!result.items || result.items.length < pageSize) { + break; + } + + page++; + } + + // Deduplicate + const seen = new Set(); + return versions.filter((v) => { + if (!v.agentRuntimeVersion || seen.has(v.agentRuntimeVersion)) { + return false; + } + seen.add(v.agentRuntimeVersion); + return true; }); }; diff --git a/src/agent-runtime/endpoint.ts b/src/agent-runtime/endpoint.ts index 4a36de2..dfdb884 100644 --- a/src/agent-runtime/endpoint.ts +++ b/src/agent-runtime/endpoint.ts @@ -5,27 +5,31 @@ * This module defines the Agent Runtime Endpoint resource class. */ -import * as $AgentRun from "@alicloud/agentrun20250910"; - -import { Config } from "../utils/config"; -import { HTTPError } from "../utils/exception"; -import { updateObjectProperties } from "../utils/resource"; -import { Status } from "../utils/model"; +import { Config } from '../utils/config'; +import { + listAllResourcesFunction, + ResourceBase, + updateObjectProperties, +} from '../utils/resource'; +import { PageableInput, Status } from '../utils/model'; -import { AgentRuntimeControlAPI } from "./api/control"; -import { AgentRuntimeDataAPI, InvokeArgs } from "./api/data"; +import { AgentRuntimeDataAPI, InvokeArgs } from './api/data'; import { AgentRuntimeEndpointCreateInput, AgentRuntimeEndpointUpdateInput, AgentRuntimeEndpointListInput, AgentRuntimeEndpointData, AgentRuntimeEndpointRoutingConfig, -} from "./model"; +} from './model'; +import { KeyOf } from 'zod/v4/core/util.cjs'; /** * Agent Runtime Endpoint resource class */ -export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { +export class AgentRuntimeEndpoint + extends ResourceBase + implements AgentRuntimeEndpointData +{ // System properties agentRuntimeEndpointArn?: string; agentRuntimeEndpointId?: string; @@ -35,49 +39,29 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { endpointPublicUrl?: string; resourceName?: string; routingConfiguration?: AgentRuntimeEndpointRoutingConfig; - status?: Status; + declare status?: Status; statusReason?: string; tags?: string[]; targetVersion?: string; - private _config?: Config; + protected _config?: Config; private _dataApi?: AgentRuntimeDataAPI; private _agentRuntimeName?: string; - constructor(data?: Partial, config?: Config) { + constructor(data?: any, config?: Config) { + super(); if (data) { updateObjectProperties(this, data); } this._config = config; } - /** - * Create endpoint from SDK response object - */ - static fromInnerObject( - obj: $AgentRun.AgentRuntimeEndpoint, - config?: Config, - ): AgentRuntimeEndpoint { - return new AgentRuntimeEndpoint( - { - agentRuntimeEndpointArn: obj.agentRuntimeEndpointArn, - agentRuntimeEndpointId: obj.agentRuntimeEndpointId, - agentRuntimeEndpointName: obj.agentRuntimeEndpointName, - agentRuntimeId: obj.agentRuntimeId, - description: obj.description, - endpointPublicUrl: obj.endpointPublicUrl, - resourceName: obj.resourceName, - status: obj.status as Status, - statusReason: obj.statusReason, - tags: obj.tags, - targetVersion: obj.targetVersion, - }, - config, - ); - } + uniqIdCallback = () => this.agentRuntimeEndpointId; - private static getClient(): AgentRuntimeControlAPI { - return new AgentRuntimeControlAPI(); + private static getClient() { + // eslint-disable-next-line @typescript-eslint/no-var-requires + const { AgentRuntimeClient } = require('./client'); + return new AgentRuntimeClient(); } /** @@ -89,31 +73,11 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { config?: Config; }): Promise { const { agentRuntimeId, input, config } = params; - const client = AgentRuntimeEndpoint.getClient(); - try { - // Set default targetVersion to "LATEST" if not provided (same as Python SDK) - const targetVersion = input.targetVersion || 'LATEST'; - - const result = await client.createAgentRuntimeEndpoint({ - agentId: agentRuntimeId, - input: new $AgentRun.CreateAgentRuntimeEndpointInput({ - agentRuntimeEndpointName: input.agentRuntimeEndpointName, - description: input.description, - tags: input.tags, - targetVersion: targetVersion, - }), - config, - }); - return AgentRuntimeEndpoint.fromInnerObject(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError( - "AgentRuntimeEndpoint", - `${agentRuntimeId}/${input.agentRuntimeEndpointName}`, - ); - } - throw error; - } + return await AgentRuntimeEndpoint.getClient().createEndpoint({ + agentRuntimeId, + input, + config, + }); } /** @@ -125,23 +89,11 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { config?: Config; }): Promise { const { agentRuntimeId, endpointId, config } = params; - const client = AgentRuntimeEndpoint.getClient(); - try { - const result = await client.deleteAgentRuntimeEndpoint({ - agentId: agentRuntimeId, - endpointId, - config, - }); - return AgentRuntimeEndpoint.fromInnerObject(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError( - "AgentRuntimeEndpoint", - `${agentRuntimeId}/${endpointId}`, - ); - } - throw error; - } + return await AgentRuntimeEndpoint.getClient().deleteEndpoint({ + agentRuntimeId, + endpointId, + config, + }); } /** @@ -154,29 +106,12 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { config?: Config; }): Promise { const { agentRuntimeId, endpointId, input, config } = params; - const client = AgentRuntimeEndpoint.getClient(); - try { - const result = await client.updateAgentRuntimeEndpoint({ - agentId: agentRuntimeId, - endpointId, - input: new $AgentRun.UpdateAgentRuntimeEndpointInput({ - agentRuntimeEndpointName: input.agentRuntimeEndpointName, - description: input.description, - tags: input.tags, - targetVersion: input.targetVersion, - }), - config, - }); - return AgentRuntimeEndpoint.fromInnerObject(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError( - "AgentRuntimeEndpoint", - `${agentRuntimeId}/${endpointId}`, - ); - } - throw error; - } + return await AgentRuntimeEndpoint.getClient().updateEndpoint({ + agentRuntimeId, + endpointId, + input, + config, + }); } /** @@ -188,64 +123,61 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { config?: Config; }): Promise { const { agentRuntimeId, endpointId, config } = params; - const client = AgentRuntimeEndpoint.getClient(); - try { - const result = await client.getAgentRuntimeEndpoint({ - agentId: agentRuntimeId, - endpointId, - config, - }); - return AgentRuntimeEndpoint.fromInnerObject(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError( - "AgentRuntimeEndpoint", - `${agentRuntimeId}/${endpointId}`, - ); - } - throw error; - } + return await AgentRuntimeEndpoint.getClient().getEndpoint({ + agentRuntimeId, + endpointId, + config, + }); } /** * List endpoints by Agent Runtime ID */ - static async listById(params: { + static async list(params: { agentRuntimeId: string; input?: AgentRuntimeEndpointListInput; config?: Config; }): Promise { const { agentRuntimeId, input, config } = params; - const client = AgentRuntimeEndpoint.getClient(); - try { - const request = new $AgentRun.ListAgentRuntimeEndpointsRequest({ - pageNumber: input?.pageNumber, - pageSize: input?.pageSize, - }); - const result = await client.listAgentRuntimeEndpoints({ - agentId: agentRuntimeId, - input: request, - config, - }); - return (result.items || []).map((item) => - AgentRuntimeEndpoint.fromInnerObject(item, config), - ); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError("AgentRuntime", agentRuntimeId); - } - throw error; - } + return await AgentRuntimeEndpoint.getClient().listEndpoints({ + agentRuntimeId, + input, + config, + }); } + static listAll = async ( + params: { + agentRuntimeId: string; + config?: Config; + } & Omit> + ) => { + const { agentRuntimeId, ...restParams } = params; + + return await listAllResourcesFunction( + (params?: { input?: AgentRuntimeEndpointListInput; config?: Config }) => + this.list({ ...params, agentRuntimeId }) + )(restParams); + }; + + get = async (params?: { config?: Config }) => { + return await AgentRuntimeEndpoint.get({ + agentRuntimeId: this.agentRuntimeId!, + endpointId: this.agentRuntimeEndpointId!, + config: params?.config, + }); + }; + /** * Delete this endpoint */ - delete = async (params?: { config?: Config }): Promise => { + delete = async (params?: { + config?: Config; + }): Promise => { const config = params?.config; if (!this.agentRuntimeId || !this.agentRuntimeEndpointId) { throw new Error( - "agentRuntimeId and agentRuntimeEndpointId are required to delete an endpoint", + 'agentRuntimeId and agentRuntimeEndpointId are required to delete an endpoint' ); } @@ -269,7 +201,7 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { const { input, config } = params; if (!this.agentRuntimeId || !this.agentRuntimeEndpointId) { throw new Error( - "agentRuntimeId and agentRuntimeEndpointId are required to update an endpoint", + 'agentRuntimeId and agentRuntimeEndpointId are required to update an endpoint' ); } @@ -287,11 +219,13 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { /** * Refresh this endpoint's data */ - refresh = async (params?: { config?: Config }): Promise => { + refresh = async (params?: { + config?: Config; + }): Promise => { const config = params?.config; if (!this.agentRuntimeId || !this.agentRuntimeEndpointId) { throw new Error( - "agentRuntimeId and agentRuntimeEndpointId are required to refresh an endpoint", + 'agentRuntimeId and agentRuntimeEndpointId are required to refresh an endpoint' ); } @@ -305,48 +239,6 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { return this; }; - /** - * Wait until the endpoint is ready - */ - waitUntilReady = async ( - options?: { - timeoutSeconds?: number; - intervalSeconds?: number; - beforeCheck?: (endpoint: AgentRuntimeEndpoint) => void; - }, - config?: Config, - ): Promise => { - const timeout = (options?.timeoutSeconds ?? 300) * 1000; - const interval = (options?.intervalSeconds ?? 5) * 1000; - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - await this.refresh({ config }); - - if (options?.beforeCheck) { - options.beforeCheck(this); - } - - if (this.status === Status.READY) { - return this; - } - - if ( - this.status === Status.CREATE_FAILED || - this.status === Status.UPDATE_FAILED || - this.status === Status.DELETE_FAILED - ) { - throw new Error(`Endpoint failed: ${this.statusReason}`); - } - - await new Promise((resolve) => setTimeout(resolve, interval)); - } - - throw new Error( - `Timeout waiting for endpoint to be ready after ${options?.timeoutSeconds ?? 300} seconds`, - ); - }; - /** * Invoke agent runtime using OpenAI-compatible API through this endpoint * @@ -379,8 +271,8 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { // Get agent runtime name if not available if (!this._agentRuntimeName && this.agentRuntimeId) { const client = AgentRuntimeEndpoint.getClient(); - const runtime = await client.getAgentRuntime({ - agentId: this.agentRuntimeId, + const runtime = await client.get({ + id: this.agentRuntimeId, config: cfg, }); this._agentRuntimeName = runtime.agentRuntimeName; @@ -388,14 +280,14 @@ export class AgentRuntimeEndpoint implements AgentRuntimeEndpointData { if (!this._agentRuntimeName) { throw new Error( - "Unable to determine agent runtime name for this endpoint", + 'Unable to determine agent runtime name for this endpoint' ); } this._dataApi = new AgentRuntimeDataAPI( this._agentRuntimeName, - this.agentRuntimeEndpointName || "", - cfg, + this.agentRuntimeEndpointName || '', + cfg ); } diff --git a/src/agent-runtime/runtime.ts b/src/agent-runtime/runtime.ts index 26c41e3..4bd37d6 100644 --- a/src/agent-runtime/runtime.ts +++ b/src/agent-runtime/runtime.ts @@ -5,11 +5,8 @@ * This module defines the Agent Runtime resource class. */ -import * as $AgentRun from '@alicloud/agentrun20250910'; - import { Config } from '../utils/config'; -import { HTTPError } from '../utils/exception'; -import { Status, NetworkMode } from '../utils/model'; +import { Status } from '../utils/model'; import { listAllResourcesFunction, ResourceBase, @@ -17,11 +14,9 @@ import { } from '../utils/resource'; import type { NetworkConfig } from '../utils/model'; -import { AgentRuntimeControlAPI } from './api/control'; import { AgentRuntimeDataAPI, InvokeArgs } from './api/data'; import { AgentRuntimeEndpoint } from './endpoint'; import { - AgentRuntimeArtifact, AgentRuntimeCode, AgentRuntimeContainer, AgentRuntimeCreateInput, @@ -83,8 +78,10 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { uniqIdCallback = () => this.agentRuntimeId; - private static getClient(): AgentRuntimeControlAPI { - return new AgentRuntimeControlAPI(); + private static getClient() { + // eslint-disable-next-line @typescript-eslint/no-var-requires + const { AgentRuntimeClient } = require('./client'); + return new AgentRuntimeClient(); } /** @@ -95,77 +92,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { config?: Config; }): Promise { const { input, config } = params; - const client = AgentRuntime.getClient(); - - // Set default network configuration - if (!input.networkConfiguration) { - input.networkConfiguration = {}; - } - - // Auto-detect artifact type - if (!input.artifactType) { - if (input.codeConfiguration) { - input.artifactType = AgentRuntimeArtifact.CODE; - } else if (input.containerConfiguration) { - input.artifactType = AgentRuntimeArtifact.CONTAINER; - } else { - throw new Error( - 'Either codeConfiguration or containerConfiguration must be provided' - ); - } - } - - try { - const result = await client.createAgentRuntime({ - input: new $AgentRun.CreateAgentRuntimeInput({ - agentRuntimeName: input.agentRuntimeName, - artifactType: input.artifactType, - codeConfiguration: input.codeConfiguration - ? new $AgentRun.CodeConfiguration({ - checksum: input.codeConfiguration.checksum, - command: input.codeConfiguration.command, - language: input.codeConfiguration.language, - ossBucketName: input.codeConfiguration.ossBucketName, - ossObjectName: input.codeConfiguration.ossObjectName, - zipFile: input.codeConfiguration.zipFile, - }) - : undefined, - containerConfiguration: input.containerConfiguration - ? new $AgentRun.ContainerConfiguration({ - command: input.containerConfiguration.command, - image: input.containerConfiguration.image, - }) - : undefined, - cpu: input.cpu, - credentialName: input.credentialName, - description: input.description, - environmentVariables: input.environmentVariables, - executionRoleArn: input.executionRoleArn, - memory: input.memory, - networkConfiguration: input.networkConfiguration - ? new $AgentRun.NetworkConfiguration({ - networkMode: - input.networkConfiguration.networkMode || NetworkMode.PUBLIC, // 默认使用公网模式 - securityGroupId: input.networkConfiguration.securityGroupId, - vpcId: input.networkConfiguration.vpcId, - vswitchIds: input.networkConfiguration.vSwitchIds, - }) - : undefined, - port: input.port, - sessionConcurrencyLimitPerInstance: - input.sessionConcurrencyLimitPerInstance, - sessionIdleTimeoutSeconds: input.sessionIdleTimeoutSeconds, - tags: input.tags, - }), - config, - }); - return new AgentRuntime(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('AgentRuntime', input.agentRuntimeName); - } - throw error; - } + return await AgentRuntime.getClient().create({ input, config }); } /** @@ -176,39 +103,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { config?: Config; }): Promise { const { id, config } = params; - const client = AgentRuntime.getClient(); - - // First delete all endpoints - const endpoints = await AgentRuntimeEndpoint.listById({ - agentRuntimeId: id, - config, - }); - for (const endpoint of endpoints) { - await endpoint.delete({ config }); - } - - // Wait for all endpoints to be deleted - let remaining = await AgentRuntimeEndpoint.listById({ - agentRuntimeId: id, - config, - }); - while (remaining.length > 0) { - await new Promise((resolve) => setTimeout(resolve, 1000)); - remaining = await AgentRuntimeEndpoint.listById({ - agentRuntimeId: id, - config, - }); - } - - try { - const result = await client.deleteAgentRuntime({ agentId: id, config }); - return new AgentRuntime(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('AgentRuntime', id); - } - throw error; - } + return await AgentRuntime.getClient().delete({ id, config }); } /** @@ -220,50 +115,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { config?: Config; }): Promise { const { id, input, config } = params; - const client = AgentRuntime.getClient(); - try { - const result = await client.updateAgentRuntime({ - agentId: id, - input: new $AgentRun.UpdateAgentRuntimeInput({ - agentRuntimeName: input.agentRuntimeName, - artifactType: input.artifactType, - codeConfiguration: input.codeConfiguration - ? new $AgentRun.CodeConfiguration({ - checksum: input.codeConfiguration.checksum, - command: input.codeConfiguration.command, - language: input.codeConfiguration.language, - ossBucketName: input.codeConfiguration.ossBucketName, - ossObjectName: input.codeConfiguration.ossObjectName, - zipFile: input.codeConfiguration.zipFile, - }) - : undefined, - containerConfiguration: input.containerConfiguration - ? new $AgentRun.ContainerConfiguration({ - command: input.containerConfiguration.command, - image: input.containerConfiguration.image, - }) - : undefined, - cpu: input.cpu, - credentialName: input.credentialName, - description: input.description, - environmentVariables: input.environmentVariables, - executionRoleArn: input.executionRoleArn, - memory: input.memory, - port: input.port, - sessionConcurrencyLimitPerInstance: - input.sessionConcurrencyLimitPerInstance, - sessionIdleTimeoutSeconds: input.sessionIdleTimeoutSeconds, - tags: input.tags, - }), - config, - }); - return new AgentRuntime(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('AgentRuntime', id); - } - throw error; - } + return await AgentRuntime.getClient().update({ id, input, config }); } /** @@ -274,16 +126,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { config?: Config; }): Promise { const { id, config } = params; - const client = AgentRuntime.getClient(); - try { - const result = await client.getAgentRuntime({ agentId: id, config }); - return new AgentRuntime(result, config); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('AgentRuntime', id); - } - throw error; - } + return await AgentRuntime.getClient().get({ id, config }); } /** @@ -294,16 +137,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { config?: Config; }): Promise { const { input, config } = params ?? {}; - - const client = AgentRuntime.getClient(); - const request = new $AgentRun.ListAgentRuntimesRequest({ - pageNumber: input?.pageNumber, - pageSize: input?.pageSize, - agentRuntimeName: input?.agentRuntimeName, - tags: input?.tags, - }); - const result = await client.listAgentRuntimes({ input: request, config }); - return (result.items || []).map((item) => new AgentRuntime(item, config)); + return await AgentRuntime.getClient().list({ input, config }); } static listAll = listAllResourcesFunction(this.list); @@ -318,50 +152,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { }): Promise { const { agentRuntimeId, input, config } = params; const client = AgentRuntime.getClient(); - const versions: AgentRuntimeVersion[] = []; - let page = 1; - const pageSize = 50; - - while (true) { - const request = new $AgentRun.ListAgentRuntimeVersionsRequest({ - pageNumber: input?.pageNumber ?? page, - pageSize: input?.pageSize ?? pageSize, - }); - const result = await client.listAgentRuntimeVersions({ - agentId: agentRuntimeId, - input: request, - config, - }); - - if (result.items) { - for (const item of result.items) { - versions.push({ - agentRuntimeArn: item.agentRuntimeArn, - agentRuntimeId: item.agentRuntimeId, - agentRuntimeName: item.agentRuntimeName, - agentRuntimeVersion: item.agentRuntimeVersion, - description: item.description, - lastUpdatedAt: item.lastUpdatedAt, - }); - } - } - - if (!result.items || result.items.length < pageSize) { - break; - } - - page++; - } - - // Deduplicate - const seen = new Set(); - return versions.filter((v) => { - if (!v.agentRuntimeVersion || seen.has(v.agentRuntimeVersion)) { - return false; - } - seen.add(v.agentRuntimeVersion); - return true; - }); + return await client.listVersions({ agentRuntimeId, input, config }); } /** @@ -508,7 +299,7 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { throw new Error('agentRuntimeId is required to list endpoints'); } - return AgentRuntimeEndpoint.listById({ + return AgentRuntimeEndpoint.list({ agentRuntimeId: this.agentRuntimeId, config: config ?? this._config, }); @@ -531,93 +322,6 @@ export class AgentRuntime extends ResourceBase implements AgentRuntimeData { }); }; - /** - * Wait until the runtime is ready - */ - waitUntilReady = async ( - options?: { - timeoutSeconds?: number; - intervalSeconds?: number; - beforeCheck?: (runtime: AgentRuntime) => void; - }, - config?: Config - ): Promise => { - const timeout = (options?.timeoutSeconds ?? 300) * 1000; - const interval = (options?.intervalSeconds ?? 5) * 1000; - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - await this.refresh({ config }); - - if (options?.beforeCheck) { - options.beforeCheck(this); - } - - if (this.status === Status.READY) { - return this; - } - - if ( - this.status === Status.CREATE_FAILED || - this.status === Status.UPDATE_FAILED || - this.status === Status.DELETE_FAILED - ) { - throw new Error(`Agent Runtime failed: ${this.statusReason}`); - } - - await new Promise((resolve) => setTimeout(resolve, interval)); - } - - throw new Error( - `Timeout waiting for Agent Runtime to be ready after ${ - options?.timeoutSeconds ?? 300 - } seconds` - ); - }; - - // /** - // * Wait until agent runtime reaches READY or any FAILED state - // * Similar to waitUntilReady but does not throw on FAILED states - // * Compatible with Python SDK's wait_until_ready_or_failed method - // */ - // waitUntilReadyOrFailed = async ( - // options?: { - // timeoutSeconds?: number; - // intervalSeconds?: number; - // beforeCheck?: (runtime: AgentRuntime) => void; - // }, - // config?: Config - // ): Promise => { - // const timeout = (options?.timeoutSeconds ?? 300) * 1000; - // const interval = (options?.intervalSeconds ?? 5) * 1000; - // const startTime = Date.now(); - - // while (Date.now() - startTime < timeout) { - // await this.refresh({ config }); - - // if (options?.beforeCheck) { - // options.beforeCheck(this); - // } - - // // Check if reached any final state - // if ( - // this.status === Status.READY || - // this.status === Status.CREATE_FAILED || - // this.status === Status.UPDATE_FAILED || - // this.status === Status.DELETE_FAILED - // ) { - // return this; - // } - - // await new Promise((resolve) => setTimeout(resolve, interval)); - // } - - // throw new Error( - // `Timeout waiting for Agent Runtime to reach final state after ${ - // options?.timeoutSeconds ?? 300 - // } seconds` - // ); - // }; /** * Invoke agent runtime using OpenAI-compatible API diff --git a/src/credential/client.ts b/src/credential/client.ts index 3ab1b88..f444090 100644 --- a/src/credential/client.ts +++ b/src/credential/client.ts @@ -7,9 +7,8 @@ import { HTTPError } from '../utils'; import { Config } from '../utils/config'; -import { fromInnerObject } from '../utils/model'; -import * as agentrun from '@alicloud/agentrun20250910'; +import * as $AgentRun from '@alicloud/agentrun20250910'; import { CredentialControlAPI } from './api/control'; import { Credential } from './credential'; import { @@ -43,16 +42,18 @@ export class CredentialClient { }): Promise => { try { const { input, config } = params; + const cfg = Config.withConfigs(this.config, config); // Normalize credentialConfig to SDK expected field names. - const cfg = input.credentialConfig as any | undefined; + const credCfg = input.credentialConfig as any | undefined; const normalized = { ...input, - credentialAuthType: cfg?.credentialAuthType ?? cfg?.authType, - credentialSourceType: cfg?.credentialSourceType ?? cfg?.sourceType, + credentialAuthType: credCfg?.credentialAuthType ?? credCfg?.authType, + credentialSourceType: + credCfg?.credentialSourceType ?? credCfg?.sourceType, credentialPublicConfig: - cfg?.credentialPublicConfig ?? cfg?.publicConfig, - credentialSecret: cfg?.credentialSecret ?? cfg?.secret, + credCfg?.credentialPublicConfig ?? credCfg?.publicConfig, + credentialSecret: credCfg?.credentialSecret ?? credCfg?.secret, }; // Ensure users field is always present in credentialPublicConfig @@ -80,14 +81,12 @@ export class CredentialClient { normalized.credentialSecret = ''; } } - const result = await this.controlApi.createCredential({ - input: new agentrun.CreateCredentialInput(normalized), - config: config ?? this.config, + input: new $AgentRun.CreateCredentialInput(normalized), + config: cfg, }); - const credential = fromInnerObject(result); - return new Credential(credential); + return new Credential(result); } catch (error) { if (error instanceof HTTPError) { throw error.toResourceError( @@ -103,16 +102,19 @@ export class CredentialClient { /** * Delete a Credential */ - delete = async (params: { name: string; config?: Config }): Promise => { + delete = async (params: { + name: string; + config?: Config; + }): Promise => { try { const { name, config } = params; + const cfg = Config.withConfigs(this.config, config); const result = await this.controlApi.deleteCredential({ credentialName: name, - config: config ?? this.config, + config: cfg, }); - const credential = fromInnerObject(result); - return new Credential(credential); + return new Credential(result); } catch (error) { if (error instanceof HTTPError) { throw error.toResourceError('Credential', params?.name); @@ -132,16 +134,18 @@ export class CredentialClient { }): Promise => { try { const { name, input, config } = params; - const cfg = input.credentialConfig as any | undefined; + const cfg = Config.withConfigs(this.config, config); + const credCfg = input.credentialConfig as any | undefined; const normalized: any = { ...input }; - if (cfg) { + if (credCfg) { normalized.credentialAuthType = - cfg?.credentialAuthType ?? cfg?.authType; + credCfg?.credentialAuthType ?? credCfg?.authType; normalized.credentialSourceType = - cfg?.credentialSourceType ?? cfg?.sourceType; + credCfg?.credentialSourceType ?? credCfg?.sourceType; normalized.credentialPublicConfig = - cfg?.credentialPublicConfig ?? cfg?.publicConfig; - normalized.credentialSecret = cfg?.credentialSecret ?? cfg?.secret; + credCfg?.credentialPublicConfig ?? credCfg?.publicConfig; + normalized.credentialSecret = + credCfg?.credentialSecret ?? credCfg?.secret; // Ensure users field is always present in credentialPublicConfig if (normalized.credentialPublicConfig) { @@ -166,11 +170,10 @@ export class CredentialClient { } } } - const result = await this.controlApi.updateCredential({ credentialName: name, - input: new agentrun.UpdateCredentialInput(normalized), - config: config ?? this.config, + input: new $AgentRun.UpdateCredentialInput(normalized), + config: cfg, }); return new Credential(result as any); @@ -186,13 +189,17 @@ export class CredentialClient { /** * Get a Credential */ - get = async (params: { name: string; config?: Config }): Promise => { + get = async (params: { + name: string; + config?: Config; + }): Promise => { try { const { name, config } = params; + const cfg = Config.withConfigs(this.config, config); const result = await this.controlApi.getCredential({ credentialName: name, - config: config ?? this.config, + config: cfg, }); return new Credential(result as any); } catch (error) { @@ -207,18 +214,22 @@ export class CredentialClient { /** * List Credentials */ - list = async (params: { + list = async (params?: { input?: CredentialListInput; config?: Config; }): Promise => { try { - const { input, config } = params; + const { input, config } = params ?? {}; + const cfg = Config.withConfigs(this.config, config); const results = await this.controlApi.listCredentials({ - input: new agentrun.ListCredentialsRequest(input), - config: config ?? this.config, + input: new $AgentRun.ListCredentialsRequest({ ...input }), + config: cfg, }); - return results.items?.map((item) => new CredentialListOutput(item as any)) ?? []; + return ( + results.items?.map((item) => new CredentialListOutput(item as any)) ?? + [] + ); } catch (error) { if (error instanceof HTTPError) { throw error.toResourceError('Credential'); diff --git a/src/credential/credential.ts b/src/credential/credential.ts index eb6d4da..416cc34 100644 --- a/src/credential/credential.ts +++ b/src/credential/credential.ts @@ -6,7 +6,6 @@ */ import { Config } from '../utils/config'; -import { HTTPError } from '../utils/exception'; import { listAllResourcesFunction, updateObjectProperties, @@ -18,11 +17,9 @@ import { CredentialAuthType, CredentialCreateInput, CredentialInterface, - CredentialListInput, - CredentialListOutput, CredentialSourceType, CredentialUpdateInput, - RelatedResource, + RelatedResource } from './model'; export class Credential extends ResourceBase implements CredentialInterface { @@ -46,7 +43,7 @@ export class Credential extends ResourceBase implements CredentialInterface { protected _config?: Config; - constructor(data?: CredentialInterface, config?: Config) { + constructor(data?: any, config?: Config) { super(); if (data) updateObjectProperties(this, data); @@ -69,15 +66,7 @@ export class Credential extends ResourceBase implements CredentialInterface { const config: Config | undefined = hasInputProp ? paramsOrInput.config : undefined; - const client = Credential.getClient(); - try { - return await client.create({ input, config }); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('Credential', input.credentialName || ''); - } - throw error; - } + return await Credential.getClient().create({ input, config }); }; /** @@ -90,15 +79,7 @@ export class Credential extends ResourceBase implements CredentialInterface { const config: Config | undefined = isString ? undefined : paramsOrName.config; - const client = Credential.getClient(); - try { - return await client.delete({ name, config }); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('Credential', name); - } - throw error; - } + return await Credential.getClient().delete({ name, config }); }; /** @@ -109,15 +90,7 @@ export class Credential extends ResourceBase implements CredentialInterface { const name: string = paramsOrName.name; const input: CredentialUpdateInput = paramsOrName.input; const config: Config | undefined = paramsOrName.config; - const client = Credential.getClient(); - try { - return await client.update({ name, input, config }); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('Credential', name); - } - throw error; - } + return await Credential.getClient().update({ name, input, config }); }; /** @@ -130,15 +103,7 @@ export class Credential extends ResourceBase implements CredentialInterface { const config: Config | undefined = isString ? undefined : paramsOrName.config; - const client = Credential.getClient(); - try { - return await client.get({ name, config }); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('Credential', name); - } - throw error; - } + return await Credential.getClient().get({ name, config }); }; /** @@ -147,15 +112,7 @@ export class Credential extends ResourceBase implements CredentialInterface { static list = async (paramsOrUndefined?: any) => { const input = paramsOrUndefined?.input ?? paramsOrUndefined; const config: Config | undefined = paramsOrUndefined?.config; - const client = Credential.getClient(); - try { - return await client.list({ input, config }); - } catch (error) { - if (error instanceof HTTPError) { - throw error.toResourceError('Credential', 'list'); - } - throw error; - } + return await Credential.getClient().list({ input, config }); }; static listAll = listAllResourcesFunction(this.list); diff --git a/src/model/client.ts b/src/model/client.ts index 6b73c19..4a234a5 100644 --- a/src/model/client.ts +++ b/src/model/client.ts @@ -23,8 +23,8 @@ import { ModelService } from './model-service'; * Provides create, delete, update and query functions for model services and model proxies. */ export class ModelClient { - private controlApi: ModelControlAPI; private config?: Config; + private controlApi: ModelControlAPI; /** * 初始化客户端 / Initialize client @@ -45,7 +45,7 @@ export class ModelClient { */ create = async (params: { input: ModelServiceCreateInput | ModelProxyCreateInput; config?: Config }): Promise => { const { input, config } = params; - const cfg = config ?? this.config; + const cfg = Config.withConfigs(this.config, config); try { if ('modelProxyName' in input) { @@ -59,17 +59,10 @@ export class ModelClient { } const createInput = new $AgentRun.CreateModelProxyInput({ - modelProxyName: modelProxyInput.modelProxyName, - description: modelProxyInput.description, - executionRoleArn: modelProxyInput.executionRoleArn, - tags: modelProxyInput.tags, - cpu: modelProxyInput.cpu ?? 2, // 默认值 2 - litellmVersion: modelProxyInput.litellmVersion, - memory: modelProxyInput.memory ?? 4096, // 默认值 4096 + ...modelProxyInput, + cpu: modelProxyInput.cpu ?? 2, // 默认值 2 + memory: modelProxyInput.memory ?? 4096, // 默认值 4096 proxyMode: modelProxyInput.proxyModel, - serviceRegionId: modelProxyInput.serviceRegionId, - proxyConfig: modelProxyInput.proxyConfig, - modelType: modelProxyInput.modelType, }); const result = await this.controlApi.createModelProxy({ @@ -84,13 +77,7 @@ export class ModelClient { const modelServiceInput = input as ModelServiceCreateInput; const createInput = new $AgentRun.CreateModelServiceInput({ - modelServiceName: modelServiceInput.modelServiceName, - description: modelServiceInput.description, - tags: modelServiceInput.tags, - provider: modelServiceInput.provider, - modelInfoConfigs: modelServiceInput.modelInfoConfigs, - providerSettings: modelServiceInput.providerSettings, - modelType: modelServiceInput.modelType, + ...modelServiceInput, }); const result = await this.controlApi.createModelService({ @@ -123,7 +110,7 @@ export class ModelClient { */ delete = async (params: { name: string; backendType?: BackendType; config?: Config }): Promise => { const { name, backendType, config } = params; - const cfg = config ?? this.config; + const cfg = Config.withConfigs(this.config, config); let error: HTTPError | null = null; // 如果是 proxy 或未指定类型，先尝试删除 proxy @@ -178,7 +165,7 @@ export class ModelClient { */ update = async (params: { name: string; input: ModelServiceUpdateInput | ModelProxyUpdateInput; config?: Config }): Promise => { const { name, input, config } = params; - const cfg = config ?? this.config; + const cfg = Config.withConfigs(this.config, config); if ('proxyModel' in input || 'executionRoleArn' in input) { // 处理 ModelProxyUpdateInput @@ -192,8 +179,8 @@ export class ModelClient { } const updateInput = new $AgentRun.UpdateModelProxyInput({ - description: modelProxyInput.description, - executionRoleArn: modelProxyInput.executionRoleArn, + ...modelProxyInput, + proxyMode: modelProxyInput.proxyModel, }); const result = await this.controlApi.updateModelProxy({ @@ -216,8 +203,7 @@ export class ModelClient { try { const updateInput = new $AgentRun.UpdateModelServiceInput({ - description: modelServiceInput.description, - providerSettings: modelServiceInput.providerSettings, + ...modelServiceInput, }); const result = await this.controlApi.updateModelService({ @@ -248,7 +234,7 @@ export class ModelClient { */ get = async (params: { name: string; backendType?: BackendType; config?: Config }): Promise => { const { name, backendType, config } = params; - const cfg = config ?? this.config; + const cfg = Config.withConfigs(this.config, config); let error: HTTPError | null = null; // 如果是 proxy 或未指定类型，先尝试获取 proxy @@ -299,18 +285,16 @@ export class ModelClient { * @param params - 参数 / Parameters * @returns 模型服务列表 / Model service list */ - list = async (params: { input: ModelServiceListInput | ModelProxyListInput; config?: Config }): Promise => { - const { input, config } = params; - const cfg = config ?? this.config; + list = async (params?: { input?: ModelServiceListInput | ModelProxyListInput; config?: Config }): Promise => { + const { input, config } = params ?? {}; + const cfg = Config.withConfigs(this.config, config); - if ('modelProxyName' in input) { + if (input && 'modelProxyName' in input) { // 处理 ModelProxyListInput const modelProxyInput = input as ModelProxyListInput; const request = new $AgentRun.ListModelProxiesRequest({ - pageNumber: modelProxyInput.pageNumber, - pageSize: modelProxyInput.pageSize, - modelProxyName: modelProxyInput.modelProxyName, + ...modelProxyInput, }); const result = await this.controlApi.listModelProxies({ @@ -323,15 +307,11 @@ export class ModelClient { return proxy; }); } else { - // 处理 ModelServiceListInput - const modelServiceInput = input as ModelServiceListInput; + // 处理 ModelServiceListInput 或无参数（默认列出 ModelService） + const modelServiceInput = (input ?? {}) as ModelServiceListInput; const request = new $AgentRun.ListModelServicesRequest({ - pageNumber: modelServiceInput.pageNumber, - pageSize: modelServiceInput.pageSize, - modelServiceName: modelServiceInput.modelServiceName, - modelType: modelServiceInput.modelType, - provider: modelServiceInput.provider, + ...modelServiceInput, }); const result = await this.controlApi.listModelServices({ diff --git a/src/model/model-proxy.ts b/src/model/model-proxy.ts index b1e1309..1d40df8 100644 --- a/src/model/model-proxy.ts +++ b/src/model/model-proxy.ts @@ -8,10 +8,9 @@ import * as _ from 'lodash'; import { Config } from '../utils/config'; -import { Status } from '../utils/model'; -import { PageableInput } from '../utils/model'; import { listAllResourcesFunction, ResourceBase } from '../utils/resource'; +import { ModelAPI, ModelInfo } from './api/model-api'; import { BackendType, ModelProxyCreateInput, @@ -22,7 +21,6 @@ import { ModelProxyUpdateInput, ProxyMode, } from './model'; -import { ModelAPI, ModelInfo } from './api/model-api'; /** * 模型代理 / Model Proxy diff --git a/src/model/model-service.ts b/src/model/model-service.ts index 82f72de..e0d627d 100644 --- a/src/model/model-service.ts +++ b/src/model/model-service.ts @@ -6,7 +6,6 @@ */ import { Config } from '../utils/config'; -import { Status, PageableInput } from '../utils/model'; import { listAllResourcesFunction, ResourceBase } from '../utils/resource'; import { ModelAPI } from './api/model-api'; @@ -17,8 +16,7 @@ import { ModelServiceListInput, ModelServiceMutableProps, ModelServiceSystemProps, - ModelServiceUpdateInput, - ModelType, + ModelServiceUpdateInput } from './model'; /** @@ -280,52 +278,4 @@ export class ModelService provider: this.provider, }; }; - - /** - * 等待模型服务就绪 / Wait until model service is ready - * - * @param options - 选项 / Options - * @param config - 配置 / Configuration - * @returns 模型服务对象 / Model service object - */ - waitUntilReady = async ( - options?: { - timeoutSeconds?: number; - intervalSeconds?: number; - beforeCheck?: (service: ModelService) => void; - }, - config?: Config - ): Promise => { - const timeout = (options?.timeoutSeconds ?? 300) * 1000; - const interval = (options?.intervalSeconds ?? 5) * 1000; - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - await this.refresh({ config }); - - if (options?.beforeCheck) { - options.beforeCheck(this); - } - - if (this.status === Status.READY) { - return this; - } - - if ( - this.status === Status.CREATE_FAILED || - this.status === Status.UPDATE_FAILED || - this.status === Status.DELETE_FAILED - ) { - throw new Error(`Model service failed with status: ${this.status}`); - } - - await new Promise((resolve) => setTimeout(resolve, interval)); - } - - throw new Error( - `Timeout waiting for model service to be ready after ${ - options?.timeoutSeconds ?? 300 - } seconds` - ); - }; } diff --git a/src/sandbox/aio-sandbox.ts b/src/sandbox/aio-sandbox.ts index 3a43396..17b7153 100644 --- a/src/sandbox/aio-sandbox.ts +++ b/src/sandbox/aio-sandbox.ts @@ -5,19 +5,19 @@ * into a single unified interface. */ -import { Config } from "../utils/config"; -import { logger } from "../utils/log"; -import { ServerError } from "../utils/exception"; +import { Config } from '../utils/config'; +import { logger } from '../utils/log'; +import { ServerError } from '../utils/exception'; -import { AioDataAPI } from "./api/aio-data"; +import { AioDataAPI } from './api/aio-data'; import { CodeLanguage, NASConfig, OSSMountConfig, PolarFsConfig, TemplateType, -} from "./model"; -import { Sandbox } from "./sandbox"; +} from './model'; +import { Sandbox } from './sandbox'; /** * File upload/download operations @@ -70,7 +70,10 @@ export class AioFileSystemOperations { /** * Move a file or directory */ - move = async (params: { source: string; destination: string }): Promise => { + move = async (params: { + source: string; + destination: string; + }): Promise => { return this.sandbox.dataApi.moveFile(params); }; @@ -198,7 +201,7 @@ export class AioContextOperations { cwd?: string; }): Promise => { const language = params?.language || CodeLanguage.PYTHON; - const cwd = params?.cwd || "/home/user"; + const cwd = params?.cwd || '/home/user'; const result = await this.sandbox.dataApi.createContext({ language, @@ -212,17 +215,19 @@ export class AioContextOperations { return this; } - throw new ServerError(500, "Failed to create context"); + throw new ServerError(500, 'Failed to create context'); }; /** * Get a specific context by ID */ - get = async (params?: { contextId?: string }): Promise => { + get = async (params?: { + contextId?: string; + }): Promise => { const id = params?.contextId || this._contextId; if (!id) { - logger.error("context id is not set"); - throw new Error("context id is not set"); + logger.error('context id is not set'); + throw new Error('context id is not set'); } const result = await this.sandbox.dataApi.getContext({ contextId: id }); @@ -234,7 +239,7 @@ export class AioContextOperations { return this; } - throw new ServerError(500, "Failed to get context"); + throw new ServerError(500, 'Failed to get context'); }; /** @@ -254,7 +259,7 @@ export class AioContextOperations { } if (!contextId && !language) { - logger.debug("context id is not set, use default language: python"); + logger.debug('context id is not set, use default language: python'); language = CodeLanguage.PYTHON; } @@ -273,7 +278,7 @@ export class AioContextOperations { const id = params?.contextId || this._contextId; if (!id) { throw new Error( - "context_id is required. Either pass it as parameter or create a context first.", + 'context_id is required. Either pass it as parameter or create a context first.' ); } @@ -304,7 +309,7 @@ export class AioSandbox extends Sandbox { ossMountConfig?: OSSMountConfig; polarFsConfig?: PolarFsConfig; }, - config?: Config, + config?: Config ): Promise { const sandbox = await Sandbox.create( { @@ -314,7 +319,7 @@ export class AioSandbox extends Sandbox { ossMountConfig: options?.ossMountConfig, polarFsConfig: options?.polarFsConfig, }, - config, + config ); const aioSandbox = new AioSandbox(sandbox, config); @@ -337,7 +342,7 @@ export class AioSandbox extends Sandbox { get dataApi(): AioDataAPI { if (!this._dataApi) { this._dataApi = new AioDataAPI({ - sandboxId: this.sandboxId || "", + sandboxId: this.sandboxId || '', config: this._config, }); } @@ -387,56 +392,15 @@ export class AioSandbox extends Sandbox { /** * Check sandbox health */ - checkHealth = async (params?: { config?: Config }): Promise<{ status: string; [key: string]: any }> => { - return this.dataApi.checkHealth({ - sandboxId: this.sandboxId!, - config: params?.config + checkHealth = async (params?: { + config?: Config; + }): Promise<{ status: string; [key: string]: any }> => { + return this.dataApi.checkHealth({ + sandboxId: this.sandboxId!, + config: params?.config, }); }; - /** - * Wait for sandbox to be ready (polls health check) - */ - waitUntilReady = async (params?: { - maxRetries?: number; - retryIntervalMs?: number; - }): Promise => { - const maxRetries = params?.maxRetries || 60; - const retryIntervalMs = params?.retryIntervalMs || 1000; - let retryCount = 0; - - logger.debug("Waiting for AIO sandbox to be ready..."); - - while (retryCount < maxRetries) { - retryCount += 1; - - try { - const health = await this.checkHealth(); - - if (health.status === "ok") { - logger.debug(`✓ AIO Sandbox is ready! (took ${retryCount} seconds)`); - return; - } - - logger.debug(`[${retryCount}/${maxRetries}] Health status: not ready`); - logger.debug( - `[${retryCount}/${maxRetries}] Health status: ${health.code} ${health.message}`, - ); - } catch (error) { - logger.error(`[${retryCount}/${maxRetries}] Health check failed: ${error}`); - } - - if (retryCount < maxRetries) { - await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)); - } - } - - throw new Error( - `Health check timeout after ${maxRetries} seconds. ` + - "AIO sandbox did not become ready in time.", - ); - }; - // ======================================== // Browser API Methods // ======================================== @@ -475,7 +439,10 @@ export class AioSandbox extends Sandbox { /** * Delete a recording */ - deleteRecording = async (params: { filename: string; config?: Config }): Promise => { + deleteRecording = async (params: { + filename: string; + config?: Config; + }): Promise => { return this.dataApi.deleteRecording(params); }; diff --git a/src/sandbox/api/control.ts b/src/sandbox/api/control.ts index 6949293..8040ce6 100644 --- a/src/sandbox/api/control.ts +++ b/src/sandbox/api/control.ts @@ -291,6 +291,50 @@ export class SandboxControlAPI extends ControlAPI { } }; + /** + * Delete Sandbox + * + * @param params - Method parameters + * @param params.sandboxId - Sandbox ID + * @param params.headers - Custom request headers + * @param params.config - Optional config override + * @returns Deleted Sandbox object + */ + deleteSandbox = async (params: { sandboxId: string; headers?: Record; config?: Config }): Promise<$AgentRun.Sandbox> => { + const { sandboxId, headers, config } = params; + + try { + const client = this.getClient(config); + const runtime = new $Util.RuntimeOptions({}); + + const response = await client.deleteSandboxWithOptions( + sandboxId, + headers ?? {}, + runtime + ); + + logger.debug( + `request api deleteSandbox, request Request ID: ${response.body?.requestId}\n request: ${JSON.stringify([sandboxId])}\n response: ${JSON.stringify(response.body?.data)}`, + ); + + return response.body?.data as $AgentRun.Sandbox; + } catch (error: unknown) { + if (error && typeof error === "object" && "statusCode" in error) { + const e = error as { statusCode: number; message: string; data?: { requestId?: string } }; + const statusCode = e.statusCode; + const message = e.message || "Unknown error"; + const requestId = e.data?.requestId; + + if (statusCode >= 400 && statusCode < 500) { + throw new ClientError(statusCode, message, { requestId }); + } else if (statusCode >= 500) { + throw new ServerError(statusCode, message, { requestId }); + } + } + throw error; + } + }; + /** * Stop Sandbox * diff --git a/src/sandbox/browser-sandbox.ts b/src/sandbox/browser-sandbox.ts index 6592155..eb7ac2e 100644 --- a/src/sandbox/browser-sandbox.ts +++ b/src/sandbox/browser-sandbox.ts @@ -5,17 +5,16 @@ * and recording management. */ -import { Config } from "../utils/config"; -import { logger } from "../utils/log"; +import { Config } from '../utils/config'; -import { BrowserDataAPI } from "./api/browser-data"; +import { BrowserDataAPI } from './api/browser-data'; import { NASConfig, OSSMountConfig, PolarFsConfig, TemplateType, -} from "./model"; -import { Sandbox } from "./sandbox"; +} from './model'; +import { Sandbox } from './sandbox'; /** * Browser Sandbox @@ -37,7 +36,7 @@ export class BrowserSandbox extends Sandbox { ossMountConfig?: OSSMountConfig; polarFsConfig?: PolarFsConfig; }, - config?: Config, + config?: Config ): Promise { const sandbox = await Sandbox.create( { @@ -47,7 +46,7 @@ export class BrowserSandbox extends Sandbox { ossMountConfig: options?.ossMountConfig, polarFsConfig: options?.polarFsConfig, }, - config, + config ); const browserSandbox = new BrowserSandbox(sandbox, config); @@ -66,7 +65,7 @@ export class BrowserSandbox extends Sandbox { get dataApi(): BrowserDataAPI { if (!this._dataApi) { if (!this.sandboxId) { - throw new Error("Sandbox ID is not set"); + throw new Error('Sandbox ID is not set'); } this._dataApi = new BrowserDataAPI({ @@ -80,50 +79,13 @@ export class BrowserSandbox extends Sandbox { /** * Check sandbox health */ - checkHealth = async (params?: { config?: Config }): Promise<{ status: string; [key: string]: any }> => { - return this.dataApi.checkHealth({ sandboxId: this.sandboxId!, config: params?.config }); - }; - - /** - * Wait for browser sandbox to be ready (polls health check) - */ - waitUntilReady = async (params?: { - maxRetries?: number; - retryIntervalMs?: number; - }): Promise => { - const maxRetries = params?.maxRetries || 60; - const retryIntervalMs = params?.retryIntervalMs || 1000; - let retryCount = 0; - - logger.debug("Waiting for browser to be ready..."); - - while (retryCount < maxRetries) { - retryCount += 1; - - try { - const health = await this.checkHealth(); - - if (health.status === "ok") { - logger.debug(`✓ Browser is ready! (took ${retryCount} seconds)`); - return; - } - - logger.debug( - `[${retryCount}/${maxRetries}] Health status: ${health.code} ${health.message}`, - ); - } catch (error) { - logger.error(`[${retryCount}/${maxRetries}] Health check failed: ${error}`); - } - - if (retryCount < maxRetries) { - await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)); - } - } - - throw new Error( - `Health check timeout after ${maxRetries} seconds. ` + - "Browser did not become ready in time.", - ); + checkHealth = async (params?: { + config?: Config; + }): Promise<{ status: string; [key: string]: any }> => { + return this.dataApi.checkHealth({ + sandboxId: this.sandboxId!, + config: params?.config, + }); }; /** @@ -140,7 +102,6 @@ export class BrowserSandbox extends Sandbox { return this.dataApi.getVncUrl(record); } - /** * List all recordings */ @@ -161,7 +122,10 @@ export class BrowserSandbox extends Sandbox { /** * Delete a recording */ - deleteRecording = async (params: { filename: string; config?: Config }): Promise => { + deleteRecording = async (params: { + filename: string; + config?: Config; + }): Promise => { return this.dataApi.deleteRecording(params); }; } diff --git a/src/sandbox/client.ts b/src/sandbox/client.ts index 8bf6610..d2e2d5c 100644 --- a/src/sandbox/client.ts +++ b/src/sandbox/client.ts @@ -5,10 +5,13 @@ * This module provides the client API for Sandbox. */ -import { Config } from "../utils/config"; +import * as $AgentRun from '@alicloud/agentrun20250910'; +import { Config } from '../utils/config'; +import { HTTPError } from '../utils/exception'; +import { SandboxControlAPI } from './api/control'; -import { BrowserSandbox } from "./browser-sandbox"; -import { CodeInterpreterSandbox } from "./code-interpreter-sandbox"; +import { BrowserSandbox } from './browser-sandbox'; +import { CodeInterpreterSandbox } from './code-interpreter-sandbox'; import { NASConfig, OSSMountConfig, @@ -17,11 +20,12 @@ import { SandboxListInput, TemplateCreateInput, TemplateListInput, + TemplateNetworkMode, TemplateType, TemplateUpdateInput, -} from "./model"; -import { Sandbox } from "./sandbox"; -import { Template } from "./template"; +} from './model'; +import { Sandbox } from './sandbox'; +import { Template } from './template'; /** * Sandbox Client @@ -30,9 +34,11 @@ import { Template } from "./template"; */ export class SandboxClient { private config?: Config; + private controlApi: SandboxControlAPI; constructor(config?: Config) { this.config = config; + this.controlApi = new SandboxControlAPI(config); } // ============ Template Operations ============ @@ -45,7 +51,30 @@ export class SandboxClient { config?: Config; }): Promise