Merge remote-tracking branch 'origin/main' into feat/trigger

api/core/plugin/entities/plugin_daemon.py

@@ -2,11 +2,12 @@ import enum
 from collections.abc import Mapping, Sequence
 from datetime import datetime
 from enum import StrEnum
-from typing import Any, Generic, Optional, TypeVar
+from typing import Any, Generic, TypeVar
 
 from pydantic import BaseModel, ConfigDict, Field
 
 from core.agent.plugin_entities import AgentProviderEntityWithPlugin
+from core.datasource.entities.datasource_entities import DatasourceProviderEntityWithPlugin
 from core.model_runtime.entities.model_entities import AIModelEntity
 from core.model_runtime.entities.provider_entities import ProviderEntity
 from core.plugin.entities.base import BasePluginEntity
@@ -26,7 +27,7 @@ class PluginDaemonBasicResponse(BaseModel, Generic[T]):
 
     code: int
     message: str
-    data: Optional[T]
+    data: T | None = None
 
 
 class InstallPluginMessage(BaseModel):
@@ -50,6 +51,14 @@ class PluginToolProviderEntity(BaseModel):
     declaration: ToolProviderEntityWithPlugin
 
 
+class PluginDatasourceProviderEntity(BaseModel):
+    provider: str
+    plugin_unique_identifier: str
+    plugin_id: str
+    is_authorized: bool = False
+    declaration: DatasourceProviderEntityWithPlugin
+
+
 class PluginAgentProviderEntity(BaseModel):
     provider: str
     plugin_unique_identifier: str
@@ -176,7 +185,7 @@ class PluginVerification(BaseModel):
 class PluginDecodeResponse(BaseModel):
     unique_identifier: str = Field(description="The unique identifier of the plugin.")
     manifest: PluginDeclaration
-    verification: Optional[PluginVerification] = Field(default=None, description="Basic verification information")
+    verification: PluginVerification | None = Field(default=None, description="Basic verification information")
 
 
 class PluginOAuthAuthorizationUrlResponse(BaseModel):
@@ -235,9 +244,9 @@ class CredentialType(enum.StrEnum):
     @classmethod
     def of(cls, credential_type: str) -> "CredentialType":
         type_name = credential_type.lower()
-        if type_name == "api-key":
+        if type_name in {"api-key", "api_key"}:
             return cls.API_KEY
-        elif type_name == "oauth2":
+        elif type_name in {"oauth2", "oauth"}:
             return cls.OAUTH2
         elif type_name == "unauthorized":
             return cls.UNAUTHORIZED