refactor(api): refactor all

- Replaced direct imports of `TriggerProviderID` and `ToolProviderID` from `core.plugin.entities.plugin` with imports from `models.provider_ids` for better organization.
- Refactored workflow node classes to inherit from a unified `Node` class, improving consistency and maintainability.
- Removed unused code and comments to clean up the implementation, particularly in the `workflow_trigger.py` and `builtin_tools_manage_service.py` files.

These changes enhance the clarity and structure of the codebase, facilitating easier future modifications.

api/commands.py

@@ -15,12 +15,12 @@ from sqlalchemy.orm import sessionmaker
 from configs import dify_config
 from constants.languages import languages
 from core.helper import encrypter
+from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.plugin import PluginInstaller
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.datasource.vdb.vector_type import VectorType
 from core.rag.index_processor.constant.built_in_field import BuiltInField
 from core.rag.models.document import Document
-from core.tools.entities.tool_entities import CredentialType
 from core.tools.utils.system_oauth_encryption import encrypt_system_oauth_params
 from events.app_event import app_was_created
 from extensions.ext_database import db
@@ -1234,7 +1234,7 @@ def setup_system_trigger_oauth_client(provider, client_params):
     """
     Setup system trigger oauth client
     """
-    from core.plugin.entities.plugin import TriggerProviderID
+    from models.provider_ids import TriggerProviderID
     from models.trigger import TriggerOAuthSystemClient
 
     provider_id = TriggerProviderID(provider)

api/controllers/console/__init__.py

@@ -137,20 +137,6 @@ from .explore import (
 # Import tag controllers
 from .tag import tags
 
-# Import workspace controllers
-from .workspace import (
-    account,
-    agent_providers,
-    endpoint,
-    load_balancing_config,
-    members,
-    model_providers,
-    models,
-    plugin,
-    tool_providers,
-    workspace,
-)
-
 # Explore Audio
 api.add_resource(ChatAudioApi, "/installed-apps/<uuid:installed_app_id>/audio-to-text", endpoint="installed_app_audio")
 api.add_resource(ChatTextApi, "/installed-apps/<uuid:installed_app_id>/text-to-audio", endpoint="installed_app_text")
@@ -312,5 +298,6 @@ __all__ = [
     "workflow_draft_variable",
     "workflow_run",
     "workflow_statistic",
+    "workflow_trigger",
     "workspace",
 ]

api/controllers/console/app/workflow_trigger.py

@@ -9,7 +9,6 @@ from configs import dify_config
 from controllers.console import api
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
-from core.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from fields.workflow_trigger_fields import trigger_fields, triggers_list_fields, webhook_trigger_fields
 from libs.login import current_user, login_required
@@ -18,104 +17,6 @@ from models.workflow import AppTrigger, AppTriggerStatus, WorkflowWebhookTrigger
 
 logger = logging.getLogger(__name__)
 
-from services.workflow_plugin_trigger_service import WorkflowPluginTriggerService
-
-
-class PluginTriggerApi(Resource):
-    """Workflow Plugin Trigger API"""
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model(mode=AppMode.WORKFLOW)
-    def post(self, app_model):
-        """Create plugin trigger"""
-        parser = reqparse.RequestParser()
-        parser.add_argument("node_id", type=str, required=False, location="json")
-        parser.add_argument("provider_id", type=str, required=False, location="json")
-        parser.add_argument("trigger_name", type=str, required=False, location="json")
-        parser.add_argument("subscription_id", type=str, required=False, location="json")
-        args = parser.parse_args()
-
-        assert isinstance(current_user, Account)
-        assert current_user.current_tenant_id is not None
-        if not current_user.is_editor:
-            raise Forbidden()
-
-        plugin_trigger = WorkflowPluginTriggerService.create_plugin_trigger(
-            app_id=app_model.id,
-            tenant_id=current_user.current_tenant_id,
-            node_id=args["node_id"],
-            provider_id=args["provider_id"],
-            trigger_name=args["trigger_name"],
-            subscription_id=args["subscription_id"],
-        )
-
-        return jsonable_encoder(plugin_trigger)
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model(mode=AppMode.WORKFLOW)
-    def get(self, app_model):
-        """Get plugin trigger"""
-        parser = reqparse.RequestParser()
-        parser.add_argument("node_id", type=str, required=True, help="Node ID is required")
-        args = parser.parse_args()
-
-        plugin_trigger = WorkflowPluginTriggerService.get_plugin_trigger(
-            app_id=app_model.id,
-            node_id=args["node_id"],
-        )
-
-        return jsonable_encoder(plugin_trigger)
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model(mode=AppMode.WORKFLOW)
-    def put(self, app_model):
-        """Update plugin trigger"""
-        parser = reqparse.RequestParser()
-        parser.add_argument("node_id", type=str, required=True, help="Node ID is required")
-        parser.add_argument("subscription_id", type=str, required=True, location="json", help="Subscription ID")
-        args = parser.parse_args()
-
-        assert isinstance(current_user, Account)
-        assert current_user.current_tenant_id is not None
-        if not current_user.is_editor:
-            raise Forbidden()
-
-        plugin_trigger = WorkflowPluginTriggerService.update_plugin_trigger(
-            app_id=app_model.id,
-            node_id=args["node_id"],
-            subscription_id=args["subscription_id"],
-        )
-
-        return jsonable_encoder(plugin_trigger)
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model(mode=AppMode.WORKFLOW)
-    def delete(self, app_model):
-        """Delete plugin trigger"""
-        parser = reqparse.RequestParser()
-        parser.add_argument("node_id", type=str, required=True, help="Node ID is required")
-        args = parser.parse_args()
-
-        assert isinstance(current_user, Account)
-        assert current_user.current_tenant_id is not None
-        if not current_user.is_editor:
-            raise Forbidden()
-
-        WorkflowPluginTriggerService.delete_plugin_trigger(
-            app_id=app_model.id,
-            node_id=args["node_id"],
-        )
-
-        return {"result": "success"}, 204
-
 
 class WebhookTriggerApi(Resource):
     """Webhook Trigger API"""

api/controllers/console/workspace/tool_providers.py

@@ -21,11 +21,12 @@ from core.mcp.auth.auth_provider import OAuthClientProvider
 from core.mcp.error import MCPAuthError, MCPError
 from core.mcp.mcp_client import MCPClient
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.plugin.entities.plugin import ToolProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.oauth import OAuthHandler
 from libs.helper import StrLen, alphanumeric, uuid_value
 from libs.login import login_required
+from models.provider_ids import ToolProviderID
+
 # from models.provider_ids import ToolProviderID
 from services.plugin.oauth_service import OAuthProxyService
 from services.tools.api_tools_manage_service import ApiToolManageService

api/controllers/console/workspace/trigger_providers.py

@@ -9,7 +9,6 @@ from configs import dify_config
 from controllers.console import api
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.oauth import OAuthHandler
 from core.trigger.entities.entities import SubscriptionBuilderUpdater
@@ -17,6 +16,7 @@ from core.trigger.trigger_manager import TriggerManager
 from extensions.ext_database import db
 from libs.login import current_user, login_required
 from models.account import Account
+from models.provider_ids import TriggerProviderID
 from services.plugin.oauth_service import OAuthProxyService
 from services.trigger.trigger_provider_service import TriggerProviderService
 from services.trigger.trigger_subscription_builder_service import TriggerSubscriptionBuilderService

api/core/app/apps/workflow/app_runner.py

@@ -1,6 +1,6 @@
 import logging
 import time
-from typing import cast
+from typing import Optional, cast
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_config_manager import WorkflowAppConfig

api/core/entities/provider_entities.py

@@ -1,5 +1,5 @@
 from enum import StrEnum, auto
-from typing import Union
+from typing import Optional, Union
 
 from pydantic import BaseModel, ConfigDict, Field
 

api/core/helper/name_generator.py

@@ -3,7 +3,7 @@ import re
 from collections.abc import Sequence
 from typing import Any
 
-from core.tools.entities.tool_entities import CredentialType
+from core.plugin.entities.plugin_daemon import CredentialType
 
 logger = logging.getLogger(__name__)
 

api/core/plugin/entities/plugin.py

@@ -1,7 +1,7 @@
 import datetime
 from collections.abc import Mapping
 from enum import StrEnum, auto
-from typing import Any
+from typing import Any, Optional
 
 from packaging.version import InvalidVersion, Version
 from pydantic import BaseModel, Field, field_validator, model_validator

api/core/plugin/impl/tool.py

@@ -8,8 +8,6 @@ from core.plugin.entities.plugin_daemon import CredentialType, PluginBasicBoolea
 from core.plugin.impl.base import BasePluginClient
 from core.plugin.utils.chunk_merger import merge_blob_chunks
 from core.schemas.resolver import resolve_dify_schema_refs
-
-# from core.tools.entities.tool_entities import CredentialType, ToolInvokeMessage, ToolParameter
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
 from models.provider_ids import GenericProviderID, ToolProviderID
 

api/core/plugin/impl/trigger.py

@@ -4,7 +4,6 @@ from typing import Any
 
 from flask import Request
 
-from core.plugin.entities.plugin import GenericProviderID, TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType, PluginTriggerProviderEntity
 from core.plugin.entities.request import (
     PluginTriggerDispatchResponse,
@@ -16,6 +15,7 @@ from core.plugin.entities.request import (
 from core.plugin.impl.base import BasePluginClient
 from core.plugin.utils.http_parser import deserialize_response, serialize_request
 from core.trigger.entities.entities import Subscription
+from models.provider_ids import GenericProviderID, TriggerProviderID
 
 
 class PluginTriggerManager(BasePluginClient):

api/core/trigger/provider.py

@@ -9,7 +9,6 @@ from typing import Any, Optional
 from flask import Request
 
 from core.entities.provider_entities import BasicProviderConfig
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.entities.request import (
     TriggerDispatchResponse,
@@ -28,6 +27,7 @@ from core.trigger.entities.entities import (
     Unsubscription,
 )
 from core.trigger.errors import TriggerProviderCredentialValidationError
+from models.provider_ids import TriggerProviderID
 from services.plugin.plugin_service import PluginService
 
 logger = logging.getLogger(__name__)

api/core/trigger/trigger_manager.py

@@ -10,7 +10,6 @@ from typing import Any, Optional
 from flask import Request
 
 import contexts
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.entities.request import Event, TriggerInvokeResponse
 from core.plugin.impl.exc import PluginInvokeError
@@ -22,6 +21,7 @@ from core.trigger.entities.entities import (
     Unsubscription,
 )
 from core.trigger.provider import PluginTriggerProviderController
+from models.provider_ids import TriggerProviderID
 
 logger = logging.getLogger(__name__)
 

api/core/workflow/enums.py

@@ -62,6 +62,16 @@ class NodeType(StrEnum):
     TRIGGER_SCHEDULE = "trigger-schedule"
     TRIGGER_PLUGIN = "trigger-plugin"
 
+    @property
+    def is_start_node(self) -> bool:
+        """Check if this node type can serve as a workflow entry point."""
+        return self in [
+            NodeType.START,
+            NodeType.TRIGGER_WEBHOOK,
+            NodeType.TRIGGER_SCHEDULE,
+            NodeType.TRIGGER_PLUGIN,
+        ]
+
 
 class NodeExecutionType(StrEnum):
     """Node execution type classification."""

api/core/workflow/nodes/trigger_plugin/entities.py

@@ -2,8 +2,8 @@ from typing import Any, Optional
 
 from pydantic import Field
 
+from core.workflow.enums import ErrorStrategy
 from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig
-from core.workflow.nodes.enums import ErrorStrategy
 
 
 class PluginTriggerData(BaseNodeData):

api/core/workflow/nodes/trigger_plugin/trigger_plugin_node.py

@@ -1,16 +1,16 @@
 from collections.abc import Mapping
 from typing import Any, Optional
 
-from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.nodes.base import BaseNode
+from core.workflow.enums import ErrorStrategy, NodeType
+from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig
-from core.workflow.nodes.enums import ErrorStrategy, NodeType
+from core.workflow.nodes.base.node import Node
 
 from .entities import PluginTriggerData
 
 
-class TriggerPluginNode(BaseNode):
+class TriggerPluginNode(Node):
     _node_type = NodeType.TRIGGER_PLUGIN
 
     _node_data: PluginTriggerData

api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py

@@ -2,15 +2,15 @@ from collections.abc import Mapping
 from datetime import UTC, datetime
 from typing import Any, Optional
 
-from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.nodes.base import BaseNode
+from core.workflow.enums import ErrorStrategy, NodeType
+from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig
-from core.workflow.nodes.enums import ErrorStrategy, NodeType
+from core.workflow.nodes.base.node import Node
 from core.workflow.nodes.trigger_schedule.entities import TriggerScheduleNodeData
 
 
-class TriggerScheduleNode(BaseNode):
+class TriggerScheduleNode(Node):
     _node_type = NodeType.TRIGGER_SCHEDULE
 
     _node_data: TriggerScheduleNodeData

api/core/workflow/nodes/trigger_webhook/node.py

@@ -1,16 +1,16 @@
 from collections.abc import Mapping
 from typing import Any, Optional
 
-from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.nodes.base import BaseNode
+from core.workflow.enums import ErrorStrategy, NodeType
+from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig
-from core.workflow.nodes.enums import ErrorStrategy, NodeType
+from core.workflow.nodes.base.node import Node
 
 from .entities import ContentType, WebhookData
 
 
-class TriggerWebhookNode(BaseNode):
+class TriggerWebhookNode(Node):
     _node_type = NodeType.TRIGGER_WEBHOOK
 
     _node_data: WebhookData

api/models/provider_ids.py

@@ -57,3 +57,8 @@ class ToolProviderID(GenericProviderID):
 class DatasourceProviderID(GenericProviderID):
     def __init__(self, value: str, is_hardcoded: bool = False) -> None:
         super().__init__(value, is_hardcoded)
+
+
+class TriggerProviderID(GenericProviderID):
+    def __init__(self, value: str, is_hardcoded: bool = False) -> None:
+        super().__init__(value, is_hardcoded)

api/services/datasource_provider_service.py

@@ -12,9 +12,9 @@ from core.helper import encrypter
 from core.helper.name_generator import generate_incremental_name
 from core.helper.provider_cache import NoOpProviderCredentialCache
 from core.model_runtime.entities.provider_entities import FormType
+from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.datasource import PluginDatasourceManager
 from core.plugin.impl.oauth import OAuthHandler
-from core.tools.entities.tool_entities import CredentialType
 from core.tools.utils.encryption import ProviderConfigCache, ProviderConfigEncrypter, create_provider_encrypter
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client

api/services/plugin/plugin_parameter_service.py

@@ -4,7 +4,6 @@ from typing import Any, Literal
 from sqlalchemy.orm import Session
 
 from core.plugin.entities.parameters import PluginParameterOption
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.dynamic_select import DynamicSelectClient
 from core.tools.tool_manager import ToolManager
@@ -13,6 +12,7 @@ from core.trigger.entities.api_entities import TriggerProviderSubscriptionApiEnt
 from core.trigger.entities.entities import SubscriptionBuilder
 from core.trigger.trigger_manager import TriggerManager
 from extensions.ext_database import db
+from models.provider_ids import TriggerProviderID
 from models.tools import BuiltinToolProvider
 from services.trigger.trigger_provider_service import TriggerProviderService
 from services.trigger.trigger_subscription_builder_service import TriggerSubscriptionBuilderService

api/services/tools/builtin_tools_manage_service.py

@@ -12,8 +12,6 @@ from constants import HIDDEN_VALUE, UNKNOWN_VALUE
 from core.helper.name_generator import generate_incremental_name
 from core.helper.position_helper import is_filtered
 from core.helper.provider_cache import NoOpProviderCredentialCache, ToolProviderCredentialsCache
-
-# from core.plugin.entities.plugin import ToolProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.tools.builtin_tool.provider import BuiltinToolProviderController
 from core.tools.builtin_tool.providers._positions import BuiltinToolProviderSort

api/services/tools/tools_transform_service.py

@@ -89,7 +89,7 @@ class ToolTransformService:
         elif isinstance(provider, PluginDatasourceProviderEntity):
             if provider.plugin_id:
                 if isinstance(provider.declaration.identity.icon, str):
-                    provider.declaration.identity.icon = ToolTransformService.get_plugin_icon_url(
+                    provider.declaration.identity.icon = PluginService.get_plugin_icon_url(
                         tenant_id=tenant_id, filename=provider.declaration.identity.icon
                     )
 

api/services/trigger/trigger_provider_service.py

@@ -11,7 +11,6 @@ from configs import dify_config
 from constants import HIDDEN_VALUE, UNKNOWN_VALUE
 from core.helper.provider_cache import NoOpProviderCredentialCache
 from core.helper.provider_encryption import create_provider_encrypter
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.oauth import OAuthHandler
 from core.tools.utils.system_oauth_encryption import decrypt_system_oauth_params
@@ -27,6 +26,7 @@ from core.trigger.utils.encryption import (
 )
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from models.provider_ids import TriggerProviderID
 from models.trigger import TriggerOAuthSystemClient, TriggerOAuthTenantClient, TriggerSubscription
 from models.workflow import WorkflowPluginTrigger
 from services.plugin.plugin_service import PluginService

api/services/trigger/trigger_subscription_builder_service.py

@@ -7,7 +7,6 @@ from typing import Any
 
 from flask import Request, Response
 
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.tools.errors import ToolProviderCredentialValidationError
 from core.trigger.entities.api_entities import SubscriptionBuilderApiEntity
@@ -21,6 +20,7 @@ from core.trigger.trigger_manager import TriggerManager
 from core.trigger.utils.encryption import masked_credentials
 from core.trigger.utils.endpoint import parse_endpoint_id
 from extensions.ext_redis import redis_client
+from models.provider_ids import TriggerProviderID
 from services.trigger.trigger_provider_service import TriggerProviderService
 
 logger = logging.getLogger(__name__)

api/services/trigger_service.py

@@ -7,17 +7,17 @@ from flask import Request, Response
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
-from core.plugin.entities.plugin import TriggerProviderID
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.utils.http_parser import deserialize_request, serialize_request
 from core.trigger.entities.entities import TriggerEntity
 from core.trigger.trigger_manager import TriggerManager
-from core.workflow.nodes.enums import NodeType
+from core.workflow.enums import NodeType
 from core.workflow.nodes.trigger_schedule.exc import TenantOwnerNotFoundError
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from models.account import Account, TenantAccountJoin, TenantAccountRole
 from models.enums import WorkflowRunTriggeredFrom
+from models.provider_ids import TriggerProviderID
 from models.trigger import TriggerSubscription
 from models.workflow import Workflow, WorkflowPluginTrigger
 from services.async_workflow_service import AsyncWorkflowService

api/services/webhook_service.py

@@ -15,7 +15,7 @@ from configs import dify_config
 from core.file.models import FileTransferMethod
 from core.tools.tool_file_manager import ToolFileManager
 from core.variables.types import SegmentType
-from core.workflow.nodes.enums import NodeType
+from core.workflow.enums import NodeType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from factories import file_factory

api/services/workflow_plugin_trigger_service.py

@@ -5,7 +5,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import NotFound
 
-from core.workflow.nodes.enums import NodeType
+from core.workflow.enums import NodeType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from models.model import App

api/tasks/trigger_processing_tasks.py

@@ -10,10 +10,10 @@ import logging
 from celery import shared_task
 from sqlalchemy.orm import Session
 
-from core.plugin.entities.plugin import TriggerProviderID
 from core.trigger.trigger_manager import TriggerManager
 from extensions.ext_database import db
 from extensions.ext_storage import storage
+from models.provider_ids import TriggerProviderID
 from models.trigger import TriggerSubscription
 from services.trigger_debug_service import TriggerDebugService
 from services.trigger_service import TriggerService

api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py

@@ -7,6 +7,7 @@ from core.tools.entities.api_entities import ToolProviderApiEntity
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderType
 from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider, WorkflowToolProvider
+from services.plugin.plugin_service import PluginService
 from services.tools.tools_transform_service import ToolTransformService
 
 
@@ -111,13 +112,13 @@ class TestToolTransformService:
         filename = "test_icon.png"
 
         # Act: Execute the method under test
-        result = ToolTransformService.get_plugin_icon_url(tenant_id, filename)
+        result = PluginService.get_plugin_icon_url(str(tenant_id), filename)
 
         # Assert: Verify the expected outcomes
         assert result is not None
         assert isinstance(result, str)
         assert "console/api/workspaces/current/plugin/icon" in result
-        assert tenant_id in result
+        assert str(tenant_id) in result
         assert filename in result
         assert result.startswith("https://console.example.com")
 
@@ -142,13 +143,13 @@ class TestToolTransformService:
         filename = "test_icon.png"
 
         # Act: Execute the method under test
-        result = ToolTransformService.get_plugin_icon_url(tenant_id, filename)
+        result = PluginService.get_plugin_icon_url(str(tenant_id), filename)
 
         # Assert: Verify the expected outcomes
         assert result is not None
         assert isinstance(result, str)
         assert result.startswith("/console/api/workspaces/current/plugin/icon")
-        assert tenant_id in result
+        assert str(tenant_id) in result
         assert filename in result
 
         # Verify URL structure
@@ -332,7 +333,7 @@ class TestToolTransformService:
         provider = {"type": ToolProviderType.BUILT_IN.value, "name": fake.company(), "icon": "🔧"}
 
         # Act: Execute the method under test
-        ToolTransformService.repack_provider(tenant_id, provider)
+        ToolTransformService.repack_provider(str(tenant_id), provider)
 
         # Assert: Verify the expected outcomes
         assert "icon" in provider
@@ -356,7 +357,7 @@ class TestToolTransformService:
 
         # Create provider entity with plugin_id
         provider = ToolProviderApiEntity(
-            id=fake.uuid4(),
+            id=str(fake.uuid4()),
             author=fake.name(),
             name=fake.company(),
             description=I18nObject(en_US=fake.text(max_nb_chars=100)),
@@ -378,14 +379,14 @@ class TestToolTransformService:
         assert provider.icon is not None
         assert isinstance(provider.icon, str)
         assert "console/api/workspaces/current/plugin/icon" in provider.icon
-        assert tenant_id in provider.icon
+        assert str(tenant_id) in provider.icon
         assert "test_icon.png" in provider.icon
 
         # Verify dark icon handling
         assert provider.icon_dark is not None
         assert isinstance(provider.icon_dark, str)
         assert "console/api/workspaces/current/plugin/icon" in provider.icon_dark
-        assert tenant_id in provider.icon_dark
+        assert str(tenant_id) in provider.icon_dark
         assert "test_icon_dark.png" in provider.icon_dark
 
     def test_repack_provider_entity_no_plugin_success(
@@ -421,7 +422,7 @@ class TestToolTransformService:
         )
 
         # Act: Execute the method under test
-        ToolTransformService.repack_provider(tenant_id, provider)
+        ToolTransformService.repack_provider(str(tenant_id), provider)
 
         # Assert: Verify the expected outcomes
         assert provider.icon is not None