refactor: 全局适配 ApiFamily/EndpointKind 结构化标识体系

将新的 (ApiFamily, EndpointKind) / `family:kind` 签名体系应用到整个代码库： - API Handlers: 所有 adapter/handler 使用新的签名格式 - Services: provider, model, usage, cache, auth 等服务层适配 - Database: ProviderEndpoint 新增 api_family/endpoint_kind 字段 - Frontend: Provider 管理、Usage 表格等组件适配 - Tests: 更新所有相关测试用例
2026-09-03 01:40:21 +08:00 · 2026-02-01 17:28:00 +08:00
parent c246ccfc91
commit 7b66505634
219 changed files with 4732 additions and 2545 deletions
--- a/src/api/admin/providers/models.py
+++ b/src/api/admin/providers/models.py
@@ -11,6 +11,7 @@ from fastapi import APIRouter, Depends, Request
 from sqlalchemy.orm import Session, joinedload

 from src.api.base.admin_adapter import AdminApiAdapter
+from src.api.base.context import ApiRequestContext
 from src.api.base.models_service import invalidate_models_list_cache
 from src.api.base.pipeline import ApiRequestPipeline
 from src.core.exceptions import InvalidRequestException, NotFoundException
@@ -21,23 +22,22 @@ from src.models.api import (
    ModelResponse,
    ModelUpdate,
 )
-from src.models.pydantic_models import (
-    BatchAssignModelsToProviderRequest,
-    BatchAssignModelsToProviderResponse,
-    ImportFromUpstreamRequest,
-    ImportFromUpstreamResponse,
-    ImportFromUpstreamSuccessItem,
-    ImportFromUpstreamErrorItem,
-    ProviderAvailableSourceModel,
-    ProviderAvailableSourceModelsResponse,
-)
 from src.models.database import (
    GlobalModel,
    Model,
    Provider,
 )
+from src.models.pydantic_models import (
+    BatchAssignModelsToProviderRequest,
+    BatchAssignModelsToProviderResponse,
+    ImportFromUpstreamErrorItem,
+    ImportFromUpstreamRequest,
+    ImportFromUpstreamResponse,
+    ImportFromUpstreamSuccessItem,
+    ProviderAvailableSourceModel,
+    ProviderAvailableSourceModelsResponse,
+)
 from src.services.model.service import ModelService
-from src.api.base.context import ApiRequestContext

 router = APIRouter(tags=["Model Management"])
 pipeline = ApiRequestPipeline()
@@ -322,9 +322,7 @@ async def batch_assign_global_models_to_provider(
      - `global_model_name`: 全局模型名称（如果可用）
      - `error`: 错误信息
    """
-    adapter = AdminBatchAssignModelsToProviderAdapter(
-        provider_id=provider_id, payload=payload
-    )
+    adapter = AdminBatchAssignModelsToProviderAdapter(provider_id=provider_id, payload=payload)
    return await pipeline.run(adapter=adapter, http_request=request, db=db, mode=adapter.mode)


@@ -407,7 +405,9 @@ class AdminCreateProviderModelAdapter(AdminApiAdapter):

        try:
            model = ModelService.create_model(db, self.provider_id, self.model_data)
-            logger.info(f"Model created: {model.provider_model_name} for provider {provider.name} by {context.user.username}")
+            logger.info(
+                f"Model created: {model.provider_model_name} for provider {provider.name} by {context.user.username}"
+            )
            # 缓存失效已在 ModelService.create_model 中处理
            return ModelService.convert_to_response(model)
        except Exception as exc:
@@ -450,7 +450,9 @@ class AdminUpdateProviderModelAdapter(AdminApiAdapter):

        try:
            updated_model = ModelService.update_model(db, self.model_id, self.model_data)
-            logger.info(f"Model updated: {updated_model.provider_model_name} by {context.user.username}")
+            logger.info(
+                f"Model updated: {updated_model.provider_model_name} by {context.user.username}"
+            )
            # 缓存失效已在 ModelService.update_model 中处理
            return ModelService.convert_to_response(updated_model)
        except Exception as exc:
@@ -495,7 +497,9 @@ class AdminBatchCreateModelsAdapter(AdminApiAdapter):

        try:
            models = ModelService.batch_create_models(db, self.provider_id, self.models_data)
-            logger.info(f"Batch created {len(models)} models for provider {provider.name} by {context.user.username}")
+            logger.info(
+                f"Batch created {len(models)} models for provider {provider.name} by {context.user.username}"
+            )
            # 缓存失效已在 ModelService.batch_create_models 中处理
            return [ModelService.convert_to_response(model) for model in models]
        except Exception as exc:
@@ -642,6 +646,7 @@ class AdminBatchAssignModelsToProviderAdapter(AdminApiAdapter):
        if success:
            # Provider 新增模型实现后，清除同进程的 ModelMapper 缓存，避免 TTL 内仍返回 None
            from src.services.cache.invalidation import get_cache_invalidation_service
+
            cache_service = get_cache_invalidation_service()
            cache_service.on_model_changed(self.provider_id, success[0].get("global_model_id", ""))

@@ -669,9 +674,12 @@ class AdminImportFromUpstreamAdapter(AdminApiAdapter):
        # 获取价格覆盖配置
        tiered_pricing = None
        price_per_request = None
-        if hasattr(self.payload, 'tiered_pricing') and self.payload.tiered_pricing:
+        if hasattr(self.payload, "tiered_pricing") and self.payload.tiered_pricing:
            tiered_pricing = self.payload.tiered_pricing
-        if hasattr(self.payload, 'price_per_request') and self.payload.price_per_request is not None:
+        if (
+            hasattr(self.payload, "price_per_request")
+            and self.payload.price_per_request is not None
+        ):
            price_per_request = self.payload.price_per_request

        for model_id in self.payload.model_ids:
@@ -679,7 +687,11 @@ class AdminImportFromUpstreamAdapter(AdminApiAdapter):
            if not model_id or len(model_id) > 100:
                errors.append(
                    ImportFromUpstreamErrorItem(
-                        model_id=model_id[:50] + "..." if model_id and len(model_id) > 50 else model_id or "<empty>",
+                        model_id=(
+                            model_id[:50] + "..."
+                            if model_id and len(model_id) > 50
+                            else model_id or "<empty>"
+                        ),
                        error="Invalid model_id: must be 1-100 characters",
                    )
                )
@@ -705,7 +717,9 @@ class AdminImportFromUpstreamAdapter(AdminApiAdapter):
                            ImportFromUpstreamSuccessItem(
                                model_id=model_id,
                                global_model_id=existing.global_model_id or "",
-                                global_model_name=existing.global_model.name if existing.global_model else "",
+                                global_model_name=(
+                                    existing.global_model.name if existing.global_model else ""
+                                ),
                                provider_model_id=existing.id,
                                created_global_model=False,
                            )
--- a/src/api/admin/providers/routes.py
+++ b/src/api/admin/providers/routes.py
@@ -2,17 +2,17 @@

 from __future__ import annotations

-from typing import Any
 import asyncio
 from datetime import datetime, timezone
+from typing import Any

 from fastapi import APIRouter, Depends, Query, Request
 from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from sqlalchemy.orm import Session

 from src.api.base.admin_adapter import AdminApiAdapter
+from src.api.base.context import ApiRequestContext
 from src.api.base.models_service import invalidate_models_list_cache
-from src.services.cache.model_cache import ModelCacheService
 from src.api.base.pipeline import ApiRequestPipeline
 from src.core.enums import ProviderBillingType
 from src.core.exceptions import InvalidRequestException, NotFoundException
@@ -21,8 +21,8 @@ from src.core.model_permissions import match_model_with_pattern, parse_allowed_m
 from src.database import get_db
 from src.models.admin_requests import CreateProviderRequest, UpdateProviderRequest
 from src.models.database import GlobalModel, Provider, ProviderAPIKey
+from src.services.cache.model_cache import ModelCacheService
 from src.services.cache.provider_cache import ProviderCacheService
-from src.api.base.context import ApiRequestContext

 router = APIRouter(tags=["Provider CRUD"])
 pipeline = ApiRequestPipeline()
@@ -159,7 +159,9 @@ async def create_provider(request: Request, db: Session = Depends(get_db)) -> An


@router.put("/{provider_id}")
-async def update_provider(provider_id: str, request: Request, db: Session = Depends(get_db)) -> None:
+async def update_provider(
+    provider_id: str, request: Request, db: Session = Depends(get_db)
+) -> None:
    """
    更新提供商配置

@@ -195,7 +197,9 @@ async def update_provider(provider_id: str, request: Request, db: Session = Depe


@router.delete("/{provider_id}")
-async def delete_provider(provider_id: str, request: Request, db: Session = Depends(get_db)) -> None:
+async def delete_provider(
+    provider_id: str, request: Request, db: Session = Depends(get_db)
+) -> None:
    """
    删除提供商

--- a/src/api/admin/providers/summary.py
+++ b/src/api/admin/providers/summary.py
@@ -2,15 +2,16 @@
 Provider 摘要与健康监控 API
 """

-from typing import Any
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
+from typing import Any

 from fastapi import APIRouter, Depends, Query, Request
 from sqlalchemy import case, func
 from sqlalchemy.orm import Session

 from src.api.base.admin_adapter import AdminApiAdapter
+from src.api.base.context import ApiRequestContext
 from src.api.base.pipeline import ApiRequestPipeline
 from src.core.enums import ProviderBillingType
 from src.core.exceptions import NotFoundException
@@ -23,7 +24,6 @@ from src.models.database import (
    ProviderEndpoint,
    RequestCandidate,
 )
-from src.api.base.context import ApiRequestContext
 from src.models.endpoint_models import (
    EndpointHealthEvent,
    EndpointHealthMonitor,
@@ -229,10 +229,14 @@ def _build_provider_summary(db: Session, provider: Provider) -> ProviderWithEndp
    active_keys = int(key_stats.active or 0)

    # Model 统计（合并为单个查询）
-    model_stats = db.query(
-        func.count(Model.id).label("total"),
-        func.sum(case((Model.is_active == True, 1), else_=0)).label("active"),
-    ).filter(Model.provider_id == provider.id).first()
+    model_stats = (
+        db.query(
+            func.count(Model.id).label("total"),
+            func.sum(case((Model.is_active == True, 1), else_=0)).label("active"),
+        )
+        .filter(Model.provider_id == provider.id)
+        .first()
+    )
    total_models = model_stats.total or 0
    active_models = int(model_stats.active or 0)

@@ -294,7 +298,9 @@ def _build_provider_summary(db: Session, provider: Provider) -> ProviderWithEndp
    # 检查是否配置了 Provider Ops（余额监控等）
    provider_ops_config = (provider.config or {}).get("provider_ops")
    ops_configured = bool(provider_ops_config)
-    ops_architecture_id = provider_ops_config.get("architecture_id") if provider_ops_config else None
+    ops_architecture_id = (
+        provider_ops_config.get("architecture_id") if provider_ops_config else None
+    )

    return ProviderWithEndpointsSummary(
        id=provider.id,