drinkzen-admin-cli 0.3.3__tar.gz → 0.4.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/PKG-INFO +30 -7
  2. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/README.md +29 -6
  3. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/__init__.py +1 -1
  4. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/cli.py +239 -66
  5. drinkzen_admin_cli-0.4.0/drinkzen_admin/config.py +249 -0
  6. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin_cli.egg-info/PKG-INFO +30 -7
  7. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/pyproject.toml +1 -1
  8. drinkzen_admin_cli-0.4.0/tests/test_config.py +197 -0
  9. drinkzen_admin_cli-0.3.3/drinkzen_admin/config.py +0 -130
  10. drinkzen_admin_cli-0.3.3/tests/test_config.py +0 -93
  11. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/client.py +0 -0
  12. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/formatting.py +0 -0
  13. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/menu_options.py +0 -0
  14. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/skill.py +0 -0
  15. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin_cli.egg-info/SOURCES.txt +0 -0
  16. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin_cli.egg-info/dependency_links.txt +0 -0
  17. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin_cli.egg-info/entry_points.txt +0 -0
  18. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin_cli.egg-info/top_level.txt +0 -0
  19. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/setup.cfg +0 -0
  20. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/tests/test_skill.py +0 -0
  21. {drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/tests/test_standalone_cli.py +0 -0
{drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: drinkzen-admin-cli
3
- Version: 0.3.3
3
+ Version: 0.4.0
4
4
  Summary: Standalone CLI client for DrinkZen Admin operations
5
5
  Author: DrinkZen Team
6
6
  License: MIT
@@ -106,7 +106,18 @@ drinkzen-admin config set --set-url "https://api.drinkzen.cn" --set-token "your-
106
106
  drinkzen-admin config set --set-url "http://api.drinkzen.localhost:8000" --set-token "local-admin-token"
107
107
  ```
108
108
 
109
- 配置文件将保存在 `~/.drinkzen/admin.json`，且在 Unix/macOS 系统上自动设置 **`chmod 600`** 权限（仅当前系统用户可读写）。
109
+ 用户全局配置保存在 `~/.config/drinkzen/admin.json`，且在 Unix/macOS 系统上自动设置 **`chmod 600`** 权限（仅当前系统用户可读写）。如果设置了 `XDG_CONFIG_HOME`，则使用 `$XDG_CONFIG_HOME/drinkzen/admin.json`。
110
+
111
+ 仓库可以保存一份仅对当前项目生效的覆盖配置：
112
+
113
+ ```bash
114
+ cd /path/to/repository
115
+ drinkzen-admin config set --scope project \
116
+ --set-url "http://api.drinkzen.localhost:8000" \
117
+ --set-token "local-admin-token"
118
+ ```
119
+
120
+ 仓库配置位于 `<repository>/.drinkzen/admin.json`。该目录已加入 DrinkZen 仓库的 `.gitignore`，不要提交包含管理员 Token 的配置文件。
110
121
 
111
122
  ### 2. 查看当前生效的配置与 Secret 脱敏展示
112
123
 
@@ -118,23 +129,35 @@ drinkzen-admin config show --json
118
129
 
119
130
  ```json
120
131
  {
121
- "config_file": "/Users/admin/.drinkzen/admin.json",
132
+ "config_file": "/path/to/repository/.drinkzen/admin.json",
122
133
  "file_exists": true,
134
+ "global_config_file": "/Users/admin/.config/drinkzen/admin.json",
135
+ "project_config_file": "/path/to/repository/.drinkzen/admin.json",
123
136
  "active_url": "https://api.drinkzen.cn",
124
- "url_source": "file",
137
+ "url_source": "project",
125
138
  "active_token": "secr****1234",
126
- "token_source": "file"
139
+ "token_source": "global"
127
140
  }
128
141
  ```
129
142
 
143
+ 分别查看用户级和仓库级路径：
144
+
145
+ ```bash
146
+ drinkzen-admin config path --scope global --json
147
+ drinkzen-admin config path --scope project --json
148
+ ```
149
+
130
150
  ### 3. 配置加载优先级
131
151
 
132
152
  当执行命令时，配置按如下优先级依次生效：
133
153
 
134
154
  1. **显式命令行参数**：`--url "..."` / `--token "..."`
135
155
  2. **系统环境变量**：`DRINKZEN_API_BASE_URL` / `DRINKZEN_ADMIN_TOKEN`
136
- 3. **用户配置文件**：`~/.drinkzen/admin.json`
137
- 4. **内置默认值**：`http://localhost:8000` / `local-admin-token`
156
+ 3. **仓库覆盖配置**：`<repository>/.drinkzen/admin.json`
157
+ 4. **用户全局配置**：`~/.config/drinkzen/admin.json`
158
+ 5. **内置默认值**：`http://localhost:8000` / `local-admin-token`
159
+
160
+ 仓库配置按字段覆盖用户配置。例如仓库只配置 `url` 时，仍可继承用户全局配置中的 `token`。
138
161
 
139
162
  ---
140
163
 
{drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/README.md RENAMED
@@ -84,7 +84,18 @@ drinkzen-admin config set --set-url "https://api.drinkzen.cn" --set-token "your-
84
84
  drinkzen-admin config set --set-url "http://api.drinkzen.localhost:8000" --set-token "local-admin-token"
85
85
  ```
86
86
 
87
- 配置文件将保存在 `~/.drinkzen/admin.json`，且在 Unix/macOS 系统上自动设置 **`chmod 600`** 权限（仅当前系统用户可读写）。
87
+ 用户全局配置保存在 `~/.config/drinkzen/admin.json`，且在 Unix/macOS 系统上自动设置 **`chmod 600`** 权限（仅当前系统用户可读写）。如果设置了 `XDG_CONFIG_HOME`，则使用 `$XDG_CONFIG_HOME/drinkzen/admin.json`。
88
+
89
+ 仓库可以保存一份仅对当前项目生效的覆盖配置：
90
+
91
+ ```bash
92
+ cd /path/to/repository
93
+ drinkzen-admin config set --scope project \
94
+ --set-url "http://api.drinkzen.localhost:8000" \
95
+ --set-token "local-admin-token"
96
+ ```
97
+
98
+ 仓库配置位于 `<repository>/.drinkzen/admin.json`。该目录已加入 DrinkZen 仓库的 `.gitignore`，不要提交包含管理员 Token 的配置文件。
88
99
 
89
100
  ### 2. 查看当前生效的配置与 Secret 脱敏展示
90
101
 
@@ -96,23 +107,35 @@ drinkzen-admin config show --json
96
107
 
97
108
  ```json
98
109
  {
99
- "config_file": "/Users/admin/.drinkzen/admin.json",
110
+ "config_file": "/path/to/repository/.drinkzen/admin.json",
100
111
  "file_exists": true,
112
+ "global_config_file": "/Users/admin/.config/drinkzen/admin.json",
113
+ "project_config_file": "/path/to/repository/.drinkzen/admin.json",
101
114
  "active_url": "https://api.drinkzen.cn",
102
- "url_source": "file",
115
+ "url_source": "project",
103
116
  "active_token": "secr****1234",
104
- "token_source": "file"
117
+ "token_source": "global"
105
118
  }
106
119
  ```
107
120
 
121
+ 分别查看用户级和仓库级路径：
122
+
123
+ ```bash
124
+ drinkzen-admin config path --scope global --json
125
+ drinkzen-admin config path --scope project --json
126
+ ```
127
+
108
128
  ### 3. 配置加载优先级
109
129
 
110
130
  当执行命令时，配置按如下优先级依次生效：
111
131
 
112
132
  1. **显式命令行参数**：`--url "..."` / `--token "..."`
113
133
  2. **系统环境变量**：`DRINKZEN_API_BASE_URL` / `DRINKZEN_ADMIN_TOKEN`
114
- 3. **用户配置文件**：`~/.drinkzen/admin.json`
115
- 4. **内置默认值**：`http://localhost:8000` / `local-admin-token`
134
+ 3. **仓库覆盖配置**：`<repository>/.drinkzen/admin.json`
135
+ 4. **用户全局配置**：`~/.config/drinkzen/admin.json`
136
+ 5. **内置默认值**：`http://localhost:8000` / `local-admin-token`
137
+
138
+ 仓库配置按字段覆盖用户配置。例如仓库只配置 `url` 时，仍可继承用户全局配置中的 `token`。
116
139
 
117
140
  ---
118
141
 
{drinkzen_admin_cli-0.3.3 → drinkzen_admin_cli-0.4.0}/drinkzen_admin/__init__.py RENAMED
@@ -1,3 +1,3 @@
1
1
  """DrinkZen Admin CLI package."""
2
2
 
3
- __version__ = "0.3.0"
3
+ __version__ = "0.4.0"