pulpcore 3.76.1__py3-none-any.whl → 3.77.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.76.1"
+    version = "3.77.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.76.1"
+    version = "3.77.0"
     python_package_name = "pulpcore"
     domain_compatible = True

pulp_file/tests/functional/api/test_remote_settings.py

@@ -1,10 +1,89 @@
-import uuid
-
 import pytest
+import uuid
 
 from pulpcore.client.pulp_file import (
     RepositorySyncURL,
 )
+from pulpcore.client.pulp_file.exceptions import BadRequestException
+
+GOOD_CERT = """-----BEGIN CERTIFICATE-----
+MIICoDCCAYgCCQC2c2uY34HNlzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdn
+b3ZlZ2FuMB4XDTE5MDMxMzIxMDMzMFoXDTM4MDYxNjIxMDMzMFowEjEQMA4GA1UE
+AwwHZ292ZWdhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEatWsZ
+1iwGmTxD02dxMI4ci+Au4FzvmWLBWD07H5GGTVFwnqmNOKhP6DHs1EsMZevkUvaG
+CRxZlPYhjNFLZr2c2FnoDZ5nBXlSW6sodXURbMfyT187nDeBXVYFuh4T2eNCatnm
+t3vgdi+pWsF0LbOgpu7GJI2sh5K1imxyB77tJ7PFTDZCSohkK+A+0nDCnJqDUNXD
+5CK8iaBciCbnzp3nRKuM2EmgXno9Repy/HYxIgB7ZodPwDvYNjMGfvs0s9mJIKmc
+CKgkPXVO9y9gaRrrytICcPOs+YoU/PN4Ttg6wzxaWvJgw44vsR8wM/0i4HlXfBdl
+9br+cgn8jukDOgECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAyNHV6NA+0GfUrvBq
+AHXHNnBE3nzMhGPhF/0B/dO4o0n6pgGZyzRxaUaoo6+5oQnBf/2NmDyLWdalFWX7
+D1WBaxkhK+FU922+qwQKhABlwMxGCnfZ8F+rlk4lNotm3fP4wHbnO1SGIDvvZFt/
+mpMgkhwL4lShUFv57YylXr+D2vSFcAryKiVGk1X3sHMXlFAMLHUm3d97fJnmb1qQ
+wC43BlJCBQF98wKtYNwTUG/9gblfk8lCB2DL1hwmPy3q9KbSDOdUK3HW6a75ZzCD
+6mXc/Y0bJcwweDsywbPBYP13hYUcpw4htcU6hg6DsoAjLNkSrlY+GGo7htx+L9HH
+IwtfRg==
+-----END CERTIFICATE-----
+"""
+
+GOOD_CERT_WITH_COMMENT = """saydas Intermédiaire CA
+-----BEGIN CERTIFICATE-----
+MIICoDCCAYgCCQC2c2uY34HNlzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdn
+b3ZlZ2FuMB4XDTE5MDMxMzIxMDMzMFoXDTM4MDYxNjIxMDMzMFowEjEQMA4GA1UE
+AwwHZ292ZWdhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEatWsZ
+1iwGmTxD02dxMI4ci+Au4FzvmWLBWD07H5GGTVFwnqmNOKhP6DHs1EsMZevkUvaG
+CRxZlPYhjNFLZr2c2FnoDZ5nBXlSW6sodXURbMfyT187nDeBXVYFuh4T2eNCatnm
+t3vgdi+pWsF0LbOgpu7GJI2sh5K1imxyB77tJ7PFTDZCSohkK+A+0nDCnJqDUNXD
+5CK8iaBciCbnzp3nRKuM2EmgXno9Repy/HYxIgB7ZodPwDvYNjMGfvs0s9mJIKmc
+CKgkPXVO9y9gaRrrytICcPOs+YoU/PN4Ttg6wzxaWvJgw44vsR8wM/0i4HlXfBdl
+9br+cgn8jukDOgECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAyNHV6NA+0GfUrvBq
+AHXHNnBE3nzMhGPhF/0B/dO4o0n6pgGZyzRxaUaoo6+5oQnBf/2NmDyLWdalFWX7
+D1WBaxkhK+FU922+qwQKhABlwMxGCnfZ8F+rlk4lNotm3fP4wHbnO1SGIDvvZFt/
+mpMgkhwL4lShUFv57YylXr+D2vSFcAryKiVGk1X3sHMXlFAMLHUm3d97fJnmb1qQ
+wC43BlJCBQF98wKtYNwTUG/9gblfk8lCB2DL1hwmPy3q9KbSDOdUK3HW6a75ZzCD
+6mXc/Y0bJcwweDsywbPBYP13hYUcpw4htcU6hg6DsoAjLNkSrlY+GGo7htx+L9HH
+IwtfRg==
+-----END CERTIFICATE-----
+"""
+
+GOOD_CERT_TWO = """-----BEGIN CERTIFICATE-----
+MIICqjCCAZICAgtCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNVBAMMB2dvdmVnYW4w
+HhcNMTkwMzEzMjEwMzMwWhcNMjkwMzEwMjEwMzMwWjAjMRAwDgYDVQQDDAdnb3Zl
+Z2FuMQ8wDQYDVQQKDAZjbGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCxJWx5t25jY4womWtKxGqv2LHg9YnU0b2VCECLhu5JjoAzFPja5VHB0Maz
+G8m5c0+N2ubrPcBC+KdoGMd2MqrrGyzKOiwbVDW0YOgnFqh58p796iKtVboWx41y
+Gzn289PzYccxH6mhhPmRVD25KyV1TenqvGIHJTepF7mgIemGDTv+j7+mYPT/3r6I
+pnwTkEVPr+Q4iW0l3fNESlFFRt2b7yhz9f0E4SMhmIRnSIGOLO1zE02IJ1hTuGkx
+/MZ1AqQdVSdm4jenTIMp91R1kYylI66yMcpU6w6x4j8qvJ8nBZ4r4DqOHcOobyHp
+qlaJjv/K5SGJxV2k0EFk7b483lbrAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALYh
+SHLGJCxVL8ePFLs294fhTq4pTQsvHm8q3SyJD9DaB+HKTceCFErNv18Dsl/QwBis
+WPHWKpDN0EUcuuE/8oUaGjjzByJ8bPafMicFCHSSefcJw+IOOqKBkWDT+4YGkvfs
+RpwxSLqLOhEt7aSkiPcMvD20v8cvj0O36c5G3Vv0E8WmPWOEqjyPFoU9X1vACr+h
+DdIKvxFbvRU9ObektFxOYHuvP010IBv2dGyw3G5W5fh9A5OSXHAShWSwkRU36oft
+ugB47fIIlb7zLm4GBmxGG0yBwAf4otBlUXVNqNx15bbUuVgKbGMFfItQgEo9AQcz
+gGsetwDOs/NgZ95oH40=
+-----END CERTIFICATE-----
+"""
+
+BAD_CERT = """-----BEGIN CERTIFICATE-----\nBOGUS==\n-----END CERTIFICATE-----
+"""
+
+NO_CERT = """
+MIICoDCCAYgCCQC2c2uY34HNlzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdn
+b3ZlZ2FuMB4XDTE5MDMxMzIxMDMzMFoXDTM4MDYxNjIxMDMzMFowEjEQMA4GA1UE
+AwwHZ292ZWdhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEatWsZ
+1iwGmTxD02dxMI4ci+Au4FzvmWLBWD07H5GGTVFwnqmNOKhP6DHs1EsMZevkUvaG
+CRxZlPYhjNFLZr2c2FnoDZ5nBXlSW6sodXURbMfyT187nDeBXVYFuh4T2eNCatnm
+t3vgdi+pWsF0LbOgpu7GJI2sh5K1imxyB77tJ7PFTDZCSohkK+A+0nDCnJqDUNXD
+5CK8iaBciCbnzp3nRKuM2EmgXno9Repy/HYxIgB7ZodPwDvYNjMGfvs0s9mJIKmc
+CKgkPXVO9y9gaRrrytICcPOs+YoU/PN4Ttg6wzxaWvJgw44vsR8wM/0i4HlXfBdl
+9br+cgn8jukDOgECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAyNHV6NA+0GfUrvBq
+AHXHNnBE3nzMhGPhF/0B/dO4o0n6pgGZyzRxaUaoo6+5oQnBf/2NmDyLWdalFWX7
+D1WBaxkhK+FU922+qwQKhABlwMxGCnfZ8F+rlk4lNotm3fP4wHbnO1SGIDvvZFt/
+mpMgkhwL4lShUFv57YylXr+D2vSFcAryKiVGk1X3sHMXlFAMLHUm3d97fJnmb1qQ
+wC43BlJCBQF98wKtYNwTUG/9gblfk8lCB2DL1hwmPy3q9KbSDOdUK3HW6a75ZzCD
+6mXc/Y0bJcwweDsywbPBYP13hYUcpw4htcU6hg6DsoAjLNkSrlY+GGo7htx+L9HH
+IwtfRg==
+"""
 
 
 def _run_basic_sync_and_assert(file_bindings, remote, file_repo, monitor_task):
@@ -211,3 +290,55 @@ def test_header_for_sync(
     assert requests_record[0].path == "/basic/PULP_MANIFEST"
     assert header_name in requests_record[0].headers
     assert header_value == requests_record[0].headers[header_name]
+
+
+@pytest.mark.parallel
+def test_certificate_clean(file_remote_factory):
+    # Check that a good cert validates
+    a_remote = file_remote_factory(url="http://example.com/", ca_cert=GOOD_CERT)
+    assert a_remote.ca_cert == GOOD_CERT
+    a_remote = file_remote_factory(url="http://example.com/", client_cert=GOOD_CERT)
+    assert a_remote.client_cert == GOOD_CERT
+
+    # Check that a good-cert-with-comments validates and strips the comments
+    a_remote = file_remote_factory(url="http://example.com/", ca_cert=GOOD_CERT_WITH_COMMENT)
+    assert a_remote.ca_cert == GOOD_CERT
+    a_remote = file_remote_factory(url="http://example.com/", client_cert=GOOD_CERT_WITH_COMMENT)
+    assert a_remote.client_cert == GOOD_CERT
+
+    # Check that a bad-cert gets rejected
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", ca_cert=BAD_CERT)
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", client_cert=BAD_CERT)
+
+    # Check that a no-cert string returns the expected error
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", ca_cert=NO_CERT)
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", client_cert=NO_CERT)
+
+
+@pytest.mark.parallel
+def test_multi_certificate_clean(file_remote_factory):
+    multi_cert = GOOD_CERT + GOOD_CERT_TWO
+
+    # Check that a good multi-cert PEM validates
+    a_remote = file_remote_factory(url="http://example.com/", ca_cert=multi_cert)
+    assert a_remote.ca_cert == multi_cert
+    a_remote = file_remote_factory(url="http://example.com/", client_cert=multi_cert)
+    assert a_remote.client_cert == multi_cert
+
+    # Check that a good-cert-with-comments validates and strips the comments
+    multi_cert_with_comment = GOOD_CERT_WITH_COMMENT + GOOD_CERT_TWO
+    a_remote = file_remote_factory(url="http://example.com/", ca_cert=multi_cert_with_comment)
+    assert a_remote.ca_cert == multi_cert
+    a_remote = file_remote_factory(url="http://example.com/", client_cert=multi_cert_with_comment)
+    assert a_remote.client_cert == multi_cert
+
+    # Check that multi-with-bad is rejected
+    multi_bad = GOOD_CERT + BAD_CERT
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", ca_cert=multi_bad)
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", client_cert=multi_bad)

pulpcore/app/apps.py

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

pulpcore/app/replica.py

@@ -8,7 +8,7 @@ from pulp_glue.common.context import PulpContext
 from pulpcore.app.models import UpstreamPulp
 from pulpcore.tasking.tasks import dispatch
 from pulpcore.app.tasks.base import (
-    general_update,
+    ageneral_update,
     general_create,
     general_multi_delete,
 )
@@ -133,7 +133,7 @@ class Replicator:
             needs_update = self.needs_update(remote_fields_dict, remote)
             if needs_update:
                 dispatch(
-                    general_update,
+                    ageneral_update,
                     task_group=self.task_group,
                     shared_resources=[self.server],
                     exclusive_resources=[remote],
@@ -162,7 +162,7 @@ class Replicator:
             needs_update = self.needs_update(repo_fields_dict, repository)
             if needs_update:
                 dispatch(
-                    general_update,
+                    ageneral_update,
                     task_group=self.task_group,
                     shared_resources=[self.server],
                     exclusive_resources=[repository],
@@ -197,7 +197,7 @@ class Replicator:
             if needs_update:
                 # Update the distribution
                 dispatch(
-                    general_update,
+                    ageneral_update,
                     task_group=self.task_group,
                     shared_resources=[repository, self.server],
                     exclusive_resources=self.distros_uris,

pulpcore/app/serializers/publication.py

@@ -407,14 +407,34 @@ def validate_repo_and_remote(repository, field, **kwargs):
 
     detail_repo = repository.cast()
     if detail_repo.remote and type(detail_repo.remote.cast()) not in detail_repo.REMOTE_TYPES:
-        msg = (
-            f"Type for Remote '{get_prn(repository.remote)}' "
-            f"does not match Repository '{get_prn(repository)}'"
-        )
-        if repository_version := kwargs.pop("repository_version", None):
-            msg += f" from RepositoryVersion '{get_prn(repository_version)}'"
-        if publication := kwargs.pop("publication", None):
-            msg += f" from Publication '{get_prn(publication)}'"
-        msg += "."
+        repository_version = kwargs.pop("repository_version", None)
+        publication = kwargs.pop("publication", None)
+
+        if repository_version and publication:
+            msg_template = _(
+                "Type for Remote '{remote}' does not match Repository '{repository}' "
+                "from RepositoryVersion '{repository_version}' from Publication '{publication}'."
+            )
+        elif repository_version:
+            msg_template = _(
+                "Type for Remote '{remote}' does not match Repository '{repository}' "
+                "from RepositoryVersion '{repository_version}'."
+            )
+        elif publication:
+            msg_template = _(
+                "Type for Remote '{remote}' does not match Repository '{repository}' "
+                "from Publication '{publication}'."
+            )
+        else:
+            msg_template = _("Type for Remote '{remote}' does not match Repository '{repository}'.")
 
-        raise serializers.ValidationError({field: _(msg)})
+        raise serializers.ValidationError(
+            {
+                field: msg_template.format(
+                    remote=get_prn(repository.remote),
+                    repository=get_prn(repository),
+                    repository_version=get_prn(repository_version) if repository_version else "",
+                    publication=get_prn(publication) if publication else "",
+                )
+            }
+        )

pulpcore/app/serializers/repository.py

@@ -1,4 +1,5 @@
 import os
+from cryptography.x509 import load_pem_x509_certificate
 from gettext import gettext as _
 from urllib.parse import urlparse
 
@@ -72,6 +73,46 @@ class RepositorySerializer(ModelSerializer):
         )
 
 
+def validate_certificate(which_cert, value):
+    """
+    Validate and return *just* the certs and not any commentary that came along with them.
+
+    Args:
+        which_cert: The attribute-name whose cert we're validating (only used for error-message).
+        value: The string being proposed as a certificate-containing PEM.
+
+    Raises:
+        ValidationError: When the provided value has no or an invalid certificate.
+
+    Returns:
+        The pem-string with *just* the validated BEGIN/END CERTIFICATE segments.
+    """
+    if value:
+        try:
+            # Find any/all CERTIFICATE entries in the proposed PEM and let crypto validate them.
+            # NOTE: crypto/39 includes load_certificates(), which will let us remove this whole
+            # loop. But we want to fix the current problem on older supported branches that
+            # allow 38, so we do it ourselves for now
+            certs = list()
+            a_cert = ""
+            for line in value.split("\n"):
+                if "-----BEGIN CERTIFICATE-----" in line or a_cert:
+                    a_cert += line + "\n"
+                if "-----END CERTIFICATE-----" in line:
+                    load_pem_x509_certificate(bytes(a_cert, "ASCII"))
+                    certs.append(a_cert.strip())
+                    a_cert = ""
+            if not certs:
+                raise serializers.ValidationError(
+                    "No {} specified in string {}".format(which_cert, value)
+                )
+            return "\n".join(certs) + "\n"
+        except ValueError as e:
+            raise serializers.ValidationError(
+                "Invalid {} specified, error '{}'".format(which_cert, e.args)
+            )
+
+
 class RemoteSerializer(ModelSerializer, HiddenFieldsMixin):
     """
     Every remote defined by a plugin should have a Remote serializer that inherits from this
@@ -271,6 +312,12 @@ class RemoteSerializer(ModelSerializer, HiddenFieldsMixin):
             raise serializers.ValidationError(_("proxy_url must not contain credentials"))
         return value
 
+    def validate_ca_cert(self, value):
+        return validate_certificate("ca_cert", value)
+
+    def validate_client_cert(self, value):
+        return validate_certificate("client_cert", value)
+
     def validate(self, data):
         """
         Check, that proxy credentials are only provided completely and if a proxy is configured.
@@ -365,9 +412,8 @@ class RepositorySyncURLSerializer(ValidateFieldsMixin, serializers.Serializer):
         if repository and type(remote.cast()) not in repository.cast().REMOTE_TYPES:
             raise serializers.ValidationError(
                 {
-                    "remote": _(
-                        f"Type for Remote '{get_prn(remote)}' "
-                        f"does not match Repository '{get_prn(repository)}'."
+                    "remote": _("Type for Remote '{}' does not match Repository '{}'.").format(
+                        get_prn(remote), get_prn(repository)
                     )
                 }
             )

pulpcore/app/settings.py

@@ -382,7 +382,19 @@ ALLOWED_CONTENT_CHECKSUMS = ["sha224", "sha256", "sha384", "sha512"]
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
-TASK_DIAGNOSTICS = False
+# Possible diagnostics:
+# * "memory"
+#    Logs the task process RSS every couple of seconds
+# * "pyinstrument"
+#    Dumps an HTML profile report produced by pyinstrument, showing time spent in various
+#    callstacks. This adds ~10% overhead to the task process and consumes extra memory.
+#    Tweaking code might be warranted for some advanced settings.
+# * "memray" - Dumps a report produced by memray which logs how much memory was allocated by which
+#    lines and functions, at the time of peak RSS of the task process. This adds significant
+#    runtime overhead to the task process, 20-40%. Tweaking code might be warranted for
+#    some advanced settings.
+# NOTE: "memray" and "pyinstrument" require additional packages to be installed on the system.
+TASK_DIAGNOSTICS = []  # ["memory", "pyinstrument", "memray"]
 
 ANALYTICS = True
 

pulpcore/app/tasks/__init__.py

@@ -1,11 +1,11 @@
 from pulpcore.app.tasks import base, repository, upload
 
 from .base import (
+    ageneral_update,
     general_create,
     general_create_from_temp_file,
     general_delete,
     general_multi_delete,
-    general_update,
 )
 
 from .export import fs_publication_export, fs_repo_version_export

pulpcore/app/tasks/base.py

@@ -2,8 +2,11 @@ from django.db import transaction
 
 from pulpcore.app.apps import get_plugin_config
 from pulpcore.app.models import CreatedResource
+from pulpcore.app.loggers import deprecation_logger
 from pulpcore.plugin.models import MasterModel
 
+from asgiref.sync import sync_to_async
+
 
 def general_create_from_temp_file(app_label, serializer_name, temp_file_pk, *args, **kwargs):
     """
@@ -63,6 +66,10 @@ def general_update(instance_id, app_label, serializer_name, *args, **kwargs):
             due to validation error. This theoretically should never occur since validation is
             performed before the task is dispatched.
     """
+    deprecation_logger.warning(
+        "`pulpcore.app.tasks.base.general_update` is deprecated and will be removed in Pulp 4. "
+        "Use `pulpcore.app.tasks.base.ageneral_update` instead."
+    )
     data = kwargs.pop("data", None)
     partial = kwargs.pop("partial", False)
     serializer_class = get_plugin_config(app_label).named_serializers[serializer_name]
@@ -85,6 +92,10 @@ def general_delete(instance_id, app_label, serializer_name):
         app_label (str): the Django app label of the plugin that provides the model
         serializer_name (str): name of the serializer class for the model
     """
+    deprecation_logger.warning(
+        "`pulpcore.app.tasks.base.general_delete` is deprecated and will be removed in Pulp 4. "
+        "Use `pulpcore.app.tasks.base.ageneral_delete` instead."
+    )
     serializer_class = get_plugin_config(app_label).named_serializers[serializer_name]
     instance = serializer_class.Meta.model.objects.get(pk=instance_id)
     if isinstance(instance, MasterModel):
@@ -111,3 +122,29 @@ def general_multi_delete(instance_ids):
     with transaction.atomic():
         for instance in instances:
             instance.delete()
+
+
+async def ageneral_update(instance_id, app_label, serializer_name, *args, **kwargs):
+    """
+    Async version of [pulpcore.app.tasks.base.general_update][].
+    """
+    data = kwargs.pop("data", None)
+    partial = kwargs.pop("partial", False)
+    serializer_class = get_plugin_config(app_label).named_serializers[serializer_name]
+    instance = await serializer_class.Meta.model.objects.aget(pk=instance_id)
+    if isinstance(instance, MasterModel):
+        instance = await instance.acast()
+    serializer = serializer_class(instance, data=data, partial=partial)
+    await sync_to_async(serializer.is_valid)(raise_exception=True)
+    await sync_to_async(serializer.save)()
+
+
+async def ageneral_delete(instance_id, app_label, serializer_name):
+    """
+    Async version of [pulpcore.app.tasks.base.general_delete][].
+    """
+    serializer_class = get_plugin_config(app_label).named_serializers[serializer_name]
+    instance = await serializer_class.Meta.model.objects.aget(pk=instance_id)
+    if isinstance(instance, MasterModel):
+        instance = await instance.acast()
+    await instance.adelete()

pulpcore/app/tasks/test.py

@@ -1,4 +1,6 @@
+import asyncio
 import backoff
+import time
 from pulpcore.app.models import TaskGroup
 from pulpcore.tasking.tasks import dispatch
 
@@ -9,17 +11,18 @@ def dummy_task():
 
 
 def sleep(interval):
-    from time import sleep
+    time.sleep(interval)
 
-    sleep(interval)
+
+async def asleep(interval):
+    """Async function that sleeps."""
+    await asyncio.sleep(interval)
 
 
 @backoff.on_exception(backoff.expo, BaseException)
 def gooey_task(interval):
     """A sleep task that tries to avoid being killed by ignoring all exceptions."""
-    from time import sleep
-
-    sleep(interval)
+    time.sleep(interval)
 
 
 def dummy_group_task(inbetween=3, intervals=None):
@@ -28,5 +31,5 @@ def dummy_group_task(inbetween=3, intervals=None):
     task_group = TaskGroup.current()
     for interval in intervals:
         dispatch(sleep, args=(interval,), task_group=task_group)
-        sleep(inbetween)
+        time.sleep(inbetween)
     task_group.finish()

pulpcore/app/viewsets/base.py

@@ -492,7 +492,7 @@ class AsyncUpdateMixin(AsyncReservedObjectMixin):
         serializer.is_valid(raise_exception=True)
         app_label = instance._meta.app_label
         task = dispatch(
-            tasks.base.general_update,
+            tasks.base.ageneral_update,
             exclusive_resources=self.async_reserved_resources(instance),
             args=(pk, app_label, serializer.__class__.__name__),
             kwargs={"data": request.data, "partial": partial},
@@ -528,7 +528,7 @@ class AsyncRemoveMixin(AsyncReservedObjectMixin):
         serializer = self.get_serializer(instance)
         app_label = instance._meta.app_label
         task = dispatch(
-            tasks.base.general_delete,
+            tasks.base.ageneral_delete,
             exclusive_resources=self.async_reserved_resources(instance),
             args=(pk, app_label, serializer.__class__.__name__),
             immediate=self.ALLOW_NON_BLOCKING_DELETE,

pulpcore/constants.py

@@ -45,6 +45,8 @@ TASK_FINAL_STATES = (
 #: Tasks in an incomplete state have not finished their work yet.
 TASK_INCOMPLETE_STATES = (TASK_STATES.WAITING, TASK_STATES.RUNNING, TASK_STATES.CANCELING)
 
+#: Timeout for immediate tasks in seconds
+IMMEDIATE_TIMEOUT = 5
 
 SYNC_MODES = SimpleNamespace(ADDITIVE="additive", MIRROR="mirror")
 SYNC_CHOICES = (

pulpcore/plugin/tasking.py

@@ -2,13 +2,13 @@
 from pulpcore.tasking.tasks import dispatch
 
 from pulpcore.app.tasks import (
+    ageneral_update,
     fs_publication_export,
     fs_repo_version_export,
     general_create,
     general_create_from_temp_file,
     general_delete,
     general_multi_delete,
-    general_update,
     orphan_cleanup,
     reclaim_space,
 )
@@ -16,6 +16,7 @@ from pulpcore.app.tasks.repository import add_and_remove
 
 
 __all__ = [
+    "ageneral_update",
     "dispatch",
     "fs_publication_export",
     "fs_repo_version_export",
@@ -23,7 +24,6 @@ __all__ = [
     "general_create_from_temp_file",
     "general_delete",
     "general_multi_delete",
-    "general_update",
     "orphan_cleanup",
     "reclaim_space",
     "add_and_remove",

pulpcore/pytest_plugin.py

@@ -9,6 +9,7 @@ import shutil
 import socket
 import ssl
 import subprocess
+import sys
 import threading
 import uuid
 
@@ -1017,6 +1018,7 @@ def dispatch_task(pulpcore_bindings):
 
         assert process.returncode == 0
         task_href = process.stdout.decode().strip()
+        print(process.stderr.decode(), file=sys.stderr)
         return task_href
 
     return _dispatch_task

pulpcore/tasking/_util.py

@@ -71,8 +71,8 @@ def write_memory_usage(stop_event, path):
             current_mb_in_use = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1024
             file.write(f"{seconds}\t{current_mb_in_use:.2f}\n")
             file.flush()
-            time.sleep(5)
-            seconds += 5
+            time.sleep(2)
+            seconds += 2
 
 
 def child_signal_handler(sig, frame):
@@ -135,15 +135,21 @@ def perform_task(task_pk, task_working_dir_rel_path):
 
 def _execute_task_and_profile(task):
     with tempfile.TemporaryDirectory(dir=settings.WORKING_DIRECTORY) as temp_dir:
-        pyinstrument_func = _pyinstrument_diagnostic_decorator(temp_dir, execute_task)
-        memory_func = _memory_diagnostic_decorator(temp_dir, pyinstrument_func)
+        _execute_task = execute_task
 
-        memory_func(task)
+        if settings.TASK_DIAGNOSTICS is True or "memory" in settings.TASK_DIAGNOSTICS:
+            _execute_task = _memory_diagnostic_decorator(temp_dir, _execute_task)
+        if settings.TASK_DIAGNOSTICS is True or "pyinstrument" in settings.TASK_DIAGNOSTICS:
+            _execute_task = _pyinstrument_diagnostic_decorator(temp_dir, _execute_task)
+        if settings.TASK_DIAGNOSTICS is True or "memray" in settings.TASK_DIAGNOSTICS:
+            _execute_task = _memray_diagnostic_decorator(temp_dir, _execute_task)
+
+        _execute_task(task)
 
 
 def _memory_diagnostic_decorator(temp_dir, func):
     def __memory_diagnostic_decorator(task):
-        mem_diagnostics_file_path = os.path.join(temp_dir, "memory.datum")
+        mem_diagnostics_file_path = os.path.join(temp_dir, "memory_profile.datum")
         # It would be better to have this recording happen in the parent process instead of here
         # https://github.com/pulp/pulpcore/issues/2337
         stop_event = threading.Event()
@@ -158,10 +164,10 @@ def _memory_diagnostic_decorator(temp_dir, func):
         artifact = Artifact.init_and_validate(mem_diagnostics_file_path)
         with suppress(IntegrityError):
             artifact.save()
-
-        ProfileArtifact.objects.get_or_create(artifact=artifact, name="memory_profile", task=task)
-
-        _logger.info("Created memory diagnostic data.")
+            ProfileArtifact.objects.get_or_create(
+                artifact=artifact, name="memory_profile", task=task
+            )
+            _logger.info("Created memory diagnostic data.")
 
     return __memory_diagnostic_decorator
 
@@ -171,7 +177,7 @@ def _pyinstrument_diagnostic_decorator(temp_dir, func):
         if importlib.util.find_spec("pyinstrument") is not None:
             from pyinstrument import Profiler
 
-            with Profiler() as profiler:
+            with Profiler(interval=0.002) as profiler:
                 func(task)
 
             profile_file_path = os.path.join(temp_dir, "pyinstrument.html")
@@ -182,16 +188,40 @@ def _pyinstrument_diagnostic_decorator(temp_dir, func):
             artifact = Artifact.init_and_validate(str(profile_file_path))
             with suppress(IntegrityError):
                 artifact.save()
+                ProfileArtifact.objects.get_or_create(
+                    artifact=artifact, name="pyinstrument_profile", task=task
+                )
+                _logger.info("Created pyinstrument profile data.")
+        else:
+            func(task)
 
-            ProfileArtifact.objects.get_or_create(
-                artifact=artifact, name="pyinstrument_data", task=task
-            )
+    return __pyinstrument_diagnostic_decorator
+
+
+def _memray_diagnostic_decorator(temp_dir, func):
+    def __memray_diagnostic_decorator(task):
+        if importlib.util.find_spec("memray") is not None:
+            import memray
+
+            profile_file_path = os.path.join(temp_dir, "memray_profile.bin")
+            with memray.Tracker(
+                profile_file_path,
+                native_traces=False,
+                file_format=memray.FileFormat.AGGREGATED_ALLOCATIONS,
+            ):
+                func(task)
 
-            _logger.info("Created pyinstrument profile data.")
+            artifact = Artifact.init_and_validate(str(profile_file_path))
+            with suppress(IntegrityError):
+                artifact.save()
+                ProfileArtifact.objects.get_or_create(
+                    artifact=artifact, name="memray_profile", task=task
+                )
+                _logger.info("Created memray memory profile data.")
         else:
             func(task)
 
-    return __pyinstrument_diagnostic_decorator
+    return __memray_diagnostic_decorator
 
 
 def dispatch_scheduled_tasks():

pulpcore/tasking/tasks.py

@@ -7,6 +7,8 @@ import os
 import sys
 import traceback
 import tempfile
+import threading
+from asgiref.sync import sync_to_async
 from datetime import timedelta
 from gettext import gettext as _
 
@@ -16,12 +18,13 @@ from django.db.models import Model, Max
 from django_guid import get_guid
 from pulpcore.app.apps import MODULE_PLUGIN_VERSIONS
 from pulpcore.app.models import Task, TaskGroup
-from pulpcore.app.util import current_task, get_domain, get_prn
+from pulpcore.app.util import current_task, get_domain, get_prn, deprecation_logger
 from pulpcore.constants import (
     TASK_FINAL_STATES,
     TASK_INCOMPLETE_STATES,
     TASK_STATES,
     TASK_DISPATCH_LOCK,
+    IMMEDIATE_TIMEOUT,
 )
 from pulpcore.tasking.kafka import send_task_notification
 
@@ -75,11 +78,38 @@ def _execute_task(task):
         func = getattr(module, function_name)
         args = task.enc_args or ()
         kwargs = task.enc_kwargs or {}
-        result = func(*args, **kwargs)
-        if asyncio.iscoroutine(result):
+        immediate = task.immediate
+        is_coroutine_fn = asyncio.iscoroutinefunction(func)
+
+        if not is_coroutine_fn:
+            if immediate:
+                deprecation_logger.warning(
+                    "Immediate tasks must be coroutine functions. "
+                    "Support for non-coroutine immediate tasks will be dropped "
+                    "in pulpcore 3.85."
+                )
+                func = sync_to_async(func)
+                is_coroutine_fn = True
+            else:
+                func(*args, **kwargs)
+
+        if is_coroutine_fn:
             _logger.debug("Task is coroutine %s", task.pk)
+            coro = func(*args, **kwargs)
+            if immediate:
+                coro = asyncio.wait_for(coro, timeout=IMMEDIATE_TIMEOUT)
             loop = asyncio.get_event_loop()
-            loop.run_until_complete(result)
+            try:
+                loop.run_until_complete(coro)
+            except asyncio.TimeoutError:
+                _logger.info(
+                    "Immediate task %s timed out after %s seconds.", task.pk, IMMEDIATE_TIMEOUT
+                )
+                raise RuntimeError(
+                    "Immediate task timed out after {timeout} seconds.".format(
+                        timeout=IMMEDIATE_TIMEOUT,
+                    )
+                )
 
     except Exception:
         exc_type, exc, tb = sys.exc_info()
@@ -101,6 +131,14 @@ def _execute_task(task):
         send_task_notification(task)
 
 
+def running_from_thread_pool() -> bool:
+    # TODO: this needs an alternative approach ASAP!
+    # Currently we rely on the weak fact that ThreadPoolExecutor names threads like:
+    # "ThreadPoolExecutor-0_0"
+    thread_name = threading.current_thread().name
+    return "ThreadPoolExecutor" in thread_name
+
+
 def dispatch(
     func,
     args=None,
@@ -148,6 +186,8 @@ def dispatch(
         ValueError: When `resources` is an unsupported type.
     """
 
+    # Can't run short tasks immediately if running from thread pool
+    immediate = immediate and not running_from_thread_pool()
     assert deferred or immediate, "A task must be at least `deferred` or `immediate`."
 
     if callable(func):

pulpcore/tests/functional/api/test_tasking.py

@@ -10,8 +10,10 @@ from urllib.parse import urljoin
 from uuid import uuid4
 
 from pulpcore.client.pulpcore import ApiException
+from contextlib import contextmanager
 
-from pulpcore.tests.functional.utils import download_file
+from pulpcore.tests.functional.utils import download_file, PulpTaskError
+from pulpcore.constants import IMMEDIATE_TIMEOUT
 
 
 @pytest.fixture(scope="module")
@@ -445,3 +447,151 @@ def test_cancel_task_group(pulpcore_bindings, dispatch_task_group, gen_user):
 
     with gen_user(model_roles=["core.task_owner"]):
         pulpcore_bindings.TaskGroupsApi.task_groups_cancel(tgroup_href, {"state": "canceled"})
+
+
+LT_TIMEOUT = IMMEDIATE_TIMEOUT / 2
+GT_TIMEOUT = IMMEDIATE_TIMEOUT * 2
+
+
+class TestImmediateTaskWithNoResource:
+
+    @pytest.mark.parallel
+    def test_succeeds_on_api_worker(self, pulpcore_bindings, dispatch_task):
+        """
+        GIVEN a task with no resource requirements
+        AND the task IS an async function
+        WHEN dispatching a task as immediate
+        THEN the task completes with no associated worker
+        """
+        task_href = dispatch_task(
+            "pulpcore.app.tasks.test.asleep", args=(LT_TIMEOUT,), immediate=True
+        )
+        task = pulpcore_bindings.TasksApi.read(task_href)
+        assert task.state == "completed"
+        assert task.worker is None
+
+    @pytest.mark.parallel
+    def test_executes_on_api_worker_when_no_async(self, pulpcore_bindings, dispatch_task, capsys):
+        """
+        GIVEN a task with no resource requirements
+        AND the task IS NOT an async function
+        WHEN dispatching a task as immediate
+        THEN the task completes with no associated worker
+        """
+        # TODO: on 3.85 this should throw an error
+        task_href = dispatch_task(
+            "pulpcore.app.tasks.test.sleep", args=(LT_TIMEOUT,), immediate=True
+        )
+        stderr_content = capsys.readouterr().err
+        task = pulpcore_bindings.TasksApi.read(task_href)
+        assert task.state == "completed"
+        assert task.worker is None
+        assert "Support for non-coroutine immediate tasks will be dropped" in stderr_content
+
+    @pytest.mark.parallel
+    def test_timeouts_on_api_worker(self, pulpcore_bindings, dispatch_task):
+        """
+        GIVEN a task with no resource requirements
+        AND the task is an async function
+        WHEN dispatching a task as immediate
+        AND it takes longer than timeout
+        THEN the task fails with a timeout error message
+        """
+        task_href = dispatch_task(
+            "pulpcore.app.tasks.test.asleep", args=(GT_TIMEOUT,), immediate=True
+        )
+        task = pulpcore_bindings.TasksApi.read(task_href)
+        assert task.worker is None
+        assert "task timed out after" in task.error["description"]
+
+
+@pytest.fixture
+def resource_blocker(pulpcore_bindings, dispatch_task):
+
+    @contextmanager
+    def _resource_blocker(exclusive_resources: list[str], duration=20):
+        task_href = dispatch_task(
+            "pulpcore.app.tasks.test.sleep",
+            args=(duration,),
+            exclusive_resources=exclusive_resources,
+        )
+        yield
+        # Trying to cancel a finished task will return a 409 code.
+        # We can ignore if that's the case, because all we want here is to cut time down.
+        # Otherwise it might be a real error.
+        try:
+            pulpcore_bindings.TasksApi.tasks_cancel(task_href, {"state": "canceled"})
+        except ApiException as e:
+            if e.status != 409:
+                raise
+
+    return _resource_blocker
+
+
+class TestImmediateTaskWithBlockedResource:
+
+    @pytest.mark.parallel
+    def test_executes_in_task_worker(
+        self, resource_blocker, dispatch_task, monitor_task, pulpcore_bindings
+    ):
+        """
+        GIVEN an async task requiring busy resources
+        WHEN dispatching a task as immediate
+        THEN the task completes with a worker
+        """
+        COMMON_RESOURCE = str(uuid4())
+        with resource_blocker(exclusive_resources=[COMMON_RESOURCE]):
+            task_href = dispatch_task(
+                "pulpcore.app.tasks.test.asleep",
+                args=(LT_TIMEOUT,),
+                immediate=True,
+                exclusive_resources=[COMMON_RESOURCE],
+            )
+        task = monitor_task(task_href)
+        assert task.state == "completed"
+        assert task.worker is not None
+
+    @pytest.mark.parallel
+    def test_throws_when_non_deferrable(
+        self, resource_blocker, pulpcore_bindings, dispatch_task, monitor_task
+    ):
+        """
+        GIVEN an async task requiring busy resources
+        WHEN dispatching as immediate and not deferrable
+        THEN an error is raised
+        """
+        COMMON_RESOURCE = str(uuid4())
+        with resource_blocker(exclusive_resources=[COMMON_RESOURCE]):
+            task_href = dispatch_task(
+                "pulpcore.app.tasks.test.asleep",
+                args=(0,),
+                immediate=True,
+                deferred=False,
+                exclusive_resources=[COMMON_RESOURCE],
+            )
+            task = pulpcore_bindings.TasksApi.read(task_href)
+            assert task.state == "canceled"
+            assert task.worker is None
+            assert "Resources temporarily unavailable." in task.error["reason"]
+
+    @pytest.mark.parallel
+    def test_times_out_on_task_worker(
+        self, resource_blocker, pulpcore_bindings, dispatch_task, monitor_task
+    ):
+        """
+        GIVEN an async task requiring busy resources
+        WHEN dispatching a task as immediate
+        AND it takes longer than timeout
+        THEN an error is raised
+        """
+        COMMON_RESOURCE = str(uuid4())
+        with pytest.raises(PulpTaskError) as ctx:
+            with resource_blocker(exclusive_resources=[COMMON_RESOURCE]):
+                task_href = dispatch_task(
+                    "pulpcore.app.tasks.test.asleep",
+                    args=(GT_TIMEOUT,),
+                    immediate=True,
+                    exclusive_resources=[COMMON_RESOURCE],
+                )
+            monitor_task(task_href)
+        assert "task timed out after" in ctx.value.task.error["description"]

{pulpcore-3.76.1.dist-info → pulpcore-3.77.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.76.1
+Version: 3.77.0
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -21,14 +21,14 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiodns<=3.2.0,>=3.0
+Requires-Dist: aiodns<=3.3.0,>=3.0
 Requires-Dist: aiofiles<24.2.0,>=22.1
 Requires-Dist: aiohttp<3.12,>=3.8.1
 Requires-Dist: asyncio-throttle<=1.0.2,>=1.0
 Requires-Dist: async-timeout<4.0.4,>=4.0.3; python_version < "3.11"
 Requires-Dist: backoff<2.2.2,>=2.1.2
 Requires-Dist: click<=8.1.8,>=8.1.0
-Requires-Dist: cryptography<44.0.3,>=38.0.1
+Requires-Dist: cryptography<44.0.4,>=38.0.1
 Requires-Dist: Django~=4.2.0
 Requires-Dist: django-filter<=25.1,>=23.1
 Requires-Dist: django-guid<=3.5.1,>=3.3
@@ -52,13 +52,13 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.33,>=1.27.0
 Requires-Dist: protobuf<6.0,>=4.21.1
 Requires-Dist: pulp-glue<0.33,>=0.18.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
-Requires-Dist: psycopg[binary]<=3.2.6,>=3.1.8
+Requires-Dist: psycopg[binary]<=3.2.7,>=3.1.8
 Requires-Dist: pyparsing<=3.2.3,>=3.1.0
 Requires-Dist: python-gnupg<=0.5.4,>=0.5
 Requires-Dist: PyYAML<=6.0.2,>=5.1.1
 Requires-Dist: redis<5.2.2,>=4.3
 Requires-Dist: tablib<3.6.0
-Requires-Dist: url-normalize<=2.2.0,>=1.4.3
+Requires-Dist: url-normalize<=2.2.1,>=1.4.3
 Requires-Dist: uuid6<=2024.7.10,>=2023.5.2
 Requires-Dist: whitenoise<6.10.0,>=5.0
 Requires-Dist: yarl<1.20.1,>=1.8
@@ -75,6 +75,9 @@ Requires-Dist: django-prometheus; extra == "prometheus"
 Provides-Extra: kafka
 Requires-Dist: cloudevents==1.11.0; extra == "kafka"
 Requires-Dist: confluent-kafka<2.10.0,>=2.4.0; extra == "kafka"
+Provides-Extra: diagnostics
+Requires-Dist: pyinstrument~=5.0; extra == "diagnostics"
+Requires-Dist: memray~=1.17; extra == "diagnostics"
 Dynamic: license-file
 
 

{pulpcore-3.76.1.dist-info → pulpcore-3.77.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=ZJG_hpr0DY5FK-rulaYcw81s2Vz9_tsPykOohd-fyDk,297
+pulp_certguard/app/__init__.py,sha256=Ri9QtsoSI0bmv_5qz0wCvWhDbrGkCr8nUXdTtLNS8QM,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=Fi_p-Vle_I-VYUSe4Zlg7esb_Ul5fpB8Rx9UGLK5UNQ,13281
-pulp_file/app/__init__.py,sha256=Uj8lL9og-flRYyE8dXQGqmcwcyki0SyG4Qswk-CRTRo,292
+pulp_file/app/__init__.py,sha256=jbAB2BH6-V4jKXVeEoaxYLmvFY-CRmc2LSOL3mBWyEw,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
@@ -94,23 +94,23 @@ pulp_file/tests/functional/api/test_mime_types.py,sha256=ZTZVpEnYXcXsDVo1PaaWEXY
 pulp_file/tests/functional/api/test_publish.py,sha256=Bjb-IHknmlXS0gY15OUDvQFNJJQJqWaXU7uFmORBOOQ,5844
 pulp_file/tests/functional/api/test_pulp_export.py,sha256=j8MJs1H4-fdRZecxroYpKHEu0aqcsPw21Fxx6YC3b10,10275
 pulp_file/tests/functional/api/test_rbac.py,sha256=8smU2gy94Bj03CiKC_8nIbB-AdZxoLbJT3G2rzGENgk,12423
-pulp_file/tests/functional/api/test_remote_settings.py,sha256=g36B9HobAc7c_pRhUArRs0_7B6ZQyi-WS35Fh6jxui8,5362
+pulp_file/tests/functional/api/test_remote_settings.py,sha256=gpIgzuPCR2y_fJF-lOIA5SFFMcVEWfFxF6S0PiHAl7s,12034
 pulp_file/tests/functional/api/test_sync.py,sha256=jN87UoibkoJkqBV36ctvB9v72JKQHFnciRxFA-_1VfA,5673
 pulp_file/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_file/tests/unit/test_safe_paths.py,sha256=CRJX3-MdIZF_4-hVK-7brH9LSK2i97GdIYdqpe3Ao84,3796
 pulp_file/tests/unit/test_serializers.py,sha256=reDGIZrAaPHITwiv-LSCJ85JK-aCcNh5cavmAaba8vw,2143
 pulpcore/__init__.py,sha256=9L859gHcVX5TxrTP0Ef7GWv8oa7tsvIs_8XDkyZIu2g,107
 pulpcore/backends.py,sha256=Ax_MJpbvtNDg_rhkHaiQRm39DBSS2dH8UpMRJN2T0oE,4482
-pulpcore/constants.py,sha256=hhAt5-yKVdVpTxmK5U06ncMMEoHLx6W0imCURLVz2aI,4609
+pulpcore/constants.py,sha256=06lih8sVRzHCrBXGmoT3Q-9ZkKZUEEYZ8EoeFfxEq04,4673
 pulpcore/filters.py,sha256=dD5oRRkWg65s3LoObr-ipRvRsxZK_3Zr0lKMNr9Sg5o,16682
 pulpcore/metrics.py,sha256=Mfq-nnRjRf3vBHFO-ux-4d1I3yE7TgeptwgiSgGz4rA,2230
 pulpcore/middleware.py,sha256=tJB2rGnulvNBN1fZ6lyN4zd60ja5QUNYD4l5dLHHaoY,5079
 pulpcore/migrations.py,sha256=gzUTxcXnbYkM0_vN8Rfr_XWuwsGWedVZAwNy9JqJ8sQ,2476
-pulpcore/pytest_plugin.py,sha256=wI6pXJ1minJh_dza-gOMLp9pWeuhKNyLc3PaZxpYkDI,37713
+pulpcore/pytest_plugin.py,sha256=Tq_xlO8Z2iyjFtbnaKHbWQogq6jxcRpjji9XbKrs5_U,37780
 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=FbhBemzuCmMHD96tM274zjH2MPm9skxiWtpXU9S392Y,17860
+pulpcore/app/apps.py,sha256=Dyk1l_Cch5VavYZp-bbWsJA1SP9RcqQN9dPjHEKmtRE,17860
 pulpcore/app/authentication.py,sha256=1LIJW6HIQQlZrliHy__jdzkDEh6Oj7xKgd0V-vRcDus,2855
 pulpcore/app/checks.py,sha256=jbfTF7nmftBbky4AQXHigpyCaGydKasvRUXsd72JZVg,1946
 pulpcore/app/entrypoint.py,sha256=HRfaHDkveSIfcTOtWEWYqg1poTmTo0J9hzzmj0yDcEM,4885
@@ -125,10 +125,10 @@ pulpcore/app/openpgp.py,sha256=jyvOBlu_wGDH_aem3TN8hw51Dx2dd3NyLzCw4Q9Xlf0,17246
 pulpcore/app/pulp_hashlib.py,sha256=NoVCO8duLz9rggPcilg0smi6fTDnsn-zS9dXgO831Pg,1327
 pulpcore/app/pulpcore_gunicorn_application.py,sha256=caqbDg9dhzECbx9Ss76biuEARhquj9gQaSL6v3XLy2w,2612
 pulpcore/app/redis_connection.py,sha256=VTdG0ulXuyESjYV6SJdG_jLzkLZH-MlLcD6pielwRSk,952
-pulpcore/app/replica.py,sha256=V7Xk4NoKv8JtCe0YYicDw1GwAfCifvWIGvfon2vrv-0,11671
+pulpcore/app/replica.py,sha256=b6r-QF4H4G94N5HoaV3PGHeOD4-BqVb7YVsRNHx0h9Y,11675
 pulpcore/app/response.py,sha256=hYH_jSBrxmRsBr2bknmXE1qfs2g8JjDTXYcQ5ZWlF_c,1950
 pulpcore/app/role_util.py,sha256=84HSt8_9fxB--dtfSyg_TumVgOdyBbyP6rBaiAfTpOU,22393
-pulpcore/app/settings.py,sha256=0541xz9CH1WFRsrjQ8PvqAkMos871upg4X4oIf3I9go,21713
+pulpcore/app/settings.py,sha256=34pHnUfM1AzF1nKNtt31nthuFyQBd006fcH_Hq4ZmxI,22509
 pulpcore/app/urls.py,sha256=0gdI74CAdycJStXSw1gknviDGe3J3k0UhS4J8RYa5dg,8120
 pulpcore/app/util.py,sha256=kenzRmvDl1obKFb806ETlEE2qs8h3Y1KcCe-Q8AtYGY,24442
 pulpcore/app/wsgi.py,sha256=7rpZ_1NHEN_UfeNZCj8206bas1WeqRkHnGdxpd7rdDI,492
@@ -318,19 +318,19 @@ pulpcore/app/serializers/importer.py,sha256=PVSNs5U0dfAm-XlRKpMqOXK0VmUErxJauNJC
 pulpcore/app/serializers/openpgp.py,sha256=3Svxskj_-HmOVbjay7QI82zXnKTsbtaSlZZ03CoT-MQ,8966
 pulpcore/app/serializers/orphans.py,sha256=Vhyaj0fqYT4pkiYoNjgmsy1u5BiR_aHwZm2y7rk9cbk,1967
 pulpcore/app/serializers/progress.py,sha256=j4IQDLb_XOrLzTud4Fq8T-8kkOqLewReMVkbS5uCEIg,2575
-pulpcore/app/serializers/publication.py,sha256=66k9ZCdxK69IMLHeoldIHtRUFKZqRdS3AJGmWjmItqc,15569
+pulpcore/app/serializers/publication.py,sha256=9Lzvn5e04TQ8EVMR_aR5NWK-P3X_4PYSUaWAfD2rHQg,16439
 pulpcore/app/serializers/purge.py,sha256=CnjKWUvkuI207QMbqwmNs7FqMdOMUh1cujagby3vVM0,779
 pulpcore/app/serializers/reclaim.py,sha256=-ewdNqu-Ck1B_IUWJHG0pvN5zCMMEK9RiWI45g7D0ro,1710
 pulpcore/app/serializers/repair.py,sha256=uKrxTnhoarxyyGCixPRn9pmG19gRRVUTM7nPwCVp6_8,554
 pulpcore/app/serializers/replica.py,sha256=E3jwn1vfBqT4Y4s9pWsTrUEJKPO9pO0q2ZmwcpIDVh4,4044
-pulpcore/app/serializers/repository.py,sha256=ak75nibokkVL841Ulau6W77csn1w9MsIS9e5fHmu25A,18299
+pulpcore/app/serializers/repository.py,sha256=fSM92qJTjQIGXgnmA4xr62jRG9atYj6tkI_ZM6VFaM0,20224
 pulpcore/app/serializers/status.py,sha256=nIrQl-MlOzUIvV2DrkgC19gqGmRVNKvWVN4pIBELgcQ,3815
 pulpcore/app/serializers/task.py,sha256=IGJGoSEC_wKS8t77JGnZWRqK-Mk5-4rXSj8j0Ha6nRA,10026
 pulpcore/app/serializers/upload.py,sha256=4r6iBegbYHmgFYjBYPcqB8J7eSxXgY4ukayMxJZNh_M,2402
 pulpcore/app/serializers/user.py,sha256=gw-Qju1akkDtjxiehNM10jnoeaoApY1MATNfpboAFoY,17122
-pulpcore/app/tasks/__init__.py,sha256=5yb1gSzThCPXej80a8MMhQ3ykllxkYTjHLcciS5peZ4,575
+pulpcore/app/tasks/__init__.py,sha256=6fhLD0Z9LMluzqyBwQkatId71qI_2U7-o2-ZI1JH1Ls,576
 pulpcore/app/tasks/analytics.py,sha256=eB3p-sdocH5yyNoe0OG5rUzwiVOfayOfHNzkohAfx-U,4722
-pulpcore/app/tasks/base.py,sha256=1_sn4pSVV3-UB1ZX3zu9pD3tYAop4VFFIQUCEDm8yRU,4330
+pulpcore/app/tasks/base.py,sha256=4I88Bn5SttqEvvVlNJmIwkPv2IWe7OhpM-kbQiQ9T_U,5929
 pulpcore/app/tasks/export.py,sha256=dRg-KcnM7HumXUx8mjgJ-EVMcz2RbzSOPmMkzVtJEnI,19320
 pulpcore/app/tasks/importer.py,sha256=tQXCQZslaMySeN6BS6hLZtiGvq-XE-bwjsEjF7fAJNc,23247
 pulpcore/app/tasks/migrate.py,sha256=wCjGskoF-XWzbINEyC_crgcigFZlC8EHqZTbjkLQykg,2452
@@ -340,7 +340,7 @@ pulpcore/app/tasks/reclaim_space.py,sha256=FZ7KFasbScPAU7A6lzK98pdylmqgThssgnNMe
 pulpcore/app/tasks/replica.py,sha256=x-Yjd8Z4EUhrhuF1DCX5jCa6F7FTAE3th-161lnLN2g,4509
 pulpcore/app/tasks/repository.py,sha256=tPQ8KvsAUgX8Gd_hXsSc64uCmhVRQqHh36bykHlUPIw,9631
 pulpcore/app/tasks/telemetry.py,sha256=QXOcYi7VIx_TBPCfs2BfcaiiVzRCiTFPZCN8MlC-hw8,1338
-pulpcore/app/tasks/test.py,sha256=yC1_zinIIvmn1yAAdvJZGXG0h4Bh08M5bALA3y2niUQ,824
+pulpcore/app/tasks/test.py,sha256=_3BdJzdtEGdyL7qnzl0apwAoGeleYPeZTr7IJ5COFyo,912
 pulpcore/app/tasks/upload.py,sha256=3YJa32XYUFgqkEEWoERRPB9Q6ph9a6ashMtMi24R15k,1413
 pulpcore/app/templates/rest_framework/api.html,sha256=n2ymhyLN7tQ5dYc5uceRSqS5L8fsPnSHIfCBsFMshnM,246
 pulpcore/app/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -353,7 +353,7 @@ pulpcore/app/views/status.py,sha256=snoAyU7KCfaxe04Tc9UF9Go8A8-zCxpKoZ6nxFfmaVU,
 pulpcore/app/viewsets/__init__.py,sha256=iaDmZbjJalbU5BQ8q9sTKRX-64ToAnnyuHiLiFoyE-Y,2225
 pulpcore/app/viewsets/access_policy.py,sha256=Tjo443gpPfR9gRAgfQfTuV15eMWylZa7lPLucTAIKhQ,2447
 pulpcore/app/viewsets/acs.py,sha256=JabJntgGAMELbarKlTXDWrgMSYdMPgv6evJxoRdj66Y,2078
-pulpcore/app/viewsets/base.py,sha256=dqR5FbxtwlUUc1ERgZok1cT7_imc-aNauo1rg5hktmc,27135
+pulpcore/app/viewsets/base.py,sha256=7FgUMLl3ZOIflnzCEcrXr6spKRLNXyfffAHnuE3gQA8,27137
 pulpcore/app/viewsets/content.py,sha256=PLKdY6l_D5_5i3aFOYdVLAz5zpjKEJmXKrEFJOrcOFg,7919
 pulpcore/app/viewsets/custom_filters.py,sha256=_O3HPCbZ_we4ZO4gxCMQwWvDjk8JMisGIRwpkk2rkSs,14465
 pulpcore/app/viewsets/domain.py,sha256=HLdd3AvAa4gp64JPGQa0iYveSqVjFdsEIVvBksl7LCk,6059
@@ -404,7 +404,7 @@ pulpcore/plugin/repo_version_utils.py,sha256=nuo55r5rQgDoFfdaobuyvqINW1B8k5xM618
 pulpcore/plugin/responses.py,sha256=VcgJtVaTzCPjdIGz_AS4nQwO4ooh4O5T9KBEa1FGA1w,62
 pulpcore/plugin/storage.py,sha256=CMoWFPfZG82-SOmuuaf8aPDYerK7mvxlER_cgWdJzQA,82
 pulpcore/plugin/sync.py,sha256=IwAUZ_7vVYuba2Uhm0ndMyEnNZTkOhX0kOVWtb8SgxE,1002
-pulpcore/plugin/tasking.py,sha256=JCndCrbI-t9ZR458NB4eWftZZ8e2x9JlT67ze2H6rS0,675
+pulpcore/plugin/tasking.py,sha256=Ij9Zqamzn566Qf-8uvcm2q1AD4nZ6Mqi7FZnJow8Q2Y,677
 pulpcore/plugin/util.py,sha256=Az0DDhdC6fEIPApC5ffdvM4oMwbqteISJ-b1yEcFRBE,1470
 pulpcore/plugin/authentication/__init__.py,sha256=0qx9U7Poy96Ql3zu7DZwmzsA8Cx_yd1zHeeGKLeLXHg,69
 pulpcore/plugin/cache/__init__.py,sha256=0P1OqLmYxJdAaxhND6flNZzYa-korgIrzS1eOiTT_kc,74
@@ -422,11 +422,11 @@ pulpcore/plugin/stages/models.py,sha256=0b7xs9d64WTG2yHog1Zo_Z_-pomFAe-gC4u9wksY
 pulpcore/plugin/viewsets/__init__.py,sha256=G2zE-NRWz6PFYp8OMZrv01RYBQELFWfW702bRvxXs3k,2281
 pulpcore/plugin/viewsets/content.py,sha256=MHvmLOxsKSQfk6y5t1s9CVxkce9YNeU-dYb1Ldyf83I,6432
 pulpcore/tasking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulpcore/tasking/_util.py,sha256=AuS6HZ0ADCOpW75NDHuB4B-U3-Sw85QzxqYKequYSwE,8319
+pulpcore/tasking/_util.py,sha256=giR8f8fNvsjsTiuJOU9X21Dyb14fFntSYU7xXGwQZzo,9705
 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=VpLaaDPUIHSSXi2KM0RXlY5u5LE98mNss7EMsD3t03A,12355
+pulpcore/tasking/tasks.py,sha256=b0YzBoxXiBXC8piZlzV63ehRHsw8V3uq6t4v8Ec8OIg,13935
 pulpcore/tasking/worker.py,sha256=NpBACe6z_xFYOEeJYRne0hlwQDVrOAYGwpNCzSL-3C4,23819
 pulpcore/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -453,7 +453,7 @@ pulpcore/tests/functional/api/test_scoping.py,sha256=uiLOsx5_7puRMcvrpPKEYQziqlu
 pulpcore/tests/functional/api/test_signing_service.py,sha256=yr1HXBrNoliBHJNAGAN4PAN0eBKPIvAQP-uMoMSrO_I,222
 pulpcore/tests/functional/api/test_status.py,sha256=NYOoYIiIifv0jO74EvPZlqws7Hob6bE8Pk2ro9tvlyU,5456
 pulpcore/tests/functional/api/test_task_purge.py,sha256=Av4DrUdCqf-JegfoP1pkY4B-teoUzYd1LBZKAhDa-08,7273
-pulpcore/tests/functional/api/test_tasking.py,sha256=JdgBCHrDrD_4swZGtzAp2vsqpBbuZnz38uPRqC7QaUc,15946
+pulpcore/tests/functional/api/test_tasking.py,sha256=LPJtsRK9Ggh7CUsVuATcLYUnhdclbbS2zPUwAJGo2fg,21566
 pulpcore/tests/functional/api/test_upload.py,sha256=oLP1ZmQgPzgK5jAQwGeXS8uLFHgAzVeLW0GfANMWexI,6794
 pulpcore/tests/functional/api/test_users_groups.py,sha256=YFG0xtyJuIRraczR7ERl_UNS7dlJfKd2eUmXgD1lLBU,2926
 pulpcore/tests/functional/api/test_workers.py,sha256=u3oQnErjf6qPCg08XMRZzecGetLLDWmvHvoZIk-AUAA,4659
@@ -526,9 +526,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.76.1.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
-pulpcore-3.76.1.dist-info/METADATA,sha256=kQOn6PhS5rHJr0MiGG3cX_1TXbOG7SKL9VOO34-cldE,4123
-pulpcore-3.76.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-pulpcore-3.76.1.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
-pulpcore-3.76.1.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
-pulpcore-3.76.1.dist-info/RECORD,,
+pulpcore-3.77.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
+pulpcore-3.77.0.dist-info/METADATA,sha256=KwDSPdPh-YRNIQvRh9sEpF7cyW7j3UiWEKTJaq5Fo_k,4260
+pulpcore-3.77.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+pulpcore-3.77.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
+pulpcore-3.77.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
+pulpcore-3.77.0.dist-info/RECORD,,

{pulpcore-3.76.1.dist-info → pulpcore-3.77.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any