pulpcore 3.77.0__py3-none-any.whl → 3.77.1__py3-none-any.whl

pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.77.0"
+    version = "3.77.1"
     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.77.0"
+    version = "3.77.1"
     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.77.0"
+    version = "3.77.1"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

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/content/handler.py

@@ -1093,26 +1093,8 @@ class Handler:
             ret.update({ca.relative_path: ca for ca in cas})
         return ret
 
-    async def _serve_content_artifact(self, content_artifact, headers, request):
-        """
-        Handle response for a Content Artifact with the file present.
-
-        Depending on where the file storage (e.g. filesystem, S3, etc) this could be responding with
-        the file (filesystem) or a redirect (S3).
-
-        Args:
-            content_artifact (pulpcore.app.models.ContentArtifact) The Content Artifact to
-                respond with.
-            headers (dict): A dictionary of response headers.
-            request(aiohttp.web.Request) The request to prepare a response for.
-
-        Raises:
-            [aiohttp.web_exceptions.HTTPFound][]: When we need to redirect to the file
-            NotImplementedError: If file is stored in a file storage we can't handle
-
-        Returns:
-            The [aiohttp.web.FileResponse][] for the file.
-        """
+    def _build_response_from_content_artifact(self, content_artifact, headers, request):
+        """Helper method to build the correct response to serve a ContentArtifact."""
 
         def _set_params_from_headers(hdrs, storage_domain):
             # Map standard-response-headers to storage-object-specific keys
@@ -1137,7 +1119,47 @@ class Handler:
         artifact_name = artifact_file.name
         domain = get_domain()
         storage = domain.get_storage()
+        headers["X-PULP-ARTIFACT-SIZE"] = str(artifact_file.size)
+
+        if domain.storage_class == "pulpcore.app.models.storage.FileSystem":
+            path = storage.path(artifact_name)
+            if not os.path.exists(path):
+                raise Exception(_("Expected path '{}' is not found").format(path))
+            return FileResponse(path, headers=headers)
+        elif not domain.redirect_to_object_storage:
+            return ArtifactResponse(content_artifact.artifact, headers=headers)
+        elif domain.storage_class == "storages.backends.s3boto3.S3Boto3Storage":
+            return HTTPFound(_build_url(http_method=request.method), headers=headers)
+        elif domain.storage_class in (
+            "storages.backends.azure_storage.AzureStorage",
+            "storages.backends.gcloud.GoogleCloudStorage",
+        ):
+            return HTTPFound(_build_url(), headers=headers)
+        else:
+            raise NotImplementedError()
 
+    async def _serve_content_artifact(self, content_artifact, headers, request):
+        """
+        Handle response for a Content Artifact with the file present.
+
+        Depending on where the file storage (e.g. filesystem, S3, etc) this could be responding with
+        the file (filesystem) or a redirect (S3).
+
+        Args:
+            content_artifact (pulpcore.app.models.ContentArtifact) The Content Artifact to
+                respond with.
+            headers (dict): A dictionary of response headers.
+            request(aiohttp.web.Request) The request to prepare a response for.
+
+        Raises:
+            [aiohttp.web_exceptions.HTTPFound][]: When we need to redirect to the file
+            NotImplementedError: If file is stored in a file storage we can't handle
+            HTTPRequestRangeNotSatisfiable: If the request is for a range that is not
+                satisfiable.
+        Returns:
+            The [aiohttp.web.FileResponse][] for the file.
+        """
+        artifact_file = content_artifact.artifact.file
         content_length = artifact_file.size
 
         try:
@@ -1152,25 +1174,13 @@ class Handler:
             size = artifact_file.size or "*"
             raise HTTPRequestRangeNotSatisfiable(headers={"Content-Range": f"bytes */{size}"})
 
-        headers["X-PULP-ARTIFACT-SIZE"] = str(content_length)
         artifacts_size_counter.add(content_length)
 
-        if domain.storage_class == "pulpcore.app.models.storage.FileSystem":
-            path = storage.path(artifact_name)
-            if not os.path.exists(path):
-                raise Exception(_("Expected path '{}' is not found").format(path))
-            return FileResponse(path, headers=headers)
-        elif not domain.redirect_to_object_storage:
-            return ArtifactResponse(content_artifact.artifact, headers=headers)
-        elif domain.storage_class == "storages.backends.s3boto3.S3Boto3Storage":
-            raise HTTPFound(_build_url(http_method=request.method), headers=headers)
-        elif domain.storage_class in (
-            "storages.backends.azure_storage.AzureStorage",
-            "storages.backends.gcloud.GoogleCloudStorage",
-        ):
-            raise HTTPFound(_build_url(), headers=headers)
+        response = self._build_response_from_content_artifact(content_artifact, headers, request)
+        if isinstance(response, HTTPFound):
+            raise response
         else:
-            raise NotImplementedError()
+            return response
 
     async def _stream_remote_artifact(
         self, request, response, remote_artifact, save_artifact=True, repository=None
@@ -1214,6 +1224,7 @@ class Handler:
             size = remote_artifact.size or "*"
             raise HTTPRequestRangeNotSatisfiable(headers={"Content-Range": f"bytes */{size}"})
 
+        original_headers = response.headers.copy()
         actual_content_length = None
 
         if range_start or range_stop:
@@ -1323,9 +1334,14 @@ class Handler:
             content_artifacts = await asyncio.shield(
                 sync_to_async(self._save_artifact)(download_result, remote_artifact, request)
             )
+            ca = content_artifacts[remote_artifact.content_artifact.relative_path]
+            # If cache is enabled, add the future response to our stream response
+            if settings.CACHE_ENABLED:
+                response.future_response = self._build_response_from_content_artifact(
+                    ca, original_headers, request
+                )
             # Try to add content to repository if present & supported
             if repository and repository.PULL_THROUGH_SUPPORTED:
-                ca = content_artifacts[remote_artifact.content_artifact.relative_path]
                 await sync_to_async(repository.pull_through_add_content)(ca)
         await response.write_eof()
 

pulpcore/tests/functional/api/using_plugin/test_content_cache.py

@@ -16,7 +16,7 @@ from pulpcore.tests.functional.utils import get_from_url
 @pytest.mark.parallel
 def test_full_workflow(
     file_repo_with_auto_publish,
-    basic_manifest_path,
+    duplicate_filename_paths,
     file_remote_factory,
     file_bindings,
     distribution_base_url,
@@ -37,7 +37,8 @@ def test_full_workflow(
         return r.status, r.headers.get("X-PULP-CACHE")
 
     # Sync from the remote and assert that a new repository version is created
-    remote = file_remote_factory(manifest_path=basic_manifest_path, policy="immediate")
+    manifest_1, manifest_2 = duplicate_filename_paths
+    remote = file_remote_factory(manifest_path=manifest_1, policy="immediate")
     body = RepositorySyncURL(remote=remote.pulp_href)
     monitor_task(
         file_bindings.RepositoriesFileApi.sync(file_repo_with_auto_publish.pulp_href, body).task
@@ -129,6 +130,21 @@ def test_full_workflow(
         url = urljoin(distro_base_url, file)
         assert (200, "HIT" if i % 2 == 1 else "MISS") == _check_cache(url), file
 
+    # Sync a new remote with same filenames but on-demand
+    remote = file_remote_factory(manifest_path=manifest_2, policy="on_demand")
+    body = RepositorySyncURL(remote=remote.pulp_href)
+    monitor_task(
+        file_bindings.RepositoriesFileApi.sync(file_repo_with_auto_publish.pulp_href, body).task
+    )
+    repo = file_bindings.RepositoriesFileApi.read(file_repo_with_auto_publish.pulp_href)
+    assert repo.latest_version_href.endswith("/versions/3/")
+
+    # Test that cache is invalidated from sync, but on-demand responses are immediately cached
+    files = ["1.iso", "1.iso", "2.iso", "2.iso", "3.iso", "3.iso"]
+    for i, file in enumerate(files):
+        url = urljoin(distro_base_url, file)
+        assert (200, "HIT" if i % 2 == 1 else None) == _check_cache(url), file
+
     # Tests that deleting a repository invalidates the cache"""
     monitor_task(file_bindings.RepositoriesFileApi.delete(repo.pulp_href).task)
     files = ["", "PULP_MANIFEST", "2.iso"]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.77.0
+Version: 3.77.1
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulpcore-3.77.0.dist-info → pulpcore-3.77.1.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=Ri9QtsoSI0bmv_5qz0wCvWhDbrGkCr8nUXdTtLNS8QM,297
+pulp_certguard/app/__init__.py,sha256=yrfk5jSZdckh14GlycVlp7yj-aqEz9RhG4NbxWcr-tg,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=jbAB2BH6-V4jKXVeEoaxYLmvFY-CRmc2LSOL3mBWyEw,292
+pulp_file/app/__init__.py,sha256=VYwb2aF8lkSmk9tLh7bZi3s7FK82uIttiD6z8Setxaw,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=Tq_xlO8Z2iyjFtbnaKHbWQogq6jxcRpjji9XbKrs5_U,377
 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=Dyk1l_Cch5VavYZp-bbWsJA1SP9RcqQN9dPjHEKmtRE,17860
+pulpcore/app/apps.py,sha256=x8Vf5rLOz4SXECRMlgYd6X18xDdnymVmdFS7c701DHo,17860
 pulpcore/app/authentication.py,sha256=1LIJW6HIQQlZrliHy__jdzkDEh6Oj7xKgd0V-vRcDus,2855
 pulpcore/app/checks.py,sha256=jbfTF7nmftBbky4AQXHigpyCaGydKasvRUXsd72JZVg,1946
 pulpcore/app/entrypoint.py,sha256=HRfaHDkveSIfcTOtWEWYqg1poTmTo0J9hzzmj0yDcEM,4885
@@ -369,11 +369,11 @@ pulpcore/app/viewsets/task.py,sha256=pMoOQnhjA91dUgNNAnL3OaCHcVOrQcB-CD3D5Px96YE
 pulpcore/app/viewsets/upload.py,sha256=Mfy9Vcm5KcqARooH4iExzoXVkL6boDddEqAnGWDWzFg,5452
 pulpcore/app/viewsets/user.py,sha256=86eMawpaVrvp6ilQmb1C4j7SKpesPB5HgMovYL9rY3Q,13813
 pulpcore/cache/__init__.py,sha256=GkYD4PgIMaVL83ywfAsLBC9JNNDUpmTtbitW9zZSslk,131
-pulpcore/cache/cache.py,sha256=2fIr4chvKOQpDeIxw0Yl2-V2zMgcjOBWEZ6M2QOFrHA,17173
+pulpcore/cache/cache.py,sha256=d8GMlvjeGG9MOMdi5_9029WpGCKH8Y5q9b2lt3wSREo,17371
 pulpcore/content/__init__.py,sha256=iDCr_SjoC8Y58sfSzx1-zU1l44fVrxOpekVALohezQM,3758
 pulpcore/content/authentication.py,sha256=lEZBkXBBBkIdtFMCSpHDD7583M0bO-zsZNYXTmpr4k8,3235
 pulpcore/content/entrypoint.py,sha256=fVqligooWVaW6ZZvNoj6TpCbb3AO5jtG9WXQL2kPXsU,1865
-pulpcore/content/handler.py,sha256=Od3BALbztHEzwUSSM8Bw-QLGprb79Wc1cXwUfk24MYo,55766
+pulpcore/content/handler.py,sha256=_hPNpfbqMucXk3uGrb_PzzlWvZ6ptLhNj7XyOJxdxgY,56651
 pulpcore/content/instrumentation.py,sha256=H0N0GWzvOPGGjFi6eIbGW3mcvagfnAfazccTh-BZVmE,1426
 pulpcore/download/__init__.py,sha256=s3Wh2GKdsmbUooVIR6wSvhYVIhpaTbtfR3Ar1OJhC7s,154
 pulpcore/download/base.py,sha256=G8jgyowvVEFCGA_KTr0CtHn0qHWXKsnv4Xpi0KSMglM,12821
@@ -460,7 +460,7 @@ pulpcore/tests/functional/api/test_workers.py,sha256=u3oQnErjf6qPCg08XMRZzecGetL
 pulpcore/tests/functional/api/using_plugin/__init__.py,sha256=QyyfzgjLOi4n32G3o9aGH5eQDNjjD_qUpHLOZpPPZa4,80
 pulpcore/tests/functional/api/using_plugin/test_checkpoint.py,sha256=gx1oiHOVUH5QZfF33k_DXSw-AVbYQp39uKii1D96BoI,7965
 pulpcore/tests/functional/api/using_plugin/test_content_access.py,sha256=Ym800bU-M48RCDfQMkVa1UQt_sfgy5ciU0FxorCk9Ds,2551
-pulpcore/tests/functional/api/using_plugin/test_content_cache.py,sha256=J9uQgcAZ2gFRkHe0gpPfOLG4DoV1dr3tbgiaig3AILY,6475
+pulpcore/tests/functional/api/using_plugin/test_content_cache.py,sha256=OB3gDbPDptQBjyYnr_jHyU9bcI_-ANAoUp9EDiskwug,7312
 pulpcore/tests/functional/api/using_plugin/test_content_delivery.py,sha256=sDYRqwZvOmDX6mc_UeVWI05CWm7nyNMPgeWf2r913i8,10549
 pulpcore/tests/functional/api/using_plugin/test_content_directory.py,sha256=w4uY258etnP8-LbrbZ_EZTolciYTt7cY1HJK9Ll7mS0,1931
 pulpcore/tests/functional/api/using_plugin/test_content_path.py,sha256=fvqeptqo-mrUAiKIjlypuvHG1XsFeKKP81ocTmo4hv0,3334
@@ -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.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.77.1.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
+pulpcore-3.77.1.dist-info/METADATA,sha256=5PbwCkEF0X97zbdXnPwJmL1f2cIxS-bfJCQ5WuG__k4,4260
+pulpcore-3.77.1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+pulpcore-3.77.1.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
+pulpcore-3.77.1.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
+pulpcore-3.77.1.dist-info/RECORD,,