wip

Author: jobselko

pulp_python/app/pypi/views.py

@@ -3,7 +3,7 @@
 
 from aiohttp.client_exceptions import ClientError
 from rest_framework.viewsets import ViewSet
-from rest_framework.renderers import JSONRenderer, TemplateHTMLRenderer
+from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, TemplateHTMLRenderer
 from rest_framework.response import Response
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import redirect
@@ -18,7 +18,6 @@
     HttpResponseBadRequest,
     StreamingHttpResponse,
     HttpResponse,
-    JsonResponse,
 )
 from drf_spectacular.utils import extend_schema
 from dynaconf import settings
@@ -74,18 +73,6 @@ class PyPISimpleJSONRenderer(JSONRenderer):
     media_type = PYPI_SIMPLE_V1_JSON
 
 
-def _select_content_type(request):
-    """Select content type based on Accept header."""
-    accept_header = request.META.get("HTTP_ACCEPT", "")
-
-    for content_type in (PYPI_TEXT_HTML, PYPI_SIMPLE_V1_HTML, PYPI_SIMPLE_V1_JSON):
-        if content_type in accept_header:
-            return content_type
-    if not accept_header:
-        return PYPI_TEXT_HTML
-    return None
-
-
 class PyPIMixin:
     """Mixin to get index specific info."""
 
@@ -263,32 +250,34 @@ class SimpleView(PackageUploadMixin, ViewSet):
         ],
     }
 
-    renderer_classes = [
-        TemplateHTMLRenderer,
-        PyPISimpleHTMLRenderer,
-        PyPISimpleJSONRenderer,
-    ]
+    def get_renderers(self):
+        """Defines custom renderers."""
+        if self.action in ["list", "retrieve"]:
+            # Use PyPI renderers for simple API endpoints
+            return [
+                TemplateHTMLRenderer(),
+                PyPISimpleHTMLRenderer(),
+                PyPISimpleJSONRenderer(),
+            ]
+        else:
+            # Use standard DRF renderers
+            return [JSONRenderer(), BrowsableAPIRenderer()]
 
     @extend_schema(summary="Get index simple page")
     def list(self, request, path):
         """Gets the simple api html page for the index."""
-        content_type = _select_content_type(request)
-        if content_type is None:
-            return HttpResponse("Not Acceptable Content-Type", status=406)
-
         repo_version, content = self.get_rvc()
         if self.should_redirect(repo_version=repo_version):
             return redirect(urljoin(self.base_content_url, f"{path}/simple/"))
-        names = content.order_by("name").values_list("name", flat=True).distinct().iterator()
 
-        if content_type == PYPI_SIMPLE_V1_JSON:
-            names_list = list(names)
-            data_dict = write_simple_index_json(names_list)
+        names = content.order_by("name").values_list("name", flat=True).distinct()
+
+        if request.accepted_renderer.media_type == PYPI_SIMPLE_V1_JSON:
+            data_dict = write_simple_index_json(list(names))
             headers = {"X-PyPI-Last-Serial": str(PYPI_SERIAL_CONSTANT)}
-            response = JsonResponse(data_dict, content_type=content_type, headers=headers)
-            return response
+            return Response(data_dict, headers=headers)
         else:
-            return StreamingHttpResponse(write_simple_index(names, streamed=True))
+            return StreamingHttpResponse(write_simple_index(names.iterator(), streamed=True))
 
     def pull_through_package_simple(self, package, path, remote):
         """Gets the package's simple page from remote."""
@@ -327,10 +316,6 @@ def parse_package(release_package):
     @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."""
-        content_type = _select_content_type(request)
-        if content_type is None:
-            return HttpResponse("Not Acceptable Content-Type", status=406)
-
         repo_ver, content = self.get_rvc()
         # Should I redirect if the normalized name is different?
         normalized = canonicalize_name(package)
@@ -352,12 +337,11 @@ def retrieve(self, request, path, package):
             name = present[2]
         releases = ((f, urljoin(self.base_content_url, f"{path}/{f}"), d) for f, d, _ in packages)
 
-        if content_type == PYPI_SIMPLE_V1_JSON:
+        if request.accepted_renderer.media_type == PYPI_SIMPLE_V1_JSON:
             releases_list = list(releases)
             data_dict = write_simple_detail_json(name, releases_list)
             headers = {"X-PyPI-Last-Serial": str(PYPI_SERIAL_CONSTANT)}
-            response = JsonResponse(data_dict, content_type=content_type, headers=headers)
-            return response
+            return Response(data_dict, headers=headers)
         else:
             return StreamingHttpResponse(write_simple_detail(name, releases, streamed=True))
 

pulp_python/tests/functional/api/test_pypi_apis.py

@@ -313,6 +313,29 @@ def test_simple_json_api(python_remote_factory, python_repo_with_sync, python_di
     assert response_detail.headers["X-PyPI-Last-Serial"] == "1000000000"
 
 
+@pytest.mark.parametrize(
+    "header, result",
+    [
+        ("application/vnd.pypi.simple.v1+json", "application/vnd.pypi.simple.v1+json"),
+        ("application/vnd.pypi.simple.v1+html", "application/vnd.pypi.simple.v1+html"),
+        ("text/html", "text/html"),
+        ("sth/else", "text/html"),
+        (f"application/vnd.pypi.simple.v1+html;q=0.2, application/vnd.pypi.simple.v1+json", "text/html"),
+    ],
+)
+def test_simple_json_api_headers(
+    python_remote_factory, python_repo_with_sync, python_distribution_factory, header, result
+):
+    remote = python_remote_factory(includes=PYTHON_SM_PROJECT_SPECIFIER)
+    repo = python_repo_with_sync(remote)
+    distro = python_distribution_factory(repository=repo)
+    index_url = urljoin(distro.base_url, "simple/")
+
+    response = requests.get(index_url, headers={"Accept": header})
+    # assert response.status_code == 200
+    assert result in response.headers["Content-Type"]
+
+
 @pytest.mark.parallel
 def test_pypi_json(python_remote_factory, python_repo_with_sync, python_distribution_factory):
     """Checks the data of `pypi/{package_name}/json` endpoint."""