Merge branch 'master' into chore-pyright-fix

astrbot/core/provider/entities.py

@@ -34,6 +34,8 @@ class ProviderType(enum.Enum):
 
 @dataclass
 class ProviderMetaData:
+    id: str
+    """提供商适配器 ID"""
     type: str
     """提供商适配器名称，如 openai, ollama"""
     desc: str = ""

astrbot/core/provider/manager.py

@@ -372,6 +372,8 @@ class ProviderManager:
                 logger.error(f"无法找到 {provider_metadata.type} 的类")
                 return
 
+            provider_metadata.id = provider_config["id"]
+
             if provider_metadata.provider_type == ProviderType.SPEECH_TO_TEXT:
                 # STT 任务
                 assert issubclass(cls_type, STTProvider)

astrbot/core/provider/register.py

@@ -36,6 +36,7 @@ def register_provider_adapter(
                 default_config_tmpl["id"] = provider_type_name
 
         pm = ProviderMetaData(
+            id="default",  # will be replaced when instantiated
             type=provider_type_name,
             desc=desc,
             provider_type=provider_type,