pulpcore 3.82.1__tar.gz → 3.83.1__tar.gz

{pulpcore-3.82.1 → pulpcore-3.83.1}/CHANGES.md

@@ -8,6 +8,52 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.83.1 (2025-07-15) {: #3.83.1 }
+
+### REST API {: #3.83.1-rest-api }
+
+#### Bugfixes {: #3.83.1-rest-api-bugfix }
+
+- Fixed the new content set optimization failing when the RepositoryVersion grew larger than 65K content units.
+  [#6772](https://github.com/pulp/pulpcore/issues/6772)
+
+### Plugin API {: #3.83.1-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.83.1-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.83.1-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.83.0 (2025-07-10) {: #3.83.0 }
+
+### REST API {: #3.83.0-rest-api }
+
+#### Features {: #3.83.0-rest-api-feature }
+
+- Improved RepositoryVersion content set calculation speed.
+  [#5783](https://github.com/pulp/pulpcore/issues/5783)
+
+### Plugin API {: #3.83.0-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.83.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.83.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.82.1 (2025-07-04) {: #3.82.1 }
 
 ### REST API {: #3.82.1-rest-api }
@@ -1628,6 +1674,26 @@ No significant changes.
 
 ---
 
+## 3.63.22 (2025-07-02) {: #3.63.22 }
+
+### REST API {: #3.63.22-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.63.22-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.63.22-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.63.22-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.63.21 (2025-06-24) {: #3.63.21 }
 
 ### REST API {: #3.63.21-rest-api }
@@ -2959,6 +3025,26 @@ No significant changes.
 
 ---
 
+## 3.49.44 (2025-07-02) {: #3.49.44 }
+
+### REST API {: #3.49.44-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.49.44-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.49.44-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.49.44-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.49.43 (2025-06-24) {: #3.49.43 }
 
 ### REST API {: #3.49.43-rest-api }

{pulpcore-3.82.1 → pulpcore-3.83.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.82.1
+Version: 3.83.1
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -50,7 +50,7 @@ Requires-Dist: opentelemetry-api<1.35,>=1.27.0
 Requires-Dist: opentelemetry-sdk<1.35,>=1.27.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.35,>=1.27.0
 Requires-Dist: protobuf<6.0,>=4.21.1
-Requires-Dist: pulp-glue<0.34,>=0.28.0
+Requires-Dist: pulp-glue<0.35,>=0.28.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
 Requires-Dist: psycopg[binary]<3.3,>=3.1.8
 Requires-Dist: pyparsing<3.3,>=3.1.0
@@ -59,7 +59,7 @@ Requires-Dist: PyYAML<6.1,>=5.1.1
 Requires-Dist: redis<5.3,>=4.3.0
 Requires-Dist: tablib<3.6,>=3.5.0
 Requires-Dist: url-normalize<2.3,>=1.4.3
-Requires-Dist: uuid6<=2025.0.0,>=2023.5.2
+Requires-Dist: uuid6<=2025.0.1,>=2023.5.2
 Requires-Dist: whitenoise<6.10.0,>=5.0
 Requires-Dist: yarl<1.21,>=1.8
 Provides-Extra: sftp

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.82.1"
+    version = "3.83.1"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.82.1"
+    version = "3.83.1"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore/app/apps.py

@@ -247,7 +247,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.82.1"
+    version = "3.83.1"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

pulpcore-3.83.1/pulpcore/app/migrations/0133_repositoryversion_content_ids.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.16 on 2025-07-10 14:53
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0132_task_profile_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="repositoryversion",
+            name="content_ids",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.UUIDField(), default=None, null=True, size=None
+            ),
+        ),
+    ]

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore/app/models/repository.py

@@ -11,11 +11,11 @@ import logging
 import django
 from asyncio_throttle import Throttler
 from django.conf import settings
-from django.contrib.postgres.fields import HStoreField
+from django.contrib.postgres.fields import HStoreField, ArrayField
 from django.core.validators import MinValueValidator
 from django.db import models, transaction
 from django.db.models import F, Func, Q, Value
-from django_lifecycle import AFTER_UPDATE, BEFORE_DELETE, hook
+from django_lifecycle import AFTER_UPDATE, BEFORE_CREATE, BEFORE_DELETE, hook
 from rest_framework.exceptions import APIException
 
 from pulpcore.app.util import (
@@ -771,6 +771,7 @@ class RepositoryVersionQuerySet(models.QuerySet):
         Returns:
             django.db.models.QuerySet: Repository versions which contains content.
         """
+        # TODO: Evaluate if this can be optimized with content_ids field
         query = models.Q(pk__in=[])
         repo_content = RepositoryContent.objects.filter(content__pk__in=content)
 
@@ -822,6 +823,7 @@ class RepositoryVersion(BaseModel):
     complete = models.BooleanField(db_index=True, default=False)
     base_version = models.ForeignKey("RepositoryVersion", null=True, on_delete=models.SET_NULL)
     info = models.JSONField(default=dict)
+    content_ids = ArrayField(models.UUIDField(), default=None, null=True)
 
     class Meta:
         default_related_name = "versions"
@@ -840,6 +842,31 @@ class RepositoryVersion(BaseModel):
             repository_id=self.repository_id, version_added__number__lte=self.number
         ).exclude(version_removed__number__lte=self.number)
 
+    def _get_content_ids(self):
+        """
+        Returns the content ids for a repository version
+        """
+        if self.content_ids is not None:
+            return self.content_ids
+        return self._content_relationships().values_list("content_id", flat=True)
+
+    @hook(BEFORE_CREATE)
+    def set_content_ids(self):
+        """
+        Sets the content ids for the new repository version based on the previous version.
+        """
+        try:
+            previous = self.previous()
+        except self.DoesNotExist:
+            pass
+        else:
+            if previous.content_ids is not None:
+                self.content_ids = previous.content_ids
+        if self.content_ids is None:
+            self.content_ids = list(
+                self._content_relationships().values_list("content_id", flat=True)
+            )
+
     def get_content(self, content_qs=None):
         """
         Returns a set of content for a repository version
@@ -863,7 +890,15 @@ class RepositoryVersion(BaseModel):
         if content_qs is None:
             content_qs = Content.objects
 
-        return content_qs.filter(pk__in=self._content_relationships().values_list("content_id"))
+        content_ids = self._get_content_ids()
+        if isinstance(content_ids, list) and len(content_ids) >= 65535:
+            # Workaround for PostgreSQL's limit on the number of parameters in a query
+            content_ids = (
+                RepositoryVersion.objects.filter(pk=self.pk)
+                .annotate(cids=Func(F("content_ids"), function="unnest"))
+                .values_list("cids", flat=True)
+            )
+        return content_qs.filter(pk__in=content_ids)
 
     @property
     def content(self):
@@ -977,9 +1012,9 @@ class RepositoryVersion(BaseModel):
         if not base_version:
             return Content.objects.filter(version_memberships__version_added=self)
 
-        return Content.objects.filter(
-            version_memberships__in=self._content_relationships()
-        ).exclude(version_memberships__in=base_version._content_relationships())
+        return Content.objects.filter(pk__in=self._get_content_ids()).exclude(
+            pk__in=base_version._get_content_ids()
+        )
 
     def removed(self, base_version=None):
         """
@@ -992,9 +1027,9 @@ class RepositoryVersion(BaseModel):
         if not base_version:
             return Content.objects.filter(version_memberships__version_removed=self)
 
-        return Content.objects.filter(
-            version_memberships__in=base_version._content_relationships()
-        ).exclude(version_memberships__in=self._content_relationships())
+        return Content.objects.filter(pk__in=base_version._get_content_ids()).exclude(
+            pk__in=self._get_content_ids()
+        )
 
     def contains(self, content):
         """
@@ -1003,6 +1038,8 @@ class RepositoryVersion(BaseModel):
         Returns:
             bool: True if the repository version contains the content, False otherwise
         """
+        if self.content_ids is not None:
+            return content.pk in self.content_ids
         return self.content.filter(pk=content.pk).exists()
 
     def add_content(self, content):
@@ -1026,9 +1063,10 @@ class RepositoryVersion(BaseModel):
             .exists()
         )
         repo_content = []
-        to_add = set(content.values_list("pk", flat=True)) - set(
-            self.content.values_list("pk", flat=True)
-        )
+        to_add = set(content.values_list("pk", flat=True)) - set(self._get_content_ids())
+        if to_add:
+            self.content_ids += list(to_add)
+            self.save()
 
         # Normalize representation if content has already been removed in this version and
         # is re-added: Undo removal by setting version_removed to None.
@@ -1071,6 +1109,11 @@ class RepositoryVersion(BaseModel):
             .exclude(pulp_domain_id=get_domain_pk())
             .exists()
         )
+        content_ids = set(self._get_content_ids())
+        to_remove = set(content.values_list("pk", flat=True))
+        if to_remove:
+            self.content_ids = list(content_ids - to_remove)
+            self.save()
 
         # Normalize representation if content has already been added in this version.
         # Undo addition by deleting the RepositoryContent.

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore/app/serializers/fields.py

@@ -268,7 +268,7 @@ class RepositoryVersionIdentityField(RepositoryVersionFieldGetURLMixin, Identity
 
 
 class RepositoryVersionRelatedField(RepositoryVersionFieldGetURLMixin, RelatedField):
-    queryset = models.RepositoryVersion.objects.all()
+    queryset = models.RepositoryVersion.objects.all().defer("content_ids")
 
     def get_object(self, view_name, view_args, view_kwargs):
         lookup_kwargs = {

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore/app/viewsets/repository.py

@@ -234,7 +234,7 @@ class RepositoryVersionQuerysetMixin:
     """A mixin to hold the shared get_queryset logic used by RepositoryVersionViewSets."""
 
     def get_queryset(self):
-        qs = super().get_queryset()
+        qs = super().get_queryset().defer("content_ids")
         if getattr(self, "action", "") == "list":
             # Fetch info for repository (DetailRelatedField),
             # base_version (RepositoryVersionRelatedField), and

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.82.1
+Version: 3.83.1
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -50,7 +50,7 @@ Requires-Dist: opentelemetry-api<1.35,>=1.27.0
 Requires-Dist: opentelemetry-sdk<1.35,>=1.27.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.35,>=1.27.0
 Requires-Dist: protobuf<6.0,>=4.21.1
-Requires-Dist: pulp-glue<0.34,>=0.28.0
+Requires-Dist: pulp-glue<0.35,>=0.28.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
 Requires-Dist: psycopg[binary]<3.3,>=3.1.8
 Requires-Dist: pyparsing<3.3,>=3.1.0
@@ -59,7 +59,7 @@ Requires-Dist: PyYAML<6.1,>=5.1.1
 Requires-Dist: redis<5.3,>=4.3.0
 Requires-Dist: tablib<3.6,>=3.5.0
 Requires-Dist: url-normalize<2.3,>=1.4.3
-Requires-Dist: uuid6<=2025.0.0,>=2023.5.2
+Requires-Dist: uuid6<=2025.0.1,>=2023.5.2
 Requires-Dist: whitenoise<6.10.0,>=5.0
 Requires-Dist: yarl<1.21,>=1.8
 Provides-Extra: sftp

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore.egg-info/SOURCES.txt

@@ -305,6 +305,7 @@ pulpcore/app/migrations/0130_upstreampulp_policy.py
 pulpcore/app/migrations/0131_distribution_checkpoint_publication_checkpoint.py
 pulpcore/app/migrations/0132_alter_content_options.py
 pulpcore/app/migrations/0132_task_profile_options.py
+pulpcore/app/migrations/0133_repositoryversion_content_ids.py
 pulpcore/app/migrations/__init__.py
 pulpcore/app/models/__init__.py
 pulpcore/app/models/access_policy.py

{pulpcore-3.82.1 → pulpcore-3.83.1}/pulpcore.egg-info/requires.txt

@@ -26,7 +26,7 @@ opentelemetry-api<1.35,>=1.27.0
 opentelemetry-sdk<1.35,>=1.27.0
 opentelemetry-exporter-otlp-proto-http<1.35,>=1.27.0
 protobuf<6.0,>=4.21.1
-pulp-glue<0.34,>=0.28.0
+pulp-glue<0.35,>=0.28.0
 pygtrie<=2.5.0,>=2.5
 psycopg[binary]<3.3,>=3.1.8
 pyparsing<3.3,>=3.1.0
@@ -35,7 +35,7 @@ PyYAML<6.1,>=5.1.1
 redis<5.3,>=4.3.0
 tablib<3.6,>=3.5.0
 url-normalize<2.3,>=1.4.3
-uuid6<=2025.0.0,>=2023.5.2
+uuid6<=2025.0.1,>=2023.5.2
 whitenoise<6.10.0,>=5.0
 yarl<1.21,>=1.8
 

{pulpcore-3.82.1 → pulpcore-3.83.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.82.1"
+version = "3.83.1"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -56,7 +56,7 @@ dependencies = [
   "opentelemetry-sdk>=1.27.0,<1.35",
   "opentelemetry-exporter-otlp-proto-http>=1.27.0,<1.35",
   "protobuf>=4.21.1,<6.0",
-  "pulp-glue>=0.28.0,<0.34",
+  "pulp-glue>=0.28.0,<0.35",
   "pygtrie>=2.5,<=2.5.0",
   "psycopg[binary]>=3.1.8,<3.3",  # SemVer, not explicitely stated, but mentioned on multiple changes.
   "pyparsing>=3.1.0,<3.3",    # Looks like only bugfixes in z-Stream.
@@ -65,7 +65,7 @@ dependencies = [
   "redis>=4.3.0,<5.3",  # Looks like only bugfixes in z-Stream.
   "tablib>=3.5.0,<3.6",  # 3.6.0 breaks with import export. Not sure about semver.
   "url-normalize>=1.4.3,<2.3",  # SemVer. https://github.com/niksite/url-normalize/blob/master/CHANGELOG.md#changelog
-  "uuid6>=2023.5.2,<=2025.0.0",
+  "uuid6>=2023.5.2,<=2025.0.1",
   "whitenoise>=5.0,<6.10.0",
   "yarl>=1.8,<1.21",  # Seems to follow SemVer https://yarl.aio-libs.org/en/latest/contributing/release_guide/#pre-release-activities .
 ]
@@ -208,7 +208,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.82.1"
+current_version = "3.83.1"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"