sync delete app table record when delete app (#5819)

api/services/app_service.py

@@ -394,6 +394,8 @@ class AppService:
         Delete app
         :param app: App instance
         """
+        db.session.delete(app)
+        db.session.commit()
         # Trigger asynchronous deletion of app and related data
         remove_app_and_related_data_task.delay(app.id)
 

api/tasks/remove_app_and_related_data_task.py

@@ -10,7 +10,6 @@ from extensions.ext_database import db
 from models.dataset import AppDatasetJoin
 from models.model import (
     ApiToken,
-    App,
     AppAnnotationHitHistory,
     AppAnnotationSetting,
     AppModelConfig,
@@ -36,17 +35,9 @@ from models.workflow import Workflow, WorkflowAppLog, WorkflowNodeExecution, Wor
 def remove_app_and_related_data_task(self, app_id: str):
     logging.info(click.style(f'Start deleting app and related data: {app_id}', fg='green'))
     start_at = time.perf_counter()
-
-    deletion_cache_key = f'app_{app_id}_deletion'
-
     try:
         # Use a transaction to ensure all deletions succeed or none do
         with db.session.begin_nested():
-            app = db.session.query(App).filter(App.id == app_id).first()
-            if not app:
-                logging.warning(click.style(f"App {app_id} not found", fg='yellow'))
-                return
-
             # Delete related data
             _delete_app_model_configs(app_id)
             _delete_app_site(app_id)
@@ -62,10 +53,6 @@ def remove_app_and_related_data_task(self, app_id: str):
             _delete_app_tag_bindings(app_id)
             _delete_end_users(app_id)
 
-            # Delete the app itself
-            db.session.delete(app)
-
-
         # If we reach here, the transaction was successful
         db.session.commit()
 
@@ -74,7 +61,8 @@ def remove_app_and_related_data_task(self, app_id: str):
 
     except SQLAlchemyError as e:
         db.session.rollback()
-        logging.exception(click.style(f"Database error occurred while deleting app {app_id} and related data", fg='red'))
+        logging.exception(
+            click.style(f"Database error occurred while deleting app {app_id} and related data", fg='red'))
         raise self.retry(exc=e, countdown=60)  # Retry after 60 seconds
 
     except Exception as e:
@@ -85,25 +73,32 @@ def remove_app_and_related_data_task(self, app_id: str):
 def _delete_app_model_configs(app_id: str):
     db.session.query(AppModelConfig).filter(AppModelConfig.app_id == app_id).delete()
 
+
 def _delete_app_site(app_id: str):
     db.session.query(Site).filter(Site.app_id == app_id).delete()
 
+
 def _delete_app_api_tokens(app_id: str):
     db.session.query(ApiToken).filter(ApiToken.app_id == app_id).delete()
 
+
 def _delete_installed_apps(app_id: str):
     db.session.query(InstalledApp).filter(InstalledApp.app_id == app_id).delete()
 
+
 def _delete_recommended_apps(app_id: str):
     db.session.query(RecommendedApp).filter(RecommendedApp.app_id == app_id).delete()
 
+
 def _delete_app_annotation_data(app_id: str):
     db.session.query(AppAnnotationHitHistory).filter(AppAnnotationHitHistory.app_id == app_id).delete()
     db.session.query(AppAnnotationSetting).filter(AppAnnotationSetting.app_id == app_id).delete()
 
+
 def _delete_app_dataset_joins(app_id: str):
     db.session.query(AppDatasetJoin).filter(AppDatasetJoin.app_id == app_id).delete()
 
+
 def _delete_app_workflows(app_id: str):
     db.session.query(WorkflowRun).filter(
         WorkflowRun.workflow_id.in_(
@@ -118,6 +113,7 @@ def _delete_app_workflows(app_id: str):
     db.session.query(WorkflowAppLog).filter(WorkflowAppLog.app_id == app_id).delete(synchronize_session=False)
     db.session.query(Workflow).filter(Workflow.app_id == app_id).delete(synchronize_session=False)
 
+
 def _delete_app_conversations(app_id: str):
     db.session.query(PinnedConversation).filter(
         PinnedConversation.conversation_id.in_(
@@ -126,25 +122,32 @@ def _delete_app_conversations(app_id: str):
     ).delete(synchronize_session=False)
     db.session.query(Conversation).filter(Conversation.app_id == app_id).delete()
 
+
 def _delete_app_messages(app_id: str):
     message_ids = select(Message.id).filter(Message.app_id == app_id).scalar_subquery()
-    db.session.query(MessageFeedback).filter(MessageFeedback.message_id.in_(message_ids)).delete(synchronize_session=False)
-    db.session.query(MessageAnnotation).filter(MessageAnnotation.message_id.in_(message_ids)).delete(synchronize_session=False)
+    db.session.query(MessageFeedback).filter(MessageFeedback.message_id.in_(message_ids)).delete(
+        synchronize_session=False)
+    db.session.query(MessageAnnotation).filter(MessageAnnotation.message_id.in_(message_ids)).delete(
+        synchronize_session=False)
     db.session.query(MessageChain).filter(MessageChain.message_id.in_(message_ids)).delete(synchronize_session=False)
-    db.session.query(MessageAgentThought).filter(MessageAgentThought.message_id.in_(message_ids)).delete(synchronize_session=False)
+    db.session.query(MessageAgentThought).filter(MessageAgentThought.message_id.in_(message_ids)).delete(
+        synchronize_session=False)
     db.session.query(MessageFile).filter(MessageFile.message_id.in_(message_ids)).delete(synchronize_session=False)
     db.session.query(SavedMessage).filter(SavedMessage.message_id.in_(message_ids)).delete(synchronize_session=False)
     db.session.query(Message).filter(Message.app_id == app_id).delete(synchronize_session=False)
 
+
 def _delete_workflow_tool_providers(app_id: str):
     db.session.query(WorkflowToolProvider).filter(
         WorkflowToolProvider.app_id == app_id
-        ).delete(synchronize_session=False)
+    ).delete(synchronize_session=False)
+
 
 def _delete_app_tag_bindings(app_id: str):
     db.session.query(TagBinding).filter(
         TagBinding.target_id == app_id
     ).delete(synchronize_session=False)
-    
+
+
 def _delete_end_users(app_id: str):
     db.session.query(EndUser).filter(EndUser.app_id == app_id).delete()