dify_plugin 0.4.1__tar.gz → 0.4.2__tar.gz

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dify_plugin
-Version: 0.4.1
+Version: 0.4.2
 Summary: Dify Plugin SDK
 Keywords: dify,plugin,sdk
 Author-Email: langgenius <hello@dify.ai>

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/config/config.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional
 
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -24,10 +23,10 @@ class DifyPluginEnv(BaseSettings):
         description="Installation method, local or network",
     )
 
-    REMOTE_INSTALL_URL: Optional[str] = Field(default=None, description="Remote installation URL")
+    REMOTE_INSTALL_URL: str | None = Field(default=None, description="Remote installation URL")
     REMOTE_INSTALL_HOST: str = Field(default="localhost", description="Remote installation host")
     REMOTE_INSTALL_PORT: int = Field(default=5003, description="Remote installation port")
-    REMOTE_INSTALL_KEY: Optional[str] = Field(default=None, description="Remote installation key")
+    REMOTE_INSTALL_KEY: str | None = Field(default=None, description="Remote installation key")
 
     SERVERLESS_HOST: str = Field(default="0.0.0.0", description="Serverless host")
     SERVERLESS_PORT: int = Field(default=8080, description="Serverless port")

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/config/integration_config.py

@@ -52,4 +52,4 @@ class IntegrationConfig(BaseSettings):
 
         return v
 
-    model_config = SettingsConfigDict(env_file=".env")
+    model_config = SettingsConfigDict(env_file=".env", extra="allow")

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/documentation/schema_doc.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable, Mapping
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -9,10 +9,10 @@ class SchemaDoc:
         self,
         cls: type[BaseModel],
         description: str,
-        name: Optional[str] = None,
+        name: str | None = None,
         top: bool = False,
-        ignore_fields: Optional[list[str]] = None,
-        outside_reference_fields: Optional[Mapping[str, type[BaseModel]]] = None,
+        ignore_fields: list[str] | None = None,
+        outside_reference_fields: Mapping[str, type[BaseModel]] | None = None,
     ):
         self.cls = cls
         self.description = description
@@ -27,10 +27,10 @@ __cls_mapping__: dict[type[BaseModel], SchemaDoc] = {}
 
 def docs(
     description: str,
-    name: Optional[str] = None,
+    name: str | None = None,
     top: bool = False,
-    ignore_fields: Optional[list[str]] = None,
-    outside_reference_fields: Optional[Mapping[str, type[BaseModel]]] = None,
+    ignore_fields: list[str] | None = None,
+    outside_reference_fields: Mapping[str, type[BaseModel]] | None = None,
 ) -> Callable:
     """
     Decorator to add schema documentation to a class

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/entities/plugin/io.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from dify_plugin.core.server.__base.request_reader import RequestReader
@@ -25,10 +25,11 @@ class PluginInStreamBase:
         session_id: str,
         event: PluginInStreamEvent,
         data: dict,
-        conversation_id: Optional[str] = None,
-        message_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        endpoint_id: Optional[str] = None,
+        conversation_id: str | None = None,
+        message_id: str | None = None,
+        app_id: str | None = None,
+        endpoint_id: str | None = None,
+        context: dict | None = None,
     ) -> None:
         self.session_id = session_id
         self.event = event
@@ -37,6 +38,7 @@ class PluginInStreamBase:
         self.message_id = message_id
         self.app_id = app_id
         self.endpoint_id = endpoint_id
+        self.context = context
 
 
 class PluginInStream(PluginInStreamBase):
@@ -47,11 +49,12 @@ class PluginInStream(PluginInStreamBase):
         data: dict,
         reader: "RequestReader",
         writer: "ResponseWriter",
-        conversation_id: Optional[str] = None,
-        message_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        endpoint_id: Optional[str] = None,
+        conversation_id: str | None = None,
+        message_id: str | None = None,
+        app_id: str | None = None,
+        endpoint_id: str | None = None,
+        context: dict | None = None,
     ):
         self.reader = reader
         self.writer = writer
-        super().__init__(session_id, event, data, conversation_id, message_id, app_id, endpoint_id)
+        super().__init__(session_id, event, data, conversation_id, message_id, app_id, endpoint_id, context)

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/entities/plugin/request.py

@@ -1,6 +1,6 @@
 from collections.abc import Mapping
 from enum import StrEnum
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict, field_validator
 
@@ -14,6 +14,7 @@ from dify_plugin.entities.model.message import (
     ToolPromptMessage,
     UserPromptMessage,
 )
+from dify_plugin.entities.provider_config import CredentialType
 
 
 class PluginInvokeType(StrEnum):
@@ -57,6 +58,7 @@ class EndpointActions(StrEnum):
 class OAuthActions(StrEnum):
     GetAuthorizationUrl = "get_authorization_url"
     GetCredentials = "get_credentials"
+    RefreshCredentials = "refresh_credentials"
 
 
 class DynamicParameterActions(StrEnum):
@@ -78,6 +80,7 @@ class ToolInvokeRequest(PluginAccessRequest):
     provider: str
     tool: str
     credentials: dict
+    credential_type: CredentialType = CredentialType.API_KEY
     tool_parameters: dict[str, Any]
 
 
@@ -146,8 +149,8 @@ class ModelInvokeLLMRequest(PluginAccessModelRequest, PromptMessageMixin):
     action: ModelActions = ModelActions.InvokeLLM
 
     model_parameters: dict[str, Any]
-    stop: Optional[list[str]]
-    tools: Optional[list[PromptMessageTool]]
+    stop: list[str] | None
+    tools: list[PromptMessageTool] | None
     stream: bool = True
 
     model_config = ConfigDict(protected_namespaces=())
@@ -156,7 +159,7 @@ class ModelInvokeLLMRequest(PluginAccessModelRequest, PromptMessageMixin):
 class ModelGetLLMNumTokens(PluginAccessModelRequest, PromptMessageMixin):
     action: ModelActions = ModelActions.GetLLMNumTokens
 
-    tools: Optional[list[PromptMessageTool]]
+    tools: list[PromptMessageTool] | None
 
 
 class ModelInvokeTextEmbeddingRequest(PluginAccessModelRequest):
@@ -176,8 +179,8 @@ class ModelInvokeRerankRequest(PluginAccessModelRequest):
 
     query: str
     docs: list[str]
-    score_threshold: Optional[float]
-    top_n: Optional[int]
+    score_threshold: float | None
+    top_n: int | None
 
 
 class ModelInvokeTTSRequest(PluginAccessModelRequest):
@@ -191,7 +194,7 @@ class ModelInvokeTTSRequest(PluginAccessModelRequest):
 class ModelGetTTSVoices(PluginAccessModelRequest):
     action: ModelActions = ModelActions.GetTTSVoices
 
-    language: Optional[str]
+    language: str | None
 
 
 class ModelInvokeSpeech2TextRequest(PluginAccessModelRequest):
@@ -241,21 +244,32 @@ class EndpointInvokeRequest(BaseModel):
     raw_http_request: str
 
 
-class OAuthGetAuthorizationUrlRequest(BaseModel):
+class OAuthGetAuthorizationUrlRequest(PluginAccessRequest):
     type: PluginInvokeType = PluginInvokeType.OAuth
     action: OAuthActions = OAuthActions.GetAuthorizationUrl
     provider: str
+    redirect_uri: str
     system_credentials: Mapping[str, Any]
 
 
-class OAuthGetCredentialsRequest(BaseModel):
+class OAuthGetCredentialsRequest(PluginAccessRequest):
     type: PluginInvokeType = PluginInvokeType.OAuth
     action: OAuthActions = OAuthActions.GetCredentials
     provider: str
+    redirect_uri: str
     system_credentials: Mapping[str, Any]
     raw_http_request: str
 
 
+class OAuthRefreshCredentialsRequest(PluginAccessRequest):
+    type: PluginInvokeType = PluginInvokeType.OAuth
+    action: OAuthActions = OAuthActions.RefreshCredentials
+    provider: str
+    redirect_uri: str
+    system_credentials: Mapping[str, Any]
+    credentials: Mapping[str, Any]
+
+
 class DynamicParameterFetchParameterOptionsRequest(BaseModel):
     type: PluginInvokeType = PluginInvokeType.DynamicParameter
     action: DynamicParameterActions = DynamicParameterActions.FetchParameterOptions

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/entities/plugin/setup.py

@@ -1,6 +1,5 @@
 import datetime
 from enum import Enum
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -44,57 +43,55 @@ class PluginResourceRequirements(BaseModel):
             description="Permission of tool",
         )
         class Tool(BaseModel):
-            enabled: Optional[bool] = Field(default=False)
+            enabled: bool | None = Field(default=False)
 
         @docs(
             description="Permission of model",
         )
         class Model(BaseModel):
-            enabled: Optional[bool] = Field(default=False, description="Whether to enable invocation of model")
-            llm: Optional[bool] = Field(default=False, description="Whether to enable invocation of llm")
-            text_embedding: Optional[bool] = Field(
+            enabled: bool | None = Field(default=False, description="Whether to enable invocation of model")
+            llm: bool | None = Field(default=False, description="Whether to enable invocation of llm")
+            text_embedding: bool | None = Field(
                 default=False, description="Whether to enable invocation of text embedding"
             )
-            rerank: Optional[bool] = Field(default=False, description="Whether to enable invocation of rerank")
-            tts: Optional[bool] = Field(default=False, description="Whether to enable invocation of tts")
-            speech2text: Optional[bool] = Field(
-                default=False, description="Whether to enable invocation of speech2text"
-            )
-            moderation: Optional[bool] = Field(default=False, description="Whether to enable invocation of moderation")
+            rerank: bool | None = Field(default=False, description="Whether to enable invocation of rerank")
+            tts: bool | None = Field(default=False, description="Whether to enable invocation of tts")
+            speech2text: bool | None = Field(default=False, description="Whether to enable invocation of speech2text")
+            moderation: bool | None = Field(default=False, description="Whether to enable invocation of moderation")
 
         @docs(
             description="Permission of node",
         )
         class Node(BaseModel):
-            enabled: Optional[bool] = Field(default=False, description="Whether to enable invocation of node")
+            enabled: bool | None = Field(default=False, description="Whether to enable invocation of node")
 
         @docs(
             description="Permission of endpoint",
         )
         class Endpoint(BaseModel):
-            enabled: Optional[bool] = Field(default=False, description="Whether to enable registration of endpoint")
+            enabled: bool | None = Field(default=False, description="Whether to enable registration of endpoint")
 
         @docs(
             description="Permission of app",
         )
         class App(BaseModel):
-            enabled: Optional[bool] = Field(default=False, description="Whether to enable invocation of app")
+            enabled: bool | None = Field(default=False, description="Whether to enable invocation of app")
 
         @docs(
             description="Permission of storage",
         )
         class Storage(BaseModel):
-            enabled: Optional[bool] = Field(default=False, description="Whether to enable uses of storage")
+            enabled: bool | None = Field(default=False, description="Whether to enable uses of storage")
             size: int = Field(ge=1024, le=1073741824, default=1048576, description="Size of storage")
 
-        tool: Optional[Tool] = Field(default=None, description="Permission of tool")
-        model: Optional[Model] = Field(default=None, description="Permission of model")
-        node: Optional[Node] = Field(default=None, description="Permission of node")
-        endpoint: Optional[Endpoint] = Field(default=None, description="Permission of endpoint")
-        app: Optional[App] = Field(default=None, description="Permission of app")
-        storage: Optional[Storage] = Field(default=None, description="Permission of storage")
+        tool: Tool | None = Field(default=None, description="Permission of tool")
+        model: Model | None = Field(default=None, description="Permission of model")
+        node: Node | None = Field(default=None, description="Permission of node")
+        endpoint: Endpoint | None = Field(default=None, description="Permission of endpoint")
+        app: App | None = Field(default=None, description="Permission of app")
+        storage: Storage | None = Field(default=None, description="Permission of storage")
 
-    permission: Optional[Permission] = Field(default=None, description="Permission of plugin")
+    permission: Permission | None = Field(default=None, description="Permission of plugin")
 
 
 @docs(
@@ -145,7 +142,7 @@ class PluginConfiguration(BaseModel):
         )
         arch: list[PluginArch]
         runner: PluginRunner
-        minimum_dify_version: Optional[str] = Field(
+        minimum_dify_version: str | None = Field(
             None,
             description="The minimum version of Dify, designed for forward compatibility."
             "When installing a newer plugin to an older Dify, many new features may not be available,"
@@ -155,12 +152,12 @@ class PluginConfiguration(BaseModel):
 
     version: str = Field(..., pattern=r"^\d{1,4}(\.\d{1,4}){1,3}(-\w{1,16})?$")
     type: PluginType
-    author: Optional[str] = Field(..., pattern=r"^[a-zA-Z0-9_-]{1,64}$")
+    author: str | None = Field(..., pattern=r"^[a-zA-Z0-9_-]{1,64}$")
     name: str = Field(..., pattern=r"^[a-z0-9_-]{1,128}$")
-    repo: Optional[str] = Field(None, description="The repository URL of the plugin")
+    repo: str | None = Field(None, description="The repository URL of the plugin")
     description: I18nObject
     icon: str
-    icon_dark: Optional[str] = Field(None, description="The dark mode icon of the plugin")
+    icon_dark: str | None = Field(None, description="The dark mode icon of the plugin")
     label: I18nObject
     created_at: datetime.datetime
     resource: PluginResourceRequirements

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/plugin_executor.py

@@ -23,6 +23,7 @@ from dify_plugin.core.entities.plugin.request import (
     ModelValidateProviderCredentialsRequest,
     OAuthGetAuthorizationUrlRequest,
     OAuthGetCredentialsRequest,
+    OAuthRefreshCredentialsRequest,
     ToolGetRuntimeParametersRequest,
     ToolInvokeRequest,
     ToolValidateCredentialsRequest,
@@ -40,7 +41,6 @@ from dify_plugin.interfaces.model.rerank_model import RerankModel
 from dify_plugin.interfaces.model.speech2text_model import Speech2TextModel
 from dify_plugin.interfaces.model.text_embedding_model import TextEmbeddingModel
 from dify_plugin.interfaces.model.tts_model import TTSModel
-from dify_plugin.interfaces.tool import ToolProvider
 from dify_plugin.protocol.dynamic_select import DynamicSelectProtocol
 from dify_plugin.protocol.oauth import OAuthProviderProtocol
 
@@ -73,6 +73,7 @@ class PluginExecutor:
         tool = tool_cls(
             runtime=ToolRuntime(
                 credentials=request.credentials,
+                credential_type=request.credential_type,
                 user_id=request.user_id,
                 session_id=session.session_id,
             ),
@@ -333,16 +334,15 @@ class PluginExecutor:
         if provider_cls is None:
             raise ValueError(f"Provider `{provider}` does not support OAuth")
 
-        if provider_cls == ToolProvider:
-            return provider_cls()
-
-        raise ValueError(f"Provider `{provider}` does not support OAuth")
+        return provider_cls()
 
     def get_oauth_authorization_url(self, session: Session, data: OAuthGetAuthorizationUrlRequest):
         provider_instance = self._get_oauth_provider_instance(data.provider)
 
         return {
-            "authorization_url": provider_instance.oauth_get_authorization_url(data.system_credentials),
+            "authorization_url": provider_instance.oauth_get_authorization_url(
+                data.redirect_uri, data.system_credentials
+            ),
         }
 
     def get_oauth_credentials(self, session: Session, data: OAuthGetCredentialsRequest):
@@ -350,8 +350,23 @@ class PluginExecutor:
         bytes_data = binascii.unhexlify(data.raw_http_request)
         request = parse_raw_request(bytes_data)
 
+        credentials = provider_instance.oauth_get_credentials(data.redirect_uri, data.system_credentials, request)
+
+        return {
+            "metadata": credentials.metadata or {},
+            "credentials": credentials.credentials,
+            "expires_at": credentials.expires_at,
+        }
+
+    def refresh_oauth_credentials(self, session: Session, data: OAuthRefreshCredentialsRequest):
+        provider_instance = self._get_oauth_provider_instance(data.provider)
+        credentials = provider_instance.oauth_refresh_credentials(
+            data.redirect_uri, data.system_credentials, data.credentials
+        )
+
         return {
-            "credentials": provider_instance.oauth_get_credentials(data.system_credentials, request),
+            "credentials": credentials.credentials,
+            "expires_at": credentials.expires_at,
         }
 
     def _get_dynamic_parameter_action(

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/runtime.py

@@ -3,10 +3,10 @@ from abc import ABC
 from collections.abc import Generator, Mapping
 from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
-from typing import Any, Generic, Optional, TypeVar, Union
+from typing import Any, Generic, TypeVar, Union
 
 import httpx
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel, Field, TypeAdapter
 from yarl import URL
 
 from dify_plugin.config.config import InstallMethod
@@ -28,7 +28,9 @@ from dify_plugin.core.server.tcp.request_reader import TCPReaderWriter
 class ModelInvocations:
     def __init__(self, session: "Session") -> None:
         from dify_plugin.invocations.model.llm import LLMInvocation, SummaryInvocation
-        from dify_plugin.invocations.model.llm_structured_output import LLMStructuredOutputInvocation
+        from dify_plugin.invocations.model.llm_structured_output import (
+            LLMStructuredOutputInvocation,
+        )
         from dify_plugin.invocations.model.moderation import ModerationInvocation
         from dify_plugin.invocations.model.rerank import RerankInvocation
         from dify_plugin.invocations.model.speech2text import Speech2TextInvocation
@@ -74,6 +76,35 @@ class WorkflowNodeInvocations:
         self.parameter_extractor = ParameterExtractorNodeInvocation(session)
 
 
+class InvokeCredentials(BaseModel):
+    """
+    Invoke credentials
+
+    Session Level Credentials, used to store session level credentials, such as tool call credentials.
+    Especially for the backwards invoke, when invoker is not specified
+    We need to use the credential id from the session context.
+    """
+
+    tool_credentials: dict[str, str] = Field(
+        default_factory=dict,
+        description="This is a map of tool provider to credential id.",
+    )
+
+    def get_credential_id(self, provider: str) -> str | None:
+        return self.tool_credentials.get(provider)
+
+
+class SessionContext(BaseModel):
+    """
+    Session Context
+
+    Session Context is used to store the session level context, such as credentials.
+    In the future, we will refactor message_id and conversation_id and the others to be part of the session context.
+    """
+
+    credentials: InvokeCredentials = Field(default_factory=InvokeCredentials)
+
+
 class Session:
     def __init__(
         self,
@@ -81,12 +112,13 @@ class Session:
         executor: ThreadPoolExecutor,
         reader: RequestReader,
         writer: ResponseWriter,
-        install_method: Optional[InstallMethod] = None,
-        dify_plugin_daemon_url: Optional[str] = None,
-        conversation_id: Optional[str] = None,
-        message_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        endpoint_id: Optional[str] = None,
+        install_method: InstallMethod | None = None,
+        dify_plugin_daemon_url: str | None = None,
+        conversation_id: str | None = None,
+        message_id: str | None = None,
+        app_id: str | None = None,
+        endpoint_id: str | None = None,
+        context: SessionContext | dict | None = None,
     ) -> None:
         # current session id
         self.session_id: str = session_id
@@ -99,22 +131,27 @@ class Session:
         self.writer: ResponseWriter = writer
 
         # conversation id
-        self.conversation_id: Optional[str] = conversation_id
+        self.conversation_id: str | None = conversation_id
 
         # message id
-        self.message_id: Optional[str] = message_id
+        self.message_id: str | None = message_id
 
         # app id
-        self.app_id: Optional[str] = app_id
+        self.app_id: str | None = app_id
 
         # endpoint id
-        self.endpoint_id: Optional[str] = endpoint_id
+        self.endpoint_id: str | None = endpoint_id
 
         # install method
-        self.install_method: Optional[InstallMethod] = install_method
+        self.install_method: InstallMethod | None = install_method
+
+        # context
+        self.context: SessionContext = (
+            SessionContext.model_validate(context) if isinstance(context, dict) else context or SessionContext()
+        )
 
         # dify plugin daemon url
-        self.dify_plugin_daemon_url: Optional[str] = dify_plugin_daemon_url
+        self.dify_plugin_daemon_url: str | None = dify_plugin_daemon_url
 
         # register invocations
         self._register_invocations()
@@ -140,6 +177,7 @@ class Session:
             writer=TCPReaderWriter(host="", port=0, key=""),
             install_method=None,
             dify_plugin_daemon_url=None,
+            context=None,
         )
 
 
@@ -157,7 +195,7 @@ class BackwardsInvocationResponseEvent(BaseModel):
     backwards_request_id: str
     event: Event
     message: str
-    data: Optional[dict]
+    data: dict | None
 
 
 T = TypeVar("T", bound=Union[BaseModel, dict, str])
@@ -166,7 +204,7 @@ T = TypeVar("T", bound=Union[BaseModel, dict, str])
 class BackwardsInvocation(Generic[T], ABC):
     def __init__(
         self,
-        session: Optional[Session] = None,
+        session: Session | None = None,
     ) -> None:
         self.session = session
 

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/server/__base/filter_reader.py

@@ -1,7 +1,7 @@
 import queue
 from collections.abc import Callable, Generator
 from queue import Queue
-from typing import Optional, overload
+from typing import overload
 
 from dify_plugin.core.entities.plugin.io import PluginInStream
 
@@ -9,12 +9,12 @@ from dify_plugin.core.entities.plugin.io import PluginInStream
 class FilterReader:
     filter: Callable[[PluginInStream], bool]
     queue: Queue[PluginInStream | None]
-    close_callback: Optional[Callable]
+    close_callback: Callable | None
 
     def __init__(
         self,
         filter: Callable[[PluginInStream], bool],  # noqa: A002
-        close_callback: Optional[Callable] = None,
+        close_callback: Callable | None = None,
     ) -> None:
         self.filter = filter
         self.queue = Queue()
@@ -26,7 +26,7 @@ class FilterReader:
     @overload
     def read(self) -> Generator[PluginInStream, None, None]: ...
 
-    def read(self, timeout_for_round: Optional[float] = None) -> Generator[PluginInStream | None, None, None]:
+    def read(self, timeout_for_round: float | None = None) -> Generator[PluginInStream | None, None, None]:
         while True:
             try:
                 data = self.queue.get(timeout=timeout_for_round)

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/server/__base/response_writer.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -27,8 +26,8 @@ class ResponseWriter(ABC):
     def put(
         self,
         event: Event,
-        session_id: Optional[str] = None,
-        data: Optional[dict | BaseModel] = None,
+        session_id: str | None = None,
+        data: dict | BaseModel | None = None,
     ):
         """
         serialize the output to the daemon
@@ -39,19 +38,19 @@ class ResponseWriter(ABC):
         self.write(StreamOutputMessage(event=event, session_id=session_id, data=data).model_dump_json())
         self.write("\n\n")
 
-    def error(self, session_id: Optional[str] = None, data: Optional[dict | BaseModel] = None):
+    def error(self, session_id: str | None = None, data: dict | BaseModel | None = None):
         return self.put(Event.ERROR, session_id, data)
 
-    def log(self, data: Optional[dict] = None):
+    def log(self, data: dict | None = None):
         return self.put(Event.LOG, None, data)
 
     def heartbeat(self):
         return self.put(Event.HEARTBEAT, None, {})
 
-    def session_message(self, session_id: Optional[str] = None, data: Optional[dict | BaseModel] = None):
+    def session_message(self, session_id: str | None = None, data: dict | BaseModel | None = None):
         return self.put(Event.SESSION, session_id, data)
 
-    def session_message_text(self, session_id: Optional[str] = None, data: Optional[dict | BaseModel] = None) -> str:
+    def session_message_text(self, session_id: str | None = None, data: dict | BaseModel | None = None) -> str:
         if isinstance(data, BaseModel):
             data = data.model_dump()
 

{dify_plugin-0.4.1 → dify_plugin-0.4.2}/dify_plugin/core/server/__base/writer_entities.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -13,5 +12,5 @@ class Event(Enum):
 
 class StreamOutputMessage(BaseModel):
     event: Event
-    session_id: Optional[str]
-    data: Optional[dict | BaseModel]
+    session_id: str | None
+    data: dict | BaseModel | None