|  | @@ -33,9 +33,9 @@ from models.web import PinnedConversation, SavedMessage
 | 
	
		
			
				|  |  |  from models.workflow import ConversationVariable, Workflow, WorkflowAppLog, WorkflowNodeExecution, WorkflowRun
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -@shared_task(queue='app_deletion', bind=True, max_retries=3)
 | 
	
		
			
				|  |  | +@shared_task(queue="app_deletion", bind=True, max_retries=3)
 | 
	
		
			
				|  |  |  def remove_app_and_related_data_task(self, tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  | -    logging.info(click.style(f'Start deleting app and related data: {tenant_id}:{app_id}', fg='green'))
 | 
	
		
			
				|  |  | +    logging.info(click.style(f"Start deleting app and related data: {tenant_id}:{app_id}", fg="green"))
 | 
	
		
			
				|  |  |      start_at = time.perf_counter()
 | 
	
		
			
				|  |  |      try:
 | 
	
		
			
				|  |  |          # Delete related data
 | 
	
	
		
			
				|  | @@ -59,13 +59,14 @@ def remove_app_and_related_data_task(self, tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          _delete_conversation_variables(app_id=app_id)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          end_at = time.perf_counter()
 | 
	
		
			
				|  |  | -        logging.info(click.style(f'App and related data deleted: {app_id} latency: {end_at - start_at}', fg='green'))
 | 
	
		
			
				|  |  | +        logging.info(click.style(f"App and related data deleted: {app_id} latency: {end_at - start_at}", fg="green"))
 | 
	
		
			
				|  |  |      except SQLAlchemyError as e:
 | 
	
		
			
				|  |  |          logging.exception(
 | 
	
		
			
				|  |  | -            click.style(f"Database error occurred while deleting app {app_id} and related data", fg='red'))
 | 
	
		
			
				|  |  | +            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:
 | 
	
		
			
				|  |  | -        logging.exception(click.style(f"Error occurred while deleting app {app_id} and related data", fg='red'))
 | 
	
		
			
				|  |  | +        logging.exception(click.style(f"Error occurred while deleting app {app_id} and related data", fg="red"))
 | 
	
		
			
				|  |  |          raise self.retry(exc=e, countdown=60)  # Retry after 60 seconds
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -77,7 +78,7 @@ def _delete_app_model_configs(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from app_model_configs where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_model_config,
 | 
	
		
			
				|  |  | -        "app model config"
 | 
	
		
			
				|  |  | +        "app model config",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -85,12 +86,7 @@ def _delete_app_site(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_site(site_id: str):
 | 
	
		
			
				|  |  |          db.session.query(Site).filter(Site.id == site_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    _delete_records(
 | 
	
		
			
				|  |  | -        """select id from sites where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  | -        {"app_id": app_id},
 | 
	
		
			
				|  |  | -        del_site,
 | 
	
		
			
				|  |  | -        "site"
 | 
	
		
			
				|  |  | -    )
 | 
	
		
			
				|  |  | +    _delete_records("""select id from sites where app_id=:app_id limit 1000""", {"app_id": app_id}, del_site, "site")
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_app_api_tokens(tenant_id: str, app_id: str):
 | 
	
	
		
			
				|  | @@ -98,10 +94,7 @@ def _delete_app_api_tokens(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          db.session.query(ApiToken).filter(ApiToken.id == api_token_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  | -        """select id from api_tokens where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  | -        {"app_id": app_id},
 | 
	
		
			
				|  |  | -        del_api_token,
 | 
	
		
			
				|  |  | -        "api token"
 | 
	
		
			
				|  |  | +        """select id from api_tokens where app_id=:app_id limit 1000""", {"app_id": app_id}, del_api_token, "api token"
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -113,44 +106,47 @@ def _delete_installed_apps(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from installed_apps where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_installed_app,
 | 
	
		
			
				|  |  | -        "installed app"
 | 
	
		
			
				|  |  | +        "installed app",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_recommended_apps(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_recommended_app(recommended_app_id: str):
 | 
	
		
			
				|  |  |          db.session.query(RecommendedApp).filter(RecommendedApp.id == recommended_app_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from recommended_apps where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_recommended_app,
 | 
	
		
			
				|  |  | -        "recommended app"
 | 
	
		
			
				|  |  | +        "recommended app",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_app_annotation_data(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_annotation_hit_history(annotation_hit_history_id: str):
 | 
	
		
			
				|  |  |          db.session.query(AppAnnotationHitHistory).filter(
 | 
	
		
			
				|  |  | -            AppAnnotationHitHistory.id == annotation_hit_history_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  | +            AppAnnotationHitHistory.id == annotation_hit_history_id
 | 
	
		
			
				|  |  | +        ).delete(synchronize_session=False)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from app_annotation_hit_histories where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_annotation_hit_history,
 | 
	
		
			
				|  |  | -        "annotation hit history"
 | 
	
		
			
				|  |  | +        "annotation hit history",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      def del_annotation_setting(annotation_setting_id: str):
 | 
	
		
			
				|  |  |          db.session.query(AppAnnotationSetting).filter(AppAnnotationSetting.id == annotation_setting_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from app_annotation_settings where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_annotation_setting,
 | 
	
		
			
				|  |  | -        "annotation setting"
 | 
	
		
			
				|  |  | +        "annotation setting",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -162,7 +158,7 @@ def _delete_app_dataset_joins(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from app_dataset_joins where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_dataset_join,
 | 
	
		
			
				|  |  | -        "dataset join"
 | 
	
		
			
				|  |  | +        "dataset join",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -174,7 +170,7 @@ def _delete_app_workflows(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from workflows where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_workflow,
 | 
	
		
			
				|  |  | -        "workflow"
 | 
	
		
			
				|  |  | +        "workflow",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -186,89 +182,93 @@ def _delete_app_workflow_runs(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from workflow_runs where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_workflow_run,
 | 
	
		
			
				|  |  | -        "workflow run"
 | 
	
		
			
				|  |  | +        "workflow run",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_app_workflow_node_executions(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_workflow_node_execution(workflow_node_execution_id: str):
 | 
	
		
			
				|  |  | -        db.session.query(WorkflowNodeExecution).filter(
 | 
	
		
			
				|  |  | -            WorkflowNodeExecution.id == workflow_node_execution_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  | +        db.session.query(WorkflowNodeExecution).filter(WorkflowNodeExecution.id == workflow_node_execution_id).delete(
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from workflow_node_executions where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_workflow_node_execution,
 | 
	
		
			
				|  |  | -        "workflow node execution"
 | 
	
		
			
				|  |  | +        "workflow node execution",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_app_workflow_app_logs(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_workflow_app_log(workflow_app_log_id: str):
 | 
	
		
			
				|  |  | -        db.session.query(WorkflowAppLog).filter(WorkflowAppLog.id == workflow_app_log_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  | +        db.session.query(WorkflowAppLog).filter(WorkflowAppLog.id == workflow_app_log_id).delete(
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from workflow_app_logs where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_workflow_app_log,
 | 
	
		
			
				|  |  | -        "workflow app log"
 | 
	
		
			
				|  |  | +        "workflow app log",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_app_conversations(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_conversation(conversation_id: str):
 | 
	
		
			
				|  |  |          db.session.query(PinnedConversation).filter(PinnedConversation.conversation_id == conversation_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |          db.session.query(Conversation).filter(Conversation.id == conversation_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from conversations where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_conversation,
 | 
	
		
			
				|  |  | -        "conversation"
 | 
	
		
			
				|  |  | +        "conversation",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  def _delete_conversation_variables(*, app_id: str):
 | 
	
		
			
				|  |  |      stmt = delete(ConversationVariable).where(ConversationVariable.app_id == app_id)
 | 
	
		
			
				|  |  |      with db.engine.connect() as conn:
 | 
	
		
			
				|  |  |          conn.execute(stmt)
 | 
	
		
			
				|  |  |          conn.commit()
 | 
	
		
			
				|  |  | -        logging.info(click.style(f"Deleted conversation variables for app {app_id}", fg='green'))
 | 
	
		
			
				|  |  | +        logging.info(click.style(f"Deleted conversation variables for app {app_id}", fg="green"))
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_app_messages(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_message(message_id: str):
 | 
	
		
			
				|  |  |          db.session.query(MessageFeedback).filter(MessageFeedback.message_id == message_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |          db.session.query(MessageAnnotation).filter(MessageAnnotation.message_id == message_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | -        db.session.query(MessageChain).filter(MessageChain.message_id == message_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  | +        db.session.query(MessageChain).filter(MessageChain.message_id == message_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  |          db.session.query(MessageAgentThought).filter(MessageAgentThought.message_id == message_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |          db.session.query(MessageFile).filter(MessageFile.message_id == message_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  | -        db.session.query(SavedMessage).filter(SavedMessage.message_id == message_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +        db.session.query(SavedMessage).filter(SavedMessage.message_id == message_id).delete(synchronize_session=False)
 | 
	
		
			
				|  |  |          db.session.query(Message).filter(Message.id == message_id).delete()
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  | -        """select id from messages where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  | -        {"app_id": app_id},
 | 
	
		
			
				|  |  | -        del_message,
 | 
	
		
			
				|  |  | -        "message"
 | 
	
		
			
				|  |  | +        """select id from messages where app_id=:app_id limit 1000""", {"app_id": app_id}, del_message, "message"
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_workflow_tool_providers(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_tool_provider(tool_provider_id: str):
 | 
	
		
			
				|  |  |          db.session.query(WorkflowToolProvider).filter(WorkflowToolProvider.id == tool_provider_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from tool_workflow_providers where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_tool_provider,
 | 
	
		
			
				|  |  | -        "tool workflow provider"
 | 
	
		
			
				|  |  | +        "tool workflow provider",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -280,7 +280,7 @@ def _delete_app_tag_bindings(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from tag_bindings where tenant_id=:tenant_id and target_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_tag_binding,
 | 
	
		
			
				|  |  | -        "tag binding"
 | 
	
		
			
				|  |  | +        "tag binding",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -292,20 +292,21 @@ def _delete_end_users(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |          """select id from end_users where tenant_id=:tenant_id and app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"tenant_id": tenant_id, "app_id": app_id},
 | 
	
		
			
				|  |  |          del_end_user,
 | 
	
		
			
				|  |  | -        "end user"
 | 
	
		
			
				|  |  | +        "end user",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _delete_trace_app_configs(tenant_id: str, app_id: str):
 | 
	
		
			
				|  |  |      def del_trace_app_config(trace_app_config_id: str):
 | 
	
		
			
				|  |  |          db.session.query(TraceAppConfig).filter(TraceAppConfig.id == trace_app_config_id).delete(
 | 
	
		
			
				|  |  | -            synchronize_session=False)
 | 
	
		
			
				|  |  | +            synchronize_session=False
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      _delete_records(
 | 
	
		
			
				|  |  |          """select id from trace_app_config where app_id=:app_id limit 1000""",
 | 
	
		
			
				|  |  |          {"app_id": app_id},
 | 
	
		
			
				|  |  |          del_trace_app_config,
 | 
	
		
			
				|  |  | -        "trace app config"
 | 
	
		
			
				|  |  | +        "trace app config",
 | 
	
		
			
				|  |  |      )
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -321,7 +322,7 @@ def _delete_records(query_sql: str, params: dict, delete_func: Callable, name: s
 | 
	
		
			
				|  |  |                  try:
 | 
	
		
			
				|  |  |                      delete_func(record_id)
 | 
	
		
			
				|  |  |                      db.session.commit()
 | 
	
		
			
				|  |  | -                    logging.info(click.style(f"Deleted {name} {record_id}", fg='green'))
 | 
	
		
			
				|  |  | +                    logging.info(click.style(f"Deleted {name} {record_id}", fg="green"))
 | 
	
		
			
				|  |  |                  except Exception:
 | 
	
		
			
				|  |  |                      logging.exception(f"Error occurred while deleting {name} {record_id}")
 | 
	
		
			
				|  |  |                      continue
 |