coding-proxy 0.1.4a2__py3-none-any.whl → 0.1.4a4__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.
Potentially problematic release.
This version of coding-proxy might be problematic. Click here for more details.
- coding/proxy/config/config.default.yaml +6 -6
- coding/proxy/config/resiliency.py +1 -1
- coding/proxy/logging/db.py +5 -3
- coding/proxy/logging/stats.py +1 -1
- coding/proxy/server/factory.py +1 -1
- coding/proxy/vendors/base.py +2 -2
- coding/proxy/vendors/zhipu.py +5 -2
- {coding_proxy-0.1.4a2.dist-info → coding_proxy-0.1.4a4.dist-info}/METADATA +1 -1
- {coding_proxy-0.1.4a2.dist-info → coding_proxy-0.1.4a4.dist-info}/RECORD +12 -12
- {coding_proxy-0.1.4a2.dist-info → coding_proxy-0.1.4a4.dist-info}/WHEEL +0 -0
- {coding_proxy-0.1.4a2.dist-info → coding_proxy-0.1.4a4.dist-info}/entry_points.txt +0 -0
- {coding_proxy-0.1.4a2.dist-info → coding_proxy-0.1.4a4.dist-info}/licenses/LICENSE +0 -0
|
@@ -118,7 +118,7 @@ vendors:
|
|
|
118
118
|
|
|
119
119
|
# === 故障转移触发条件 ===
|
|
120
120
|
failover:
|
|
121
|
-
status_codes: [429, 403, 503, 500]
|
|
121
|
+
status_codes: [429, 403, 503, 500, 529]
|
|
122
122
|
error_types:
|
|
123
123
|
- "rate_limit_error"
|
|
124
124
|
- "overloaded_error"
|
|
@@ -158,7 +158,7 @@ model_mapping:
|
|
|
158
158
|
is_regex: true
|
|
159
159
|
- pattern: "claude-opus-.*"
|
|
160
160
|
vendors: ["zhipu"]
|
|
161
|
-
target: "glm-
|
|
161
|
+
target: "glm-5.1"
|
|
162
162
|
is_regex: true
|
|
163
163
|
- pattern: "claude-haiku-.*"
|
|
164
164
|
vendors: ["zhipu"]
|
|
@@ -247,7 +247,7 @@ pricing:
|
|
|
247
247
|
- vendor: zhipu
|
|
248
248
|
model: glm-4.5-air # 待区分长短上下文定价
|
|
249
249
|
input_cost_per_mtok: ¥0.80
|
|
250
|
-
output_cost_per_mtok: ¥
|
|
250
|
+
output_cost_per_mtok: ¥2.00
|
|
251
251
|
cache_read_cost_per_mtok: ¥0.16
|
|
252
252
|
- vendor: zhipu
|
|
253
253
|
model: glm-5v-turbo # 待区分长短上下文定价
|
|
@@ -256,9 +256,9 @@ pricing:
|
|
|
256
256
|
cache_read_cost_per_mtok: ¥1.20
|
|
257
257
|
- vendor: zhipu
|
|
258
258
|
model: glm-5.1 # 待区分长短上下文定价
|
|
259
|
-
input_cost_per_mtok: ¥
|
|
260
|
-
output_cost_per_mtok: ¥
|
|
261
|
-
cache_read_cost_per_mtok: ¥1.
|
|
259
|
+
input_cost_per_mtok: ¥6.00
|
|
260
|
+
output_cost_per_mtok: ¥24.00
|
|
261
|
+
cache_read_cost_per_mtok: ¥1.30
|
|
262
262
|
- vendor: zhipu
|
|
263
263
|
model: glm-5-turbo # 待区分长短上下文定价
|
|
264
264
|
input_cost_per_mtok: ¥5.00
|
|
@@ -24,7 +24,7 @@ class RetryConfig(BaseModel):
|
|
|
24
24
|
|
|
25
25
|
class FailoverConfig(BaseModel):
|
|
26
26
|
status_codes: list[int] = Field(
|
|
27
|
-
default=[429, 403, 503, 500],
|
|
27
|
+
default=[429, 403, 503, 500, 529],
|
|
28
28
|
)
|
|
29
29
|
error_types: list[str] = Field(
|
|
30
30
|
default=["rate_limit_error", "overloaded_error", "api_error"],
|
coding/proxy/logging/db.py
CHANGED
|
@@ -255,7 +255,9 @@ class TokenLogger:
|
|
|
255
255
|
return []
|
|
256
256
|
days = max(1, days)
|
|
257
257
|
start_iso = _days_start_utc_iso(days)
|
|
258
|
-
sql = """SELECT local_date(ts) AS date, vendor,
|
|
258
|
+
sql = """SELECT local_date(ts) AS date, vendor,
|
|
259
|
+
GROUP_CONCAT(DISTINCT model_requested) AS model_requested,
|
|
260
|
+
model_served,
|
|
259
261
|
COUNT(*) AS total_requests,
|
|
260
262
|
SUM(input_tokens) AS total_input,
|
|
261
263
|
SUM(output_tokens) AS total_output,
|
|
@@ -272,8 +274,8 @@ class TokenLogger:
|
|
|
272
274
|
sql += " AND model_requested = ?"
|
|
273
275
|
params.append(model)
|
|
274
276
|
sql += (
|
|
275
|
-
" GROUP BY local_date(ts), vendor,
|
|
276
|
-
" ORDER BY local_date(ts) DESC, vendor,
|
|
277
|
+
" GROUP BY local_date(ts), vendor, model_served"
|
|
278
|
+
" ORDER BY local_date(ts) DESC, vendor, model_served"
|
|
277
279
|
)
|
|
278
280
|
cursor = await self._db.execute(sql, params)
|
|
279
281
|
rows = await cursor.fetchall()
|
coding/proxy/logging/stats.py
CHANGED
|
@@ -101,7 +101,7 @@ async def show_usage(
|
|
|
101
101
|
table.add_row(
|
|
102
102
|
str(row.get("date", "")),
|
|
103
103
|
vendor_name,
|
|
104
|
-
|
|
104
|
+
_format_model_display(row.get("model_requested")),
|
|
105
105
|
model_served,
|
|
106
106
|
str(row.get("total_requests", 0)),
|
|
107
107
|
_format_tokens(total_input),
|
coding/proxy/server/factory.py
CHANGED
|
@@ -150,7 +150,7 @@ def _create_vendor_from_config(
|
|
|
150
150
|
api_key=vendor_cfg.api_key,
|
|
151
151
|
timeout_ms=vendor_cfg.timeout_ms,
|
|
152
152
|
)
|
|
153
|
-
return ZhipuVendor(cfg, mapper)
|
|
153
|
+
return ZhipuVendor(cfg, mapper, failover_cfg)
|
|
154
154
|
case _:
|
|
155
155
|
raise ValueError(f"未知的 vendor 类型: {vendor_cfg.vendor!r}")
|
|
156
156
|
|
coding/proxy/vendors/base.py
CHANGED
|
@@ -268,8 +268,8 @@ class BaseVendor(ABC):
|
|
|
268
268
|
for pattern in self._failover_config.error_message_patterns:
|
|
269
269
|
if pattern.lower() in error_message:
|
|
270
270
|
return True
|
|
271
|
-
# 429/503 即使无法解析 body 也触发故障转移
|
|
272
|
-
return status_code in (429, 503)
|
|
271
|
+
# 429/503/529 即使无法解析 body 也触发故障转移
|
|
272
|
+
return status_code in (429, 503, 529)
|
|
273
273
|
|
|
274
274
|
async def check_health(self) -> bool:
|
|
275
275
|
"""检查供应商健康状态(轻量级探测).
|
coding/proxy/vendors/zhipu.py
CHANGED
|
@@ -16,7 +16,7 @@ from typing import Any
|
|
|
16
16
|
|
|
17
17
|
import httpx
|
|
18
18
|
|
|
19
|
-
from ..config.schema import ZhipuConfig
|
|
19
|
+
from ..config.schema import FailoverConfig, ZhipuConfig
|
|
20
20
|
from ..routing.model_mapper import ModelMapper
|
|
21
21
|
from .base import (
|
|
22
22
|
PROXY_SKIP_HEADERS,
|
|
@@ -42,8 +42,11 @@ class ZhipuVendor(BaseVendor):
|
|
|
42
42
|
self,
|
|
43
43
|
config: ZhipuConfig,
|
|
44
44
|
model_mapper: ModelMapper,
|
|
45
|
+
failover_config: FailoverConfig | None = None,
|
|
45
46
|
) -> None:
|
|
46
|
-
super().__init__(
|
|
47
|
+
super().__init__(
|
|
48
|
+
config.base_url, config.timeout_ms, failover_config=failover_config
|
|
49
|
+
)
|
|
47
50
|
self._api_key = config.api_key
|
|
48
51
|
self._model_mapper = model_mapper
|
|
49
52
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: coding-proxy
|
|
3
|
-
Version: 0.1.
|
|
3
|
+
Version: 0.1.4a4
|
|
4
4
|
Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM.
|
|
5
5
|
Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
|
|
6
6
|
Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md
|
|
@@ -17,9 +17,9 @@ coding/proxy/compat/canonical.py,sha256=-zcuEwZ402xeH3C545RmuYRkT2HDuvFloyFydDv8
|
|
|
17
17
|
coding/proxy/compat/session_store.py,sha256=B9IFjjQJnHMg1244m__jG9gnqGWi26-JyEtwopEri6Q,5244
|
|
18
18
|
coding/proxy/config/__init__.py,sha256=hzgU5noJGecjj13UY38cC_p6jpWO3GO7okSW-A2XkJ0,127
|
|
19
19
|
coding/proxy/config/auth_schema.py,sha256=LYrJQU_fgW-6AoQdjXt4-MgPJjXjv9HrghlCcZwotnA,696
|
|
20
|
-
coding/proxy/config/config.default.yaml,sha256=
|
|
20
|
+
coding/proxy/config/config.default.yaml,sha256=nnJBa6eYWZ9-k85bBDgZFjFmo9uGdIohgP1xlB4_8Og,9625
|
|
21
21
|
coding/proxy/config/loader.py,sha256=1J_RBJgjuC8RwB2mwewLMS7vy9WEhUqttZG2igeDm-w,8984
|
|
22
|
-
coding/proxy/config/resiliency.py,sha256=
|
|
22
|
+
coding/proxy/config/resiliency.py,sha256=dGal9eyZK5bE1E7Qrpws8tY1-cLd-SmU5cGFkiCSc6M,1209
|
|
23
23
|
coding/proxy/config/routing.py,sha256=1jX96Uhs15PogZF67kIvKrgpWb01m7EP85XKzz7Ov38,11255
|
|
24
24
|
coding/proxy/config/schema.py,sha256=p-l1iQSbeZBNtHWnIRBo6PkWP7FajPI84zacUxMqpFg,11911
|
|
25
25
|
coding/proxy/config/server.py,sha256=um6SJHat9Z_DPjE0AzpdbmbA0fTB0KovUlkNl_eJX-k,509
|
|
@@ -31,8 +31,8 @@ coding/proxy/convert/gemini_sse_adapter.py,sha256=b7zQ9wBBn1bbG46WpLrAYOl0ExpyMT
|
|
|
31
31
|
coding/proxy/convert/gemini_to_anthropic.py,sha256=EE_rUsLmWTsF2QSYWqIYzsjyk1mKXFp2sziqj_S2W5U,3446
|
|
32
32
|
coding/proxy/convert/openai_to_anthropic.py,sha256=8rg8NZs_1up27MixrXRJAfmSiYrOkh_lkAJuytDGZow,3694
|
|
33
33
|
coding/proxy/logging/__init__.py,sha256=UZDWoTbgQNZadUZs56DG4TDK-X9F7wYUjTMgl2wfXuk,1664
|
|
34
|
-
coding/proxy/logging/db.py,sha256=
|
|
35
|
-
coding/proxy/logging/stats.py,sha256=
|
|
34
|
+
coding/proxy/logging/db.py,sha256=GsFNe2qif9_VSzjaLpDWxezEQLyIAI7b51ws9sJZ_EA,12857
|
|
35
|
+
coding/proxy/logging/stats.py,sha256=nCBZFIU5jnb8nlRnN8wqzF5zasyQS2hU6nZVqA_WrCk,4803
|
|
36
36
|
coding/proxy/model/__init__.py,sha256=E8E59yabP-CF5GIwHE4OEGPLiJj3yTLjFWmCorkQTxc,3947
|
|
37
37
|
coding/proxy/model/auth.py,sha256=NiiIPdLdxPtuHNrsGoxFASUXwJU5pkDuVRorQe_1Z-Q,934
|
|
38
38
|
coding/proxy/model/compat.py,sha256=D1ngBbtQb39cbtCsmxbMBiH8Hyu3rVU-fZPB_4TBj6M,5120
|
|
@@ -55,7 +55,7 @@ coding/proxy/routing/usage_parser.py,sha256=j4G0ArFduQ2D4Yeuad94DVlwdc-JvSh7SJLV
|
|
|
55
55
|
coding/proxy/routing/usage_recorder.py,sha256=pSs2r79fOrrq2cWJP-P5KKFnnXf62-3gYLaxAwndFi0,6272
|
|
56
56
|
coding/proxy/server/__init__.py,sha256=KeH7mEu36v9v27m3VgeSxSeFz9sLTJrxS_EVATJ7Vks,20
|
|
57
57
|
coding/proxy/server/app.py,sha256=hxCKb8FVEOYCvC84agUtwECajtqLqNgkTIEpEySJaGs,5613
|
|
58
|
-
coding/proxy/server/factory.py,sha256=
|
|
58
|
+
coding/proxy/server/factory.py,sha256=jQZ1Wv8H__S96p4anTW90b57ZOSXbiHNz2rp09ud5mk,7773
|
|
59
59
|
coding/proxy/server/request_normalizer.py,sha256=vN9ibmDw7oJy0WNPZkP3lWeOzogQoPQShwC-CSXmnX4,5443
|
|
60
60
|
coding/proxy/server/responses.py,sha256=i0ugnLRNOdRYGHEWxkwsxR35ChmdMQsSaD8AjRluTn4,2167
|
|
61
61
|
coding/proxy/server/routes.py,sha256=QeEsYczjvPfVhOrED2qe1V6CpwVBZbQHs8dP0OGdGXQ,11734
|
|
@@ -64,16 +64,16 @@ coding/proxy/streaming/anthropic_compat.py,sha256=cycYiJ-glN88OmfLTR7FroHRethONl
|
|
|
64
64
|
coding/proxy/vendors/__init__.py,sha256=fehSpQ2-kUlZY6N8cNMGVJYMXspQmi3V4e0FgC4Ay4k,1011
|
|
65
65
|
coding/proxy/vendors/anthropic.py,sha256=krdbP38Rs-BLPsyQD7AmYK2Uf0-s_soLoPhoaAqC0Do,4004
|
|
66
66
|
coding/proxy/vendors/antigravity.py,sha256=zVl2fguxyIy3OjkosZYr2n5tR8dEEIjxazBEXY7v6BQ,13300
|
|
67
|
-
coding/proxy/vendors/base.py,sha256=
|
|
67
|
+
coding/proxy/vendors/base.py,sha256=CNZrBTtVl_fxssxA_5BLvH4S1FqAI72V5LJbgsgIXl4,14772
|
|
68
68
|
coding/proxy/vendors/copilot.py,sha256=qAFTO2xMqnawaFlvZS2a9-7f_UEkfODIFfDlgOBiQl4,29590
|
|
69
69
|
coding/proxy/vendors/copilot_models.py,sha256=UckIQYA4qLyNwEA09koQGBOZ65Nxhuo3ytUuDNqtzRU,15514
|
|
70
70
|
coding/proxy/vendors/copilot_token_manager.py,sha256=_sZBSFr4sFF2BuP-ZWexQxbN3R8TZs9CJ_d62LvyeBw,6710
|
|
71
71
|
coding/proxy/vendors/copilot_urls.py,sha256=YxaR6zmPdrySzsotJx6PjNIu2JIGG6N1D8kZs77oUCM,404
|
|
72
72
|
coding/proxy/vendors/mixins.py,sha256=eZd_vlsPCKUNOEWSxWTDDb5i24GUIE3_JZDsj5LMr08,2583
|
|
73
73
|
coding/proxy/vendors/token_manager.py,sha256=s10t4Com0jNnKGkPyJ_HpG5SjHrCEJvfArEOAaPKA_k,4189
|
|
74
|
-
coding/proxy/vendors/zhipu.py,sha256=
|
|
75
|
-
coding_proxy-0.1.
|
|
76
|
-
coding_proxy-0.1.
|
|
77
|
-
coding_proxy-0.1.
|
|
78
|
-
coding_proxy-0.1.
|
|
79
|
-
coding_proxy-0.1.
|
|
74
|
+
coding/proxy/vendors/zhipu.py,sha256=7xynP_1OYpkaY3Ngi-NDYmgCDnKgk6ECMXvcwGRq668,9749
|
|
75
|
+
coding_proxy-0.1.4a4.dist-info/METADATA,sha256=MqHcFDYRQiNPdvLDLeOyiXLU77n_Y5bJatUtfvyFEpc,10782
|
|
76
|
+
coding_proxy-0.1.4a4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
|
|
77
|
+
coding_proxy-0.1.4a4.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
|
|
78
|
+
coding_proxy-0.1.4a4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
79
|
+
coding_proxy-0.1.4a4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|