pulpcore 3.77.0__tar.gz → 3.78.0__tar.gz

{pulpcore-3.77.0 → pulpcore-3.78.0}/CHANGES.md

@@ -8,6 +8,68 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.78.0 (2025-05-13) {: #3.78.0 }
+
+### REST API {: #3.78.0-rest-api }
+
+#### Features {: #3.78.0-rest-api-feature }
+
+- Added the optional feature to enable uvloop library as a replacement of asyncio eventloop.
+  The feature is activated through the UVLOOP_ENABLED feature flag settings and the 'uvloop' optional dependency.
+  [#6021](https://github.com/pulp/pulpcore/issues/6021)
+
+#### Bugfixes {: #3.78.0-rest-api-bugfix }
+
+- Taught tasks to update the state of associated progress-reports when canceled/failed.
+
+  Added a management-task, `clean-up-progress-reports`, to clean up existing reports.
+  [#3609](https://github.com/pulp/pulpcore/issues/3609)
+- Fixed a server error when listing user roles.
+  [#6330](https://github.com/pulp/pulpcore/issues/6330)
+- On-demand or pull-through content is now immediately cached upon first request.
+  [#6540](https://github.com/pulp/pulpcore/issues/6540)
+
+#### Misc {: #3.78.0-rest-api-misc }
+
+- 
+
+### Plugin API {: #3.78.0-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.78.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.78.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.77.1 (2025-05-08) {: #3.77.1 }
+
+### REST API {: #3.77.1-rest-api }
+
+#### Bugfixes {: #3.77.1-rest-api-bugfix }
+
+- On-demand or pull-through content is now immediately cached upon first request.
+  [#6540](https://github.com/pulp/pulpcore/issues/6540)
+
+### Plugin API {: #3.77.1-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.77.1-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.77.1-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.77.0 (2025-05-06) {: #3.77.0 }
 
 ### REST API {: #3.77.0-rest-api }
@@ -347,6 +409,26 @@ No significant changes.
 
 ---
 
+## 3.73.9 (2025-05-06) {: #3.73.9 }
+
+### REST API {: #3.73.9-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.73.9-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.73.9-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.73.9-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.73.8 (2025-04-24) {: #3.73.8 }
 
 ### REST API {: #3.73.8-rest-api }
@@ -2478,6 +2560,29 @@ No significant changes.
 
 ---
 
+## 3.49.40 (2025-05-06) {: #3.49.40 }
+
+### REST API {: #3.49.40-rest-api }
+
+#### Bugfixes {: #3.49.40-rest-api-bugfix }
+
+- Fixed to not use the OpenTelemetryMiddleware when PULP_OTEL_ENABLED is not set.
+  [#6529](https://github.com/pulp/pulpcore/issues/6529)
+
+### Plugin API {: #3.49.40-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.49.40-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.49.40-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.49.39 (2025-04-24) {: #3.49.39 }
 
 ### REST API {: #3.49.39-rest-api }

{pulpcore-3.77.0 → pulpcore-3.78.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.77.0
+Version: 3.78.0
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiodns<=3.3.0,>=3.0
+Requires-Dist: aiodns<=3.4.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
@@ -46,13 +46,13 @@ Requires-Dist: jinja2<=3.1.6,>=3.1
 Requires-Dist: json_stream<2.4,>=2.3.2
 Requires-Dist: jq<1.9.0,>=1.6.0
 Requires-Dist: PyOpenSSL<26.0
-Requires-Dist: opentelemetry-api<1.33,>=1.27.0
-Requires-Dist: opentelemetry-sdk<1.33,>=1.27.0
-Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.33,>=1.27.0
+Requires-Dist: opentelemetry-api<1.34,>=1.27.0
+Requires-Dist: opentelemetry-sdk<1.34,>=1.27.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.34,>=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.7,>=3.1.8
+Requires-Dist: psycopg[binary]<=3.2.8,>=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
@@ -78,6 +78,8 @@ 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"
+Provides-Extra: uvloop
+Requires-Dist: uvloop<0.22,>=0.20; extra == "uvloop"
 Dynamic: license-file
 
 

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulp_certguard/app/__init__.py

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

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulp_file/app/__init__.py

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

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/app/apps.py

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

pulpcore-3.78.0/pulpcore/app/management/commands/clean-up-progress-reports.py

@@ -0,0 +1,52 @@
+from gettext import gettext as _
+
+from django.core.management import BaseCommand
+from django.db.models import F
+
+from pulpcore.app.models import ProgressReport
+from pulpcore.constants import TASK_STATES
+
+
+class Command(BaseCommand):
+    """
+    Django management command for repairing progress-reports in inconsistent states.
+    """
+
+    help = (
+        "Repairs issue #3609. Long-running tasks that utilize ProgressReports, which "
+        "fail or are cancelled, can leave their associated reports in state 'running'. "
+        "This script finds the ProgressReports marked as 'running', whose owning task "
+        "is in either 'cancelled or 'failed', and moves the state of the ProgressReport "
+        "to match that of the task."
+    )
+
+    def add_arguments(self, parser):
+        """Set up arguments."""
+        parser.add_argument(
+            "--dry-run",
+            action="store_true",
+            help=_(
+                "Don't modify anything, just collect results on how many ProgressReports "
+                "are impacted."
+            ),
+        )
+
+    def handle(self, *args, **options):
+        dry_run = options["dry_run"]
+        for state in [TASK_STATES.CANCELED, TASK_STATES.FAILED]:
+            if dry_run:
+                to_be_updated = ProgressReport.objects.filter(
+                    task__state__ne=F("state"), state=TASK_STATES.RUNNING, task__state=state
+                ).count()
+                print(
+                    _("Number of ProgressReports in inconsistent state for {} tasks: {}").format(
+                        state, to_be_updated
+                    )
+                )
+            else:
+                updated = ProgressReport.objects.filter(
+                    task__state__ne=F("state"), state=TASK_STATES.RUNNING, task__state=state
+                ).update(state=state)
+                print(
+                    _("Number of ProgressReports updated for {} tasks: {}").format(state, updated)
+                )

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/app/models/task.py

@@ -204,6 +204,10 @@ class Task(BaseModel, AutoAddObjPermsMixin):
                 )
             )
 
+    def _cleanup_progress_reports(self, state):
+        """Find any running progress-reports and set their states to the specified end-state."""
+        self.progress_reports.filter(state=TASK_STATES.RUNNING).update(state=state)
+
     def set_completed(self):
         """
         Set this Task to the completed state, save it, and log output in warning cases.
@@ -232,6 +236,7 @@ class Task(BaseModel, AutoAddObjPermsMixin):
                         self.pk, self.state
                     )
                 )
+        self._cleanup_progress_reports(TASK_STATES.COMPLETED)
 
     def set_failed(self, exc, tb):
         """
@@ -264,6 +269,7 @@ class Task(BaseModel, AutoAddObjPermsMixin):
                     self.pk, self.state
                 )
             )
+        self._cleanup_progress_reports(TASK_STATES.FAILED)
 
     def set_canceling(self):
         """
@@ -317,6 +323,7 @@ class Task(BaseModel, AutoAddObjPermsMixin):
                     self.pk, self.state
                 )
             )
+        self._cleanup_progress_reports(final_state)
 
     def unblock(self):
         # This should be safe to be called without holding the lock.

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/app/serializers/user.py

@@ -24,8 +24,10 @@ from pulpcore.app.serializers import (
     PRNField,
 )
 from pulpcore.app.util import (
-    get_viewset_for_model,
     get_request_without_query_params,
+    get_url,
+    get_prn,
+    resolve_prn,
 )
 
 User = get_user_model()
@@ -60,27 +62,42 @@ class PermissionField(serializers.RelatedField):
 class ContentObjectField(serializers.CharField):
     """Content object field"""
 
-    def to_representation(self, obj):
-        content_object = getattr(obj, "content_object", None)
-        if content_object:
-            viewset = get_viewset_for_model(obj.content_object)
-
+    def to_representation(self, value):
+        if value is None:
+            return None
+        else:
             request = get_request_without_query_params(self.context)
+            return get_url(value, request=request)
 
-            serializer = viewset.serializer_class(obj.content_object, context={"request": request})
-            return serializer.data.get("pulp_href")
-
-    def to_internal_value(self, data):
+    def to_internal_value(self, value):
         # ... circular import ...
         from pulpcore.app.viewsets.base import NamedModelViewSet
 
-        if data is None:
-            return {"content_object": None}
-        try:
-            obj = NamedModelViewSet.get_resource(data)
-        except serializers.ValidationError:
-            raise serializers.ValidationError(_("Invalid value: {}.").format(data))
-        return {"content_object": obj}
+        if value is None:
+            return None
+        else:
+            try:
+                obj = NamedModelViewSet.get_resource(value)
+            except serializers.ValidationError:
+                raise serializers.ValidationError(_("Invalid value: {}.").format(value))
+            return obj
+
+
+class ContentObjectPRNField(serializers.CharField):
+    """Content object PRN field"""
+
+    def to_representation(self, value):
+        if value is None:
+            return None
+        else:
+            return get_prn(value)
+
+    def to_internal_value(self, value):
+        if value is None:
+            return None
+        else:
+            model, pk = resolve_prn(value)
+            return model.objects.get(pk=pk)
 
 
 class UserGroupSerializer(serializers.ModelSerializer):
@@ -247,6 +264,13 @@ class ValidateRoleMixin:
         and checks if the user/group already has the role. Does not set any value
         in data or return anything.
         """
+        if "content_object" not in data:
+            raise serializers.ValidationError(
+                _(
+                    "Either 'content_object' or 'content_object_prn' needs to be specified."
+                    " Use 'null' for global or domain level access."
+                )
+            )
         natural_key_args = {
             f"{role_type}_id": data[role_type].pk,
             "role_id": data["role"].pk,
@@ -308,8 +332,18 @@ class UserRoleSerializer(ValidateRoleMixin, ModelSerializer, NestedHyperlinkedMo
             "pulp_href of the object for which role permissions should be asserted. "
             "If set to 'null', permissions will act on either domain or model-level."
         ),
-        source="*",
         allow_null=True,
+        required=False,
+    )
+
+    content_object_prn = ContentObjectPRNField(
+        help_text=_(
+            "prn of the object for which role permissions should be asserted. "
+            "If set to 'null', permissions will act on either domain or model-level."
+        ),
+        source="content_object",
+        allow_null=True,
+        required=False,
     )
 
     domain = RelatedField(
@@ -343,6 +377,7 @@ class UserRoleSerializer(ValidateRoleMixin, ModelSerializer, NestedHyperlinkedMo
         fields = ModelSerializer.Meta.fields + (
             "role",
             "content_object",
+            "content_object_prn",
             "description",
             "permissions",
             "domain",
@@ -366,8 +401,18 @@ class GroupRoleSerializer(ValidateRoleMixin, ModelSerializer, NestedHyperlinkedM
             "pulp_href of the object for which role permissions should be asserted. "
             "If set to 'null', permissions will act on the model-level."
         ),
-        source="*",
         allow_null=True,
+        required=False,
+    )
+
+    content_object_prn = ContentObjectPRNField(
+        help_text=_(
+            "prn of the object for which role permissions should be asserted. "
+            "If set to 'null', permissions will act on either domain or model-level."
+        ),
+        source="content_object",
+        allow_null=True,
+        required=False,
     )
 
     domain = RelatedField(
@@ -403,6 +448,7 @@ class GroupRoleSerializer(ValidateRoleMixin, ModelSerializer, NestedHyperlinkedM
         fields = ModelSerializer.Meta.fields + (
             "role",
             "content_object",
+            "content_object_prn",
             "description",
             "permissions",
             "domain",

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/app/settings.py

@@ -342,9 +342,7 @@ CACHE_SETTINGS = {
     "EXPIRES_TTL": 600,  # 10 minutes
 }
 
-# The time a RemoteArtifact will be ignored after failure.
-# In on-demand, if a fetching content from a remote failed due to corrupt data,
-# the corresponding RemoteArtifact will be ignored for that time (seconds).
+# The time in seconds a RemoteArtifact will be ignored after failure.
 REMOTE_CONTENT_FETCH_FAILURE_COOLDOWN = 5 * 60  # 5 minutes
 
 SPECTACULAR_SETTINGS = {
@@ -425,6 +423,9 @@ KAFKA_SASL_PASSWORD = None
 # opentelemetry settings
 OTEL_ENABLED = False
 
+# Replaces asyncio event loop with uvloop
+UVLOOP_ENABLED = False
+
 # HERE STARTS DYNACONF EXTENSION LOAD (Keep at the very bottom of settings.py)
 # Read more at https://www.dynaconf.com/django/
 

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/app/util.py

@@ -66,18 +66,19 @@ def get_url(model, domain=None, request=None):
         str: The path component of the resource url
     """
     kwargs = {}
-    view_action = "list"
     if settings.DOMAIN_ENABLED:
         kwargs["pulp_domain"] = "default"
-        if not domain and hasattr(model, "pulp_domain") and isinstance(model, model._meta.model):
+        if not domain and hasattr(model, "pulp_domain") and isinstance(model, Model):
             kwargs["pulp_domain"] = model.pulp_domain.name
         elif isinstance(domain, models.Domain):
             kwargs["pulp_domain"] = domain.name
         elif isinstance(domain, str):
             kwargs["pulp_domain"] = domain
-    if isinstance(model, model._meta.model):
+    if isinstance(model, Model):
         view_action = "detail"
         kwargs["pk"] = model.pk
+    else:
+        view_action = "list"
 
     return reverse(get_view_name_for_model(model, view_action), kwargs=kwargs, request=request)
 

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/cache/cache.py

@@ -8,7 +8,7 @@ from django.http import HttpResponseRedirect, HttpResponse, FileResponse as ApiF
 
 from rest_framework.request import Request as ApiRequest
 
-from aiohttp.web import FileResponse, Response, HTTPSuccessful, Request
+from aiohttp.web import FileResponse, Response, HTTPSuccessful, Request, StreamResponse
 from aiohttp.web_exceptions import HTTPFound
 
 from redis import ConnectionError
@@ -401,6 +401,11 @@ class AsyncContentCache(AsyncCache):
         except (HTTPSuccessful, HTTPFound) as e:
             response = e
 
+        original_response = response
+        if isinstance(response, StreamResponse):
+            if hasattr(response, "future_response"):
+                response = response.future_response
+
         entry = {"headers": dict(response.headers), "status": response.status}
         if expires is not None:
             # Redis TTL is not sufficient: https://github.com/pulp/pulpcore/issues/4845
@@ -427,12 +432,12 @@ class AsyncContentCache(AsyncCache):
             entry["location"] = str(response.location)
             entry["type"] = "Redirect"
         else:
-            # We don't cache StreamResponses or errors
+            # We don't cache errors
             return response
 
         # TODO look into smaller format, maybe some compression on the text
         await self.set(key, json.dumps(entry), expires, base_key=base_key)
-        return response
+        return original_response
 
     def make_key(self, request):
         """Makes the key based off the request"""

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/content/__init__.py

@@ -1,6 +1,7 @@
 import asyncio
 from contextlib import suppress
 from importlib import import_module
+from importlib.util import find_spec
 import logging
 import os
 
@@ -35,6 +36,13 @@ if settings.OTEL_ENABLED:
 else:
     app = web.Application(middlewares=[guid, authenticate])
 
+
+if settings.UVLOOP_ENABLED:
+    if not find_spec("uvloop"):
+        raise RuntimeError("The library 'uvloop' must be installed if UVLOOP_ENABLED is true.")
+    log.info("Using uvloop as the asyncio event loop.")
+
+
 CONTENT_MODULE_NAME = "content"
 
 

{pulpcore-3.77.0 → pulpcore-3.78.0}/pulpcore/content/entrypoint.py

@@ -1,11 +1,17 @@
 import click
 from pulpcore.app.pulpcore_gunicorn_application import PulpcoreGunicornApplication
+from django.conf import settings
 
 
 class PulpcoreContentApplication(PulpcoreGunicornApplication):
     def load_app_specific_config(self):
+        worker_class = (
+            "aiohttp.GunicornUVLoopWebWorker"
+            if settings.UVLOOP_ENABLED
+            else "aiohttp.GunicornWebWorker"
+        )
         self.set_option("default_proc_name", "pulpcore-content", enforced=True)
-        self.set_option("worker_class", "aiohttp.GunicornWebWorker", enforced=True)
+        self.set_option("worker_class", worker_class, enforced=True)
 
     def load(self):
         import pulpcore.content