Merge branch 'main' into Ajay/uv-test

Author: ajay-sentry

.github/workflows/ci.yml

@@ -36,16 +36,6 @@ jobs:
     uses: codecov/gha-workflows/.github/workflows/[email protected]
     secrets: inherit
 
-  # ats:
-  #   name: ATS
-  #   needs: [build]
-  #   if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'codecov' }}
-  #   uses: codecov/gha-workflows/.github/workflows/[email protected]
-  #   secrets: inherit
-  #   with:
-  #     repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
-  #     codecov_cli_upload_args: '--plugin pycoverage --plugin compress-pycoverage --flag smart-labels'
-  #     app_container_name: api
   test:
     name: Test
     needs: [build]

Makefile

@@ -205,7 +205,7 @@ test_env.install_cli:
 
 test_env.container_prepare:
 	apt-get -y install git build-essential netcat-traditional
-	git config --global --add safe.directory /app
+	git config --global --add safe.directory /app || true
 
 test_env.container_check_db:
 	while ! nc -vz postgres 5432; do sleep 1; echo "waiting for postgres"; done
@@ -229,24 +229,6 @@ test_env.run_integration:
 test_env.check-for-migration-conflicts:
 	docker compose exec api python manage.py check_for_migration_conflicts
 
-test_env.static_analysis:
-	docker compose exec api make test_env.container_static_analysis CODECOV_STATIC_TOKEN=${CODECOV_STATIC_TOKEN}
-
-test_env.label_analysis:
-	docker compose exec api make test_env.container_label_analysis CODECOV_STATIC_TOKEN=${CODECOV_STATIC_TOKEN}
-
-test_env.ats:
-	docker compose exec api make test_env.container_ats CODECOV_UPLOAD_TOKEN=${CODECOV_UPLOAD_TOKEN}
-
-test_env.container_static_analysis:
-	codecovcli -u ${CODECOV_URL} static-analysis --token=${CODECOV_STATIC_TOKEN}
-
-test_env.container_label_analysis:
-	codecovcli -u ${CODECOV_URL} label-analysis --base-sha=${merge_sha} --token=${CODECOV_STATIC_TOKEN}
-
-test_env.container_ats:
-	codecovcli -u ${CODECOV_URL} --codecov-yml-path=codecov_cli.yml upload-process --plugin pycoverage --plugin compress-pycoverage --flag smart-labels --fail-on-error
-
 test_env:
 	make test_env.up
 	make test_env.prepare

codecov.yml

@@ -1,16 +1,5 @@
 ignore:
   - "**tests**/test_*.py"
-comment:
-  show_critical_paths: true
-
-beta_groups:
-  - "labels"
-
-flag_management:
-  individual_flags:
-    - name: "smart-labels"
-      carryforward: true
-      carryforward_mode: "labels"
 
 codecov:
   require_ci_to_pass: false

codecov_cli.yml

@@ -22,10 +22,15 @@ async def get_file_from_service(self, commit: Commit, path: str) -> str | None:
                 return content.get("content")
             return content.get("content").decode("utf-8")
         # TODO raise this to the API so we can handle it.
-        except Exception:
-            log.info(
+        except Exception as e:
+            log.warning(
                 "GetFileContentInteractor - exception raised",
-                extra=dict(commitid=commit.commitid),
+                extra=dict(
+                    commitid=commit.commitid,
+                    path=path,
+                    error_name=type(e).__name__,
+                    error_message=str(e),
+                ),
             )
             return None
 

core/commands/commit/interactors/get_file_content.py

@@ -3,21 +3,25 @@
 
 import sentry_sdk
 from django.db.models import QuerySet
-from shared.django_apps.codecov_auth.models import Owner
+from shared.django_apps.codecov_auth.models import GithubAppInstallation, Owner
 from shared.django_apps.core.models import Repository
 
+from utils.config import get_config
+
 log = logging.getLogger(__name__)
+AI_FEATURES_GH_APP_ID = get_config("github", "ai_features_app_id")
 
 
 def apply_filters_to_queryset(
-    queryset: QuerySet, filters: dict[str, Any] | None
+    queryset: QuerySet, filters: dict[str, Any] | None, owner: Owner | None = None
 ) -> QuerySet:
     filters = filters or {}
     term = filters.get("term")
     active = filters.get("active")
     activated = filters.get("activated")
     repo_names = filters.get("repo_names")
     is_public = filters.get("is_public")
+    ai_enabled = filters.get("ai_enabled")
 
     if repo_names:
         queryset = queryset.filter(name__in=repo_names)
@@ -29,6 +33,23 @@ def apply_filters_to_queryset(
         queryset = queryset.filter(active=active)
     if is_public is not None:
         queryset = queryset.filter(private=not is_public)
+    if ai_enabled is not None:
+        queryset = filter_queryset_by_ai_enabled_repos(queryset, owner)
+    return queryset
+
+
+def filter_queryset_by_ai_enabled_repos(queryset: QuerySet, owner: Owner) -> QuerySet:
+    ai_features_app_install = GithubAppInstallation.objects.filter(
+        app_id=AI_FEATURES_GH_APP_ID, owner=owner
+    ).first()
+
+    if not ai_features_app_install:
+        return Repository.objects.none()
+
+    if ai_features_app_install.repository_service_ids:
+        queryset = queryset.filter(
+            service_id__in=ai_features_app_install.repository_service_ids
+        )
 
     return queryset
 
@@ -42,15 +63,21 @@ def list_repository_for_owner(
     exclude_okta_enforced_repos: bool = True,
 ) -> QuerySet:
     queryset = Repository.objects.viewable_repos(current_owner)
+    filters = filters or {}
+    ai_enabled_filter = filters.get("ai_enabled")
+
+    if ai_enabled_filter:
+        return filter_queryset_by_ai_enabled_repos(queryset, owner)
 
     if exclude_okta_enforced_repos:
         queryset = queryset.exclude_accounts_enforced_okta(okta_account_auths)
 
-    queryset = (
-        queryset.with_recent_coverage().with_latest_commit_at().filter(author=owner)
-    )
+    if not ai_enabled_filter:
+        queryset = (
+            queryset.with_recent_coverage().with_latest_commit_at().filter(author=owner)
+        )
 
-    queryset = apply_filters_to_queryset(queryset, filters)
+    queryset = apply_filters_to_queryset(queryset, filters, owner)
     return queryset
 
 

graphql_api/actions/repository.py

@@ -1,9 +1,10 @@
 import enum
+from base64 import b64decode
 from dataclasses import dataclass
 from functools import cached_property
 from typing import Any, Dict, List, Optional
 
-from cursor_pagination import CursorPage, CursorPaginator
+from cursor_pagination import CursorPage, CursorPaginator, InvalidCursor
 from django.db.models import QuerySet
 
 from codecov.commands.exceptions import ValidationError
@@ -181,6 +182,7 @@ def page_info(self) -> Dict[str, Any]:
 
 
 class DictCursorPaginator(CursorPaginator):
+    NULL_VALUE_REPR = "\x1f"
     """
     WARNING: DictCursorPaginator does not work for dict objects where a key contains the following string: "__"
     TODO: if instance is a dictionary and not an object, don't split the ordering
@@ -205,6 +207,17 @@ class DictCursorPaginator(CursorPaginator):
     if the dict access fails then it throws an exception, although it would be a different
     """
 
+    def decode_cursor(self, cursor):
+        try:
+            orderings = b64decode(cursor.encode("ascii")).decode("utf8")
+            orderings = orderings.split(self.delimiter)
+            return [
+                None if ordering == self.NULL_VALUE_REPR else ordering
+                for ordering in orderings
+            ]
+        except (TypeError, ValueError):
+            raise InvalidCursor(self.invalid_cursor_message)
+
     def position_from_instance(self, instance):
         position = []
         for order in self.ordering:
@@ -219,7 +232,7 @@ def position_from_instance(self, instance):
                     except (KeyError, TypeError):
                         raise attr_err from None
                 parts.pop(0)
-            position.append(str(attr))
+            position.append(self.NULL_VALUE_REPR if attr is None else str(attr))
         return position
 
 

graphql_api/helpers/connection.py

@@ -155,3 +155,21 @@ def test_invalid_cursors(self):
 
         with self.assertRaises(ValidationError):
             queryset_to_connection_sync(data, first=3, after="invalid")
+
+    def test_dict_cursor_paginator_null_encoding(self):
+        from graphql_api.helpers.connection import DictCursorPaginator, field_order
+
+        repo_1 = RepositoryFactory(name="a", active=None)
+        repo_2 = RepositoryFactory(name="b", active=True)
+        repo_3 = RepositoryFactory(name="c", active=False)
+        r = Repository.objects.all()
+
+        ordering = tuple(
+            field_order(field, OrderingDirection.ASC) for field in ("active",)
+        )
+
+        paginator = DictCursorPaginator(r, ordering=ordering)
+
+        assert paginator.position_from_instance(repo_1) == ["\x1f"]
+        assert paginator.position_from_instance(repo_2) == ["True"]
+        assert paginator.position_from_instance(repo_3) == ["False"]

graphql_api/helpers/tests/test_connection.py

@@ -772,18 +772,15 @@ def test_fetch_path_contents_component_filter_missing_coverage(
     @patch("services.components.component_filtered_report")
     @patch("services.components.commit_components")
     @patch("shared.reports.api_report_service.build_report_from_commit")
+    @patch("services.path.ReportPaths.files", new_callable=PropertyMock)
     def test_fetch_path_contents_component_filter_has_coverage(
-        self, report_mock, commit_components_mock, filtered_mock
+        self, files_mock, report_mock, commit_components_mock, filtered_mock
     ):
-        components = ["Global"]
-        variables = {
-            "org": self.org.username,
-            "repo": self.repo.name,
-            "branch": self.branch.name,
-            "path": "",
-            "filters": {"components": components},
-        }
-
+        files_mock.return_value = [
+            "folder/fileB.py",
+            "folder/subfolder/fileC.py",
+            "folder/subfolder/fileD.py",
+        ]
         report_mock.return_value = MockReport()
         commit_components_mock.return_value = [
             Component.from_dict(
@@ -810,6 +807,14 @@ def test_fetch_path_contents_component_filter_has_coverage(
         ]
         filtered_mock.return_value = MockReport()
 
+        components = ["Global"]
+        variables = {
+            "org": self.org.username,
+            "repo": self.repo.name,
+            "branch": self.branch.name,
+            "path": "",
+            "filters": {"components": components},
+        }
         data = self.gql_request(query_files, variables=variables)
 
         assert data == {
@@ -841,18 +846,15 @@ def test_fetch_path_contents_component_filter_has_coverage(
     @patch("services.components.component_filtered_report")
     @patch("services.components.commit_components")
     @patch("shared.reports.api_report_service.build_report_from_commit")
-    @patch("services.report.files_belonging_to_flags")
-    @patch("services.report.files_in_sessions")
+    @patch("services.path.ReportPaths.files", new_callable=PropertyMock)
     def test_fetch_path_contents_component_and_flag_filters(
         self,
-        session_files_mock,
-        flag_files_mock,
+        files_mock,
         report_mock,
         commit_components_mock,
         filtered_mock,
     ):
-        session_files_mock.return_value = ["fileA.py"]
-        flag_files_mock.return_value = ["fileA.py"]
+        files_mock.return_value = ["fileA.py"]
         report_mock.return_value = MockReport()
         commit_components_mock.return_value = [
             Component.from_dict(
@@ -945,11 +947,11 @@ def test_fetch_path_contents_component_and_flag_filters(
     @patch("services.components.component_filtered_report")
     @patch("services.components.commit_components")
     @patch("shared.reports.api_report_service.build_report_from_commit")
-    @patch("services.report.files_belonging_to_flags")
+    @patch("services.path.ReportPaths.files", new_callable=PropertyMock)
     def test_fetch_path_contents_component_and_flag_filters_unknown_flags(
-        self, flag_files_mock, report_mock, commit_components_mock, filtered_mock
+        self, files_mock, report_mock, commit_components_mock, filtered_mock
     ):
-        flag_files_mock.return_value = ["fileA.py"]
+        files_mock.return_value = ["fileA.py"]
         report_mock.return_value = MockNoFlagsReport()
         commit_components_mock.return_value = [
             Component.from_dict(
@@ -1035,18 +1037,15 @@ def test_fetch_path_contents_component_and_flag_filters_unknown_flags(
     @patch("services.components.component_filtered_report")
     @patch("services.components.commit_components")
     @patch("shared.reports.api_report_service.build_report_from_commit")
-    @patch("services.report.files_belonging_to_flags")
-    @patch("services.report.files_in_sessions")
+    @patch("services.path.ReportPaths.files", new_callable=PropertyMock)
     def test_fetch_path_contents_component_flags_filters(
         self,
-        session_files_mock,
-        flag_files_mock,
+        files_mock,
         report_mock,
         commit_components_mock,
         filtered_mock,
     ):
-        session_files_mock.return_value = ["fileA.py"]
-        flag_files_mock.return_value = ["fileA.py"]
+        files_mock.return_value = ["fileA.py"]
         report_mock.return_value = MockReport()
         commit_components_mock.return_value = [
             Component.from_dict(