Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions packages/commands/src/commands/usage/free.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,7 @@ export default defineCommand({
}
}

const [quotaResult, stopResult] = await Promise.all([
ctx.client.console(FREE_TIER_API, requestData),
ctx.client.console(FREE_TIER_ONLY_STATUS_API, {
queryFreeTierOnlyStatusRequest: { models },
}),
]);
const quotaResult = await ctx.client.console(FREE_TIER_API, requestData);

const allQuotas = extractQuotas(quotaResult);
let quotas = modelFlag
Expand Down Expand Up @@ -137,7 +132,16 @@ export default defineCommand({
);
}

const stopStatuses = extractFreeTierOnlyStatuses(stopResult);
// Query auto-stop status only for the filtered models (the full catalog can
// exceed the status API's batch limit and trigger a server-side error).
const filteredModels = quotas.map((quota) => quota.model);
const stopResult = filteredModels.length
? await ctx.client.console(FREE_TIER_ONLY_STATUS_API, {
queryFreeTierOnlyStatusRequest: { models: filteredModels },
})
: null;

const stopStatuses = stopResult ? extractFreeTierOnlyStatuses(stopResult) : [];
const stopMap = new Map(stopStatuses.map((status) => [status.model, status.freeTierOnly]));

if (format === "json") {
Expand All @@ -146,12 +150,12 @@ export default defineCommand({
const used = hasQuota ? quota.quotaInitTotal - quota.quotaTotal : 0;
const stopStatus = stopMap.get(quota.model);
const autoStop =
quota.quotaStatus === "UNKNOWN"
? "unsupported"
: stopStatus === true
? true
: stopStatus === false
? false
stopStatus === true
? true
: stopStatus === false
? false
: quota.quotaStatus === "UNKNOWN"
? "unsupported"
: null;
return {
model: quota.model,
Expand Down
21 changes: 3 additions & 18 deletions packages/commands/src/commands/usage/freetier.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { defineCommand, detectOutputFormat, unwrapResponse } from "bailian-cli-core";
import { emitResult } from "bailian-cli-runtime";
import {
FREE_TIER_API,
FREE_TIER_ONLY_STATUS_API,
extractFreeTierOnlyStatuses,
extractQuotas,
fetchAllModels,
pollFreeTierBatch,
} from "./shared.ts";
Expand Down Expand Up @@ -92,15 +90,9 @@ export default defineCommand({
}

if (off) {
const [quotaResult, stopResult] = await Promise.all([
ctx.client.console(FREE_TIER_API, { queryFreeTierQuotaRequest: { models } }),
ctx.client.console(FREE_TIER_ONLY_STATUS_API, {
queryFreeTierOnlyStatusRequest: { models },
}),
]);

const quotas = extractQuotas(quotaResult);
const quotaMap = new Map(quotas.map((quota) => [quota.model, quota]));
const stopResult = await ctx.client.console(FREE_TIER_ONLY_STATUS_API, {
queryFreeTierOnlyStatusRequest: { models },
});

const stopStatuses = extractFreeTierOnlyStatuses(stopResult);
const stopMap = new Map(stopStatuses.map((status) => [status.model, status.freeTierOnly]));
Expand All @@ -110,13 +102,6 @@ export default defineCommand({
process.stderr.write(`Auto-stop is already disabled for "${name}".\n`);
continue;
}
const quota = quotaMap.get(name);
if (quota && quota.quotaTotal > 0 && stopMap.get(name) === true) {
process.stderr.write(
`Cannot disable auto-stop for "${name}": free-tier quota has not been fully consumed. Please disable auto-stop after the quota is exhausted.\n`,
);
continue;
}
await pollFreeTierBatch(ctx.client, api, requestKey, [name]);
process.stdout.write(`Disabled auto-stop for "${name}".\n`);
}
Expand Down
12 changes: 6 additions & 6 deletions packages/commands/src/commands/usage/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@ export function printFreeTierTable(options: FreeTierTableOptions): void {

const stopStatus = stopMap.get(quota.model);
const autoStop =
quota.quotaStatus === "UNKNOWN"
? "Unsupported"
: stopStatus === true
? "ON"
: stopStatus === false
? "OFF"
stopStatus === true
? "ON"
: stopStatus === false
? "OFF"
: quota.quotaStatus === "UNKNOWN"
? "Unsupported"
: "-";

return [quota.model, typeMap.get(quota.model) || "-", remaining, total, "", autoStop];
Expand Down