pulpcore 3.89.1__py3-none-any.whl → 3.90.1__py3-none-any.whl

pulpcore/app/viewsets/base.py

@@ -13,7 +13,7 @@ from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
-from pulpcore.openapi import PulpAutoSchema
+from pulpcore.openapi import PulpAutoSchema, InheritSerializer
 from rest_framework.serializers import ValidationError as DRFValidationError, ListField, CharField
 
 from pulpcore.app import tasks
@@ -482,27 +482,31 @@ class AsyncUpdateMixin(AsyncReservedObjectMixin):
     ALLOW_NON_BLOCKING_UPDATE = True
 
     @extend_schema(
-        description="Trigger an asynchronous update task",
-        responses={202: AsyncOperationResponseSerializer},
+        description="Update the entity and trigger an asynchronous task if necessary",
+        responses={200: InheritSerializer, 202: AsyncOperationResponseSerializer},
     )
     def update(self, request, pk, **kwargs):
         partial = kwargs.pop("partial", False)
         instance = self.get_object()
         serializer = self.get_serializer(instance, data=request.data, partial=partial)
         serializer.is_valid(raise_exception=True)
-        app_label = instance._meta.app_label
-        task = dispatch(
-            tasks.base.ageneral_update,
-            exclusive_resources=self.async_reserved_resources(instance),
-            args=(pk, app_label, serializer.__class__.__name__),
-            kwargs={"data": request.data, "partial": partial},
-            immediate=self.ALLOW_NON_BLOCKING_UPDATE,
-        )
-        return OperationPostponedResponse(task, request)
+
+        if all(getattr(instance, key) == value for key, value in serializer.validated_data.items()):
+            return Response(serializer.data)
+        else:
+            app_label = instance._meta.app_label
+            task = dispatch(
+                tasks.base.ageneral_update,
+                exclusive_resources=self.async_reserved_resources(instance),
+                args=(pk, app_label, serializer.__class__.__name__),
+                kwargs={"data": request.data, "partial": partial},
+                immediate=self.ALLOW_NON_BLOCKING_UPDATE,
+            )
+            return OperationPostponedResponse(task, request)
 
     @extend_schema(
-        description="Trigger an asynchronous partial update task",
-        responses={202: AsyncOperationResponseSerializer},
+        description="Update the entity partially and trigger an asynchronous task if necessary",
+        responses={200: InheritSerializer, 202: AsyncOperationResponseSerializer},
     )
     def partial_update(self, request, *args, **kwargs):
         kwargs["partial"] = True

pulpcore/app/viewsets/domain.py

@@ -109,7 +109,7 @@ class DomainViewSet(
 
     @extend_schema(
         description="Trigger an asynchronous update task",
-        responses={202: AsyncOperationResponseSerializer},
+        responses={200: DomainSerializer, 202: AsyncOperationResponseSerializer},
     )
     def update(self, request, pk, **kwargs):
         """Prevent trying to update the default domain."""

pulpcore/app/viewsets/exporter.py

@@ -1,6 +1,5 @@
-from django.conf import settings
 from drf_spectacular.utils import extend_schema
-from rest_framework import mixins, exceptions
+from rest_framework import mixins
 
 from pulpcore.app.models import (
     Export,
@@ -34,8 +33,6 @@ from pulpcore.app.viewsets.base import NAME_FILTER_OPTIONS
 from pulpcore.plugin.tasking import dispatch
 from pulpcore.app.response import OperationPostponedResponse
 
-from gettext import gettext as _
-
 
 class ExporterViewSet(
     NamedModelViewSet,
@@ -120,8 +117,6 @@ class PulpExportViewSet(ExportViewSet):
         """
         Generates a Task to export the set of repositories assigned to a specific PulpExporter.
         """
-        if settings.DOMAIN_ENABLED:
-            raise exceptions.ValidationError(_("Export not supported with Domains enabled."))
         # Validate Exporter
         exporter = PulpExporter.objects.get(pk=exporter_pk).cast()
         ExporterSerializer.validate_path(exporter.path, check_is_dir=True)
@@ -159,8 +154,6 @@ class FilesystemExportViewSet(ExportViewSet):
         """
         Generates a Task to export files to the filesystem.
         """
-        if settings.DOMAIN_ENABLED:
-            raise exceptions.ValidationError(_("Export not supported with Domains enabled."))
         # Validate Exporter
         exporter = FilesystemExporter.objects.get(pk=exporter_pk).cast()
         ExporterSerializer.validate_path(exporter.path, check_is_dir=True)

pulpcore/app/viewsets/importer.py

@@ -1,7 +1,6 @@
-from django.conf import settings
 from django.http import Http404
 from drf_spectacular.utils import extend_schema
-from rest_framework import mixins, exceptions
+from rest_framework import mixins
 
 from pulpcore.app.models import (
     Import,
@@ -25,8 +24,6 @@ from pulpcore.app.viewsets import (
 from pulpcore.app.viewsets.base import NAME_FILTER_OPTIONS
 from pulpcore.tasking.tasks import dispatch
 
-from gettext import gettext as _
-
 
 class ImporterViewSet(
     NamedModelViewSet,
@@ -87,8 +84,6 @@ class PulpImportViewSet(ImportViewSet):
     )
     def create(self, request, importer_pk):
         """Import a Pulp export into Pulp."""
-        if settings.DOMAIN_ENABLED:
-            raise exceptions.ValidationError(_("Import not supported with Domains enabled."))
         try:
             importer = PulpImporter.objects.get(pk=importer_pk)
         except PulpImporter.DoesNotExist:

pulpcore/app/viewsets/task.py

@@ -68,7 +68,6 @@ class TaskFilter(BaseFilterSet):
         model = Task
         fields = {
             "state": ["exact", "in", "ne"],
-            "worker": ["exact", "in", "isnull"],
             "name": ["exact", "contains", "in", "ne"],
             "logging_cid": ["exact", "contains"],
             "pulp_created": DATETIME_FILTER_OPTIONS,

pulpcore/content/instrumentation.py

@@ -21,23 +21,26 @@ def instrumentation(exporter=None, reader=None, provider=None):
         try:
             response = await handler(request)
             status_code = response.status
+
+            return response
         except web.HTTPException as exc:
             status_code = exc.status
-            response = exc
-
-        duration_ms = (time.time() - start_time) * 1000
-
-        request_duration_histogram.record(
-            duration_ms,
-            attributes={
-                "http.method": request.method,
-                "http.status_code": normalize_http_status(status_code),
-                "http.route": _get_view_request_handler_func(request),
-                "worker.name": get_worker_name(),
-            },
-        )
-
-        return response
+            raise exc
+        except Exception as exc:
+            status_code = exc.status if hasattr(exc, "status") else 500
+            raise exc
+        finally:
+            duration_ms = (time.time() - start_time) * 1000
+
+            request_duration_histogram.record(
+                duration_ms,
+                attributes={
+                    "http.method": request.method,
+                    "http.status_code": normalize_http_status(status_code),
+                    "http.route": _get_view_request_handler_func(request),
+                    "worker.name": get_worker_name(),
+                },
+            )
 
     return middleware
 

pulpcore/openapi/__init__.py

@@ -23,8 +23,8 @@ from drf_spectacular.plumbing import (
 )
 from drf_spectacular.settings import spectacular_settings
 from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter, extend_schema_field
-from drf_spectacular.extensions import OpenApiAuthenticationExtension
+from drf_spectacular.utils import OpenApiParameter, extend_schema, extend_schema_field
+from drf_spectacular.extensions import OpenApiViewExtension, OpenApiAuthenticationExtension
 from rest_framework import mixins, serializers
 from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
@@ -48,6 +48,10 @@ API_ROOT_NO_FRONT_SLASH = API_ROOT_NO_FRONT_SLASH.replace("<", "{").replace(">",
 extend_schema_field(OpenApiTypes.INT64)(serializers.IntegerField)
 
 
+class InheritSerializer(serializers.Serializer):
+    """This is a dummy tracer to allow mixins to refer to the natural serializer of a viewset."""
+
+
 class PulpAutoSchema(AutoSchema):
     """Pulp Auto Schema."""
 
@@ -238,6 +242,7 @@ class PulpAutoSchema(AutoSchema):
         """
         Handle response status code.
         """
+        # DRF handles this most of the time. But it seems set_label still needs it.
         response = super()._get_response_bodies()
         if (
             self.method == "POST"
@@ -248,6 +253,15 @@ class PulpAutoSchema(AutoSchema):
 
         return response
 
+    def _get_response_for_code(
+        self, serializer, status_code, media_types=None, direction="response"
+    ):
+        """Hack to replace the InheritSerializer with the real deal."""
+        if serializer == InheritSerializer:
+            serializer = self._get_serializer()
+
+        return super()._get_response_for_code(serializer, status_code, media_types, direction)
+
 
 class PulpSchemaGenerator(SchemaGenerator):
     """Pulp Schema Generator."""

pulpcore/plugin/tasking.py

@@ -1,5 +1,5 @@
 # Support plugins dispatching tasks
-from pulpcore.tasking.tasks import dispatch
+from pulpcore.tasking.tasks import dispatch, adispatch
 
 from pulpcore.app.tasks import (
     ageneral_update,
@@ -13,13 +13,14 @@ from pulpcore.app.tasks import (
     reclaim_space,
 )
 from pulpcore.app.tasks.vulnerability_report import check_content
-from pulpcore.app.tasks.repository import add_and_remove
+from pulpcore.app.tasks.repository import add_and_remove, aadd_and_remove
 
 
 __all__ = [
     "ageneral_update",
     "check_content",
     "dispatch",
+    "adispatch",
     "fs_publication_export",
     "fs_repo_version_export",
     "general_create",
@@ -29,4 +30,5 @@ __all__ = [
     "orphan_cleanup",
     "reclaim_space",
     "add_and_remove",
+    "aadd_and_remove",
 ]