tmp

Author: jobselko

pulp_python/app/pypi/views.py

@@ -287,7 +287,7 @@ def list(self, request, path):
             kwargs = {"content_type": media_type}
             return StreamingHttpResponse(index_data, **kwargs)
 
-    def pull_through_package_simple(self, package, path, remote):
+    def pull_through_package_simple(self, package, path, remote, media_type):
         """Gets the package's simple page from remote."""
 
         def parse_package(release_package):
@@ -299,7 +299,8 @@ def parse_package(release_package):
                 "filename": release_package.filename,
                 "url": d_url,
                 "sha256": release_package.digests.get("sha256", ""),
-                # todo: more fields?
+                "requires_python": release_package.requires_python,
+                "metadata_sha256": (release_package.metadata_digests or {}).get("sha256", ""),
             }
 
         rfilter = get_remote_package_filter(remote)
@@ -324,27 +325,33 @@ def parse_package(release_package):
         packages = [
             parse_package(p) for p in page.packages if rfilter.filter_release(package, p.version)
         ]
-        return HttpResponse(write_simple_detail(package, packages))
+
+        if media_type == PYPI_SIMPLE_V1_JSON:
+            detail_data = write_simple_detail_json(package, packages)
+            headers = {"X-PyPI-Last-Serial": str(PYPI_SERIAL_CONSTANT)}
+            return Response(detail_data, headers=headers)
+        else:
+            detail_data = write_simple_detail(package, packages)
+            kwargs = {"content_type": media_type}
+            return HttpResponse(detail_data, **kwargs)  # todo: streamed?
 
     @extend_schema(operation_id="pypi_simple_package_read", summary="Get package simple page")
     def retrieve(self, request, path, package):
-        """Retrieves the simple api html page for a package."""
+        """Retrieves the simple api html/json page for a package."""
+        media_type = request.accepted_renderer.media_type
+
         repo_ver, content = self.get_rvc()
         # Should I redirect if the normalized name is different?
         normalized = canonicalize_name(package)
         if self.distribution.remote:
-            return self.pull_through_package_simple(normalized, path, self.distribution.remote)
+            return self.pull_through_package_simple(
+                normalized, path, self.distribution.remote, media_type
+            )
         if self.should_redirect(repo_version=repo_ver):
             return redirect(urljoin(self.base_content_url, f"{path}/simple/{normalized}/"))
         packages = (
             content.filter(name__normalize=normalized)
-            .values_list(
-                "filename",
-                "sha256",
-                "name",
-                "metadata_sha256",
-                "requires_python",
-            )
+            .values_list("filename", "sha256", "name", "metadata_sha256", "requires_python")
             .iterator()
         )
         try:
@@ -373,7 +380,7 @@ def retrieve(self, request, path, package):
         else:
             detail_data = write_simple_detail(name, releases, streamed=True)
             kwargs = {"content_type": media_type}
-            return StreamingHttpResponse(detail_data, kwargs)
+            return StreamingHttpResponse(detail_data, **kwargs)
 
     @extend_schema(
         request=PackageUploadSerializer,

pulp_python/tests/functional/api/test_full_mirror.py

@@ -15,6 +15,7 @@
 from random import sample
 
 
+# json
 def test_pull_through_install(
     python_bindings, python_remote_factory, python_distribution_factory, delete_orphans_pre
 ):
@@ -41,6 +42,7 @@ def test_pull_through_install(
     assert content.count == 1
 
 
+# json
 @pytest.mark.parallel
 def test_pull_through_simple(python_remote_factory, python_distribution_factory, pulp_content_url):
     """Tests that the simple page is properly modified when requesting a pull-through."""
@@ -58,6 +60,61 @@ def test_pull_through_simple(python_remote_factory, python_distribution_factory,
         assert PYTHON_XS_FIXTURE_CHECKSUMS[package.filename] == package.digests["sha256"]
 
 
+@pytest.mark.parallel
+def test_pull_through_simple_html(
+    python_remote_factory, python_distribution_factory, pulp_content_url
+):
+    """Tests that the simple HTML page works for pull-through."""
+    media_type = "text/html"
+    remote = python_remote_factory(url=PYPI_URL, includes=["shelf-reader"])
+    distro = python_distribution_factory(remote=remote.pulp_href)
+
+    url = f"{distro.base_url}simple/shelf-reader/"
+    headers = {"Accept": media_type}
+    response = requests.get(url, headers=headers)
+
+    assert response.status_code == 200
+    assert media_type in response.headers["Content-Type"]
+    # assert "X-PyPI-Last-Serial" in response.headers
+
+    project_page = ProjectPage.from_response(response, "shelf-reader")
+    assert len(project_page.packages) == 2
+
+    for package in project_page.packages:
+        assert package.filename in PYTHON_XS_FIXTURE_CHECKSUMS
+        relative_path = f"{distro.base_path}/{package.filename}?redirect="
+        assert urljoin(pulp_content_url, relative_path) in package.url
+        assert PYTHON_XS_FIXTURE_CHECKSUMS[package.filename] == package.digests["sha256"]
+
+
+@pytest.mark.parallel
+def test_pull_through_simple_json(
+    python_remote_factory, python_distribution_factory, pulp_content_url
+):
+    """Tests that the simple JSON API page works for pull-through."""
+    media_type = "application/vnd.pypi.simple.v1+json"
+    remote = python_remote_factory(url=PYPI_URL, includes=["shelf-reader"])
+    distro = python_distribution_factory(remote=remote.pulp_href)
+
+    url = f"{distro.base_url}simple/shelf-reader/"
+    headers = {"Accept": media_type}
+    response = requests.get(url, headers=headers)
+
+    assert response.status_code == 200
+    assert media_type in response.headers["Content-Type"]
+    assert "X-PyPI-Last-Serial" in response.headers
+
+    project_page = ProjectPage.from_response(response, "shelf-reader")
+    assert len(project_page.packages) == 2
+
+    for package in project_page.packages:
+        assert package.filename in PYTHON_XS_FIXTURE_CHECKSUMS
+        relative_path = f"{distro.base_path}/{package.filename}?redirect="
+        assert urljoin(pulp_content_url, relative_path) in package.url
+        assert PYTHON_XS_FIXTURE_CHECKSUMS[package.filename] == package.digests["sha256"]
+
+
+# json, html
 @pytest.mark.parallel
 def test_pull_through_filter(python_remote_factory, python_distribution_factory):
     """Tests that pull-through respects the includes/excludes filter on the remote."""
@@ -96,6 +153,7 @@ def test_pull_through_filter(python_remote_factory, python_distribution_factory)
     assert r.status_code == 200
 
 
+# html
 @pytest.mark.parallel
 def test_pull_through_with_repo(
     python_repo_factory,