coding-proxy 0.2.0a1__py3-none-any.whl → 0.2.1__py3-none-any.whl
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.
- coding/proxy/cli/__init__.py +8 -1
- coding/proxy/config/config.default.yaml +92 -72
- coding/proxy/config/routing.py +2 -0
- coding/proxy/config/server.py +12 -0
- coding/proxy/config/vendors.py +1 -0
- coding/proxy/logging/__init__.py +142 -4
- coding/proxy/logging/formatters.py +27 -0
- coding/proxy/routing/circuit_breaker.py +30 -7
- coding/proxy/routing/executor.py +59 -5
- coding/proxy/routing/quota_guard.py +9 -2
- coding/proxy/routing/tier.py +24 -2
- coding/proxy/routing/usage_recorder.py +1 -1
- coding/proxy/server/app.py +5 -6
- coding/proxy/server/factory.py +4 -1
- coding/proxy/server/request_normalizer.py +2 -117
- coding/proxy/vendors/antigravity.py +214 -10
- {coding_proxy-0.2.0a1.dist-info → coding_proxy-0.2.1.dist-info}/METADATA +3 -3
- {coding_proxy-0.2.0a1.dist-info → coding_proxy-0.2.1.dist-info}/RECORD +21 -20
- {coding_proxy-0.2.0a1.dist-info → coding_proxy-0.2.1.dist-info}/WHEEL +0 -0
- {coding_proxy-0.2.0a1.dist-info → coding_proxy-0.2.1.dist-info}/entry_points.txt +0 -0
- {coding_proxy-0.2.0a1.dist-info → coding_proxy-0.2.1.dist-info}/licenses/LICENSE +0 -0
coding/proxy/cli/__init__.py
CHANGED
|
@@ -104,11 +104,18 @@ def start(
|
|
|
104
104
|
# 打印启动品牌横幅
|
|
105
105
|
print_banner(console, host=cfg.server.host, port=cfg.server.port)
|
|
106
106
|
|
|
107
|
+
# 解析文件日志路径:未显式配置时使用默认值
|
|
108
|
+
_file_path: str | None = cfg.logging.file or "coding-proxy.log"
|
|
107
109
|
uvicorn.run(
|
|
108
110
|
fastapi_app,
|
|
109
111
|
host=cfg.server.host,
|
|
110
112
|
port=cfg.server.port,
|
|
111
|
-
log_config=build_log_config(
|
|
113
|
+
log_config=build_log_config(
|
|
114
|
+
level=cfg.logging.level,
|
|
115
|
+
file_path=_file_path,
|
|
116
|
+
max_bytes=cfg.logging.max_bytes,
|
|
117
|
+
backup_count=cfg.logging.backup_count,
|
|
118
|
+
),
|
|
112
119
|
)
|
|
113
120
|
|
|
114
121
|
|
|
@@ -8,6 +8,9 @@ server:
|
|
|
8
8
|
|
|
9
9
|
logging:
|
|
10
10
|
level: "INFO"
|
|
11
|
+
# file: "coding-proxy.log" # 文件日志路径;设为 null 或空字符串禁用
|
|
12
|
+
# max_bytes: 5242880 # 单文件上限(5 MB),触发轮转
|
|
13
|
+
# backup_count: 5 # 保留 gzip 压缩备份文件数
|
|
11
14
|
|
|
12
15
|
# === 降级链路优先级(可选) ===
|
|
13
16
|
#
|
|
@@ -26,12 +29,12 @@ logging:
|
|
|
26
29
|
# 示例 3:将 zhipu 提升为首选,anthropic 作为后备
|
|
27
30
|
# tiers: ["zhipu", "anthropic"]
|
|
28
31
|
|
|
29
|
-
tiers: ["
|
|
32
|
+
tiers: ["zhipu", "anthropic", "copilot", "antigravity"]
|
|
30
33
|
|
|
31
34
|
# === 供应商定义(vendors 列表) ===
|
|
32
35
|
#
|
|
33
36
|
# 每个 vendor 通过 vendor 字段指定供应商类型:
|
|
34
|
-
# anthropic |
|
|
37
|
+
# anthropic | zhipu | minimax | alibaba | xiaomi | kimi | doubao | copilot | antigravity
|
|
35
38
|
#
|
|
36
39
|
# 优先级规则:
|
|
37
40
|
# - 若配置了 tiers,以其指定的顺序为准
|
|
@@ -101,6 +104,7 @@ vendors:
|
|
|
101
104
|
|
|
102
105
|
# Vendor 3: 智谱 GLM(终端兜底,无 circuit_breaker)
|
|
103
106
|
- vendor: zhipu
|
|
107
|
+
enabled: true
|
|
104
108
|
base_url: "https://open.bigmodel.cn/api/anthropic"
|
|
105
109
|
api_key: "${ZHIPU_API_KEY}"
|
|
106
110
|
timeout_ms: 3000000
|
|
@@ -127,75 +131,75 @@ vendors:
|
|
|
127
131
|
recovery_timeout_seconds: 300
|
|
128
132
|
success_threshold: 2
|
|
129
133
|
quota_guard:
|
|
130
|
-
enabled:
|
|
134
|
+
enabled: false
|
|
131
135
|
token_budget: 1000000000
|
|
132
136
|
window_hours: 24.0
|
|
133
137
|
threshold_percent: 95.0
|
|
134
138
|
probe_interval_seconds: 300
|
|
135
139
|
|
|
136
|
-
# Vendor 5:
|
|
137
|
-
- vendor:
|
|
140
|
+
# Vendor 5: 阿里 Qwen(默认禁用)
|
|
141
|
+
- vendor: alibaba
|
|
138
142
|
enabled: false
|
|
139
|
-
base_url: "https://
|
|
140
|
-
api_key: "${
|
|
143
|
+
base_url: "https://coding-intl.dashscope.aliyuncs.com/apps/anthropic"
|
|
144
|
+
api_key: "${ALIBABA_API_KEY}"
|
|
141
145
|
timeout_ms: 3000000
|
|
142
146
|
circuit_breaker:
|
|
143
147
|
failure_threshold: 3
|
|
144
148
|
recovery_timeout_seconds: 300
|
|
145
149
|
success_threshold: 2
|
|
146
150
|
quota_guard:
|
|
147
|
-
enabled:
|
|
151
|
+
enabled: false
|
|
148
152
|
token_budget: 1000000000
|
|
149
153
|
window_hours: 24.0
|
|
150
154
|
threshold_percent: 95.0
|
|
151
155
|
probe_interval_seconds: 300
|
|
152
156
|
|
|
153
|
-
# Vendor 6:
|
|
154
|
-
- vendor:
|
|
157
|
+
# Vendor 6: 小米 MiMo(默认禁用)
|
|
158
|
+
- vendor: xiaomi
|
|
155
159
|
enabled: false
|
|
156
|
-
base_url: "https://
|
|
157
|
-
api_key: "${
|
|
160
|
+
base_url: "https://token-plan-cn.xiaomimimo.com/anthropic"
|
|
161
|
+
api_key: "${XIAOMI_API_KEY}"
|
|
158
162
|
timeout_ms: 3000000
|
|
159
163
|
circuit_breaker:
|
|
160
164
|
failure_threshold: 3
|
|
161
165
|
recovery_timeout_seconds: 300
|
|
162
166
|
success_threshold: 2
|
|
163
167
|
quota_guard:
|
|
164
|
-
enabled:
|
|
168
|
+
enabled: false
|
|
165
169
|
token_budget: 1000000000
|
|
166
170
|
window_hours: 24.0
|
|
167
171
|
threshold_percent: 95.0
|
|
168
172
|
probe_interval_seconds: 300
|
|
169
173
|
|
|
170
|
-
# Vendor 7:
|
|
171
|
-
- vendor:
|
|
174
|
+
# Vendor 7: Kimi(默认禁用)
|
|
175
|
+
- vendor: kimi
|
|
172
176
|
enabled: false
|
|
173
|
-
base_url: "https://
|
|
174
|
-
api_key: "${
|
|
177
|
+
base_url: "https://api.kimi.com/coding/"
|
|
178
|
+
api_key: "${KIMI_API_KEY}"
|
|
175
179
|
timeout_ms: 3000000
|
|
176
180
|
circuit_breaker:
|
|
177
181
|
failure_threshold: 3
|
|
178
182
|
recovery_timeout_seconds: 300
|
|
179
183
|
success_threshold: 2
|
|
180
184
|
quota_guard:
|
|
181
|
-
enabled:
|
|
185
|
+
enabled: false
|
|
182
186
|
token_budget: 1000000000
|
|
183
187
|
window_hours: 24.0
|
|
184
188
|
threshold_percent: 95.0
|
|
185
189
|
probe_interval_seconds: 300
|
|
186
190
|
|
|
187
|
-
# Vendor 8:
|
|
188
|
-
- vendor:
|
|
191
|
+
# Vendor 8: 豆包 Doubao(默认禁用)
|
|
192
|
+
- vendor: doubao
|
|
189
193
|
enabled: false
|
|
190
|
-
base_url: "https://
|
|
191
|
-
api_key: "${
|
|
194
|
+
base_url: "https://ark.cn-beijing.volces.com/api/coding"
|
|
195
|
+
api_key: "${ARK_API_KEY}"
|
|
192
196
|
timeout_ms: 3000000
|
|
193
197
|
circuit_breaker:
|
|
194
198
|
failure_threshold: 3
|
|
195
199
|
recovery_timeout_seconds: 300
|
|
196
200
|
success_threshold: 2
|
|
197
201
|
quota_guard:
|
|
198
|
-
enabled:
|
|
202
|
+
enabled: false
|
|
199
203
|
token_budget: 1000000000
|
|
200
204
|
window_hours: 24.0
|
|
201
205
|
threshold_percent: 95.0
|
|
@@ -231,11 +235,15 @@ model_mapping:
|
|
|
231
235
|
# Google Antigravity 模型映射
|
|
232
236
|
- pattern: "claude-sonnet-.*"
|
|
233
237
|
vendors: ["antigravity"]
|
|
234
|
-
target: "
|
|
238
|
+
target: "Claude Sonnet 4.6"
|
|
235
239
|
is_regex: true
|
|
236
240
|
- pattern: "claude-opus-.*"
|
|
237
241
|
vendors: ["antigravity"]
|
|
238
|
-
target: "
|
|
242
|
+
target: "Claude Opus 4.6 Thinking"
|
|
243
|
+
is_regex: true
|
|
244
|
+
- pattern: "claude-haiku-.*"
|
|
245
|
+
vendors: ["antigravity"]
|
|
246
|
+
target: "Gemini 3 Flash"
|
|
239
247
|
is_regex: true
|
|
240
248
|
# 智谱 GLM 映射(官方原生 Anthropic 兼容端点)
|
|
241
249
|
# glm-5v-turbo 完整承载 Claude Code 满血能力(tool calling / thinking / 多模态)
|
|
@@ -264,6 +272,32 @@ model_mapping:
|
|
|
264
272
|
vendors: ["minimax"]
|
|
265
273
|
target: "minimax-m2.7"
|
|
266
274
|
is_regex: true
|
|
275
|
+
# 阿里 Qwen 模型映射(原生 Anthropic 兼容端点)
|
|
276
|
+
- pattern: "claude-sonnet-.*"
|
|
277
|
+
vendors: ["alibaba"]
|
|
278
|
+
target: "qwen3.6-plus"
|
|
279
|
+
is_regex: true
|
|
280
|
+
- pattern: "claude-opus-.*"
|
|
281
|
+
vendors: ["alibaba"]
|
|
282
|
+
target: "qwen3.6-plus"
|
|
283
|
+
is_regex: true
|
|
284
|
+
- pattern: "claude-haiku-.*"
|
|
285
|
+
vendors: ["alibaba"]
|
|
286
|
+
target: "qwen3.6-plus"
|
|
287
|
+
is_regex: true
|
|
288
|
+
# 小米 MiMo 模型映射(原生 Anthropic 兼容端点)
|
|
289
|
+
- pattern: "claude-sonnet-.*"
|
|
290
|
+
vendors: ["xiaomi"]
|
|
291
|
+
target: "mimo-v2-pro"
|
|
292
|
+
is_regex: true
|
|
293
|
+
- pattern: "claude-opus-.*"
|
|
294
|
+
vendors: ["xiaomi"]
|
|
295
|
+
target: "mimo-v2-pro"
|
|
296
|
+
is_regex: true
|
|
297
|
+
- pattern: "claude-haiku-.*"
|
|
298
|
+
vendors: ["xiaomi"]
|
|
299
|
+
target: "mimo-v2-pro"
|
|
300
|
+
is_regex: true
|
|
267
301
|
# Kimi 模型映射(原生 Anthropic 兼容端点)
|
|
268
302
|
- pattern: "claude-sonnet-.*"
|
|
269
303
|
vendors: ["kimi"]
|
|
@@ -290,32 +324,6 @@ model_mapping:
|
|
|
290
324
|
vendors: ["doubao"]
|
|
291
325
|
target: "doubao-seed-2.0-lite"
|
|
292
326
|
is_regex: true
|
|
293
|
-
# 小米 MiMo 模型映射(原生 Anthropic 兼容端点)
|
|
294
|
-
- pattern: "claude-sonnet-.*"
|
|
295
|
-
vendors: ["xiaomi"]
|
|
296
|
-
target: "mimo-v2-pro"
|
|
297
|
-
is_regex: true
|
|
298
|
-
- pattern: "claude-opus-.*"
|
|
299
|
-
vendors: ["xiaomi"]
|
|
300
|
-
target: "mimo-v2-pro"
|
|
301
|
-
is_regex: true
|
|
302
|
-
- pattern: "claude-haiku-.*"
|
|
303
|
-
vendors: ["xiaomi"]
|
|
304
|
-
target: "mimo-v2-pro"
|
|
305
|
-
is_regex: true
|
|
306
|
-
# 阿里 Qwen 模型映射(原生 Anthropic 兼容端点)
|
|
307
|
-
- pattern: "claude-sonnet-.*"
|
|
308
|
-
vendors: ["alibaba"]
|
|
309
|
-
target: "qwen3.6-plus"
|
|
310
|
-
is_regex: true
|
|
311
|
-
- pattern: "claude-opus-.*"
|
|
312
|
-
vendors: ["alibaba"]
|
|
313
|
-
target: "qwen3.6-plus"
|
|
314
|
-
is_regex: true
|
|
315
|
-
- pattern: "claude-haiku-.*"
|
|
316
|
-
vendors: ["alibaba"]
|
|
317
|
-
target: "qwen3.6-plus"
|
|
318
|
-
is_regex: true
|
|
319
327
|
|
|
320
328
|
# === 模型定价(USD / 1M tokens) ===
|
|
321
329
|
# vendor: 供应商名称(对应 `usage` 统计表中的"供应商"列)
|
|
@@ -348,6 +356,12 @@ pricing:
|
|
|
348
356
|
output_cost_per_mtok: $25.0
|
|
349
357
|
cache_write_cost_per_mtok: $6.25
|
|
350
358
|
cache_read_cost_per_mtok: $0.50
|
|
359
|
+
- vendor: copilot
|
|
360
|
+
model: Claude Opus 4.6
|
|
361
|
+
input_cost_per_mtok: $5.0
|
|
362
|
+
output_cost_per_mtok: $25.0
|
|
363
|
+
cache_write_cost_per_mtok: $6.25
|
|
364
|
+
cache_read_cost_per_mtok: $0.50
|
|
351
365
|
- vendor: copilot
|
|
352
366
|
model: Claude Sonnet 4.6
|
|
353
367
|
input_cost_per_mtok: $3.0
|
|
@@ -372,6 +386,12 @@ pricing:
|
|
|
372
386
|
output_cost_per_mtok: $5
|
|
373
387
|
cache_write_cost_per_mtok: $1.25
|
|
374
388
|
cache_read_cost_per_mtok: $0.10
|
|
389
|
+
- vendor: copilot
|
|
390
|
+
model: Claude Haiku 4.5
|
|
391
|
+
input_cost_per_mtok: $1
|
|
392
|
+
output_cost_per_mtok: $5
|
|
393
|
+
cache_write_cost_per_mtok: $1.25
|
|
394
|
+
cache_read_cost_per_mtok: $0.10
|
|
375
395
|
# ── Google Antigravity(参照 Anthropic 定价估算) ──
|
|
376
396
|
- vendor: antigravity
|
|
377
397
|
model: claude-opus-4-6-thinking
|
|
@@ -434,6 +454,27 @@ pricing:
|
|
|
434
454
|
output_cost_per_mtok: ¥8.40
|
|
435
455
|
cache_write_cost_per_mtok: ¥2.625
|
|
436
456
|
cache_read_cost_per_mtok: ¥0.21
|
|
457
|
+
# ── 阿里 Qwen ──
|
|
458
|
+
- vendor: alibaba
|
|
459
|
+
model: qwen3.6-plus
|
|
460
|
+
input_cost_per_mtok: $0.276
|
|
461
|
+
output_cost_per_mtok: $1.651
|
|
462
|
+
# ── 小米 MiMo ──
|
|
463
|
+
- vendor: xiaomi
|
|
464
|
+
model: mimo-v2-pro
|
|
465
|
+
input_cost_per_mtok: ¥7.00
|
|
466
|
+
output_cost_per_mtok: ¥21.00
|
|
467
|
+
cache_read_cost_per_mtok: ¥1.40
|
|
468
|
+
- vendor: xiaomi
|
|
469
|
+
model: mimo-v2-omni
|
|
470
|
+
input_cost_per_mtok: ¥2.80
|
|
471
|
+
output_cost_per_mtok: ¥14.00
|
|
472
|
+
cache_read_cost_per_mtok: ¥0.56
|
|
473
|
+
- vendor: xiaomi
|
|
474
|
+
model: mimo-v2-flash
|
|
475
|
+
input_cost_per_mtok: ¥0.70
|
|
476
|
+
output_cost_per_mtok: ¥2.10
|
|
477
|
+
cache_read_cost_per_mtok: ¥0.07
|
|
437
478
|
# ── Kimi ──
|
|
438
479
|
- vendor: kimi
|
|
439
480
|
model: kimi-k2.5
|
|
@@ -458,27 +499,6 @@ pricing:
|
|
|
458
499
|
output_cost_per_mtok: ¥3.60
|
|
459
500
|
cache_write_cost_per_mtok: ¥0.12
|
|
460
501
|
cache_read_cost_per_mtok: ¥0.017
|
|
461
|
-
# ── 小米 MiMo ──
|
|
462
|
-
- vendor: xiaomi
|
|
463
|
-
model: mimo-v2-pro
|
|
464
|
-
input_cost_per_mtok: ¥7.00
|
|
465
|
-
output_cost_per_mtok: ¥21.00
|
|
466
|
-
cache_read_cost_per_mtok: ¥1.40
|
|
467
|
-
- vendor: xiaomi
|
|
468
|
-
model: mimo-v2-omni
|
|
469
|
-
input_cost_per_mtok: ¥2.80
|
|
470
|
-
output_cost_per_mtok: ¥14.00
|
|
471
|
-
cache_read_cost_per_mtok: ¥0.56
|
|
472
|
-
- vendor: xiaomi
|
|
473
|
-
model: mimo-v2-flash
|
|
474
|
-
input_cost_per_mtok: ¥0.70
|
|
475
|
-
output_cost_per_mtok: ¥2.10
|
|
476
|
-
cache_read_cost_per_mtok: ¥0.07
|
|
477
|
-
# ── 阿里 Qwen ──
|
|
478
|
-
- vendor: alibaba
|
|
479
|
-
model: qwen3.6-plus
|
|
480
|
-
input_cost_per_mtok: $0.276
|
|
481
|
-
output_cost_per_mtok: $1.651
|
|
482
502
|
|
|
483
503
|
database:
|
|
484
504
|
path: "~/.coding-proxy/usage.db"
|
coding/proxy/config/routing.py
CHANGED
|
@@ -295,6 +295,8 @@ class VendorConfig(BaseModel):
|
|
|
295
295
|
if vendor_type == self.vendor:
|
|
296
296
|
continue
|
|
297
297
|
for field_name in fields:
|
|
298
|
+
if field_name in exclusive:
|
|
299
|
+
continue
|
|
298
300
|
value = getattr(self, field_name, None)
|
|
299
301
|
if value and value != getattr(
|
|
300
302
|
VendorConfig.model_fields[field_name], "default", None
|
coding/proxy/config/server.py
CHANGED
|
@@ -17,8 +17,20 @@ class DatabaseConfig(BaseModel):
|
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
class LoggingConfig(BaseModel):
|
|
20
|
+
"""日志配置.
|
|
21
|
+
|
|
22
|
+
Attributes:
|
|
23
|
+
level: 控制台日志级别(INFO / WARNING / DEBUG 等)。
|
|
24
|
+
file: 文件日志路径。为 ``None`` 时使用默认值 ``coding-proxy.log``;
|
|
25
|
+
设为空字符串可禁用文件日志。
|
|
26
|
+
max_bytes: 单个日志文件最大字节数(触发轮转)。默认 5 MB。
|
|
27
|
+
backup_count: 保留的已压缩备份文件数。默认 5。
|
|
28
|
+
"""
|
|
29
|
+
|
|
20
30
|
level: str = "INFO"
|
|
21
31
|
file: str | None = None
|
|
32
|
+
max_bytes: int = 5 * 1024 * 1024
|
|
33
|
+
backup_count: int = 5
|
|
22
34
|
|
|
23
35
|
|
|
24
36
|
__all__ = ["ServerConfig", "DatabaseConfig", "LoggingConfig"]
|
coding/proxy/config/vendors.py
CHANGED
|
@@ -34,6 +34,7 @@ class AntigravityConfig(BaseModel):
|
|
|
34
34
|
model_endpoint: str = "models/claude-sonnet-4-20250514"
|
|
35
35
|
timeout_ms: int = 300000
|
|
36
36
|
safety_settings: dict[str, str] | None = None
|
|
37
|
+
project_id: str = "" # GCP Project ID(v1internal 协议必填)
|
|
37
38
|
|
|
38
39
|
|
|
39
40
|
class ZhipuConfig(BaseModel):
|
coding/proxy/logging/__init__.py
CHANGED
|
@@ -1,11 +1,92 @@
|
|
|
1
|
-
"""日志模块.
|
|
1
|
+
"""日志模块.
|
|
2
|
+
|
|
3
|
+
提供 uvicorn 兼容的 dictConfig 构建、文件日志字符串格式化器、
|
|
4
|
+
以及 gzip 压缩轮转支持。
|
|
5
|
+
"""
|
|
2
6
|
|
|
3
7
|
from __future__ import annotations
|
|
4
8
|
|
|
9
|
+
import gzip
|
|
10
|
+
import logging
|
|
11
|
+
import logging.handlers
|
|
12
|
+
import os
|
|
13
|
+
from pathlib import Path
|
|
14
|
+
|
|
15
|
+
from .formatters import FileFormatter
|
|
16
|
+
|
|
17
|
+
# ── 常量 ────────────────────────────────────────────────────────
|
|
18
|
+
|
|
19
|
+
_DEFAULT_MAX_BYTES = 5 * 1024 * 1024 # 5 MB per file
|
|
20
|
+
_DEFAULT_BACKUP_COUNT = 5 # Keep 5 rotated backups
|
|
21
|
+
_FILE_LOG_LEVEL = "DEBUG" # File logs capture everything
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
def _gzip_namer(default_name: str) -> str:
|
|
25
|
+
"""RotatingFileHandler namer: 为轮转文件添加 .gz 后缀."""
|
|
26
|
+
return default_name + ".gz"
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
def _gzip_rotator(source: str, dest: str) -> None:
|
|
30
|
+
"""RotatingFileHandler rotator: 将源文件 gzip 压缩后写入目标.
|
|
31
|
+
|
|
32
|
+
流程:
|
|
33
|
+
1. 读取 source 文件全部内容
|
|
34
|
+
2. gzip 压缩写入 dest 文件
|
|
35
|
+
3. 删除 source 原文件
|
|
36
|
+
"""
|
|
37
|
+
with open(source, "rb") as f_in:
|
|
38
|
+
data = f_in.read()
|
|
39
|
+
with open(dest, "wb") as f_out:
|
|
40
|
+
f_out.write(gzip.compress(data, compresslevel=6))
|
|
41
|
+
os.remove(source)
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def _create_rotating_file_handler(
|
|
45
|
+
*,
|
|
46
|
+
filename: str,
|
|
47
|
+
maxBytes: int = _DEFAULT_MAX_BYTES,
|
|
48
|
+
backupCount: int = _DEFAULT_BACKUP_COUNT,
|
|
49
|
+
encoding: str = "utf-8",
|
|
50
|
+
) -> logging.handlers.RotatingFileHandler:
|
|
51
|
+
"""创建带 gzip 压缩轮转的 RotatingFileHandler(dictConfig 兼容工厂函数).
|
|
52
|
+
|
|
53
|
+
``logging.config.dictConfig`` 仅支持通过构造函数 kwargs 配置 handler,
|
|
54
|
+
而 ``namer`` / ``rotator`` 是实例属性而非构造参数,因此需要通过工厂函数注入。
|
|
55
|
+
"""
|
|
56
|
+
handler = logging.handlers.RotatingFileHandler(
|
|
57
|
+
filename=filename,
|
|
58
|
+
maxBytes=maxBytes,
|
|
59
|
+
backupCount=backupCount,
|
|
60
|
+
encoding=encoding,
|
|
61
|
+
)
|
|
62
|
+
handler.namer = _gzip_namer
|
|
63
|
+
handler.rotator = _gzip_rotator
|
|
64
|
+
return handler
|
|
65
|
+
|
|
5
66
|
|
|
6
|
-
def build_log_config(
|
|
7
|
-
|
|
8
|
-
|
|
67
|
+
def build_log_config(
|
|
68
|
+
level: str = "INFO",
|
|
69
|
+
file_path: str | None = None,
|
|
70
|
+
max_bytes: int = _DEFAULT_MAX_BYTES,
|
|
71
|
+
backup_count: int = _DEFAULT_BACKUP_COUNT,
|
|
72
|
+
) -> dict:
|
|
73
|
+
"""构建 uvicorn log_config,支持双写(控制台 + 文件).
|
|
74
|
+
|
|
75
|
+
Args:
|
|
76
|
+
level: 控制台日志级别(默认 INFO)。
|
|
77
|
+
file_path: 文件日志路径。为 ``None`` 时仅输出到控制台(向后兼容)。
|
|
78
|
+
max_bytes: 单个日志文件最大字节数(默认 5 MB)。
|
|
79
|
+
backup_count: 保留的轮转备份文件数(默认 5)。
|
|
80
|
+
|
|
81
|
+
Returns:
|
|
82
|
+
符合 ``logging.config.dictConfig`` 规范的字典。
|
|
83
|
+
|
|
84
|
+
双写行为:
|
|
85
|
+
- 控制台:人类可读格式,级别由 ``level`` 参数控制(handler 级别过滤)
|
|
86
|
+
- 文件:字符串格式(与控制台风格一致),固定 DEBUG 级别(捕获所有日志)
|
|
87
|
+
- 当 ``file_path`` 为 ``None`` 或空字符串时,退化为纯控制台模式(向后兼容)
|
|
88
|
+
"""
|
|
89
|
+
config: dict = {
|
|
9
90
|
"version": 1,
|
|
10
91
|
"disable_existing_loggers": False,
|
|
11
92
|
"formatters": {
|
|
@@ -26,11 +107,13 @@ def build_log_config(level: str = "INFO") -> dict:
|
|
|
26
107
|
"formatter": "default",
|
|
27
108
|
"class": "logging.StreamHandler",
|
|
28
109
|
"stream": "ext://sys.stderr",
|
|
110
|
+
"level": level,
|
|
29
111
|
},
|
|
30
112
|
"access": {
|
|
31
113
|
"formatter": "access",
|
|
32
114
|
"class": "logging.StreamHandler",
|
|
33
115
|
"stream": "ext://sys.stdout",
|
|
116
|
+
"level": "INFO",
|
|
34
117
|
},
|
|
35
118
|
},
|
|
36
119
|
"loggers": {
|
|
@@ -48,3 +131,58 @@ def build_log_config(level: str = "INFO") -> dict:
|
|
|
48
131
|
},
|
|
49
132
|
},
|
|
50
133
|
}
|
|
134
|
+
|
|
135
|
+
# ── 条件注入:文件日志基础设施 ────────────────────────────
|
|
136
|
+
if file_path:
|
|
137
|
+
# 确保日志目录存在
|
|
138
|
+
log_file = Path(file_path)
|
|
139
|
+
log_file.parent.mkdir(parents=True, exist_ok=True)
|
|
140
|
+
|
|
141
|
+
# 注入文件日志字符串 formatter
|
|
142
|
+
config["formatters"]["file_fmt"] = {
|
|
143
|
+
"()": "coding.proxy.logging.formatters.FileFormatter",
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
# 注入 RotatingFileHandler(gzip 压缩轮转)
|
|
147
|
+
# 使用工厂函数(而非 class + namer/rotator kwargs),
|
|
148
|
+
# 因为 dictConfig 不支持将 namer/rotator 作为构造参数传递
|
|
149
|
+
config["handlers"]["file"] = {
|
|
150
|
+
"formatter": "file_fmt",
|
|
151
|
+
"()": "coding.proxy.logging._create_rotating_file_handler",
|
|
152
|
+
"filename": str(log_file.resolve()),
|
|
153
|
+
"maxBytes": max_bytes,
|
|
154
|
+
"backupCount": backup_count,
|
|
155
|
+
"encoding": "utf-8",
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
# 为每个 logger 添加 file handler
|
|
159
|
+
# 注意:uvicorn.error 无 handlers 键(通过 propagate 继承 uvicorn 的 handler)
|
|
160
|
+
for logger_name in (
|
|
161
|
+
"uvicorn",
|
|
162
|
+
"uvicorn.error",
|
|
163
|
+
"uvicorn.access",
|
|
164
|
+
"coding.proxy",
|
|
165
|
+
):
|
|
166
|
+
logger_cfg = config["loggers"][logger_name]
|
|
167
|
+
handlers = logger_cfg.get("handlers", [])
|
|
168
|
+
if isinstance(handlers, list):
|
|
169
|
+
handlers.append("file")
|
|
170
|
+
logger_cfg["handlers"] = handlers
|
|
171
|
+
else:
|
|
172
|
+
logger_cfg["handlers"] = [handlers, "file"]
|
|
173
|
+
|
|
174
|
+
# Logger 级别设为 DEBUG(让所有消息通过到 file handler)
|
|
175
|
+
# Console handler 已设 level 过滤,确保控制台仅输出 INFO+
|
|
176
|
+
config["loggers"]["coding.proxy"]["level"] = _FILE_LOG_LEVEL
|
|
177
|
+
config["loggers"]["uvicorn"]["level"] = _FILE_LOG_LEVEL
|
|
178
|
+
config["loggers"]["uvicorn.error"]["level"] = _FILE_LOG_LEVEL
|
|
179
|
+
|
|
180
|
+
return config
|
|
181
|
+
|
|
182
|
+
|
|
183
|
+
__all__ = [
|
|
184
|
+
"build_log_config",
|
|
185
|
+
"FileFormatter",
|
|
186
|
+
"_gzip_namer",
|
|
187
|
+
"_gzip_rotator",
|
|
188
|
+
]
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"""文件日志格式化器(字符串输出).
|
|
2
|
+
|
|
3
|
+
为文件日志提供人类可读的字符串格式输出,
|
|
4
|
+
与控制台输出风格一致,便于人工阅读和 grep 检索。
|
|
5
|
+
"""
|
|
6
|
+
|
|
7
|
+
from __future__ import annotations
|
|
8
|
+
|
|
9
|
+
import logging
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class FileFormatter(logging.Formatter):
|
|
13
|
+
"""将 LogRecord 格式化为单行可读字符串.
|
|
14
|
+
|
|
15
|
+
输出格式:``2026-04-11 16:51:13 INFO ModelCall: vendor=zhipu ...``
|
|
16
|
+
|
|
17
|
+
设计要点:
|
|
18
|
+
- 时间戳使用 ``yyyy-MM-dd HH:mm:ss`` 格式(与控制台一致)
|
|
19
|
+
- 日志级别左对齐 5 字符宽度,保证多行对齐美观
|
|
20
|
+
- 无 ANSI 颜色码(文件输出不需要终端转义)
|
|
21
|
+
"""
|
|
22
|
+
|
|
23
|
+
def __init__(self) -> None:
|
|
24
|
+
super().__init__(
|
|
25
|
+
fmt="%(asctime)s %(levelname)-5s %(message)s",
|
|
26
|
+
datefmt="%Y-%m-%d %H:%M:%S",
|
|
27
|
+
)
|
|
@@ -32,11 +32,14 @@ class CircuitBreaker:
|
|
|
32
32
|
recovery_timeout_seconds: int = 300,
|
|
33
33
|
success_threshold: int = 2,
|
|
34
34
|
max_recovery_seconds: int = 3600,
|
|
35
|
+
*,
|
|
36
|
+
vendor_name: str = "",
|
|
35
37
|
) -> None:
|
|
36
38
|
self._failure_threshold = failure_threshold
|
|
37
39
|
self._recovery_timeout = recovery_timeout_seconds
|
|
38
40
|
self._success_threshold = success_threshold
|
|
39
41
|
self._max_recovery = max_recovery_seconds
|
|
42
|
+
self._vendor_label = f" [{vendor_name}]" if vendor_name else ""
|
|
40
43
|
|
|
41
44
|
self._state = CircuitState.CLOSED
|
|
42
45
|
self._failure_count = 0
|
|
@@ -65,7 +68,13 @@ class CircuitBreaker:
|
|
|
65
68
|
self._success_count += 1
|
|
66
69
|
if self._success_count >= self._success_threshold:
|
|
67
70
|
self._transition_to(CircuitState.CLOSED)
|
|
68
|
-
logger.info(
|
|
71
|
+
logger.info(
|
|
72
|
+
"Circuit breaker%s: HALF_OPEN → CLOSED "
|
|
73
|
+
"(recovered, %d/%d consecutive successes)",
|
|
74
|
+
self._vendor_label,
|
|
75
|
+
self._success_count,
|
|
76
|
+
self._success_threshold,
|
|
77
|
+
)
|
|
69
78
|
elif self._state == CircuitState.CLOSED:
|
|
70
79
|
# 正常状态下成功,无需操作
|
|
71
80
|
pass
|
|
@@ -94,7 +103,10 @@ class CircuitBreaker:
|
|
|
94
103
|
self._transition_to(CircuitState.OPEN)
|
|
95
104
|
self._backoff_recovery(hint_seconds=retry_after_seconds)
|
|
96
105
|
logger.warning(
|
|
97
|
-
"Circuit breaker: HALF_OPEN → OPEN
|
|
106
|
+
"Circuit breaker%s: HALF_OPEN → OPEN "
|
|
107
|
+
"(recovery probe failed, backoff %ds → next retry in %ds)",
|
|
108
|
+
self._vendor_label,
|
|
109
|
+
self._current_recovery,
|
|
98
110
|
self._current_recovery,
|
|
99
111
|
)
|
|
100
112
|
elif self._state == CircuitState.CLOSED:
|
|
@@ -117,14 +129,17 @@ class CircuitBreaker:
|
|
|
117
129
|
)
|
|
118
130
|
if force_open:
|
|
119
131
|
logger.warning(
|
|
120
|
-
"Circuit breaker: CLOSED → OPEN "
|
|
121
|
-
"(forced, rate-limited, next retry in %ds)",
|
|
132
|
+
"Circuit breaker%s: CLOSED → OPEN "
|
|
133
|
+
"(forced, rate-limited, retry-after=%ss → next retry in %ds)",
|
|
134
|
+
self._vendor_label,
|
|
135
|
+
retry_after_seconds or "N/A",
|
|
122
136
|
self._current_recovery,
|
|
123
137
|
)
|
|
124
138
|
else:
|
|
125
139
|
logger.warning(
|
|
126
|
-
"Circuit breaker: CLOSED → OPEN "
|
|
140
|
+
"Circuit breaker%s: CLOSED → OPEN "
|
|
127
141
|
"(%d consecutive failures, next retry in %ds)",
|
|
142
|
+
self._vendor_label,
|
|
128
143
|
self._failure_count,
|
|
129
144
|
self._current_recovery,
|
|
130
145
|
)
|
|
@@ -134,7 +149,9 @@ class CircuitBreaker:
|
|
|
134
149
|
with self._lock:
|
|
135
150
|
self._transition_to(CircuitState.CLOSED)
|
|
136
151
|
self._current_recovery = self._recovery_timeout
|
|
137
|
-
logger.info(
|
|
152
|
+
logger.info(
|
|
153
|
+
"Circuit breaker%s: manually reset to CLOSED", self._vendor_label
|
|
154
|
+
)
|
|
138
155
|
|
|
139
156
|
def get_info(self) -> dict:
|
|
140
157
|
"""获取熔断器状态信息."""
|
|
@@ -157,7 +174,13 @@ class CircuitBreaker:
|
|
|
157
174
|
elapsed = time.monotonic() - self._last_failure_time
|
|
158
175
|
if elapsed >= self._current_recovery:
|
|
159
176
|
self._transition_to(CircuitState.HALF_OPEN)
|
|
160
|
-
|
|
177
|
+
elapsed_s = int(elapsed)
|
|
178
|
+
logger.info(
|
|
179
|
+
"Circuit breaker%s: OPEN → HALF_OPEN (recovery timeout, waited %ds/%ds)",
|
|
180
|
+
self._vendor_label,
|
|
181
|
+
elapsed_s,
|
|
182
|
+
self._current_recovery,
|
|
183
|
+
)
|
|
161
184
|
|
|
162
185
|
def _transition_to(self, new_state: CircuitState) -> None:
|
|
163
186
|
self._state = new_state
|