Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine

api/core/plugin/entities/plugin.py

@@ -3,7 +3,8 @@ import enum
 from collections.abc import Mapping
 from typing import Any, Optional
 
-from pydantic import BaseModel, Field, model_validator
+from packaging.version import InvalidVersion, Version
+from pydantic import BaseModel, Field, field_validator, model_validator
 
 from core.agent.plugin_entities import AgentStrategyProviderEntity
 from core.model_runtime.entities.provider_entities import ProviderEntity
@@ -69,10 +70,21 @@ class PluginDeclaration(BaseModel):
         endpoints: Optional[list[str]] = Field(default_factory=list[str])
 
     class Meta(BaseModel):
-        minimum_dify_version: Optional[str] = Field(default=None, pattern=r"^\d{1,4}(\.\d{1,4}){1,3}(-\w{1,16})?$")
+        minimum_dify_version: Optional[str] = Field(default=None)
         version: Optional[str] = Field(default=None)
 
-    version: str = Field(..., pattern=r"^\d{1,4}(\.\d{1,4}){1,3}(-\w{1,16})?$")
+        @field_validator("minimum_dify_version")
+        @classmethod
+        def validate_minimum_dify_version(cls, v: Optional[str]) -> Optional[str]:
+            if v is None:
+                return v
+            try:
+                Version(v)
+                return v
+            except InvalidVersion as e:
+                raise ValueError(f"Invalid version format: {v}") from e
+
+    version: str = Field(...)
     author: Optional[str] = Field(..., pattern=r"^[a-zA-Z0-9_-]{1,64}$")
     name: str = Field(..., pattern=r"^[a-z0-9_-]{1,128}$")
     description: I18nObject
@@ -92,6 +104,15 @@ class PluginDeclaration(BaseModel):
     agent_strategy: Optional[AgentStrategyProviderEntity] = None
     meta: Meta
 
+    @field_validator("version")
+    @classmethod
+    def validate_version(cls, v: str) -> str:
+        try:
+            Version(v)
+            return v
+        except InvalidVersion as e:
+            raise ValueError(f"Invalid version format: {v}") from e
+
     @model_validator(mode="before")
     @classmethod
     def validate_category(cls, values: dict) -> dict:

api/core/plugin/utils/chunk_merger.py

@@ -1,6 +1,6 @@
 from collections.abc import Generator
 from dataclasses import dataclass, field
-from typing import TypeVar, Union
+from typing import TypeVar, Union, cast
 
 from core.agent.entities import AgentInvokeMessage
 from core.tools.entities.tool_entities import ToolInvokeMessage
@@ -85,7 +85,7 @@ def merge_blob_chunks(
                     message=ToolInvokeMessage.BlobMessage(blob=files[chunk_id].data[: files[chunk_id].bytes_written]),
                     meta=resp.meta,
                 )
-                yield merged_message
+                yield cast(MessageType, merged_message)
                 # Clean up the buffer
                 del files[chunk_id]
         else: