feat: resolve provider api keys from env (#4696)

This commit is contained in:
Soulter
2026-01-26 22:37:30 +08:00
committed by GitHub
parent b04dad1fd2
commit a41391f9f2
+31
View File
@@ -1,5 +1,6 @@
import asyncio
import copy
import os
import traceback
from typing import Protocol, runtime_checkable
@@ -406,10 +407,40 @@ class ProviderManager:
pc = merged_config
return pc
def _resolve_env_key_list(self, provider_config: dict) -> dict:
keys = provider_config.get("key", [])
if not isinstance(keys, list):
return provider_config
resolved_keys = []
for idx, key in enumerate(keys):
if isinstance(key, str) and key.startswith("$"):
env_key = key[1:]
if env_key.startswith("{") and env_key.endswith("}"):
env_key = env_key[1:-1]
if env_key:
env_val = os.getenv(env_key)
if env_val is None:
provider_id = provider_config.get("id")
logger.warning(
f"Provider {provider_id} 配置项 key[{idx}] 使用环境变量 {env_key} 但未设置。",
)
resolved_keys.append("")
else:
resolved_keys.append(env_val)
else:
resolved_keys.append(key)
else:
resolved_keys.append(key)
provider_config["key"] = resolved_keys
return provider_config
async def load_provider(self, provider_config: dict):
# 如果 provider_source_id 存在且不为空,则从 provider_sources 中找到对应的配置并合并
provider_config = self.get_merged_provider_config(provider_config)
if provider_config.get("provider_type", "") == "chat_completion":
provider_config = self._resolve_env_key_list(provider_config)
if not provider_config["enable"]:
logger.info(f"Provider {provider_config['id']} is disabled, skipping")
return