Merge branch 'main' of github.com:codecov/codecov-api into 3171-gh-webhook-commit-lock-help

Author: adrian-codecov

VERSION

@@ -1 +1 @@
-24.12.2
+25.1.3

api/internal/commit/serializers.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Dict, List
 
 import shared.reports.api_report_service as report_service
 from rest_framework import serializers
@@ -32,7 +33,7 @@ class Meta:
 class CommitWithFileLevelReportSerializer(CommitSerializer):
     report = serializers.SerializerMethodField()
 
-    def get_report(self, commit: Commit):
+    def get_report(self, commit: Commit) -> Dict[str, List[Dict] | Dict] | None:
         report = report_service.build_report_from_commit(commit)
         if report is None:
             return None

codecov_auth/commands/owner/interactors/save_terms_agreement.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional
+from typing import Any, Optional
 
 from django.utils import timezone
 
@@ -20,7 +20,7 @@ class TermsAgreementInput:
 class SaveTermsAgreementInteractor(BaseInteractor):
     requires_service = False
 
-    def validate(self, input: TermsAgreementInput):
+    def validate(self, input: TermsAgreementInput) -> None:
         valid_customer_intents = ["Business", "BUSINESS", "Personal", "PERSONAL"]
         if (
             input.customer_intent
@@ -30,7 +30,7 @@ def validate(self, input: TermsAgreementInput):
         if not self.current_user.is_authenticated:
             raise Unauthenticated()
 
-    def update_terms_agreement(self, input: TermsAgreementInput):
+    def update_terms_agreement(self, input: TermsAgreementInput) -> None:
         self.current_user.terms_agreement = input.terms_agreement
         self.current_user.terms_agreement_at = timezone.now()
         self.current_user.customer_intent = input.customer_intent
@@ -44,14 +44,14 @@ def update_terms_agreement(self, input: TermsAgreementInput):
         if input.marketing_consent:
             self.send_data_to_marketo()
 
-    def send_data_to_marketo(self):
+    def send_data_to_marketo(self) -> None:
         event_data = {
             "email": self.current_user.email,
         }
         AnalyticsService().opt_in_email(self.current_user.id, event_data)
 
     @sync_to_async
-    def execute(self, input):
+    def execute(self, input: Any) -> None:
         typed_input = TermsAgreementInput(
             business_email=input.get("business_email"),
             terms_agreement=input.get("terms_agreement"),

codecov_auth/signals.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Type
+from typing import Any, Dict, Optional, Type, cast
 
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -38,7 +38,7 @@ def update_owner(
     """
     Shelter tracks a limited set of Owner fields - only update if those fields have changed.
     """
-    created: bool = kwargs["created"]
+    created: bool = cast(bool, kwargs["created"])
     tracked_fields = [
         "upload_token_required_for_public_repos",
         "username",

codecov_auth/views/sentry.py

@@ -123,7 +123,7 @@ def _perform_login(self, request: HttpRequest) -> HttpResponse:
             # user has not connected any owners yet
             return redirect(f"{settings.CODECOV_DASHBOARD_URL}/sync")
 
-    def _login_user(self, request: HttpRequest, user_data: dict):
+    def _login_user(self, request: HttpRequest, user_data: dict) -> User:
         sentry_id = user_data["user"]["id"]
         user_name = user_data["user"].get("name")
         user_email = user_data["user"].get("email")
@@ -177,7 +177,7 @@ def _login_user(self, request: HttpRequest, user_data: dict):
         login(request, current_user)
         return current_user
 
-    def get(self, request):
+    def get(self, request: HttpRequest) -> HttpResponse:
         if request.GET.get("code"):
             return self._perform_login(request)
         else:

core/commands/commit/interactors/get_file_content.py

@@ -1,13 +1,15 @@
 import logging
+from typing import Any, Coroutine
 
 from codecov.commands.base import BaseInteractor
+from core.models import Commit
 from services.repo_providers import RepoProviderService
 
 log = logging.getLogger(__name__)
 
 
 class GetFileContentInteractor(BaseInteractor):
-    async def get_file_from_service(self, commit, path):
+    async def get_file_from_service(self, commit: Commit, path: str) -> str | None:
         try:
             repository_service = await RepoProviderService().async_get_adapter(
                 owner=self.current_owner, repo=commit.repository
@@ -27,5 +29,5 @@ async def get_file_from_service(self, commit, path):
             )
             return None
 
-    def execute(self, commit, path):
+    def execute(self, commit: Commit, path: str) -> Coroutine[Any, Any, str | None]:
         return self.get_file_from_service(commit, path)

graphql_api/actions/repository.py

@@ -9,7 +9,9 @@
 log = logging.getLogger(__name__)
 
 
-def apply_filters_to_queryset(queryset, filters: dict[str, Any]) -> QuerySet:
+def apply_filters_to_queryset(
+    queryset: QuerySet, filters: dict[str, Any] | None
+) -> QuerySet:
     filters = filters or {}
     term = filters.get("term")
     active = filters.get("active")

requirements.in

@@ -26,7 +26,7 @@ freezegun
 google-cloud-pubsub
 gunicorn>=22.0.0
 https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
-https://github.com/codecov/shared/archive/abc6b36feceb05c3b754050061436574111058f9.tar.gz#egg=shared
+https://github.com/codecov/shared/archive/c3288a017d49d72a85d6f42a2056d3063cfd8dda.tar.gz#egg=shared
 https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz
 idna>=3.7
 minio

requirements.txt

@@ -202,6 +202,8 @@ googleapis-common-protos[grpc]==1.59.1
     #   grpcio-status
 graphql-core==3.2.3
     # via ariadne
+greenlet==3.1.1
+    # via sqlalchemy
 grpc-google-iam-v1==0.12.6
     # via google-cloud-pubsub
 grpcio==1.62.1
@@ -414,7 +416,7 @@ sentry-sdk[celery]==2.13.0
     #   shared
 setproctitle==1.1.10
     # via -r requirements.in
-shared @ https://github.com/codecov/shared/archive/abc6b36feceb05c3b754050061436574111058f9.tar.gz
+shared @ https://github.com/codecov/shared/archive/c3288a017d49d72a85d6f42a2056d3063cfd8dda.tar.gz
     # via -r requirements.in
 simplejson==3.17.2
     # via -r requirements.in

upload/serializers.py

@@ -1,4 +1,7 @@
+from typing import Any, Dict, List
+
 from django.conf import settings
+from django.db.models import QuerySet
 from rest_framework import serializers
 from shared.api_archive.archive import ArchiveService
 
@@ -11,7 +14,7 @@
 class FlagListField(serializers.ListField):
     child = serializers.CharField()
 
-    def to_representation(self, data):
+    def to_representation(self, data: QuerySet) -> List[str | None]:
         return [item.flag_name if item is not None else None for item in data.all()]
 
 
@@ -47,12 +50,12 @@ class Meta:
 
     raw_upload_location = serializers.SerializerMethodField()
 
-    def get_raw_upload_location(self, obj: ReportSession):
+    def get_raw_upload_location(self, obj: ReportSession) -> str:
         repo = obj.report.commit.repository
         archive_service = ArchiveService(repo)
         return archive_service.create_presigned_put(obj.storage_path)
 
-    def get_url(self, obj: ReportSession):
+    def get_url(self, obj: ReportSession) -> str:
         repository = obj.report.commit.repository
         commit = obj.report.commit
         return f"{settings.CODECOV_DASHBOARD_URL}/{repository.author.service}/{repository.author.username}/{repository.name}/commit/{commit.commitid}"
@@ -64,7 +67,7 @@ def _create_existing_flags_map(self, repoid: int) -> dict:
             existing_flags_map[flag_obj.flag_name] = flag_obj
         return existing_flags_map
 
-    def create(self, validated_data):
+    def create(self, validated_data: Dict[str, Any]) -> ReportSession | None:
         flag_names = (
             validated_data.pop("flags") if "flags" in validated_data.keys() else []
         )
@@ -134,7 +137,7 @@ class Meta:
             "branch",
         )
 
-    def create(self, validated_data):
+    def create(self, validated_data: Dict[str, Any]) -> Commit:
         repo = validated_data.pop("repository", None)
         commitid = validated_data.pop("commitid", None)
         commit, created = Commit.objects.get_or_create(
@@ -161,7 +164,7 @@ class Meta:
         )
         fields = read_only_fields + ("code",)
 
-    def create(self, validated_data) -> tuple[CommitReport, bool]:
+    def create(self, validated_data: Dict[str, Any]) -> tuple[CommitReport, bool]:
         report = (
             CommitReport.objects.coverage_reports()
             .filter(