feat: add provider fallback and default adapter switching
这个提交存在于:
父节点
03d2dea0da
当前提交
7041735142
共有 13 个文件被更改,包括 189 次插入 和 111 次删除
|
|
@ -7,7 +7,7 @@ from urllib.parse import urlsplit
|
|||
|
||||
from backend.services.model_provider_service import ModelProviderService
|
||||
from core.secret_service import SecretStore, resolve_secret_value
|
||||
from engines.image_provider import ImageProvider, ImageProviderConfig, OpenAIImageProvider
|
||||
from engines.image_provider import FallbackImageProvider, ImageProvider, ImageProviderConfig, OpenAIImageProvider
|
||||
from engines.vision_provider import OpenAIVisionProvider, VisionProvider, VisionProviderConfig
|
||||
|
||||
|
||||
|
|
@ -28,6 +28,26 @@ class ModelProviderRuntime:
|
|||
resolved = self.model_provider_service.resolve_route(route_name, modality="image_generation")
|
||||
if not resolved:
|
||||
return None
|
||||
candidates = [resolved]
|
||||
fallback_enabled = bool(route_context.get("allow_provider_fallback", True))
|
||||
if fallback_enabled:
|
||||
seen = {str(resolved.get("route_id"))}
|
||||
fallback_routes = sorted(
|
||||
self.model_provider_service.list_routes(enabled=True),
|
||||
key=lambda item: (int(item.get("priority") or 100), str(item.get("route_id") or "")),
|
||||
)
|
||||
for route in fallback_routes:
|
||||
if route.get("modality") != "image_generation" or str(route.get("route_id")) in seen:
|
||||
continue
|
||||
candidate = self.model_provider_service.resolve_route(str(route.get("route_name")), modality="image_generation")
|
||||
if candidate:
|
||||
candidates.append(candidate); seen.add(str(candidate.get("route_id")))
|
||||
providers = [provider for candidate in candidates if (provider := self._image_provider_from_resolved(candidate))]
|
||||
if not providers:
|
||||
return None
|
||||
return providers[0] if len(providers) == 1 else FallbackImageProvider(providers)
|
||||
|
||||
def _image_provider_from_resolved(self, resolved: dict[str, Any]) -> ImageProvider | None:
|
||||
provider = resolved.get("provider") or {}
|
||||
if str(provider.get("provider_type") or "openai_compatible") != "openai_compatible":
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
## P0:核心功能闭环
|
||||
|
||||
### 1. 多适配器真实路由(已完成第一阶段)
|
||||
### 1. 多适配器真实路由(已完成,含默认切换与运行时故障回退)
|
||||
|
||||
- 后端加载并管理全部生成适配器,而非只使用 `generation.provider`。
|
||||
- 支持默认适配器切换、任务指定适配器和禁用状态。
|
||||
|
|
|
|||
|
|
@ -157,6 +157,37 @@ class OpenAIImageProvider:
|
|||
)
|
||||
|
||||
|
||||
class FallbackImageProvider:
|
||||
"""Try configured image providers in priority order on provider failures."""
|
||||
|
||||
def __init__(self, providers: list[ImageProvider]):
|
||||
if not providers:
|
||||
raise ValueError("at least one image provider is required")
|
||||
self.providers = providers
|
||||
self.provider_id = providers[0].provider_id
|
||||
|
||||
def generate_image(self, request: ImageGenerationRequest) -> ImageGenerationResult:
|
||||
failures: list[dict[str, Any]] = []
|
||||
for provider in self.providers:
|
||||
try:
|
||||
result = provider.generate_image(request)
|
||||
return ImageGenerationResult(
|
||||
provider_id=result.provider_id,
|
||||
model=result.model,
|
||||
images=result.images,
|
||||
usage=result.usage,
|
||||
raw_metadata={**result.raw_metadata, "fallback_attempts": failures},
|
||||
)
|
||||
except ImageProviderError as exc:
|
||||
failures.append({"provider_id": provider.provider_id, "error_type": exc.error_type, "status_code": exc.status_code})
|
||||
raise ImageProviderError(
|
||||
"all configured image providers failed",
|
||||
provider_id=self.provider_id,
|
||||
error_type="provider_pool_exhausted",
|
||||
details={"attempts": failures},
|
||||
)
|
||||
|
||||
|
||||
class MockImageProvider:
|
||||
provider_id = "mock"
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ function persistAdapters(list:Adapter[]){const next=clone(draft.value);const gen
|
|||
function updateAdapter(id:string,key:keyof Adapter,value:string|number|boolean){persistAdapters(adapters.value.map(a=>a.id===id?{...a,[key]:value}:a))}
|
||||
function addAdapter(){const id=`adapter-${Date.now()}`;persistAdapters([...adapters.value,{id,name:"新生成服务",provider_type:"openai_compatible",base_url:"",image_endpoint:"/v1/images/generations",model_id:"",route_name:`image_${adapters.value.length+1}`,api_key_env_var:"",timeout_seconds:180,enabled:true}]);expandedAdapter.value=id}
|
||||
function removeAdapter(id:string){if(adapters.value.length<=1)return;persistAdapters(adapters.value.filter(a=>a.id!==id));expandedAdapter.value=adapters.value[0]?.id||""}
|
||||
function makeDefaultAdapter(id:string){const selected=adapters.value.find(item=>item.id===id);if(!selected)return;persistAdapters([selected,...adapters.value.filter(item=>item.id!==id)])}
|
||||
async function probeAdapter(a:Adapter,lightweight=false){probingAdapter.value=a.id;probeError.value="";try{const result=await postJson<CapabilityProfile>(endpoints.apiDiscoveryProbeProvider,{provider_id:a.id,model_id:a.model_id||"auto-discovery",dialect:"openai_images",live_probe:true,allow_lightweight_test:lightweight,base_url:a.base_url,image_endpoint:a.image_endpoint,api_key_env_var:a.api_key_env_var,timeout_seconds:Math.min(a.timeout_seconds,60)});probeResults.value={...probeResults.value,[a.id]:result};const detectedEndpoint=result.probe_result.image_endpoint;if(typeof detectedEndpoint==="string"&&detectedEndpoint)updateAdapter(a.id,"image_endpoint",detectedEndpoint);const models=probeModelsFromResult(result);if(!a.model_id&&models.length)updateAdapter(a.id,"model_id",models[0])}catch(e){probeError.value=e instanceof Error?e.message:String(e)}finally{probingAdapter.value=""}}
|
||||
function probeModelsFromResult(result:CapabilityProfile):string[]{const value=result.probe_result.models;return Array.isArray(value)?value.map(String):[]}
|
||||
function probeConnected(id:string){return probeResults.value[id]?.probe_result.connected===true}
|
||||
|
|
@ -91,7 +92,7 @@ function inputValue(e:Event,type:string):ConfigValue{const t=e.target as HTMLInp
|
|||
<header><div><span>生成服务适配器</span><h3>{{a.name}}</h3><p>填写连接信息与模型路由参数。</p></div><button class="close" aria-label="关闭配置" @click="expandedAdapter=''">×</button></header>
|
||||
<div class="adapter-body"><div class="fields"><label><span>适配器名称</span><input :value="a.name" @input="updateAdapter(a.id,'name',($event.target as HTMLInputElement).value)"></label><label><span>适配器类型</span><select :value="a.provider_type" @change="updateAdapter(a.id,'provider_type',($event.target as HTMLSelectElement).value)"><option value="openai_compatible">OpenAI Compatible</option><option value="custom">自定义 HTTP</option></select></label><label class="wide"><span>API 根地址</span><input placeholder="https://api.example.com 或 https://api.example.com/v1" :value="a.base_url" @input="updateAdapter(a.id,'base_url',($event.target as HTMLInputElement).value)"><small>可直接填写到 /v1,探测时会自动识别 API 层级。</small></label><label><span>生图 Endpoint</span><input :value="a.image_endpoint" @input="updateAdapter(a.id,'image_endpoint',($event.target as HTMLInputElement).value)"><small>连接测试成功后自动回填。</small></label><label><span>模型 ID</span><input :list="`models-${a.id}`" placeholder="测试后选择或手动输入" :value="a.model_id" @input="updateAdapter(a.id,'model_id',($event.target as HTMLInputElement).value)"><datalist :id="`models-${a.id}`"><option v-for="model in probeModels(a.id)" :key="model" :value="model"></option></datalist><small>{{probeModels(a.id).length?`已发现 ${probeModels(a.id).length} 个模型,可展开选择。`:'测试连接后自动获取模型。'}}</small></label><label><span>路由名称</span><input :value="a.route_name" @input="updateAdapter(a.id,'route_name',($event.target as HTMLInputElement).value)"></label><label><span>API Key 环境变量</span><input placeholder="IMAGE_API_KEY" :value="a.api_key_env_var" @input="updateAdapter(a.id,'api_key_env_var',($event.target as HTMLInputElement).value)"><small>密钥不直接写入配置文件,填写保存密钥的环境变量名。</small></label><label><span>超时(秒)</span><input type="number" min="1" :value="a.timeout_seconds" @input="updateAdapter(a.id,'timeout_seconds',Number(($event.target as HTMLInputElement).value))"></label></div>
|
||||
<section class="probe-panel"><header><div><span>能力探测</span><strong>连接、模型与分辨率</strong></div><div class="actions"><button :disabled="!a.base_url||probingAdapter===a.id" @click="probeAdapter(a,false)">{{probingAdapter===a.id?'探测中…':'测试连接与模型'}}</button><button class="probe-live" :disabled="!a.base_url||!a.model_id||probingAdapter===a.id" @click="probeAdapter(a,true)">1K / 2K / 4K 测试</button></div></header><p>轻量测试会依次申请 1920×1080、2560×1440、3840×2160 横图,用于判断已验证的最大分辨率,可能产生少量 API 费用。</p><div v-if="probeError" class="probe-error">{{probeError}}</div><div v-if="probeResults[a.id]" class="probe-result"><span :class="{ok:probeConnected(a.id)}">{{probeConnected(a.id)?'连接成功':'连接失败'}}</span><span>发现模型 {{probeModels(a.id).length}} 个</span><span>最大已验证 {{probeSizeLabel(a.id)}}</span><small v-if="probeModels(a.id).length">{{probeModels(a.id).slice(0,8).join('、')}}</small></div></section>
|
||||
<footer><label class="switch"><input type="checkbox" :checked="a.enabled" @change="updateAdapter(a.id,'enabled',($event.target as HTMLInputElement).checked)"><span>启用此适配器</span></label><div class="actions"><button class="danger" :disabled="adapters.length<=1" @click="removeAdapter(a.id)">删除适配器</button><button class="primary" @click="expandedAdapter=''">完成</button></div></footer></div>
|
||||
<footer><label class="switch"><input type="checkbox" :checked="a.enabled" @change="updateAdapter(a.id,'enabled',($event.target as HTMLInputElement).checked)"><span>启用此适配器</span></label><div class="actions"><button :disabled="adapters[0]?.id===a.id" @click="makeDefaultAdapter(a.id)">设为默认</button><button class="danger" :disabled="adapters.length<=1" @click="removeAdapter(a.id)">删除适配器</button><button class="primary" @click="expandedAdapter=''">完成</button></div></footer></div>
|
||||
</article>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
|
|
@ -4,8 +4,8 @@
|
|||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>AstrBot ImageStudio</title>
|
||||
<script type="module" crossorigin src="./assets/index-BIdmO0fX.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-qFPID2zC.css">
|
||||
<script type="module" crossorigin src="./assets/index-BKG3cNQ-.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-Dx9JF8Lp.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
|
|
|||
|
|
@ -9,9 +9,35 @@ from backend.services.model_provider_runtime import ModelProviderRuntime
|
|||
from backend.services.model_provider_service import ModelProviderService
|
||||
from database.db_helper import Database, DatabaseSettings, SqliteSettings
|
||||
from database.repositories.model_provider_repository import ModelProviderRepository
|
||||
from engines.image_provider import GeneratedImagePayload, ImageGenerationRequest, ImageGenerationResult, ImageProviderError
|
||||
|
||||
|
||||
class ModelProviderRuntimeTests(unittest.TestCase):
|
||||
def test_runtime_falls_back_to_next_enabled_route(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
database = Database(DatabaseSettings(sqlite=SqliteSettings(path=str(Path(tmp) / "imagestudio.db"))))
|
||||
database.initialize()
|
||||
service = ModelProviderService(ModelProviderRepository(database))
|
||||
for provider_id in ("primary", "fallback"):
|
||||
service.upsert_provider({"provider_id": provider_id, "base_url": f"https://{provider_id}.example"})
|
||||
service.upsert_route({"route_name": "primary_image", "provider_id": "primary", "model_id": "a", "priority": 10})
|
||||
service.upsert_route({"route_name": "fallback_image", "provider_id": "fallback", "model_id": "b", "priority": 20})
|
||||
runtime = ModelProviderRuntime(service)
|
||||
provider = runtime.image_provider_for_route({"route_name": "primary_image"})
|
||||
self.assertEqual(len(provider.providers), 2)
|
||||
|
||||
def fail(_request):
|
||||
raise ImageProviderError("failed", provider_id="primary", error_type="network_error")
|
||||
def succeed(_request):
|
||||
return ImageGenerationResult(provider_id="fallback", model="b", images=[GeneratedImagePayload(b64_json="abc")])
|
||||
provider.providers[0].generate_image = fail
|
||||
provider.providers[1].generate_image = succeed
|
||||
|
||||
result = provider.generate_image(ImageGenerationRequest(prompt="test"))
|
||||
|
||||
self.assertEqual(result.provider_id, "fallback")
|
||||
self.assertEqual(result.raw_metadata["fallback_attempts"][0]["provider_id"], "primary")
|
||||
|
||||
def test_runtime_builds_openai_provider_from_env_secret(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
database = Database(DatabaseSettings(sqlite=SqliteSettings(path=str(Path(tmp) / "imagestudio.db"))))
|
||||
|
|
|
|||
文件差异因一行或多行过长而隐藏
文件差异因一行或多行过长而隐藏
51
web/assets/index-Cm1uzzf8.js
普通文件
51
web/assets/index-Cm1uzzf8.js
普通文件
文件差异因一行或多行过长而隐藏
|
|
@ -4,8 +4,8 @@
|
|||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>AstrBot ImageStudio</title>
|
||||
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BpXvhHrv.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-CbIuGuTy.css">
|
||||
<script type="module" crossorigin src="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-Cm1uzzf8.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/api/v1/plugins/extensions/astrbot_plugin_imagestudio/web/assets/index-BZytriHv.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
|
|
|||
正在加载…
添加表格
在新工单中引用