From 03993ed4f7093f46acddafe3b4c4f45e23d1c830 Mon Sep 17 00:00:00 2001 From: hjlarry Date: Fri, 12 Dec 2025 09:26:40 +0800 Subject: [PATCH] rename the get_runs_batch_for_cleanup --- api/repositories/api_workflow_run_repository.py | 4 ++-- api/repositories/sqlalchemy_api_workflow_run_repository.py | 2 +- api/services/clear_free_plan_expired_workflow_run_logs.py | 2 +- .../test_sqlalchemy_api_workflow_run_repository.py | 6 +++--- .../test_clear_free_plan_expired_workflow_run_logs.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/repositories/api_workflow_run_repository.py b/api/repositories/api_workflow_run_repository.py index dea5c781d0..cb9c8921b6 100644 --- a/api/repositories/api_workflow_run_repository.py +++ b/api/repositories/api_workflow_run_repository.py @@ -253,7 +253,7 @@ class APIWorkflowRunRepository(WorkflowExecutionRepository, Protocol): """ ... - def get_runs_batch_for_cleanup( + def get_runs_batch_by_time_range( self, start_after: datetime | None, end_before: datetime, @@ -261,7 +261,7 @@ class APIWorkflowRunRepository(WorkflowExecutionRepository, Protocol): batch_size: int, ) -> Sequence[WorkflowRun]: """ - Fetch a batch of workflow runs within a time window using keyset pagination for cleanup. + Fetch a batch of workflow runs within a time window using keyset pagination. """ ... diff --git a/api/repositories/sqlalchemy_api_workflow_run_repository.py b/api/repositories/sqlalchemy_api_workflow_run_repository.py index 2e462cf3ef..24dd9b5e6b 100644 --- a/api/repositories/sqlalchemy_api_workflow_run_repository.py +++ b/api/repositories/sqlalchemy_api_workflow_run_repository.py @@ -323,7 +323,7 @@ class DifyAPISQLAlchemyWorkflowRunRepository(APIWorkflowRunRepository): logger.info("Total deleted %s workflow runs for app %s", total_deleted, app_id) return total_deleted - def get_runs_batch_for_cleanup( + def get_runs_batch_by_time_range( self, start_after: datetime | None, end_before: datetime, diff --git a/api/services/clear_free_plan_expired_workflow_run_logs.py b/api/services/clear_free_plan_expired_workflow_run_logs.py index 922d0ab43c..6734c0b020 100644 --- a/api/services/clear_free_plan_expired_workflow_run_logs.py +++ b/api/services/clear_free_plan_expired_workflow_run_logs.py @@ -60,7 +60,7 @@ class WorkflowRunCleanup: last_seen: tuple[datetime.datetime, str] | None = None while True: - run_rows = self.repo.get_runs_batch_for_cleanup( + run_rows = self.repo.get_runs_batch_by_time_range( start_after=self.window_start, end_before=self.window_end, last_seen=last_seen, diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py index 9a8edbb1fe..14d197e0ac 100644 --- a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py +++ b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py @@ -105,15 +105,15 @@ class TestDifyAPISQLAlchemyWorkflowRunRepository: return pause -class TestGetRunsBatchForCleanup(TestDifyAPISQLAlchemyWorkflowRunRepository): - def test_get_runs_batch_for_cleanup_filters_terminal_statuses( +class TestGetRunsBatchByTimeRange(TestDifyAPISQLAlchemyWorkflowRunRepository): + def test_get_runs_batch_by_time_range_filters_terminal_statuses( self, repository: DifyAPISQLAlchemyWorkflowRunRepository, mock_session: Mock ): scalar_result = Mock() scalar_result.all.return_value = [] mock_session.scalars.return_value = scalar_result - repository.get_runs_batch_for_cleanup( + repository.get_runs_batch_by_time_range( start_after=None, end_before=datetime(2024, 1, 1), last_seen=None, diff --git a/api/tests/unit_tests/services/test_clear_free_plan_expired_workflow_run_logs.py b/api/tests/unit_tests/services/test_clear_free_plan_expired_workflow_run_logs.py index 44d5988bf2..415bb9b67d 100644 --- a/api/tests/unit_tests/services/test_clear_free_plan_expired_workflow_run_logs.py +++ b/api/tests/unit_tests/services/test_clear_free_plan_expired_workflow_run_logs.py @@ -29,7 +29,7 @@ class FakeRepo: "pause_reasons": 0, } - def get_runs_batch_for_cleanup( + def get_runs_batch_by_time_range( self, start_after: datetime.datetime | None, end_before: datetime.datetime,