FEAT: NEW WORKFLOW ENGINE (#3160)

Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Yeuoly <admin@srmxy.cn>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
Co-authored-by: jyong <jyong@dify.ai>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: jyong <718720800@qq.com>

api/core/tools/entities/tool_entities.py

@@ -11,6 +11,7 @@ class ToolProviderType(Enum):
         Enum class for tool provider
     """
     BUILT_IN = "built-in"
+    DATASET_RETRIEVAL = "dataset-retrieval"
     APP_BASED = "app-based"
     API_BASED = "api-based"
 
@@ -161,6 +162,8 @@ class ToolIdentity(BaseModel):
     author: str = Field(..., description="The author of the tool")
     name: str = Field(..., description="The name of the tool")
     label: I18nObject = Field(..., description="The label of the tool")
+    provider: str = Field(..., description="The provider of the tool")
+    icon: Optional[str] = None
 
 class ToolCredentialsOption(BaseModel):
     value: str = Field(..., description="The value of the option")
@@ -326,4 +329,33 @@ class ModelToolProviderConfiguration(BaseModel):
     """
     provider: str = Field(..., description="The provider of the model tool")
     models: list[ModelToolConfiguration] = Field(..., description="The models of the model tool")
-    label: I18nObject = Field(..., description="The label of the model tool")
+    label: I18nObject = Field(..., description="The label of the model tool")
+
+class ToolInvokeMeta(BaseModel):
+    """
+    Tool invoke meta
+    """
+    time_cost: float = Field(..., description="The time cost of the tool invoke")
+    error: Optional[str] = None
+    tool_config: Optional[dict] = None
+
+    @classmethod
+    def empty(cls) -> 'ToolInvokeMeta':
+        """
+        Get an empty instance of ToolInvokeMeta
+        """
+        return cls(time_cost=0.0, error=None, tool_config={})
+    
+    @classmethod
+    def error_instance(cls, error: str) -> 'ToolInvokeMeta':
+        """
+        Get an instance of ToolInvokeMeta with error
+        """
+        return cls(time_cost=0.0, error=error, tool_config={})
+    
+    def to_dict(self) -> dict:
+        return {
+            'time_cost': self.time_cost,
+            'error': self.error,
+            'tool_config': self.tool_config,
+        }

api/core/tools/entities/user_entities.py

@@ -8,6 +8,13 @@ from core.tools.entities.tool_entities import ToolProviderCredentials
 from core.tools.tool.tool import ToolParameter
 
 
+class UserTool(BaseModel):
+    author: str
+    name: str # identifier
+    label: I18nObject # label
+    description: I18nObject
+    parameters: Optional[list[ToolParameter]]
+
 class UserToolProvider(BaseModel):
     class ProviderType(Enum):
         BUILTIN = "builtin"
@@ -22,9 +29,11 @@ class UserToolProvider(BaseModel):
     icon: str
     label: I18nObject # label
     type: ProviderType
-    team_credentials: dict = None
+    masked_credentials: dict = None
+    original_credentials: dict = None
     is_team_authorization: bool = False
     allow_delete: bool = True
+    tools: list[UserTool] = None
 
     def to_dict(self) -> dict:
         return {
@@ -35,17 +44,11 @@ class UserToolProvider(BaseModel):
             'icon': self.icon,
             'label': self.label.to_dict(),
             'type': self.type.value,
-            'team_credentials': self.team_credentials,
+            'team_credentials': self.masked_credentials,
             'is_team_authorization': self.is_team_authorization,
-            'allow_delete': self.allow_delete
+            'allow_delete': self.allow_delete,
+            'tools': self.tools
         }
 
 class UserToolProviderCredentials(BaseModel):
-    credentials: dict[str, ToolProviderCredentials]
-
-class UserTool(BaseModel):
-    author: str
-    name: str # identifier
-    label: I18nObject # label
-    description: I18nObject
-    parameters: Optional[list[ToolParameter]]
+    credentials: dict[str, ToolProviderCredentials]