Skip to content

Commit 84a260f

Browse files
committed
refactor(config): 重命名模型配置变量,统一命名规范
- 更新settings模型命名为GLM45 - zai_provider优化params参数 - 更新所有相关文件中的变量引用,保持一致性 - 删除不再需要的测试文件
1 parent bdd3bcb commit 84a260f

File tree

10 files changed

+35
-1062
lines changed

10 files changed

+35
-1062
lines changed

app/core/config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@ def longcat_token_list(self) -> List[str]:
137137
return []
138138

139139
# Model Configuration
140-
PRIMARY_MODEL: str = os.getenv("PRIMARY_MODEL", "GLM-4.5")
141-
THINKING_MODEL: str = os.getenv("THINKING_MODEL", "GLM-4.5-Thinking")
142-
SEARCH_MODEL: str = os.getenv("SEARCH_MODEL", "GLM-4.5-Search")
140+
GLM45_MODEL: str = os.getenv("GLM45_MODEL", "GLM-4.5")
141+
GLM45_THINKING_MODEL: str = os.getenv("GLM45_THINKING_MODEL", "GLM-4.5-Thinking")
142+
GLM45_SEARCH_MODEL: str = os.getenv("GLM45_SEARCH_MODEL", "GLM-4.5-Search")
143143
AIR_MODEL: str = os.getenv("AIR_MODEL", "GLM-4.5-Air")
144144
GLM46_MODEL: str = os.getenv("GLM46_MODEL", "GLM-4.6")
145-
GLM46_THINKING_MODEL: str = os.getenv("GLM46_THINKING_MODEL", "GLM-4.6-Thinking")
146-
GLM46_SEARCH_MODEL: str = os.getenv("GLM46_SEARCH_MODEL", "GLM-4.6-Search")
145+
GLM46_GLM45_THINKING_MODEL: str = os.getenv("GLM46_GLM45_THINKING_MODEL", "GLM-4.6-Thinking")
146+
GLM46_GLM45_SEARCH_MODEL: str = os.getenv("GLM46_GLM45_SEARCH_MODEL", "GLM-4.6-Search")
147147

148148

149149

app/core/openai.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ async def list_models():
8888
current_time = int(time.time())
8989
fallback_response = ModelsResponse(
9090
data=[
91-
Model(id=settings.PRIMARY_MODEL, created=current_time, owned_by="z.ai"),
92-
Model(id=settings.THINKING_MODEL, created=current_time, owned_by="z.ai"),
93-
Model(id=settings.SEARCH_MODEL, created=current_time, owned_by="z.ai"),
91+
Model(id=settings.GLM45_MODEL, created=current_time, owned_by="z.ai"),
92+
Model(id=settings.GLM45_THINKING_MODEL, created=current_time, owned_by="z.ai"),
93+
Model(id=settings.GLM45_SEARCH_MODEL, created=current_time, owned_by="z.ai"),
9494
Model(id=settings.AIR_MODEL, created=current_time, owned_by="z.ai"),
9595
]
9696
)

app/providers/zai_provider.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ def __init__(self):
114114

115115
# 模型映射
116116
self.model_mapping = {
117-
settings.PRIMARY_MODEL: "0727-360B-API", # GLM-4.5
118-
settings.THINKING_MODEL: "0727-360B-API", # GLM-4.5-Thinking
119-
settings.SEARCH_MODEL: "0727-360B-API", # GLM-4.5-Search
117+
settings.GLM45_MODEL: "0727-360B-API", # GLM-4.5
118+
settings.GLM45_THINKING_MODEL: "0727-360B-API", # GLM-4.5-Thinking
119+
settings.GLM45_SEARCH_MODEL: "0727-360B-API", # GLM-4.5-Search
120120
settings.AIR_MODEL: "0727-106B-API", # GLM-4.5-Air
121121
settings.GLM46_MODEL: "GLM-4-6-API-V1", # GLM-4.6
122-
settings.GLM46_THINKING_MODEL: "GLM-4-6-API-V1", # GLM-4.6-Thinking
123-
settings.GLM46_SEARCH_MODEL: "GLM-4-6-API-V1", # GLM-4.6-Search
122+
settings.GLM46_GLM45_THINKING_MODEL: "GLM-4-6-API-V1", # GLM-4.6-Thinking
123+
settings.GLM46_GLM45_SEARCH_MODEL: "GLM-4-6-API-V1", # GLM-4.6-Search
124124
}
125125

126126
def _generate_uuid(self) -> str:
@@ -130,13 +130,13 @@ def _generate_uuid(self) -> str:
130130
def get_supported_models(self) -> List[str]:
131131
"""获取支持的模型列表"""
132132
return [
133-
settings.PRIMARY_MODEL,
134-
settings.THINKING_MODEL,
135-
settings.SEARCH_MODEL,
133+
settings.GLM45_MODEL,
134+
settings.GLM45_THINKING_MODEL,
135+
settings.GLM45_SEARCH_MODEL,
136136
settings.AIR_MODEL,
137137
settings.GLM46_MODEL,
138-
settings.GLM46_THINKING_MODEL,
139-
settings.GLM46_SEARCH_MODEL,
138+
settings.GLM46_GLM45_THINKING_MODEL,
139+
settings.GLM46_GLM45_SEARCH_MODEL,
140140
]
141141

142142
async def get_token(self) -> str:
@@ -266,21 +266,21 @@ def _generate_browser_params(self, user_agent: str) -> Dict[str, Any]:
266266
# 语言和时区(固定)
267267
"language": "zh-CN",
268268
"languages": "zh-CN,en-US",
269-
"timezone": "Asia/Shanghai",
270-
"timezone_offset": -480,
269+
# "timezone": "Asia/Shanghai",
270+
# "timezone_offset": -480,
271271
# 时间(动态)
272272
"local_time": now.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z",
273273
"utc_time": datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"),
274274
# 浏览器环境(固定值,模拟常见环境)
275-
# "cookie_enabled": "true",
276-
# "screen_width": "2560",
277-
# "screen_height": "1440",
278-
# "screen_resolution": "2560x1440",
279-
# "viewport_height": "1271",
280-
# "viewport_width": "1107",
281-
# "viewport_size": "1107x1271",
282-
# "color_depth": "24",
283-
# "pixel_ratio": "1",
275+
"cookie_enabled": "true",
276+
"screen_width": "1920",
277+
"screen_height": "1080",
278+
"screen_resolution": "1920x1080",
279+
"viewport_width": "1920",
280+
"viewport_height": "869",
281+
"viewport_size": "1920x869",
282+
"color_depth": "32",
283+
"pixel_ratio": "1",
284284
# 设备检测(固定)
285285
"is_mobile": "false",
286286
"is_touch": "false",

main.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def lifespan(app: FastAPI):
3333
token_pool = initialize_token_pool(
3434
tokens=token_list,
3535
failure_threshold=settings.TOKEN_FAILURE_THRESHOLD,
36-
recovery_timeout=settings.TOKEN_RECOVERY_TIMEOUT
36+
recovery_timeout=settings.TOKEN_RECOVERY_TIMEOUT,
3737
)
3838

3939
yield
@@ -74,8 +74,10 @@ def run_server():
7474

7575
logger.info(f"🚀 启动 {service_name} 服务...")
7676
logger.info(f"📡 监听地址: 0.0.0.0:{settings.LISTEN_PORT}")
77-
logger.info(f"🔧 调试模式: {'开启' if settings.DEBUG_LOGGING else '关闭'}")
78-
logger.info(f"🔐 匿名模式: {'开启' if settings.ANONYMOUS_MODE else '关闭'}")
77+
logger.info(f"🔧 调试模式: {'✅ 开启' if settings.DEBUG_LOGGING else '❌ 关闭'}")
78+
logger.info(f"🔓 跳过认证: {'✅ 开启' if settings.SKIP_AUTH_TOKEN else '❌ 关闭'}")
79+
logger.info(f"🔑 令牌透传: {'✅ 开启' if settings.USE_CLIENT_TOKEN else '❌ 关闭'}")
80+
logger.info(f"👻 匿名模式: {'✅ 开启' if settings.ANONYMOUS_MODE else '❌ 关闭'}")
7981

8082
try:
8183
Granian(
@@ -85,7 +87,7 @@ def run_server():
8587
port=settings.LISTEN_PORT,
8688
reload=False, # 生产环境请关闭热重载
8789
process_name=service_name, # 设置进程名称
88-
**RELOAD_CONFIG, # 热重载配置
90+
**RELOAD_CONFIG, # 热重载配置
8991
).serve()
9092
except KeyboardInterrupt:
9193
logger.info("🛑 收到中断信号,正在关闭服务...")

0 commit comments

Comments
 (0)