pulpcore 3.82.0__py3-none-any.whl → 3.83.0__py3-none-any.whl

pulp_certguard/app/__init__.py

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

pulp_file/app/__init__.py

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

pulpcore/app/apps.py

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

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/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,7 @@ 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"))
+        return content_qs.filter(pk__in=self._get_content_ids())
 
     @property
     def content(self):
@@ -977,9 +1004,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 +1019,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 +1030,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 +1055,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 +1101,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/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/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/tasking/tasks.py

@@ -249,6 +249,7 @@ def dispatch(
                 deferred=deferred,
                 profile_options=x_task_diagnostics_var.get(None),
             )
+            task.refresh_from_db()  # The database may have assigned a timestamp for us.
             if newest_created and task.pulp_created <= newest_created:
                 # Let this workaround not row forever into the future.
                 if newest_created - task.pulp_created > timedelta(seconds=1):

{pulpcore-3.82.0.dist-info → pulpcore-3.83.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.82.0
+Version: 3.83.0
 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.0.dist-info → pulpcore-3.83.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_certguard/__init__.py,sha256=llnEd00PrsAretsgAOHiNKFbmvIdXe3iDVPmSaKz7gU,71
 pulp_certguard/pytest_plugin.py,sha256=qhRbChzqN2PROtD-65KuoTfKr5k9T3GPsz9daFgpqpM,852
-pulp_certguard/app/__init__.py,sha256=asgxMyJ-_usTvtv9VipyiO0urYAshXR_2kfO8CtupGw,297
+pulp_certguard/app/__init__.py,sha256=VpVc88ihHFsvJn-lWEAvOmLWtLdHSnDsQlDdNOowOIc,297
 pulp_certguard/app/models.py,sha256=xy5IWxf0LQxayIDmQw25Y2YhB_NrlTGvuvdY-YW7QBU,8119
 pulp_certguard/app/serializers.py,sha256=3jxWu82vU3xA578Qbyz-G4Q9Zlh3MFLGRHzX62M0RF8,1826
 pulp_certguard/app/utils.py,sha256=O6T1Npdb8fu3XqIkDJd8PQdEFJWPUeQ-i_aHXBl7MEc,816
@@ -49,7 +49,7 @@ pulp_certguard/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6q
 pulp_file/__init__.py,sha256=0vOCXofR6Eyxkg4y66esnOGPeESCe23C1cNBHj56w44,61
 pulp_file/manifest.py,sha256=1WwIOJrPSkFcmkRm7CkWifVOCoZvo_nnANgce6uuG7U,3796
 pulp_file/pytest_plugin.py,sha256=l1PvTxUi5D3uJy4SnHWNhr-otWEYNcm-kc5nSqVJg0Y,10646
-pulp_file/app/__init__.py,sha256=H2wrrNOzI22OucPfAe9Od3DtsHVRpfwIA0kcylz6Efc,292
+pulp_file/app/__init__.py,sha256=V8tnnkZot-0zwAX2rtdh7A2e9Jk-fNzYTHvNV87Hqv8,292
 pulp_file/app/modelresource.py,sha256=v-m-_bBEsfr8wG0TI5ffx1TuKUy2-PsirhuQz4XXF-0,1063
 pulp_file/app/models.py,sha256=QsrVg_2uKqnR89sLN2Y7Zy260_nLIcUfa94uZowlmFw,4571
 pulp_file/app/replica.py,sha256=OtNWVmdFUgNTYhPttftVNQnSrnvx2_hnrJgtW_G0Vrg,1894
@@ -110,7 +110,7 @@ pulpcore/pytest_plugin.py,sha256=skubiEUIevVURr4LnmmVMt_ZeH5vT9mI0yiPUYerMnQ,380
 pulpcore/responses.py,sha256=mIGKmdCfTSoZxbFu4yIH1xbdLx1u5gqt3D99LTamcJg,6125
 pulpcore/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/app/access_policy.py,sha256=5vCKy6WoHtIt1_-eS5vMaZ7CmR4G-CIpsrB8yT-d88Q,6079
-pulpcore/app/apps.py,sha256=0CaBE8E7gFLpu-mv5pv13EjHBBNa7Tj3r9oNT5Tiw8Y,17860
+pulpcore/app/apps.py,sha256=IW5DssCm6NG4cu8TVPar3EYtcltL-NgMiIa9KyxaIo8,17860
 pulpcore/app/authentication.py,sha256=1LIJW6HIQQlZrliHy__jdzkDEh6Oj7xKgd0V-vRcDus,2855
 pulpcore/app/checks.py,sha256=jbfTF7nmftBbky4AQXHigpyCaGydKasvRUXsd72JZVg,1946
 pulpcore/app/entrypoint.py,sha256=YIfQpM5UxybBTasiEY5ptq--UmqPqjdIGnwmqVsDC7E,4972
@@ -285,6 +285,7 @@ pulpcore/app/migrations/0130_upstreampulp_policy.py,sha256=PLpgBU6iXTl7gruCe12aA
 pulpcore/app/migrations/0131_distribution_checkpoint_publication_checkpoint.py,sha256=MXZXQapnSXVfV9FFiIaoMb6M7qAnAJwtEmN6hSlJ8RQ,561
 pulpcore/app/migrations/0132_alter_content_options.py,sha256=hrhUTsRqQJgwC6wU9Ys5AvyVz2YCzklj2OuVf6hyBfs,477
 pulpcore/app/migrations/0132_task_profile_options.py,sha256=ljdIm5-NXl_8s87HzkthvUxr7eHhLaETrr5qNtAVKDE,518
+pulpcore/app/migrations/0133_repositoryversion_content_ids.py,sha256=P8H16p6-EWtnyoenomC4R8CvAivfPqUkkRAsoizgm2M,545
 pulpcore/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/app/models/__init__.py,sha256=9JKMGKbEV6nJPep_K36rnWnS1QWMKBFSty-Hkr65JVk,3459
 pulpcore/app/models/access_policy.py,sha256=o4L41RGoZ5UMmh5UeeenmadD5MJgShguphgd4eAVxQA,6071
@@ -301,7 +302,7 @@ pulpcore/app/models/openpgp.py,sha256=3R5p8ZBPq63NzaE2_EwCXEMYPUQu7QUWanMcKCOoWk
 pulpcore/app/models/progress.py,sha256=osD0cqPWC5oaebKgjpaOLY6tgv1bpjA66ty7nr8TaLU,13499
 pulpcore/app/models/publication.py,sha256=Ltiwylew7OOrobQRjdy1p6NbppBMXD2uX_IC2Ybgl7E,28869
 pulpcore/app/models/replica.py,sha256=i_wPxyPaVWpEVTJNVjJsBarxFauqeagtuwLadsmVz-g,2067
-pulpcore/app/models/repository.py,sha256=xBMKsryirkpZyrQHnFbwolNbvyX1jHljcqC1ofvkD7A,56185
+pulpcore/app/models/repository.py,sha256=LESgL3t4ae67uXn_G8ZfDTv7NchfOffORkfNgoatbiY,57432
 pulpcore/app/models/role.py,sha256=dZklNd2VeAw4cT6dyJ7SyTBt9sZvdqakY86wXGAY3vU,3287
 pulpcore/app/models/status.py,sha256=72oUOJ7BnCAw3uDbc-XuI72oAyP2llCoBic4zb2JP78,3683
 pulpcore/app/models/storage.py,sha256=2b-DQWaO31NqjV6FiISALegND-sQZAU7BVAsduUvm3o,6780
@@ -316,7 +317,7 @@ pulpcore/app/serializers/base.py,sha256=ojWmsr2U2Mx8qpSFxqHLNQyfU2Z9q7hY1NUwVs9s
 pulpcore/app/serializers/content.py,sha256=TKEh774Q-0l1AfUeMmVxPM5lk5UiYZxgkt9NU1RjZ9M,11966
 pulpcore/app/serializers/domain.py,sha256=y2qXdf2gSvWH5UtYULhX390u6wWmegg-GD9g5QwqZJA,22758
 pulpcore/app/serializers/exporter.py,sha256=TxAgHDt34YUGPusawn7B8HL3bBymp46__6CnfhXSgGs,11179
-pulpcore/app/serializers/fields.py,sha256=kWA6wYNA8dYmDJfFE_3eVUQRj4vCceqjzYPEEP53rxA,16481
+pulpcore/app/serializers/fields.py,sha256=Ql-DXvOFWrJ98ISB-6GGR19K2FD2WNkvV2dJDeTPURM,16502
 pulpcore/app/serializers/importer.py,sha256=PVSNs5U0dfAm-XlRKpMqOXK0VmUErxJauNJCNro6ONA,8200
 pulpcore/app/serializers/openpgp.py,sha256=3Svxskj_-HmOVbjay7QI82zXnKTsbtaSlZZ03CoT-MQ,8966
 pulpcore/app/serializers/orphans.py,sha256=Vhyaj0fqYT4pkiYoNjgmsy1u5BiR_aHwZm2y7rk9cbk,1967
@@ -367,7 +368,7 @@ pulpcore/app/viewsets/orphans.py,sha256=wArGxXMBdvRO3D_MMwlqd1kZkXrLNEFoUOEJDkVT
 pulpcore/app/viewsets/publication.py,sha256=5os3PVMs0Z7oRJX5HkQ7U8JojLengq7rYCUdVZ7PJd8,19443
 pulpcore/app/viewsets/reclaim.py,sha256=s8eURE5LItYBwo8c3aBou5SgclnXfDm0-KOW2seIzHQ,1757
 pulpcore/app/viewsets/replica.py,sha256=SOzcl30r-X5I5Ia_IZlb3BBGC31UqnMSf8uipgPC2sg,4981
-pulpcore/app/viewsets/repository.py,sha256=e6oHiLUzF6DcWhu9SttFTftcklYc1jTfY57QLl9AqD0,12954
+pulpcore/app/viewsets/repository.py,sha256=kRk1Ww61bvTiKVTz_o9Gr4sSJcM2s5CXvcYCF8A_Br4,12975
 pulpcore/app/viewsets/task.py,sha256=pMoOQnhjA91dUgNNAnL3OaCHcVOrQcB-CD3D5Px96YE,16753
 pulpcore/app/viewsets/upload.py,sha256=Mfy9Vcm5KcqARooH4iExzoXVkL6boDddEqAnGWDWzFg,5452
 pulpcore/app/viewsets/user.py,sha256=86eMawpaVrvp6ilQmb1C4j7SKpesPB5HgMovYL9rY3Q,13813
@@ -429,7 +430,7 @@ pulpcore/tasking/_util.py,sha256=fPW4k1nUa_NZ0ywy_A15Fuiejo5stY58abPbZTXw5t8,990
 pulpcore/tasking/entrypoint.py,sha256=Npnn41e39soGvJ7CTaZXT5MjIhOO7UtQmpmNaZtfKYg,1120
 pulpcore/tasking/kafka.py,sha256=76z4DzeXM1WL5uu1HlKnduWeLO3-b-czvGBXdWR6054,3845
 pulpcore/tasking/storage.py,sha256=zQkwlpC_FDQtmZGZ8vKwHqxvD6CLO_gAS4Q7wijZE-k,3106
-pulpcore/tasking/tasks.py,sha256=OhiKVl_WKc7m-7V-bWTh9hM3GgQlcnPCIeLw97FXAYM,14448
+pulpcore/tasking/tasks.py,sha256=0WLv16FOCPOsrGAxEOYOkmzFP7MRYCczXWB94ajIkzY,14537
 pulpcore/tasking/worker.py,sha256=c9RgSYg4J_Jn_q70MVF_2egDeASFgXlLrP00lqWKtnQ,23822
 pulpcore/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -531,9 +532,9 @@ pulpcore/tests/unit/stages/test_artifactdownloader.py,sha256=qB1ANdFmNtUnljg8fCd
 pulpcore/tests/unit/stages/test_stages.py,sha256=H1a2BQLjdZlZvcb_qULp62huZ1xy6ItTcthktVyGU0w,4735
 pulpcore/tests/unit/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/unit/viewsets/test_viewset_base.py,sha256=W9o3V6758bZctR6krMPPQytb0xJuF-jb4uBWTNDoD_U,4837
-pulpcore-3.82.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
-pulpcore-3.82.0.dist-info/METADATA,sha256=WRDG4YKlKA1AR0LuMwR56Gsp7DRzkbqsXMUcurqx6jI,4320
-pulpcore-3.82.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pulpcore-3.82.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
-pulpcore-3.82.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
-pulpcore-3.82.0.dist-info/RECORD,,
+pulpcore-3.83.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
+pulpcore-3.83.0.dist-info/METADATA,sha256=mD378YtDXAZAY0Magpnrz1suf-YynabuXhpLvdFTwfg,4320
+pulpcore-3.83.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pulpcore-3.83.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
+pulpcore-3.83.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
+pulpcore-3.83.0.dist-info/RECORD,,