Also remove duplicated redis config, etc

Swatinem · Swatinem · commit 61ed1a2c8d3c · 2025-04-02T12:37:46.000+02:00
diff --git a/celery_config.py b/celery_config.py
@@ -16,11 +16,11 @@
 )
 from shared.config import get_config
 from shared.helpers.cache import RedisBackend, cache
+from shared.helpers.redis import get_redis_connection
 
 from celery_task_router import route_task
 from helpers.clock import get_utc_now_as_iso_format
 from helpers.health_check import get_health_check_interval_seconds
-from services.redis import get_redis_connection
 
 log = logging.getLogger(__name__)
 
diff --git a/conftest.py b/conftest.py
@@ -270,7 +270,7 @@ def codecov_vcr(request):
 
 @pytest.fixture
 def mock_redis(mocker):
-    m = mocker.patch("services.redis._get_redis_instance_from_url")
+    m = mocker.patch("shared.helpers.redis._get_redis_instance_from_url")
     redis_server = mocker.MagicMock()
     m.return_value = redis_server
     yield redis_server
diff --git a/pyproject.toml b/pyproject.toml
@@ -83,4 +83,4 @@ dev-dependencies = [
 [tool.uv.sources]
 timestring = { git = "https://github.com/codecov/timestring", rev = "d37ceacc5954dff3b5bd2f887936a98a668dda42" }
 test-results-parser = { git = "https://github.com/codecov/test-results-parser", rev = "190bbc8a911099749928e13d5fe57f6027ca1e74" }
-shared = { git = "https://github.com/codecov/shared", rev = "470269642d3d843c969dbb07edc38d6b541f2628" }
+shared = { git = "https://github.com/codecov/shared", rev = "53e82da98ca4d0b9dd607483c29d3ed03fa9cce4" }
diff --git a/services/github.py b/services/github.py
@@ -4,16 +4,14 @@
 from redis import RedisError
 from shared.github import InvalidInstallationError
 from shared.github import get_github_integration_token as _get_github_integration_token
-from shared.helpers.cache import cache
+from shared.helpers.redis import get_redis_connection
 
 from database.models.core import Commit
 from helpers.exceptions import RepositoryWithoutValidBotError
-from services.redis import get_redis_connection
 
 log = logging.getLogger(__name__)
 
 
-@cache.cache_function(ttl=480)
 def get_github_integration_token(
     service: str,
     installation_id: int = None,
diff --git a/services/lock_manager.py b/services/lock_manager.py
@@ -6,9 +6,9 @@
 
 from redis import Redis
 from redis.exceptions import LockError
+from shared.helpers.redis import get_redis_connection
 
 from database.enums import ReportType
-from services.redis import get_redis_connection
 
 log = logging.getLogger(__name__)
 
diff --git a/services/processing/intermediate.py b/services/processing/intermediate.py
@@ -1,10 +1,9 @@
 import orjson
 import sentry_sdk
 import zstandard
+from shared.helpers.redis import get_redis_connection
 from shared.reports.resources import Report
 
-from services.redis import get_redis_connection
-
 from .metrics import INTERMEDIATE_REPORT_SIZE
 from .types import IntermediateReport
 
diff --git a/services/processing/state.py b/services/processing/state.py
@@ -23,10 +23,9 @@
 
 from dataclasses import dataclass
 
+from shared.helpers.redis import get_redis_connection
 from shared.metrics import Counter
 
-from services.redis import get_redis_connection
-
 MERGE_BATCH_SIZE = 10
 
 CLEARED_UPLOADS = Counter(
diff --git a/services/redis.py b/services/redis.py
diff --git a/services/test_analytics/ta_process_flakes.py b/services/test_analytics/ta_process_flakes.py
@@ -7,8 +7,8 @@
 from shared.django_apps.reports.models import CommitReport, ReportSession
 from shared.django_apps.ta_timeseries.models import Testrun
 from shared.django_apps.test_analytics.models import Flake
+from shared.helpers.redis import get_redis_connection
 
-from services.redis import get_redis_connection
 from services.test_analytics.ta_metrics import process_flakes_summary
 
 log = logging.getLogger(__name__)
diff --git a/services/test_analytics/tests/test_ta_process_flakes.py b/services/test_analytics/tests/test_ta_process_flakes.py
@@ -6,8 +6,8 @@
 from shared.django_apps.reports.tests.factories import CommitReportFactory
 from shared.django_apps.ta_timeseries.models import Testrun
 from shared.django_apps.test_analytics.models import Flake
+from shared.helpers.redis import get_redis_connection
 
-from services.redis import get_redis_connection
 from services.test_analytics.ta_process_flakes import KEY_NAME, process_flakes_for_repo
 
 
diff --git a/services/tests/test_redis.py b/services/tests/test_redis.py
@@ -1,8 +1,8 @@
-from services.redis import get_redis_connection
+from shared.helpers.redis import get_redis_connection
 
 
 def test_get_redis_connection(mocker):
-    mocked = mocker.patch("services.redis.Redis.from_url")
+    mocked = mocker.patch("shared.helpers.redis.Redis.from_url")
     res = get_redis_connection()
     assert res is not None
     mocked.assert_called_with("redis://redis:6379")
diff --git a/tasks/cache_test_rollups.py b/tasks/cache_test_rollups.py
@@ -8,10 +8,10 @@
 from shared.celery_config import cache_test_rollups_task_name
 from shared.config import get_config
 from shared.django_apps.reports.models import LastCacheRollupDate
+from shared.helpers.redis import get_redis_connection
 
 from app import celery_app
 from django_scaffold import settings
-from services.redis import get_redis_connection
 from services.test_analytics.ta_cache_rollups import cache_rollups
 from services.test_analytics.ta_metrics import (
     read_rollups_from_db_summary,
diff --git a/tasks/cache_test_rollups_redis.py b/tasks/cache_test_rollups_redis.py
@@ -3,11 +3,11 @@
 import shared.storage
 from redis.exceptions import LockError
 from shared.celery_config import cache_test_rollups_redis_task_name
+from shared.helpers.redis import get_redis_connection
 from shared.storage.exceptions import FileNotInStorageError
 
 from app import celery_app
 from django_scaffold import settings
-from services.redis import get_redis_connection
 from tasks.base import BaseCodecovTask
 
 
diff --git a/tasks/crontasks.py b/tasks/crontasks.py
@@ -2,8 +2,8 @@
 from datetime import datetime, timedelta, timezone
 
 from redis.exceptions import LockError
+from shared.helpers.redis import get_redis_connection
 
-from services.redis import get_redis_connection
 from tasks.base import BaseCodecovTask
 
 log = logging.getLogger(__name__)
diff --git a/tasks/health_check.py b/tasks/health_check.py
@@ -1,10 +1,10 @@
 import logging
 from typing import Set
 
+import shared.helpers.redis as redis_service
 from shared.celery_config import health_check_task_name
 from shared.config import get_config
 
-import services.redis as redis_service
 from app import celery_app
 from helpers.metrics import metrics
 from tasks.crontasks import CodecovCronTask
diff --git a/tasks/manual_trigger.py b/tasks/manual_trigger.py
@@ -8,14 +8,14 @@
     notify_task_name,
     pulls_task_name,
 )
+from shared.helpers.redis import get_redis_connection
 from shared.reports.enums import UploadState
 
 from app import celery_app
 from database.enums import ReportType
 from database.models import Commit, Pull
 from database.models.reports import CommitReport, Upload
 from services.comparison import get_or_create_comparison
-from services.redis import get_redis_connection
 from tasks.base import BaseCodecovTask
 
 log = logging.getLogger(__name__)
diff --git a/tasks/notify.py b/tasks/notify.py
@@ -16,6 +16,7 @@
 )
 from shared.config import get_config
 from shared.django_apps.codecov_auth.models import Service
+from shared.helpers.redis import Redis, get_redis_connection
 from shared.reports.readonly import ReadOnlyReport
 from shared.torngit.base import TokenType, TorngitBaseAdapter
 from shared.torngit.exceptions import TorngitClientError, TorngitServerFailureError
@@ -53,7 +54,6 @@
 from services.github import get_github_app_for_commit, set_github_app_for_commit
 from services.lock_manager import LockManager, LockRetry, LockType
 from services.notification import NotificationService
-from services.redis import Redis, get_redis_connection
 from services.report import ReportService
 from services.repository import (
     EnrichedPull,
diff --git a/tasks/preprocess_upload.py b/tasks/preprocess_upload.py
@@ -2,6 +2,7 @@
 from typing import Optional
 
 from redis.exceptions import LockError
+from shared.helpers.redis import get_redis_connection
 from shared.torngit.base import TorngitBaseAdapter
 
 from app import celery_app
@@ -10,7 +11,6 @@
 from helpers.exceptions import RepositoryWithoutValidBotError
 from helpers.github_installation import get_installation_name_for_owner_for_task
 from helpers.save_commit_error import save_commit_error
-from services.redis import get_redis_connection
 from services.report import ReportService
 from services.repository import (
     fetch_commit_yaml_and_possibly_store,
diff --git a/tasks/process_flakes.py b/tasks/process_flakes.py
@@ -4,11 +4,11 @@
 from redis import Redis
 from redis.exceptions import LockError
 from shared.celery_config import process_flakes_task_name
+from shared.helpers.redis import get_redis_connection
 from sqlalchemy.orm import Session
 
 from app import celery_app
 from services.processing.flake_processing import process_flake_for_repo_commit
-from services.redis import get_redis_connection
 from services.test_analytics.ta_process_flakes import process_flakes_for_repo
 from tasks.base import BaseCodecovTask
 
diff --git a/tasks/status_set_pending.py b/tasks/status_set_pending.py
@@ -2,13 +2,13 @@
 
 from asgiref.sync import async_to_sync
 from shared.celery_config import status_set_pending_task_name
+from shared.helpers.redis import get_redis_connection
 from shared.helpers.yaml import default_if_true
 from shared.utils.match import match
 from shared.utils.urls import make_url
 
 from app import celery_app
 from database.models import Commit
-from services.redis import get_redis_connection
 from services.repository import get_repo_provider_service
 from services.yaml import get_current_yaml
 from services.yaml.reader import read_yaml_field
diff --git a/tasks/sync_pull.py b/tasks/sync_pull.py
@@ -10,6 +10,7 @@
 from asgiref.sync import async_to_sync
 from redis.exceptions import LockError
 from shared.celery_config import notify_task_name, pulls_task_name
+from shared.helpers.redis import get_redis_connection
 from shared.metrics import Counter, inc_counter
 from shared.reports.types import Change
 from shared.torngit.exceptions import TorngitClientError
@@ -23,7 +24,6 @@
 from helpers.metrics import metrics
 from rollouts import SYNC_PULL_USE_MERGE_COMMIT_SHA
 from services.comparison.changes import get_changes
-from services.redis import get_redis_connection
 from services.report import Report, ReportService
 from services.repository import (
     EnrichedPull,
diff --git a/tasks/sync_repos.py b/tasks/sync_repos.py
@@ -11,6 +11,7 @@
     sync_repos_task_name,
 )
 from shared.config import get_config
+from shared.helpers.redis import get_redis_connection
 from shared.torngit.base import TorngitBaseAdapter
 from shared.torngit.exceptions import TorngitClientError, TorngitServerFailureError
 from sqlalchemy import and_
@@ -19,7 +20,6 @@
 from app import celery_app
 from database.models import Owner, Repository
 from services.owner import get_owner_provider_service
-from services.redis import get_redis_connection
 from tasks.base import BaseCodecovTask
 
 log = logging.getLogger(__name__)
diff --git a/tasks/test_results_finisher.py b/tasks/test_results_finisher.py
@@ -2,6 +2,7 @@
 from typing import Any, Literal
 
 from asgiref.sync import async_to_sync
+from shared.helpers.redis import get_redis_connection
 from shared.reports.types import UploadType
 from shared.typings.torngit import AdditionalData
 from shared.yaml import UserYaml
@@ -15,7 +16,6 @@
 from helpers.string import EscapeEnum, Replacement, StringEscaper, shorten_file_paths
 from services.activation import activate_user, schedule_new_user_activated_task
 from services.lock_manager import LockManager, LockRetry, LockType
-from services.redis import get_redis_connection
 from services.repository import (
     fetch_and_update_pull_request_information_from_commit,
     get_repo_provider_service,
diff --git a/tasks/tests/integration/test_upload_e2e.py b/tasks/tests/integration/test_upload_e2e.py
@@ -6,6 +6,7 @@
 
 import pytest
 from redis import Redis
+from shared.helpers.redis import get_redis_connection
 from shared.reports.resources import Report, ReportFile
 from shared.reports.types import ReportLine
 from shared.utils.sessions import SessionType
@@ -17,7 +18,6 @@
 from database.tests.factories import CommitFactory, RepositoryFactory
 from database.tests.factories.core import PullFactory
 from services.archive import ArchiveService
-from services.redis import get_redis_connection
 from services.report import ReportService
 from tasks.tests.utils import hook_repo_provider, hook_session, run_tasks
 from tasks.upload import upload_task
diff --git a/tasks/tests/unit/test_cache_test_rollups_redis.py b/tasks/tests/unit/test_cache_test_rollups_redis.py
@@ -1,9 +1,9 @@
 import polars as pl
 import shared.storage
 from shared.django_apps.core.tests.factories import RepositoryFactory
+from shared.helpers.redis import get_redis_connection
 from shared.storage.exceptions import BucketAlreadyExistsError
 
-from services.redis import get_redis_connection
 from tasks.cache_test_rollups_redis import CacheTestRollupsRedisTask
 
 
diff --git a/tasks/tests/unit/test_process_flakes.py b/tasks/tests/unit/test_process_flakes.py
@@ -18,14 +18,14 @@
     TestInstanceFactory,
     UploadFactory,
 )
+from shared.helpers.redis import get_redis_connection
 
 from services.processing.flake_processing import (
     create_flake,
     fetch_curr_flakes,
     get_test_instances,
     update_flake,
 )
-from services.redis import get_redis_connection
 from tasks.process_flakes import (
     NEW_KEY,
     OLD_KEY,
diff --git a/tasks/tests/unit/test_upload_task.py b/tasks/tests/unit/test_upload_task.py
@@ -8,6 +8,7 @@
 from celery.exceptions import Retry
 from mock import AsyncMock, call
 from redis.exceptions import LockError
+from shared.helpers.redis import get_redis_connection
 from shared.reports.enums import UploadState, UploadType
 from shared.torngit import GitlabEnterprise
 from shared.torngit.exceptions import TorngitClientError, TorngitRepoNotFoundError
@@ -27,7 +28,6 @@
 from helpers.checkpoint_logger.flows import TestResultsFlow, UploadFlow
 from helpers.exceptions import RepositoryWithoutValidBotError
 from helpers.log_context import LogContext, set_log_context
-from services.redis import get_redis_connection
 from services.report import NotReadyToBuildReportYetError, ReportService
 from tasks.bundle_analysis_notify import bundle_analysis_notify_task
 from tasks.bundle_analysis_processor import bundle_analysis_processor_task
@@ -110,7 +110,7 @@ def delete(self, key):
 
 @pytest.fixture
 def mock_redis(mocker):
-    m = mocker.patch("services.redis._get_redis_instance_from_url")
+    m = mocker.patch("shared.helpers.redis._get_redis_instance_from_url")
     redis_server = FakeRedis(mocker)
     m.return_value = redis_server
     yield redis_server
diff --git a/tasks/upload.py b/tasks/upload.py
@@ -17,6 +17,7 @@
 from shared.celery_config import upload_task_name
 from shared.config import get_config
 from shared.django_apps.user_measurements.models import UserMeasurement
+from shared.helpers.redis import get_redis_connection
 from shared.metrics import Histogram
 from shared.torngit.exceptions import TorngitClientError, TorngitRepoNotFoundError
 from shared.upload.utils import UploaderType, bulk_insert_coverage_measurements
@@ -34,7 +35,6 @@
 from services.bundle_analysis.report import BundleAnalysisReportService
 from services.processing.state import ProcessingState
 from services.processing.types import UploadArguments
-from services.redis import get_redis_connection
 from services.report import (
     BaseReportService,
     NotReadyToBuildReportYetError,
diff --git a/tasks/upload_finisher.py b/tasks/upload_finisher.py
diff --git a/uv.lock b/uv.lock
