i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-03 01:40:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(proxy-resolver): 将 resolve_ops_proxy_config 改为异步调用避免阻塞事件循环

Browse Source 
在 anyrouter/nekocode/sub2api/yescode 架构及 service.py 中，
将同步的 resolve_ops_proxy_config 替换为 resolve_ops_proxy_config_async，
通过 asyncio.to_thread 包装避免同步 DB 查询阻塞事件循环。
This commit is contained in:
fawney19
2026-03-17 18:06:15 +08:00
parent 8a21cb9a55
commit 460eb5434d
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/provider_ops/architectures/anyrouter.py
View File

@@ -417,9 +417,9 @@ class AnyrouterArchitecture(ProviderArchitecture):
包含 acw_cookie 的配置
"""
# 从 config 获取代理配置（支持 proxy_node_id、tunnel 和旧的 proxy URL）
from src.services.proxy_node.resolver import resolve_ops_proxy_config
from src.services.proxy_node.resolver import resolve_ops_proxy_config_async
proxy, tunnel_node_id = resolve_ops_proxy_config(config)
proxy, tunnel_node_id = await resolve_ops_proxy_config_async(config)
acw_cookie = await _get_acw_cookie(base_url, proxy=proxy, tunnel_node_id=tunnel_node_id)
if acw_cookie:
return {"acw_cookie": acw_cookie}

6
src/services/provider_ops/architectures/nekocode.py
View File

@@ -193,9 +193,9 @@ class NekoCodeArchitecture(ProviderArchitecture):
"timeout": 10,
"verify": get_ssl_context(),
}
from src.services.proxy_node.resolver import resolve_ops_proxy_config
from src.services.proxy_node.resolver import resolve_ops_proxy_config_async
proxy, tunnel_node_id = resolve_ops_proxy_config(config)
proxy, tunnel_node_id = await resolve_ops_proxy_config_async(config)
if tunnel_node_id:
from src.services.proxy_node.tunnel_transport import create_tunnel_transport
@@ -215,7 +215,7 @@ class NekoCodeArchitecture(ProviderArchitecture):
return {"_usage_summary": data.get("data", {})}
except Exception as e:
logger.debug(f"获取 NekoCode usage summary 失败: {e}")
logger.debug("获取 NekoCode usage summary 失败: {}", e)
return {}

4
src/services/provider_ops/architectures/sub2api.py
View File

@@ -479,9 +479,9 @@ class Sub2ApiArchitecture(ProviderArchitecture):
"""
base_url = base_url.rstrip("/")
from src.services.proxy_node.resolver import resolve_ops_proxy_config
from src.services.proxy_node.resolver import resolve_ops_proxy_config_async
proxy, tunnel_node_id = resolve_ops_proxy_config(config)
proxy, tunnel_node_id = await resolve_ops_proxy_config_async(config)
client_kwargs: dict[str, Any] = {
"base_url": base_url,
"timeout": 30.0,

4
src/services/provider_ops/architectures/yescode.py
View File

@@ -233,9 +233,9 @@ class YesCodeArchitecture(ProviderArchitecture):
cookie_header = _build_cookie_header(cookie_input)
# 获取代理配置（支持 proxy_node_id、tunnel 和旧的 proxy URL）
from src.services.proxy_node.resolver import resolve_ops_proxy_config
from src.services.proxy_node.resolver import resolve_ops_proxy_config_async
proxy, tunnel_node_id = resolve_ops_proxy_config(config)
proxy, tunnel_node_id = await resolve_ops_proxy_config_async(config)
try:
# 构建 client 参数

4
src/services/provider_ops/service.py
View File

@@ -1041,9 +1041,9 @@ class ProviderOpsService:
)
# 获取代理配置（支持 proxy_node_id、tunnel 模式和旧的 proxy URL）
from src.services.proxy_node.resolver import resolve_ops_proxy_config
from src.services.proxy_node.resolver import resolve_ops_proxy_config_async
proxy, tunnel_node_id = resolve_ops_proxy_config(config)
proxy, tunnel_node_id = await resolve_ops_proxy_config_async(config)
try:
# 构建 httpx client 参数

7
src/services/proxy_node/resolver.py
View File

@@ -300,6 +300,13 @@ def resolve_ops_proxy_config(
return None, None
async def resolve_ops_proxy_config_async(
connector_config: dict[str, Any] | None,
) -> tuple[str | httpx.Proxy | None, str | None]:
"""异步解析 ops connector 代理配置，避免同步 DB 查询阻塞事件循环。"""
return await asyncio.to_thread(resolve_ops_proxy_config, connector_config)
def resolve_ops_proxy(
connector_config: dict[str, Any] | None,
) -> str | httpx.Proxy | None: