gaoding-cli 1.0.0-alpha.12 → 1.0.0-alpha.14

package/dist/src/features/dam/dam-api-adapter.js

@@ -1,5 +1,11 @@
 import { RemoteRequestError } from "../../platform/signed-http-transport.js";
 import { projectDamAssetDetail, projectDamAssetSummary } from "./asset-projection.js";
+export class DamAssetNotFoundError extends Error {
+    constructor() {
+        super("DAM 素材不存在。");
+        this.name = "DamAssetNotFoundError";
+    }
+}
 const contentFormats = {
     image: ["gdpic", "gdimage"],
     video: ["gdvideo"],
@@ -152,10 +158,19 @@ export function createDamApiAdapter(dependencies) {
             return searchResult(response, input);
         },
         async getAsset(input) {
-            const response = await dependencies.transport.getJson({
-                path: `/dam/asset/${encodeURIComponent(input.assetId)}`,
-                ...requestContext(input)
-            });
+            let response;
+            try {
+                response = await dependencies.transport.getJson({
+                    path: `/dam/asset/${encodeURIComponent(input.assetId)}`,
+                    ...requestContext(input)
+                });
+            }
+            catch (error) {
+                if (error instanceof RemoteRequestError && error.status === 404) {
+                    throw new DamAssetNotFoundError();
+                }
+                throw error;
+            }
             const asset = projectDamAssetDetail(response, input.assetId);
             if (asset === undefined)
                 throw new RemoteRequestError();

package/dist/src/features/dam/object-storage.js

@@ -66,6 +66,8 @@ const defaultPutOss = async (input) => {
         accessKeyId: input.token.accessKeyId,
         accessKeySecret: input.token.accessKeySecret,
         stsToken: input.token.securityToken,
+        // DAM issues one-shot credentials without a refresh endpoint.
+        refreshSTSTokenInterval: Number.MAX_SAFE_INTEGER,
         endpoint: input.endpoint,
         region: input.token.region,
         bucket: input.token.bucketName,

package/dist/src/features/dam/registered-uploader.js

@@ -114,24 +114,45 @@ export function createDamRegisteredUploader(dependencies) {
     return {
         async upload(input) {
             try {
+                const stage = (name, run) => (dependencies.telemetry.stage(name, async () => {
+                    try {
+                        return await run();
+                    }
+                    catch (error) {
+                        if (input.signal.aborted)
+                            throw input.signal.reason;
+                        if (error instanceof RemoteRequestError)
+                            throw error;
+                        throw new RemoteRequestError();
+                    }
+                }));
                 input.signal.throwIfAborted();
-                const [digest, metadata] = await Promise.all([
-                    hashes(input.file.filePath, input.signal),
-                    localMetadata(input.file, input.signal)
-                ]);
-                input.signal.throwIfAborted();
-                const contentId = await dependencies.api.createAssetId({
-                    access: input.access,
-                    signal: input.signal
+                const prepared = await stage("prepare", async () => {
+                    const [digest, metadata] = await Promise.all([
+                        hashes(input.file.filePath, input.signal),
+                        localMetadata(input.file, input.signal)
+                    ]);
+                    input.signal.throwIfAborted();
+                    const contentId = await dependencies.api.createAssetId({
+                        access: input.access,
+                        signal: input.signal
+                    });
+                    const format = input.file.format.toLowerCase();
+                    return {
+                        digest,
+                        metadata,
+                        contentId,
+                        format,
+                        damFormat: storageFormat(format),
+                        title: input.input.title ?? filenameTitle(input.file.filename),
+                        folderId: input.input.folderId ?? "0"
+                    };
                 });
-                const stored = await dependencies.storage.upload({
+                const { digest, metadata, contentId, format, damFormat, title, folderId } = prepared;
+                const stored = await stage("upload", () => dependencies.storage.upload({
                     file: input.file,
                     contentId
-                }, input.access, input.signal);
-                const format = input.file.format.toLowerCase();
-                const damFormat = storageFormat(format);
-                const title = input.input.title ?? filenameTitle(input.file.filename);
-                const folderId = input.input.folderId ?? "0";
+                }, input.access, input.signal));
                 const preview = input.file.mediaType.startsWith("image/")
                     ? {
                         url: stored.url,
@@ -182,35 +203,37 @@ export function createDamRegisteredUploader(dependencies) {
                 });
                 if (fallback === undefined)
                     throw new RemoteRequestError();
-                let latest = await dependencies.api.createMaterial({
+                let latest = await stage("persist", () => dependencies.api.createMaterial({
                     body,
                     fallback,
                     access: input.access,
                     signal: input.signal
-                });
+                }));
                 if (input.input.waitAnalysis !== true || terminalAnalysisStatus(latest.analysis_status)) {
                     return latest;
                 }
-                const deadline = now().getTime() + 180_000;
-                while (true) {
-                    input.signal.throwIfAborted();
-                    const current = await dependencies.api.getBatchStatus({
-                        assetId: latest.asset_id,
-                        fallback: latest,
-                        access: input.access,
-                        signal: input.signal
-                    });
-                    if (current !== null)
-                        latest = current;
-                    if (terminalAnalysisStatus(latest.analysis_status))
-                        return latest;
-                    const remaining = deadline - now().getTime();
-                    if (remaining <= 0) {
-                        dependencies.warn("素材分析仍在处理中，已返回当前结果。");
-                        return latest;
+                return stage("wait", async () => {
+                    const deadline = now().getTime() + 180_000;
+                    while (true) {
+                        input.signal.throwIfAborted();
+                        const current = await dependencies.api.getBatchStatus({
+                            assetId: latest.asset_id,
+                            fallback: latest,
+                            access: input.access,
+                            signal: input.signal
+                        });
+                        if (current !== null)
+                            latest = current;
+                        if (terminalAnalysisStatus(latest.analysis_status))
+                            return latest;
+                        const remaining = deadline - now().getTime();
+                        if (remaining <= 0) {
+                            dependencies.warn("素材分析仍在处理中，已返回当前结果。");
+                            return latest;
+                        }
+                        await sleep(Math.min(3000, remaining), input.signal);
                     }
-                    await sleep(Math.min(3000, remaining), input.signal);
-                }
+                });
             }
             catch (error) {
                 if (input.signal.aborted)

package/dist/src/features/dam/use-cases.js

@@ -62,57 +62,63 @@ export function createDamUseCases(dependencies) {
         async list({ input, access, signal }) {
             signal.throwIfAborted();
             assertPageSize(input.pageSize);
-            const repositories = await resolveRepositories(input, access, signal);
-            const result = await dependencies.api.search({
-                ...searchRequest(input, "", repositories.map((repository) => repository.id)),
-                access,
-                signal
+            const repositories = await dependencies.telemetry.stage("repository", () => (resolveRepositories(input, access, signal)));
+            return dependencies.telemetry.stage("request", async () => {
+                const result = await dependencies.api.search({
+                    ...searchRequest(input, "", repositories.map((repository) => repository.id)),
+                    access,
+                    signal
+                });
+                signal.throwIfAborted();
+                validate.list(result);
+                return result;
             });
-            signal.throwIfAborted();
-            validate.list(result);
-            return result;
         },
         async search({ input, access, signal }) {
             signal.throwIfAborted();
             if (!nonblank(input.query))
                 invalid();
             assertPageSize(input.pageSize);
-            const repositories = await resolveRepositories(input, access, signal);
-            const result = await dependencies.api.search({
-                ...searchRequest(input, input.query, repositories.map((repository) => repository.id)),
-                access,
-                signal
+            const repositories = await dependencies.telemetry.stage("repository", () => (resolveRepositories(input, access, signal)));
+            return dependencies.telemetry.stage("request", async () => {
+                const result = await dependencies.api.search({
+                    ...searchRequest(input, input.query, repositories.map((repository) => repository.id)),
+                    access,
+                    signal
+                });
+                signal.throwIfAborted();
+                validate.search(result);
+                return result;
             });
-            signal.throwIfAborted();
-            validate.search(result);
-            return result;
         },
         async get({ input, access, signal }) {
             signal.throwIfAborted();
             assertAssetId(input.asset_id);
-            const result = await dependencies.api.getAsset({
-                assetId: input.asset_id,
-                access,
-                signal
+            return dependencies.telemetry.stage("request", async () => {
+                const result = await dependencies.api.getAsset({
+                    assetId: input.asset_id,
+                    access,
+                    signal
+                });
+                signal.throwIfAborted();
+                validate.get(result);
+                return result;
             });
-            signal.throwIfAborted();
-            validate.get(result);
-            return result;
         },
         async upload({ input, access, signal }) {
             signal.throwIfAborted();
             if (!nonblank(input.file))
                 invalid();
-            const file = await dependencies.storage.inspect({
+            const file = await dependencies.telemetry.stage("inspect", () => (dependencies.storage.inspect({
                 url: pathToFileURL(resolve(process.cwd(), input.file)).href,
                 ...(input.allowSensitivePath === undefined
                     ? {}
                     : { allowSensitivePath: input.allowSensitivePath })
-            }, signal);
+            }, signal)));
             signal.throwIfAborted();
-            const [repository] = await resolveRepositories({
+            const [repository] = await dependencies.telemetry.stage("repository", () => (resolveRepositories({
                 ...(input.repositoryId === undefined ? {} : { repositoryId: input.repositoryId })
-            }, access, signal);
+            }, access, signal)));
             if (repository === undefined)
                 throw new RemoteRequestError();
             const result = await dependencies.uploader.upload({
@@ -129,9 +135,9 @@ export function createDamUseCases(dependencies) {
         async delete({ input, access, signal }) {
             signal.throwIfAborted();
             assertAssetId(input.asset_id);
-            const [repository] = await resolveRepositories({
+            const [repository] = await dependencies.telemetry.stage("repository", () => (resolveRepositories({
                 ...(input.repositoryId === undefined ? {} : { repositoryId: input.repositoryId })
-            }, access, signal);
+            }, access, signal)));
             if (repository === undefined)
                 throw new RemoteRequestError();
             const request = {
@@ -140,10 +146,11 @@ export function createDamUseCases(dependencies) {
                 access,
                 signal
             };
-            await dependencies.api.recycle(request);
+            await dependencies.telemetry.stage("recycle", () => dependencies.api.recycle(request));
             signal.throwIfAborted();
-            if (input.permanent === true)
-                await dependencies.api.deleteRecycled(request);
+            if (input.permanent === true) {
+                await dependencies.telemetry.stage("delete", () => dependencies.api.deleteRecycled(request));
+            }
             signal.throwIfAborted();
             validate.delete(null);
         }

package/dist/src/features/org/use-cases.js

@@ -38,7 +38,11 @@ export function createOrgUseCases(dependencies) {
     }
     return {
         async list(input) {
-            const records = await dependencies.org.list(input.state.credential, input.signal);
+            dependencies.telemetry.annotate({
+                account_id: input.state.account?.id,
+                organization_id: input.state.organization?.id
+            });
+            const records = await dependencies.telemetry.stage("list", () => dependencies.org.list(input.state.credential, input.signal));
             return {
                 orgs: records.map((record) => ({
                     id: record.id,
@@ -53,7 +57,13 @@ export function createOrgUseCases(dependencies) {
             };
         },
         async current() {
-            const state = await dependencies.store.read();
+            const state = await dependencies.telemetry.stage("state", () => dependencies.store.read());
+            if (state) {
+                dependencies.telemetry.annotate({
+                    account_id: state.account?.id,
+                    organization_id: state.organization?.id
+                });
+            }
             return {
                 organization: state?.organization
                     ? { id: state.organization.id, name: state.organization.name }
@@ -65,15 +75,21 @@ export function createOrgUseCases(dependencies) {
         },
         async switchOrganization(input) {
             input.signal.throwIfAborted();
-            const records = await dependencies.org.list(input.state.credential, input.signal);
-            const selectedId = input.organizationId === undefined
-                ? await selectOrganization(records, input.select)
-                : requiredSelection(input.organizationId);
-            const record = records.find((candidate) => candidate.id === selectedId);
-            if (!record)
-                throw new OrganizationInvalidError();
-            const organization = await bind(input.state.credential, record, input.signal);
-            await dependencies.store.write({ ...input.state, organization });
+            dependencies.telemetry.annotate({ account_id: input.state.account?.id });
+            const records = await dependencies.telemetry.stage("list", () => dependencies.org.list(input.state.credential, input.signal));
+            const { record, selectedId } = await dependencies.telemetry.stage("select", async () => {
+                const selectedId = input.organizationId === undefined
+                    ? await selectOrganization(records, input.select)
+                    : requiredSelection(input.organizationId);
+                const record = records.find((candidate) => candidate.id === selectedId);
+                if (!record)
+                    throw new OrganizationInvalidError();
+                return { record, selectedId };
+            });
+            dependencies.telemetry.annotate({ parameters: { organizationId: selectedId } });
+            const organization = await dependencies.telemetry.stage("bind", () => bind(input.state.credential, record, input.signal));
+            await dependencies.telemetry.stage("state", () => dependencies.store.write({ ...input.state, organization }));
+            dependencies.telemetry.annotate({ organization_id: organization.id });
             return record;
         },
         async bindAuthorizedOrganization(input) {

package/dist/src/features/tool/catalog.js

@@ -56,10 +56,14 @@ export function projectModelList(catalog, tool) {
             .map(summary)
     };
 }
-export function projectModelDetail(catalog, model) {
+export function findModel(catalog, model) {
     const found = catalog.models.find((candidate) => candidate.model === model);
     if (found === undefined)
         throw new ToolInputError();
+    return found;
+}
+export function projectModelDetail(catalog, model) {
+    const found = findModel(catalog, model);
     return {
         ...summary(found),
         ...(found.usageDescription === undefined
@@ -72,8 +76,8 @@ export function projectModelDetail(catalog, model) {
     };
 }
 export function findToolModel(catalog, tool, model) {
-    const found = catalog.models.find((candidate) => candidate.tool === tool && candidate.model === model);
-    if (found === undefined)
+    const found = findModel(catalog, model);
+    if (found.tool !== tool)
         throw new ToolInputError();
     return found;
 }

package/dist/src/features/tool/dynamic-schema.js

@@ -11,6 +11,8 @@ function parameterSchema(parameter) {
     if (parameter.type === "uri[]") {
         return { type: "array", items: { type: "string", format: "uri" }, ...common };
     }
+    if (parameter.type === "number")
+        return { type: "number", ...common };
     return {
         type: "string",
         ...(parameter.options === undefined
@@ -67,29 +69,37 @@ export function buildToolArgumentsSchema(catalog, tool) {
         additionalProperties: false
     };
 }
-const ajv = new Ajv2020({ allErrors: true, strict: true });
-const addFormats = addFormatsImport;
-addFormats(ajv);
-function validator(model) {
+export function buildModelArgumentsSchema(model) {
     const properties = {
-        model: { type: "string" }
+        model: {
+            type: "string",
+            const: model.model,
+            description: "要调用的模型机器标识。"
+        }
     };
     for (const parameter of model.parameters) {
         properties[parameter.name] = parameterSchema(parameter);
     }
-    return ajv.compile({
+    return {
         type: "object",
         properties,
         required: [
             "model",
-            ...model.parameters.filter((parameter) => parameter.required).map((parameter) => parameter.name)
+            ...model.parameters
+                .filter((parameter) => parameter.required)
+                .map((parameter) => parameter.name)
         ],
         additionalProperties: false
-    });
+    };
+}
+const ajv = new Ajv2020({ allErrors: true, strict: true });
+const addFormats = addFormatsImport;
+addFormats(ajv);
+function validator(model) {
+    return ajv.compile(buildModelArgumentsSchema(model));
 }
 export function assertModelArguments(model, value) {
     if (typeof value !== "object" || value === null
-        || value.model !== model.model
         || !validator(model)(value)) {
         throw new ToolInputError();
     }

package/dist/src/features/tool/mns-catalog-adapter.js

@@ -18,6 +18,7 @@ const toolOrder = {
 };
 const multiUriKeys = new Set([
     "image_urls",
+    "reference_images",
     "file_urls",
     "video_urls",
     "audio_urls"
@@ -98,9 +99,11 @@ function parameter(value) {
         ? "uri[]"
         : name === "start_frame" || name === "end_frame" || sourceType === "IMAGE"
             ? "uri"
-            : sourceType === "TEXT" || sourceType === "INPUT" || sourceType === "SELECT"
-                ? "string"
-                : undefined;
+            : sourceType === "NUMBER"
+                ? "number"
+                : sourceType === "TEXT" || sourceType === "INPUT" || sourceType === "SELECT"
+                    ? "string"
+                    : undefined;
     if (type === undefined)
         throw new Error("unsupported parameter");
     let options;
@@ -120,7 +123,7 @@ function parameter(value) {
         if (options.length === 0)
             throw new Error("empty options");
     }
-    const description = text(field.label) ?? text(field.description);
+    const description = text(field.description) ?? text(field.label);
     const defaultValue = field.default_value;
     const hasDefault = defaultValue !== undefined
         && defaultValue !== null

package/dist/src/features/tool/tool-api-adapter.js

@@ -138,7 +138,7 @@ export function createToolApiAdapter(dependencies) {
         async execute({ invocation, access, signal }) {
             signal.throwIfAborted();
             const managedContentId = contentId(createContentId());
-            const intent = parseIntent(await safePost(dependencies.transport, {
+            const intent = await dependencies.telemetry.stage("intent", async () => parseIntent(await safePost(dependencies.transport, {
                 path: "/ai-agent/v1/tool-intent",
                 body: {
                     prompt: invocation.prompt,
@@ -148,9 +148,9 @@ export function createToolApiAdapter(dependencies) {
                 credential: access.credential,
                 organizationId: access.organizationId,
                 signal
-            }));
+            })));
             signal.throwIfAborted();
-            const taskId = submittedTask(await safePost(dependencies.transport, {
+            const taskId = await dependencies.telemetry.stage("submit", async () => submittedTask(await safePost(dependencies.transport, {
                 path: "/gdesign/tool/v1/dify/call_async",
                 body: {
                     jsonrpc: "2.0",
@@ -164,37 +164,39 @@ export function createToolApiAdapter(dependencies) {
                 credential: access.credential,
                 organizationId: access.organizationId,
                 signal
-            }));
-            let transientFailures = 0;
-            while (true) {
-                signal.throwIfAborted();
-                let response;
-                try {
-                    response = await safePost(dependencies.transport, {
-                        path: "/gdesign/tool/v1/dify/process/batch",
-                        body: { task_ids: [taskId] },
-                        credential: access.credential,
-                        organizationId: access.organizationId,
-                        signal
-                    });
-                    transientFailures = 0;
-                }
-                catch (error) {
-                    if (signal.aborted)
-                        throw signal.reason;
-                    if (!(error instanceof RemoteRequestError) || !error.transient)
-                        throw error;
-                    transientFailures += 1;
-                    if (transientFailures > 3)
-                        throw error;
-                    await sleep(transientFailures * 1_000, signal);
-                    continue;
+            })));
+            return dependencies.telemetry.stage("wait", async () => {
+                let transientFailures = 0;
+                while (true) {
+                    signal.throwIfAborted();
+                    let response;
+                    try {
+                        response = await safePost(dependencies.transport, {
+                            path: "/gdesign/tool/v1/dify/process/batch",
+                            body: { task_ids: [taskId] },
+                            credential: access.credential,
+                            organizationId: access.organizationId,
+                            signal
+                        });
+                        transientFailures = 0;
+                    }
+                    catch (error) {
+                        if (signal.aborted)
+                            throw signal.reason;
+                        if (!(error instanceof RemoteRequestError) || !error.transient)
+                            throw error;
+                        transientFailures += 1;
+                        if (transientFailures > 3)
+                            throw error;
+                        await sleep(transientFailures * 1_000, signal);
+                        continue;
+                    }
+                    const result = pollResult(response, taskId);
+                    if (result !== undefined)
+                        return result;
+                    await sleep(2_000, signal);
                 }
-                const result = pollResult(response, taskId);
-                if (result !== undefined)
-                    return result;
-                await sleep(2_000, signal);
-            }
+            });
         }
     };
 }