diff --git a/config.yaml b/config.yaml index 37534f4..871f0fe 100644 --- a/config.yaml +++ b/config.yaml @@ -1,7 +1,7 @@ plugin: name: astrbot_plugin_imagestudio display_name: ImageStudio - version: 1.0.2 + version: 1.0.3 features: quick_profile: true diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 324ab57..96dbdbf 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.2", + "version": "1.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.2", + "version": "1.0.3", "dependencies": { "@vitejs/plugin-vue": "^5.2.0", "pinia": "^2.3.0", diff --git a/frontend/package.json b/frontend/package.json index a3255f4..95191fe 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "astrbot-plugin-imagestudio-frontend", - "version": "1.0.2", + "version": "1.0.3", "private": true, "type": "module", "scripts": { diff --git a/frontend/standalone-web/src/components/MaterialDetailDialog.vue b/frontend/standalone-web/src/components/MaterialDetailDialog.vue index 494461c..e4ee3ca 100644 --- a/frontend/standalone-web/src/components/MaterialDetailDialog.vue +++ b/frontend/standalone-web/src/components/MaterialDetailDialog.vue @@ -50,6 +50,7 @@ function requestClose() { emit("close") } function objectValue(value:unknown):Record{return value&&typeof value==="object"&&!Array.isArray(value)?value as Record: {}} +function stringList(value:unknown):string[]{return Array.isArray(value)?value.map(String):[]} function pretty(value:unknown){return JSON.stringify(value??{},null,2)} function saveProfile(){emit("saveProfile",{...profile.value,category:editCategory.value,role:editRole.value,body_slots:editSlots.value.split(/[,,]/).map(item=>item.trim()).filter(Boolean),wear_layer:editLayer.value||null,confidence:Math.min(Math.max(editConfidence.value,0),1),user_locked:editLocked.value,stackable:editStackable.value,confirmed:true})} function saveAdvancedProfile(){try{const parsed=JSON.parse(editProfileJson.value);if(!parsed||typeof parsed!=="object"||Array.isArray(parsed))throw new Error("必须是 JSON 对象");profileEditError.value="";emit("saveProfile",parsed)}catch(e){profileEditError.value=e instanceof Error?e.message:String(e)}} @@ -104,7 +105,7 @@ function saveAdvancedProfile(){try{const parsed=JSON.parse(editProfileJson.value
RawAnalysis{{String(rawAnalysis.schema_version||'Legacy')}}

保留视觉模型完整结构化返回、属性来源和置信度,便于重新标准化。

{{pretty(rawAnalysis)}}
NormalizedAssetProfile{{String(profile.category||'other')}}
高级 JSON 编辑(属性值、置信度、来源状态、锁定项)

{{profileEditError}}

{{String(profile.role||'other')}}{{String(profile.wear_layer||'无层级')}}{{slot}}
{{pretty(profile)}}
-
Generation CapsuleCompact / Standard / Detailed
{{tier}}

{{(Array.isArray(objectValue(capsules[tier]).prompt_parts)?objectValue(capsules[tier]).prompt_parts:[]).join(',')||'暂无提示词'}}

+
Generation CapsuleCompact / Standard / Detailed
{{tier}}

{{stringList(objectValue(capsules[tier]).prompt_parts).join(',')||'暂无提示词'}}

识别与标准化版本{{history.length}} 个历史版本

重新识别与批量重新标准化不会覆盖已确认结构;历史版本可用于人工对比。

{{String(objectValue(version).archived_at||`版本 ${index+1}`)}}

{{String(objectValue(objectValue(version).normalized_asset_profile).category||'other')}} · {{String(objectValue(objectValue(version).normalized_asset_profile).role||'other')}}

{{pretty(version)}}

暂无历史版本。

diff --git a/frontend/standalone-web/src/features/settings/SettingsPage.vue b/frontend/standalone-web/src/features/settings/SettingsPage.vue index 05d9838..c79e6c9 100644 --- a/frontend/standalone-web/src/features/settings/SettingsPage.vue +++ b/frontend/standalone-web/src/features/settings/SettingsPage.vue @@ -48,6 +48,7 @@ const probeError=ref("") const probeResults=ref>({}) const probeLogs=ref>({}) const probeApiKeys=ref>({}) +let adapterBackdropPress:{pointerId:number;x:number;y:number}|undefined const backupBusy=ref(false) const backupMessage=ref("") const backupError=ref("") @@ -70,13 +71,19 @@ watch(baseline,v=>{draft.value=clone(v);expandedAdapter.value=""},{immediate:tru watch(effectiveSchema,s=>{if(!s.sections.some(x=>x.key===activeSectionKey.value))activeSectionKey.value=s.sections[0]?.key||""},{immediate:true}) function clone(v:T):T{return JSON.parse(JSON.stringify(v)) as T} function obj(v:unknown):Record{return v&&typeof v==="object"&&!Array.isArray(v)?v as Record: {}} -function normalizeAdapter(v:unknown):Adapter{const x=obj(v);return{id:String(x.id||x.provider_id||`adapter-${Date.now()}`),name:String(x.name||x.display_name||x.provider_id||"未命名适配器"),provider_type:String(x.provider_type||"openai_compatible"),base_url:String(x.base_url||""),image_endpoint:String(x.image_endpoint||"/v1/images/generations"),model_id:String(x.model_id||""),route_name:String(x.route_name||""),api_key_env_var:String(x.api_key_env_var||""),timeout_seconds:Number(x.timeout_seconds||180),enabled:x.enabled!==false}} +function hasOwn(x:Record,key:string){return Object.prototype.hasOwnProperty.call(x,key)} +function stringField(x:Record,key:string,fallback=""){return hasOwn(x,key)?String(x[key]??""):fallback} +function normalizeAdapter(v:unknown):Adapter{const x=obj(v);return{id:String(x.id||x.provider_id||`adapter-${Date.now()}`),name:stringField(x,"name",String(x.display_name||x.provider_id||"")),provider_type:stringField(x,"provider_type","openai_compatible"),base_url:stringField(x,"base_url"),image_endpoint:stringField(x,"image_endpoint"),model_id:stringField(x,"model_id"),route_name:stringField(x,"route_name"),api_key_env_var:stringField(x,"api_key_env_var"),timeout_seconds:hasOwn(x,"timeout_seconds")?Number(x.timeout_seconds):180,enabled:x.enabled!==false}} function persistAdapters(list:Adapter[]){const next=clone(draft.value);const generation=obj(next.generation);generation.adapters=list.map(clone);generation.provider=list[0]?{...list[0],provider_id:list[0].id,display_name:list[0].name}:{};generation.default_model=list[0]?.route_name||list[0]?.model_id||"";next.generation=generation;draft.value=next} function updateAdapter(id:string,key:keyof Adapter,value:string|number|boolean){persistAdapters(adapters.value.map(a=>a.id===id?{...a,[key]:value}:a))} +function updateProbeApiKey(id:string,value:string){probeApiKeys.value={...probeApiKeys.value,[id]:value}} function updateAdapterCredential(id:string,value:string){if(/^sk[-_]/i.test(value.trim())){probeApiKeys.value={...probeApiKeys.value,[id]:value.trim()};updateAdapter(id,"api_key_env_var","");return}updateAdapter(id,"api_key_env_var",value)} -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 addAdapter(){const id=`adapter-${Date.now()}`;persistAdapters([...adapters.value,{id,name:"",provider_type:"openai_compatible",base_url:"",image_endpoint:"",model_id:"",route_name:"",api_key_env_var:"",timeout_seconds:180,enabled:true}]);expandedAdapter.value=id} function removeAdapter(id:string){const remaining=adapters.value.filter(a=>a.id!==id);persistAdapters(remaining);expandedAdapter.value="";const logs={...probeLogs.value};delete logs[id];probeLogs.value=logs;const results={...probeResults.value};delete results[id];probeResults.value=results;const keys={...probeApiKeys.value};delete keys[id];probeApiKeys.value=keys} 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)])} +function beginAdapterBackdropClick(event:PointerEvent){if(event.button!==0)return;adapterBackdropPress={pointerId:event.pointerId,x:event.clientX,y:event.clientY}} +function finishAdapterBackdropClick(event:PointerEvent){const press=adapterBackdropPress;adapterBackdropPress=undefined;if(!press||press.pointerId!==event.pointerId)return;if(Math.hypot(event.clientX-press.x,event.clientY-press.y)>6)return;const selection=window.getSelection();if(selection&&!selection.isCollapsed)return;expandedAdapter.value=""} +function cancelAdapterBackdropClick(){adapterBackdropPress=undefined} async function probeAdapter(a:Adapter,lightweight=false){probingAdapter.value=a.id;probeError.value="";try{const result=await postJson(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:probeApiKeys.value[a.id]||"",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 probe=obj(result.probe_result);const connected=probe.connected===true;const details=[`目标:${String(probe.resolved_api_base||a.base_url)}`,`鉴权:${probe.auth_source==="request"?"会话 API Key":probe.auth_source==="environment"?"环境变量":"未提供"}`,probe.http_status?`HTTP:${String(probe.http_status)}`:"",probe.error?`原因:${String(probe.error)}`:"",probe.error_body?`响应:${String(probe.error_body)}`:"",`模型:${probeModelsFromResult(result).length} 个`].filter(Boolean);probeLogs.value={...probeLogs.value,[a.id]:{time:new Date().toLocaleString(),level:connected?"success":"error",summary:connected?"连接与模型探测成功":"连接探测失败",details}};const detectedEndpoint=probe.image_endpoint;if(typeof detectedEndpoint==="string"&&detectedEndpoint&&connected)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){const details=e instanceof ApiClientError?[`错误码:${e.code}`,...Object.entries(e.details).filter(([key])=>!key.toLowerCase().includes("key")&&!key.toLowerCase().includes("secret")).map(([key,value])=>`${key}:${String(value)}`)]:[];const message=e instanceof Error?e.message:String(e);probeError.value=message;probeLogs.value={...probeLogs.value,[a.id]:{time:new Date().toLocaleString(),level:"error",summary:message,details}}}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} @@ -105,11 +112,11 @@ function inputValue(e:Event,type:string):ConfigValue{const t=e.target as HTMLInp