|
@@ -11,7 +11,7 @@ import os
|
|
|
logger = logging.getLogger(__name__)
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
# company_base_pool的API地址
|
|
# company_base_pool的API地址
|
|
|
-COMPANY_BASE_POOL_URL = os.getenv("COMPANY_BASE_POOL_URL", "http://localhost:8011")
|
|
|
|
|
|
|
+COMPANY_BASE_POOL_URL = os.getenv("COMPANY_BASE_POOL_URL", "http://localhost:8010")
|
|
|
SYNC_ENDPOINT = f"{COMPANY_BASE_POOL_URL}/api/admin/key-pool/sync"
|
|
SYNC_ENDPOINT = f"{COMPANY_BASE_POOL_URL}/api/admin/key-pool/sync"
|
|
|
|
|
|
|
|
|
|
|
|
@@ -47,19 +47,11 @@ async def push_group_keys_to_pool(pool, group_id: int, api_key_ids: list):
|
|
|
|
|
|
|
|
api_keys = [k['key_value'] for k in keys]
|
|
api_keys = [k['key_value'] for k in keys]
|
|
|
|
|
|
|
|
- # 获取分组的provider(从绑定的模型推断)
|
|
|
|
|
- provider_row = await conn.fetchrow("""
|
|
|
|
|
- SELECT DISTINCT m.provider
|
|
|
|
|
- FROM models m
|
|
|
|
|
- WHERE m.group_id = $1 AND m.provider IS NOT NULL
|
|
|
|
|
- LIMIT 1
|
|
|
|
|
- """, group_id)
|
|
|
|
|
- provider = provider_row['provider'] if provider_row else "dashscope"
|
|
|
|
|
-
|
|
|
|
|
# 推送到company_base_pool
|
|
# 推送到company_base_pool
|
|
|
data = [{
|
|
data = [{
|
|
|
"group_name": group['name'],
|
|
"group_name": group['name'],
|
|
|
- "provider": provider,
|
|
|
|
|
|
|
+ "provider": "dashscope",
|
|
|
|
|
+ "base_url": "https://dashscope.aliyuncs.com",
|
|
|
"model_name": None,
|
|
"model_name": None,
|
|
|
"api_keys": api_keys
|
|
"api_keys": api_keys
|
|
|
}]
|
|
}]
|