ruff fix但指定了--unsafe-fixes

This commit is contained in:
minecraft1024a
2025-10-05 21:48:32 +08:00
parent 0b4e1f5b7b
commit 9d705463ce
76 changed files with 300 additions and 315 deletions

View File

@@ -68,14 +68,14 @@ def _remove_title(schema: dict[str, Any] | list[Any]) -> dict[str, Any] | list[A
if isinstance(schema, list):
# 如果当前Schema是列表则对所有dict/list子元素递归调用
for idx, item in enumerate(schema):
if isinstance(item, (dict, list)):
if isinstance(item, dict | list):
schema[idx] = _remove_title(item)
elif isinstance(schema, dict):
# 是字典移除title字段并对所有dict/list子元素递归调用
if "title" in schema:
del schema["title"]
for key, value in schema.items():
if isinstance(value, (dict, list)):
if isinstance(value, dict | list):
schema[key] = _remove_title(value)
return schema
@@ -120,7 +120,7 @@ def _link_definitions(schema: dict[str, Any]) -> dict[str, Any]:
raise ValueError(f"Schema中引用的定义'{def_key}'不存在")
# 遍历键值对
for key, value in sub_schema.items():
if isinstance(value, (dict, list)):
if isinstance(value, dict | list):
# 如果当前值是字典或列表,则递归调用
sub_schema[key] = link_definitions_recursive(f"{path}/{key}", value, defs)
@@ -136,13 +136,13 @@ def _remove_defs(schema: dict[str, Any]) -> dict[str, Any]:
if isinstance(schema, list):
# 如果当前Schema是列表则对所有dict/list子元素递归调用
for idx, item in enumerate(schema):
if isinstance(item, (dict, list)):
if isinstance(item, dict | list):
schema[idx] = _remove_title(item)
elif isinstance(schema, dict):
# 是字典移除title字段并对所有dict/list子元素递归调用
schema.pop("$defs", None)
for key, value in schema.items():
if isinstance(value, (dict, list)):
if isinstance(value, dict | list):
schema[key] = _remove_title(value)
return schema

View File

@@ -157,7 +157,7 @@ class LLMUsageRecorder:
):
input_cost = (model_usage.prompt_tokens / 1000000) * model_info.price_in
output_cost = (model_usage.completion_tokens / 1000000) * model_info.price_out
total_cost = round(input_cost + output_cost, 6)
round(input_cost + output_cost, 6)
session = None
try:

View File

@@ -228,7 +228,7 @@ class _ModelSelector:
penalty_increment = self.DEFAULT_PENALTY_INCREMENT
# 对严重错误施加更高的惩罚,以便快速将问题模型移出候选池
if isinstance(e, (NetworkConnectionError, ReqAbortException)):
if isinstance(e, NetworkConnectionError | ReqAbortException):
# 网络连接错误或请求被中断,通常是基础设施问题,应重罚
penalty_increment = self.CRITICAL_PENALTY_MULTIPLIER
logger.warning(
@@ -525,7 +525,7 @@ class _RequestExecutor:
model_name = model_info.name
retry_interval = api_provider.retry_interval
if isinstance(e, (NetworkConnectionError, ReqAbortException)):
if isinstance(e, NetworkConnectionError | ReqAbortException):
return self._check_retry(remain_try, retry_interval, "连接异常", model_name)
elif isinstance(e, RespNotOkException):
return self._handle_resp_not_ok(e, model_info, api_provider, remain_try, messages_info)