chore: Remove unnecessary request context copying in threads

Eliminates the usage of Flask's `copy_current_request_context` decorator
for thread creation across multiple app generators. The change simplifies
thread initialization by directly passing necessary context and parameters
to the worker function. This refactoring reduces complexity and potential
overhead associated with copying request contexts when not required.

Signed-off-by: -LAN- <laipz8200@outlook.com>

api/core/app/apps/advanced_chat/app_generator.py

@@ -5,7 +5,7 @@ import uuid
 from collections.abc import Generator, Mapping
 from typing import Any, Literal, Optional, Union, overload
 
-from flask import Flask, copy_current_request_context, current_app
+from flask import Flask, current_app
 from pydantic import ValidationError
 from sqlalchemy.orm import sessionmaker
 
@@ -400,20 +400,17 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
         # new thread with request context and contextvars
         context = contextvars.copy_context()
 
-        @copy_current_request_context
+        worker_thread = threading.Thread(
-        def worker_with_context():
+            target=self._generate_worker,
-            # Run the worker within the copied context
+            kwargs={
-            return context.run(
+                "flask_app": current_app._get_current_object(),  # type: ignore
-                self._generate_worker,
+                "application_generate_entity": application_generate_entity,
-                flask_app=current_app._get_current_object(),  # type: ignore
+                "queue_manager": queue_manager,
-                application_generate_entity=application_generate_entity,
+                "conversation_id": conversation.id,
-                queue_manager=queue_manager,
+                "message_id": message.id,
-                conversation_id=conversation.id,
+                "context": context,
-                message_id=message.id,
+            },
-                context=context,
+        )
-            )
-
-        worker_thread = threading.Thread(target=worker_with_context)
 
         worker_thread.start()
 

api/core/app/apps/agent_chat/app_generator.py

@@ -5,7 +5,7 @@ import uuid
 from collections.abc import Generator, Mapping
 from typing import Any, Literal, Union, overload
 
-from flask import Flask, copy_current_request_context, current_app
+from flask import Flask, current_app
 from pydantic import ValidationError
 
 from configs import dify_config
@@ -183,20 +183,17 @@ class AgentChatAppGenerator(MessageBasedAppGenerator):
         # new thread with request context and contextvars
         context = contextvars.copy_context()
 
-        @copy_current_request_context
+        worker_thread = threading.Thread(
-        def worker_with_context():
+            target=self._generate_worker,
-            # Run the worker within the copied context
+            kwargs={
-            return context.run(
+                "flask_app": current_app._get_current_object(),  # type: ignore
-                self._generate_worker,
+                "context": context,
-                flask_app=current_app._get_current_object(),  # type: ignore
+                "application_generate_entity": application_generate_entity,
-                context=context,
+                "queue_manager": queue_manager,
-                application_generate_entity=application_generate_entity,
+                "conversation_id": conversation.id,
-                queue_manager=queue_manager,
+                "message_id": message.id,
-                conversation_id=conversation.id,
+            },
-                message_id=message.id,
+        )
-            )
-
-        worker_thread = threading.Thread(target=worker_with_context)
 
         worker_thread.start()
 

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

@@ -5,7 +5,7 @@ import uuid
 from collections.abc import Generator, Mapping, Sequence
 from typing import Any, Literal, Optional, Union, overload
 
-from flask import Flask, copy_current_request_context, current_app
+from flask import Flask, current_app
 from pydantic import ValidationError
 from sqlalchemy.orm import sessionmaker
 
@@ -210,19 +210,16 @@ class WorkflowAppGenerator(BaseAppGenerator):
         # new thread with request context and contextvars
         context = contextvars.copy_context()
 
-        @copy_current_request_context
+        worker_thread = threading.Thread(
-        def worker_with_context():
+            target=self._generate_worker,
-            # Run the worker within the copied context
+            kwargs={
-            return context.run(
+                "flask_app": current_app._get_current_object(),  # type: ignore
-                self._generate_worker,
+                "application_generate_entity": application_generate_entity,
-                flask_app=current_app._get_current_object(),  # type: ignore
+                "queue_manager": queue_manager,
-                application_generate_entity=application_generate_entity,
+                "context": context,
-                queue_manager=queue_manager,
+                "workflow_thread_pool_id": workflow_thread_pool_id,
-                context=context,
+            },
-                workflow_thread_pool_id=workflow_thread_pool_id,
+        )
-            )
-
-        worker_thread = threading.Thread(target=worker_with_context)
 
         worker_thread.start()