Merge branch 'fix/chore-fix' into dev/plugin-deploy

api/services/agent_service.py

@@ -1,6 +1,9 @@
+import threading
+
 import pytz
 from flask_login import current_user
 
+import contexts
 from core.app.app_config.easy_ui_based_app.agent.manager import AgentConfigManager
 from core.tools.tool_manager import ToolManager
 from extensions.ext_database import db
@@ -14,6 +17,9 @@ class AgentService:
         """
         Service to get agent logs
         """
+        contexts.plugin_tool_providers.set({})
+        contexts.plugin_tool_providers_lock.set(threading.Lock())
+
         conversation: Conversation = (
             db.session.query(Conversation)
             .filter(

api/services/tools/tools_transform_service.py

@@ -97,6 +97,7 @@ class ToolTransformService:
 
         if isinstance(provider_controller, PluginToolProviderController):
             result.plugin_id = provider_controller.plugin_id
+            result.plugin_unique_identifier = provider_controller.plugin_unique_identifier
 
         # get credentials schema
         schema = {x.to_basic_provider_config().name: x for x in provider_controller.get_credentials_schema()}
@@ -173,6 +174,7 @@ class ToolTransformService:
             masked_credentials={},
             is_team_authorization=True,
             plugin_id=None,
+            plugin_unique_identifier=None,
             tools=[],
             labels=labels or [],
         )
@@ -214,6 +216,7 @@ class ToolTransformService:
             ),
             type=ToolProviderType.API,
             plugin_id=None,
+            plugin_unique_identifier=None,
             masked_credentials={},
             is_team_authorization=True,
             tools=[],

api/services/workflow_run_service.py

@@ -1,3 +1,6 @@
+import threading
+
+import contexts
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models.enums import WorkflowRunTriggeredFrom
@@ -117,6 +120,9 @@ class WorkflowRunService:
         """
         workflow_run = self.get_workflow_run(app_model, run_id)
 
+        contexts.plugin_tool_providers.set({})
+        contexts.plugin_tool_providers_lock.set(threading.Lock())
+
         if not workflow_run:
             return []