Skip to content

Commit 017ab86

Browse files
Merge pull request #46 from modelstudioai/feat/model-usage
feat: add model usage\quota\workspace command
2 parents 2f22b33 + b9e2d75 commit 017ab86

29 files changed

Lines changed: 3529 additions & 60 deletions

.claude/scheduled_tasks.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"sessionId":"3eed9a85-f117-45ce-82e9-e404b5547852","pid":17131,"procStart":"Wed Jun 3 09:14:36 2026","acquiredAt":1780915535766}

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
1515
- `DashScopeKnowledgeRetrieveRequest` / `DashScopeKnowledgeRetrieveResponse` types and `knowledgeRetrieveEndpoint` added to `bailian-cli-core`.
1616
- Comprehensive E2E tests for knowledge retrieve covering both auth paths, dry-run, rerank flags, and error cases.
1717

18+
- `bl usage` command group:
19+
- `bl usage free` — query free-tier quota for all models (or a specific model with `--model`).
20+
- `bl usage freetier` — enable (`--on`) or disable (`--off`) auto-stop for free-tier models.
21+
- `bl usage stats` — query model usage statistics (requires `--workspace-id`).
22+
- `bl quota` command group:
23+
- `bl quota list` — view model RPM/TPM rate limits (filter with `--model`, show all with `--all`).
24+
- `bl quota check` — check current RPM/TPM usage against rate limits.
25+
- `bl quota history` — view quota change history with pagination.
26+
- `bl quota request` — request a temporary quota increase for a model.
27+
- `bl workspace list` — list all workspaces with region and endpoint details.
28+
1829
### Changed
1930

2031
- Credential resolution priority: explicit API-Key → explicit AK/SK flags → auto-detected API-Key → fallback AK/SK from config/env.

CHANGELOG.zh.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@
66

77
[English](CHANGELOG.md) · [README](README.zh.md) · [参与贡献](CONTRIBUTING.zh.md)
88

9-
## [1.3.0] - 2026-06-10
9+
## [1.3.0] - 2026-06-11
1010

1111
### 新增
1212

13+
- `bl usage` 命令组:
14+
- `bl usage free` — 查询所有模型的免费额度(可通过 `--model` 指定模型)。
15+
- `bl usage freetier` — 启用(`--on`)或禁用(`--off`)免费额度模型的自动停服。
16+
- `bl usage stats` — 查询模型用量统计(需指定 `--workspace-id`)。
17+
- `bl quota` 命令组:
18+
- `bl quota list` — 查看模型 RPM/TPM 速率限制(支持 `--model` 过滤,`--all` 展示全部)。
19+
- `bl quota check` — 查看当前 RPM/TPM 用量与速率限制。
20+
- `bl quota history` — 查看配额变更记录,支持分页。
21+
- `bl quota request` — 申请模型临时配额提升。
22+
- `bl workspace list` — 列出所有业务空间,包含地域和 endpoint 信息。
1323
- `bl knowledge retrieve` 新增 API-Key 鉴权(DashScope 网关),与原有 AK/SK 并存,可用时自动优先使用 API-Key。
1424
- 新增检索参数:`--dense-similarity-top-k``--sparse-similarity-top-k``--rerank-model``--rerank-mode``--rerank-instruct`,API-Key 与 AK/SK 两条链路均支持。
1525
- `bailian-cli-core` 新增 `DashScopeKnowledgeRetrieveRequest` / `DashScopeKnowledgeRetrieveResponse` 类型及 `knowledgeRetrieveEndpoint` 端点。

README.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Equip your AI Agent out-of-the-box with these capabilities, composable across co
3535
- **MCP integration** — Orchestrate Bailian MCP servers: list services, inspect tools, and invoke any tool directly from the terminal
3636
- **Web search** — Real-time internet retrieval for up-to-date, accurate answers
3737
- **Model recommendation** — Describe your scenario and get best-fit model suggestions; supports scoped search, model comparison, and alternative discovery
38-
- **Console capabilities** — Browse Bailian apps (`app list`) and check free-tier quota (`usage free`)
38+
- **Console capabilities** — Browse Bailian apps (`app list`), check free-tier quota (`usage free`), view model usage statistics (`usage stats`), manage workspaces (`workspace list`), and manage rate limits (`quota list/request/check/history`)
3939
- **Local file auto-upload** — Every URL parameter accepts a local path; uploaded to free temp storage with 48-hour validity
4040

4141
## Showcase: One-Sentence Cinematic Video
@@ -108,9 +108,22 @@ bl advisor recommend --message "qwen-max vs deepseek-v3 for code generation"
108108
# Browser login (required for console capability commands)
109109
bl auth login --console
110110

111-
# Browse apps / free-tier quota
111+
# Browse apps / free-tier quota / usage statistics / workspaces
112112
bl app list
113113
bl usage free --model qwen3-max
114+
bl usage free --expiring 30 # Quotas expiring within 30 days
115+
bl usage free --sort remaining # Sort by remaining % ascending
116+
bl usage stats --workspace-id <id> # Usage overview for a workspace
117+
bl usage stats --model qwen-turbo --workspace-id <id> # Per-model usage
118+
bl workspace list # List all workspaces
119+
120+
# Rate limit management
121+
bl quota list # View RPM/TPM limits for all models
122+
bl quota list --model qwen3.6-plus # View limits for a specific model
123+
bl quota check # Current usage vs rate limits
124+
bl quota check --model qwen3.6-plus --period 5 # Check usage over last 5 minutes
125+
bl quota request --model qwen3.6-plus --tpm 6000000 # Request a temporary TPM increase
126+
bl quota history # View quota change history
114127
```
115128

116129
> More examples and scenarios: [Aliyun Model Studio CLI Site](https://bailian.console.aliyun.com/cli?source_channel=cli_github&)
@@ -134,7 +147,7 @@ bl text chat --api-key sk-xxxxx --message "Hello"
134147

135148
### Console Login (OAuth)
136149

137-
Required for console capability commands (`app list`, `usage free`). Opens the Bailian console in your browser to sign in.
150+
Required for console capability commands (`app list`, `usage free`, `usage stats`, `workspace list`, `quota list/request/check/history`). Opens the Bailian console in your browser to sign in.
138151

139152
```bash
140153
bl auth login --console

README.zh.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ _专为 AI Agent 打造,每个命令均可作为结构化工具调用。_
3535
- **MCP 集成** — 统一调度百炼 MCP 服务:列出服务、查看工具、直接在终端调用任意工具
3636
- **联网搜索** — 实时互联网信息检索,提升回答准确性及时效性
3737
- **模型推荐** — 描述你的场景,智能推荐最适合的模型;支持限定范围搜索、模型对比和替代发现
38-
- **控制台能力** — 浏览百炼应用(`app list`),查询模型免费额度(`usage free`
38+
- **控制台能力** — 浏览百炼应用(`app list`),查询模型免费额度(`usage free`,查看模型用量统计(`usage stats`),管理业务空间(`workspace list`),管理限流与提额(`quota list/request/check/history`
3939
- **本地文件自动上传** — 所有 URL 参数同时支持本地路径,免费临时存储 48 小时
4040

4141
## 示例:一句话生成一部电影短片
@@ -103,9 +103,22 @@ bl advisor recommend --message "qwen-max 和 deepseek-v3 哪个更适合做代
103103
# 浏览器登录(控制台能力相关命令需要)
104104
bl auth login --console
105105

106-
# 浏览应用 / 免费额度
106+
# 浏览应用 / 免费额度 / 用量统计 / 业务空间
107107
bl app list
108108
bl usage free --model qwen3-max
109+
bl usage free --expiring 30 # 30 天内过期的额度
110+
bl usage free --sort remaining # 按剩余百分比升序排列
111+
bl usage stats --workspace-id <id> # 指定空间的用量概览
112+
bl usage stats --model qwen-turbo --workspace-id <id> # 指定模型用量
113+
bl workspace list # 列出所有业务空间
114+
115+
# 限流管理与提额
116+
bl quota list # 查看所有模型的 RPM/TPM 限额
117+
bl quota list --model qwen3.6-plus # 查看指定模型限额
118+
bl quota check # 查看当前用量 vs 限流阈值
119+
bl quota check --model qwen3.6-plus --period 5 # 查看最近 5 分钟用量
120+
bl quota request --model qwen3.6-plus --tpm 6000000 # 申请临时 TPM 提额
121+
bl quota history # 查看提额历史记录
109122
```
110123

111124
> 更多案例与使用场景:[阿里云百炼 CLI 官方主页](https://bailian.console.aliyun.com/cli?source_channel=cli_github&)
@@ -129,7 +142,7 @@ bl text chat --api-key sk-xxxxx --message "你好"
129142

130143
### 控制台登录(OAuth)
131144

132-
控制台能力命令(`app list``usage free`)需要使用此登录方式。打开浏览器跳转百炼控制台完成登录。
145+
控制台能力命令(`app list``usage free``usage stats``workspace list``quota list/request/check/history`)需要使用此登录方式。打开浏览器跳转百炼控制台完成登录。
133146

134147
```bash
135148
bl auth login --console

packages/cli/README.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Equip your AI Agent out-of-the-box with these capabilities, composable across co
3535
- **MCP integration** — Orchestrate Bailian MCP servers: list services, inspect tools, and invoke any tool directly from the terminal
3636
- **Web search** — Real-time internet retrieval for up-to-date, accurate answers
3737
- **Model recommendation** — Describe your scenario and get best-fit model suggestions; supports scoped search, model comparison, and alternative discovery
38-
- **Console capabilities** — Browse Bailian apps (`app list`) and check free-tier quota (`usage free`)
38+
- **Console capabilities** — Browse Bailian apps (`app list`), check free-tier quota (`usage free`), view model usage statistics (`usage stats`), manage workspaces (`workspace list`), and manage rate limits (`quota list/request/check/history`)
3939
- **Local file auto-upload** — Every URL parameter accepts a local path; uploaded to free temp storage with 48-hour validity
4040

4141
## Showcase: One-Sentence Cinematic Video
@@ -108,9 +108,22 @@ bl advisor recommend --message "qwen-max vs deepseek-v3 for code generation"
108108
# Browser login (required for console capability commands)
109109
bl auth login --console
110110

111-
# Browse apps / free-tier quota
111+
# Browse apps / free-tier quota / usage statistics / workspaces
112112
bl app list
113113
bl usage free --model qwen3-max
114+
bl usage free --expiring 30 # Quotas expiring within 30 days
115+
bl usage free --sort remaining # Sort by remaining % ascending
116+
bl usage stats --workspace-id <id> # Usage overview for a workspace
117+
bl usage stats --model qwen-turbo --workspace-id <id> # Per-model usage
118+
bl workspace list # List all workspaces
119+
120+
# Rate limit management
121+
bl quota list # View RPM/TPM limits for all models
122+
bl quota list --model qwen3.6-plus # View limits for a specific model
123+
bl quota check # Current usage vs rate limits
124+
bl quota check --model qwen3.6-plus --period 5 # Check usage over last 5 minutes
125+
bl quota request --model qwen3.6-plus --tpm 6000000 # Request a temporary TPM increase
126+
bl quota history # View quota change history
114127
```
115128

116129
> More examples and scenarios: [Aliyun Model Studio CLI Site](https://bailian.console.aliyun.com/cli?source_channel=cli_github&)
@@ -134,7 +147,7 @@ bl text chat --api-key sk-xxxxx --message "Hello"
134147

135148
### Console Login (OAuth)
136149

137-
Required for console capability commands (`app list`, `usage free`). Opens the Bailian console in your browser to sign in.
150+
Required for console capability commands (`app list`, `usage free`, `usage stats`, `workspace list`, `quota list/request/check/history`). Opens the Bailian console in your browser to sign in.
138151

139152
```bash
140153
bl auth login --console

packages/cli/README.zh.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ _专为 AI Agent 打造,每个命令均可作为结构化工具调用。_
3535
- **MCP 集成** — 统一调度百炼 MCP 服务:列出服务、查看工具、直接在终端调用任意工具
3636
- **联网搜索** — 实时互联网信息检索,提升回答准确性及时效性
3737
- **模型推荐** — 描述你的场景,智能推荐最适合的模型;支持限定范围搜索、模型对比和替代发现
38-
- **控制台能力** — 浏览百炼应用(`app list`),查询模型免费额度(`usage free`
38+
- **控制台能力** — 浏览百炼应用(`app list`),查询模型免费额度(`usage free`,查看模型用量统计(`usage stats`),管理业务空间(`workspace list`),管理限流与提额(`quota list/request/check/history`
3939
- **本地文件自动上传** — 所有 URL 参数同时支持本地路径,免费临时存储 48 小时
4040

4141
## 示例:一句话生成一部电影短片
@@ -103,9 +103,22 @@ bl advisor recommend --message "qwen-max 和 deepseek-v3 哪个更适合做代
103103
# 浏览器登录(控制台能力相关命令需要)
104104
bl auth login --console
105105

106-
# 浏览应用 / 免费额度
106+
# 浏览应用 / 免费额度 / 用量统计 / 业务空间
107107
bl app list
108108
bl usage free --model qwen3-max
109+
bl usage free --expiring 30 # 30 天内过期的额度
110+
bl usage free --sort remaining # 按剩余百分比升序排列
111+
bl usage stats --workspace-id <id> # 指定空间的用量概览
112+
bl usage stats --model qwen-turbo --workspace-id <id> # 指定模型用量
113+
bl workspace list # 列出所有业务空间
114+
115+
# 限流管理与提额
116+
bl quota list # 查看所有模型的 RPM/TPM 限额
117+
bl quota list --model qwen3.6-plus # 查看指定模型限额
118+
bl quota check # 查看当前用量 vs 限流阈值
119+
bl quota check --model qwen3.6-plus --period 5 # 查看最近 5 分钟用量
120+
bl quota request --model qwen3.6-plus --tpm 6000000 # 申请临时 TPM 提额
121+
bl quota history # 查看提额历史记录
109122
```
110123

111124
> 更多案例与使用场景:[阿里云百炼 CLI 官方主页](https://bailian.console.aliyun.com/cli?source_channel=cli_github&)
@@ -129,7 +142,7 @@ bl text chat --api-key sk-xxxxx --message "你好"
129142

130143
### 控制台登录(OAuth)
131144

132-
控制台能力命令(`app list``usage free`)需要使用此登录方式。打开浏览器跳转百炼控制台完成登录。
145+
控制台能力命令(`app list``usage free``usage stats``workspace list``quota list/request/check/history`)需要使用此登录方式。打开浏览器跳转百炼控制台完成登录。
133146

134147
```bash
135148
bl auth login --console

packages/cli/src/commands/advisor/recommend.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,12 @@ export default defineCommand({
234234
},
235235
],
236236
examples: [
237-
'bl advisor recommend --message "我要做一个能理解图片的客服机器人"',
238-
'bl advisor recommend --message "做一个Agent自动根据用户意图生成动画片"',
239-
'bl advisor recommend --message "法律合同审查,要求高精准度"',
240-
'bl advisor recommend --message "做一个低成本高并发的在线客服" --output json',
241-
'bl advisor recommend --message "长文本摘要" --dry-run',
242-
"bl advisor recommend # 交互式输入需求",
237+
'bl advisor recommend --message "I need a visual-understanding chatbot"',
238+
'bl advisor recommend --message "Build an Agent that auto-generates animations"',
239+
'bl advisor recommend --message "Legal contract review, high precision required"',
240+
'bl advisor recommend --message "Low-cost high-concurrency online customer service" --output json',
241+
'bl advisor recommend --message "Long document summarization" --dry-run',
242+
"bl advisor recommend # Interactive input",
243243
],
244244
async run(config: Config, flags: GlobalFlags) {
245245
const positional = ((flags as Record<string, unknown>)._positional as string[]) ?? [];

packages/cli/src/commands/catalog.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,16 @@ import speechRecognize from "./speech/recognize.ts";
3636
import fileUpload from "./file/upload.ts";
3737
import consoleCall from "./console/call.ts";
3838
import usageFree from "./usage/free.ts";
39+
import usageFreetier from "./usage/freetier.ts";
40+
import usageStats from "./usage/stats.ts";
3941
import pipelineRun from "./pipeline/run.ts";
4042
import pipelineValidate from "./pipeline/validate.ts";
4143
import advisorRecommend from "./advisor/recommend.ts";
44+
import workspaceList from "./workspace/list.ts";
45+
import quotaList from "./quota/list.ts";
46+
import quotaRequest from "./quota/request.ts";
47+
import quotaHistory from "./quota/history.ts";
48+
import quotaCheck from "./quota/check.ts";
4249

4350
/** Command registry map (no dependency on registry.ts — safe for build-time import). */
4451
export const commands: Record<string, Command> = {
@@ -74,11 +81,18 @@ export const commands: Record<string, Command> = {
7481
"file upload": fileUpload,
7582
"console call": consoleCall,
7683
"usage free": usageFree,
84+
"usage freetier": usageFreetier,
85+
"usage stats": usageStats,
7786
"pipeline run": pipelineRun,
7887
"pipeline validate": pipelineValidate,
7988
"config show": configShow,
8089
"config set": configSet,
8190
"config export-schema": configExportSchema,
8291
"advisor recommend": advisorRecommend,
92+
"workspace list": workspaceList,
93+
"quota list": quotaList,
94+
"quota request": quotaRequest,
95+
"quota history": quotaHistory,
96+
"quota check": quotaCheck,
8397
update: update,
8498
};

0 commit comments

Comments
 (0)