Merge tag '15.2.0' into rel

Author: humitos

docs/conf.py

@@ -64,9 +64,9 @@
 ogp_use_first_image = True  # https://github.com/readthedocs/blog/pull/118
 ogp_image = "https://docs.readthedocs.io/en/latest/_static/img/logo-opengraph.png"
 # Inspired by https://github.com/executablebooks/MyST-Parser/pull/404/
-ogp_custom_meta_tags = [
+ogp_custom_meta_tags = (
     '<meta name="twitter:card" content="summary_large_image" />',
-]
+)
 ogp_enable_meta_description = True
 ogp_description_length = 300
 
@@ -81,7 +81,7 @@
 
 master_doc = "index"
 copyright = "Read the Docs, Inc & contributors"
-version = "15.1.0"
+version = "15.2.0"
 release = version
 exclude_patterns = ["_build", "shared", "_includes"]
 default_role = "obj"

docs/user/guides/conda.rst

@@ -119,9 +119,9 @@ with these contents:
    version: 2
 
    build:
-     os: "ubuntu-20.04"
+     os: "ubuntu-24.04"
      tools:
-       python: "mambaforge-22.9"
+       python: "miniconda3-3.12-24.9"
 
    conda:
      environment: environment.yml

readthedocs/__init__.py

@@ -1,3 +1,3 @@
 """Read the Docs."""
 
-__version__ = "15.1.0"
+__version__ = "15.2.0"

readthedocs/api/v2/models.py

@@ -16,11 +16,17 @@ def create_key(self, project):
         """
         Create a new API key for a project.
 
-        Build API keys are valid for 3 hours,
+        Build API keys are valid for
+
+        - project or default build time limit
+        - plus 25% to cleanup task once build is finished
+        - plus extra time to allow multiple retries (concurrency limit reached)
+
         and can be revoked at any time by hitting the /api/v2/revoke/ endpoint.
         """
-        # Use the project or default build time limit + 25% for the API token
-        delta = (project.container_time_limit or settings.BUILD_TIME_LIMIT) * 1.25
+        delta = (
+            project.container_time_limit or settings.BUILD_TIME_LIMIT
+        ) * 1.25 + settings.RTD_BUILDS_RETRY_DELAY * settings.RTD_BUILDS_MAX_RETRIES
         expiry_date = timezone.now() + timedelta(seconds=delta)
         name_max_length = self.model._meta.get_field("name").max_length
         return super().create_key(

readthedocs/api/v2/views/model_views.py

@@ -305,6 +305,9 @@ def concurrent(self, request, **kwargs):
         # We make this endpoint public because we don't want to expose the build API key inside the user's container.
         # To emulate "auth" we check for the builder hostname to match the `Build.builder` defined in the database.
         permission_classes=[],
+        # We can't use the default `get_queryset()` method because it's filtered by build API key and/or user access.
+        # Since we don't want to check for permissions here we need to use a custom queryset here.
+        get_queryset=lambda: Build.objects.all(),
         methods=["post"],
     )
     def healthcheck(self, request, **kwargs):

readthedocs/oauth/services/base.py

@@ -144,6 +144,10 @@ class UserService(Service):
     def __init__(self, user, account):
         self.user = user
         self.account = account
+        # Cache organizations to avoid multiple DB hits
+        # when syncing repositories that belong to the same organization.
+        # Used by `create_organization` method in subclasses.
+        self._organizations_cache = {}
         structlog.contextvars.bind_contextvars(
             user_username=self.user.username,
             social_provider=self.allauth_provider.id,

readthedocs/oauth/services/bitbucket.py

@@ -63,24 +63,26 @@ def sync_repositories(self):
                 "https://bitbucket.org/api/2.0/repositories/",
                 role="admin",
             )
-            admin_repo_relations = RemoteRepositoryRelation.objects.filter(
+            RemoteRepositoryRelation.objects.filter(
                 user=self.user,
                 account=self.account,
                 remote_repository__vcs_provider=self.vcs_provider_slug,
                 remote_repository__remote_id__in=[r["uuid"] for r in resp],
-            )
-            for remote_repository_relation in admin_repo_relations:
-                remote_repository_relation.admin = True
-                remote_repository_relation.save()
+            ).update(admin=True)
         except (TypeError, ValueError):
-            pass
+            log.warning("Error syncing Bitbucket admin repositories")
 
         return remote_ids
 
     def sync_organizations(self):
-        """Sync Bitbucket workspaces(our RemoteOrganization) and workspace repositories."""
+        """
+        Sync Bitbucket workspaces (organizations).
+
+        This method only creates the relationships between the
+        organizations and the user, as all the repositories
+        are already created in the sync_repositories method.
+        """
         organization_remote_ids = []
-        repository_remote_ids = []
 
         try:
             workspaces = self.paginate(
@@ -89,18 +91,8 @@ def sync_organizations(self):
             )
             for workspace in workspaces:
                 remote_organization = self.create_organization(workspace)
-                repos = self.paginate(workspace["links"]["repositories"]["href"])
-
+                remote_organization.get_remote_organization_relation(self.user, self.account)
                 organization_remote_ids.append(remote_organization.remote_id)
-
-                for repo in repos:
-                    remote_repository = self.create_repository(
-                        repo,
-                        organization=remote_organization,
-                    )
-                    if remote_repository:
-                        repository_remote_ids.append(remote_repository.remote_id)
-
         except ValueError:
             log.warning("Error syncing Bitbucket organizations")
             raise SyncServiceError(
@@ -109,9 +101,9 @@ def sync_organizations(self):
                 )
             )
 
-        return organization_remote_ids, repository_remote_ids
+        return organization_remote_ids, []
 
-    def create_repository(self, fields, privacy=None, organization=None):
+    def create_repository(self, fields, privacy=None):
         """
         Update or create a repository from Bitbucket API response.
 
@@ -136,42 +128,15 @@ def create_repository(self, fields, privacy=None, organization=None):
             repo, _ = RemoteRepository.objects.get_or_create(
                 remote_id=fields["uuid"], vcs_provider=self.vcs_provider_slug
             )
-            repo.get_remote_repository_relation(self.user, self.account)
+            self._update_repository_from_fields(repo, fields)
 
-            if repo.organization and repo.organization != organization:
-                log.debug(
-                    "Not importing repository because mismatched orgs.",
-                    repository=fields["name"],
-                )
-                return None
-
-            repo.organization = organization
-            repo.name = fields["name"]
-            repo.full_name = fields["full_name"]
-            repo.description = fields["description"]
-            repo.private = fields["is_private"]
-
-            # Default to HTTPS, use SSH for private repositories
-            clone_urls = {u["name"]: u["href"] for u in fields["links"]["clone"]}
-            repo.clone_url = self.https_url_pattern.sub(
-                "https://bitbucket.org/",
-                clone_urls.get("https"),
+            # The repositories API doesn't return the admin status of the user,
+            # so we default to False, and then update it later using another API call.
+            remote_repository_relation = repo.get_remote_repository_relation(
+                self.user, self.account
             )
-            repo.ssh_url = clone_urls.get("ssh")
-            if repo.private:
-                repo.clone_url = repo.ssh_url
-
-            repo.html_url = fields["links"]["html"]["href"]
-            repo.vcs = fields["scm"]
-            mainbranch = fields.get("mainbranch") or {}
-            repo.default_branch = mainbranch.get("name")
-
-            avatar_url = fields["links"]["avatar"]["href"] or ""
-            repo.avatar_url = re.sub(r"\/16\/$", r"/32/", avatar_url)
-            if not repo.avatar_url:
-                repo.avatar_url = self.default_user_avatar_url
-
-            repo.save()
+            remote_repository_relation.admin = False
+            remote_repository_relation.save()
 
             return repo
 
@@ -180,17 +145,59 @@ def create_repository(self, fields, privacy=None, organization=None):
             repository=fields["name"],
         )
 
+    def _update_repository_from_fields(self, repo, fields):
+        # All repositories are created under a workspace,
+        # which we consider an organization.
+        organization = self.create_organization(fields["workspace"])
+        repo.organization = organization
+        repo.name = fields["name"]
+        repo.full_name = fields["full_name"]
+        repo.description = fields["description"]
+        repo.private = fields["is_private"]
+
+        # Default to HTTPS, use SSH for private repositories
+        clone_urls = {u["name"]: u["href"] for u in fields["links"]["clone"]}
+        repo.clone_url = self.https_url_pattern.sub(
+            "https://bitbucket.org/",
+            clone_urls.get("https"),
+        )
+        repo.ssh_url = clone_urls.get("ssh")
+        if repo.private:
+            repo.clone_url = repo.ssh_url
+
+        repo.html_url = fields["links"]["html"]["href"]
+        repo.vcs = fields["scm"]
+        mainbranch = fields.get("mainbranch") or {}
+        repo.default_branch = mainbranch.get("name")
+
+        avatar_url = fields["links"]["avatar"]["href"] or ""
+        repo.avatar_url = re.sub(r"\/16\/$", r"/32/", avatar_url)
+        if not repo.avatar_url:
+            repo.avatar_url = self.default_user_avatar_url
+
+        repo.save()
+
     def create_organization(self, fields):
         """
         Update or create remote organization from Bitbucket API response.
 
         :param fields: dictionary response of data from API
         :rtype: RemoteOrganization
+
+        .. note::
+
+           This method caches organizations by their remote ID to avoid
+           unnecessary database queries, specially when creating
+           multiple repositories that belong to the same organization.
         """
+        organization_id = fields["uuid"]
+        if organization_id in self._organizations_cache:
+            return self._organizations_cache[organization_id]
+
         organization, _ = RemoteOrganization.objects.get_or_create(
-            remote_id=fields["uuid"], vcs_provider=self.vcs_provider_slug
+            remote_id=organization_id,
+            vcs_provider=self.vcs_provider_slug,
         )
-        organization.get_remote_organization_relation(self.user, self.account)
 
         organization.slug = fields.get("slug")
         organization.name = fields.get("name")
@@ -201,6 +208,7 @@ def create_organization(self, fields):
 
         organization.save()
 
+        self._organizations_cache[organization_id] = organization
         return organization
 
     def get_next_url_to_paginate(self, response):