deal db session in celery worker (#17549)

api/tasks/annotation/add_annotation_to_index_task.py

@@ -6,6 +6,7 @@ from celery import shared_task  # type: ignore
 
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.models.document import Document
+from extensions.ext_database import db
 from models.dataset import Dataset
 from services.dataset_service import DatasetCollectionBindingService
 
@@ -55,3 +56,5 @@ def add_annotation_to_index_task(
         )
     except Exception:
         logging.exception("Build index for annotation failed")
+    finally:
+        db.session.close()

api/tasks/annotation/batch_import_annotations_task.py

@@ -88,3 +88,5 @@ def batch_import_annotations_task(job_id: str, content_list: list[dict], app_id:
             indexing_error_msg_key = "app_annotation_batch_import_error_msg_{}".format(str(job_id))
             redis_client.setex(indexing_error_msg_key, 600, str(e))
             logging.exception("Build index for batch import annotations failed")
+        finally:
+            db.session.close()

api/tasks/annotation/delete_annotation_index_task.py

@@ -5,6 +5,7 @@ import click
 from celery import shared_task  # type: ignore
 
 from core.rag.datasource.vdb.vector_factory import Vector
+from extensions.ext_database import db
 from models.dataset import Dataset
 from services.dataset_service import DatasetCollectionBindingService
 
@@ -39,3 +40,5 @@ def delete_annotation_index_task(annotation_id: str, app_id: str, tenant_id: str
         )
     except Exception as e:
         logging.exception("Annotation deleted index failed")
+    finally:
+        db.session.close()

api/tasks/annotation/disable_annotation_reply_task.py

@@ -3,7 +3,6 @@ import time
 
 import click
 from celery import shared_task  # type: ignore
-from werkzeug.exceptions import NotFound
 
 from core.rag.datasource.vdb.vector_factory import Vector
 from extensions.ext_database import db
@@ -23,14 +22,18 @@ def disable_annotation_reply_task(job_id: str, app_id: str, tenant_id: str):
     app = db.session.query(App).filter(App.id == app_id, App.tenant_id == tenant_id, App.status == "normal").first()
     annotations_count = db.session.query(MessageAnnotation).filter(MessageAnnotation.app_id == app_id).count()
     if not app:
-        raise NotFound("App not found")
+        logging.info(click.style("App not found: {}".format(app_id), fg="red"))
+        db.session.close()
+        return
 
     app_annotation_setting = (
         db.session.query(AppAnnotationSetting).filter(AppAnnotationSetting.app_id == app_id).first()
     )
 
     if not app_annotation_setting:
-        raise NotFound("App annotation setting not found")
+        logging.info(click.style("App annotation setting not found: {}".format(app_id), fg="red"))
+        db.session.close()
+        return
 
     disable_app_annotation_key = "disable_app_annotation_{}".format(str(app_id))
     disable_app_annotation_job_key = "disable_app_annotation_job_{}".format(str(job_id))
@@ -66,3 +69,4 @@ def disable_annotation_reply_task(job_id: str, app_id: str, tenant_id: str):
         redis_client.setex(disable_app_annotation_error_key, 600, str(e))
     finally:
         redis_client.delete(disable_app_annotation_key)
+        db.session.close()

api/tasks/annotation/enable_annotation_reply_task.py

@@ -4,7 +4,6 @@ import time
 
 import click
 from celery import shared_task  # type: ignore
-from werkzeug.exceptions import NotFound
 
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.models.document import Document
@@ -34,7 +33,9 @@ def enable_annotation_reply_task(
     app = db.session.query(App).filter(App.id == app_id, App.tenant_id == tenant_id, App.status == "normal").first()
 
     if not app:
-        raise NotFound("App not found")
+        logging.info(click.style("App not found: {}".format(app_id), fg="red"))
+        db.session.close()
+        return
 
     annotations = db.session.query(MessageAnnotation).filter(MessageAnnotation.app_id == app_id).all()
     enable_app_annotation_key = "enable_app_annotation_{}".format(str(app_id))
@@ -121,3 +122,4 @@ def enable_annotation_reply_task(
         db.session.rollback()
     finally:
         redis_client.delete(enable_app_annotation_key)
+        db.session.close()

api/tasks/annotation/update_annotation_to_index_task.py

@@ -6,6 +6,7 @@ from celery import shared_task  # type: ignore
 
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.models.document import Document
+from extensions.ext_database import db
 from models.dataset import Dataset
 from services.dataset_service import DatasetCollectionBindingService
 
@@ -56,3 +57,5 @@ def update_annotation_to_index_task(
         )
     except Exception:
         logging.exception("Build index for annotation failed")
+    finally:
+        db.session.close()