Merge fe29a6585e into a246dc8b17

api/controllers/service_api/wraps.py

@@ -270,7 +270,6 @@ def cloud_edition_billing_rate_limit_check[**P, R](
                             operation="knowledge",
                         )
                         db.session.add(rate_limit_log)
-                        db.session.commit()
                         raise Forbidden(
                             "Sorry, you have reached the knowledge base request rate limit of your subscription."
                         )

api/core/helper/code_executor/code_executor.py

@@ -74,12 +74,19 @@ class CodeExecutor:
         :param code: code
         :return:
         """
+        running_language = cls.code_language_to_running_language.get(language)
+        if not running_language:
+            raise CodeExecutionError(
+                f"Unsupported code language: {language}. "
+                f"Supported languages: {', '.join(lang.value for lang in cls.code_language_to_running_language)}"
+            )
+
         url = code_execution_endpoint_url / "v1" / "sandbox" / "run"
 
         headers = {"X-Api-Key": dify_config.CODE_EXECUTION_API_KEY}
 
         data = {
-            "language": cls.code_language_to_running_language.get(language),
+            "language": running_language,
             "code": code,
             "preload": preload,
             "enable_network": True,

api/core/rag/retrieval/dataset_retrieval.py

@@ -1030,6 +1030,12 @@ class DatasetRetrieval:
     ):
         """
         Persist dataset query audit rows for retrieval requests.
+
+        Stages audit rows on the current scoped session without committing.
+        The caller (or Flask request teardown) is responsible for the final
+        commit so that the audit rows participate in the same transaction as
+        the surrounding retrieval workflow.  This prevents partial commits
+        when a downstream step fails after the query log is written.
         """
         if not query and not attachment_ids:
             return
@@ -1059,9 +1065,8 @@ class DatasetRetrieval:
                     created_by=created_by,
                 )
                 dataset_queries.append(dataset_query)
-            if dataset_queries:
-                db.session.add_all(dataset_queries)
-        db.session.commit()
+        if dataset_queries:
+            db.session.add_all(dataset_queries)
 
     def _retriever(
         self,

api/core/tools/tool_engine.py

@@ -338,9 +338,17 @@ class ToolEngine:
         user_id: str,
     ) -> list[str]:
         """
-        Create message file
+        Create message file records for binary tool outputs.
 
-        :return: message file ids
+        Stages ``MessageFile`` rows on the current scoped session and flushes
+        to obtain generated IDs, but does **not** commit or close the session.
+        The caller (or Flask request teardown) is responsible for the final
+        commit so that the file records participate in the same transaction as
+        the surrounding agent workflow.  This prevents:
+
+        * Partial commits when a downstream step fails after files are written.
+        * ``DetachedInstanceError`` on lazy-loaded ORM properties caused by an
+          early ``db.session.close()``.
         """
         result = []
 
@@ -374,11 +382,8 @@ class ToolEngine:
             )
 
             db.session.add(message_file)
-            db.session.commit()
-            db.session.refresh(message_file)
+            db.session.flush()
 
-            result.append(message_file.id)
-
-        db.session.close()
+            result.append(str(message_file.id))
 
         return result