Use new helper from pulpcore for currently-served object lookup

And adapt to the possibility that the user may want to distribute a
particular repository version, perhaps without having created a
publication.

Author: dralley

CHANGES/+dist-from-repo-version.bugfix

@@ -0,0 +1 @@
+Pulpcore enabled a feature to allow users to specify "repository_version" on their distributions, which pulp_python already allowed. However, some additional plugin changes were required in order to deconflict the two implementations.

pulp_python/app/models.py

@@ -79,6 +79,24 @@ def content_handler(self, path):
         name = None
         version = None
         domain = get_domain()
+
+        # Resolve the repo version and publication for this distribution.
+        # The behavior of pulp_python differs from pulpcore here in that it always looks
+        # for a publication even though distribution.SERVE_FROM_PUBLICATION = False
+        publication = self.publication
+        repo_version = self.repository_version
+        if publication:
+            repo_version = publication.repository_version
+        elif self.repository:
+            repo_version = self.repository.latest_version()
+        if not publication and repo_version:
+            try:
+                publication = Publication.objects.filter(
+                    repository_version=repo_version, complete=True
+                ).latest("pulp_created")
+            except ObjectDoesNotExist:
+                pass
+
         if path.match("pypi/*/*/json"):
             version = path.parts[2]
             name = path.parts[1]
@@ -88,13 +106,7 @@ def content_handler(self, path):
             # Temporary fix for PublishedMetadata not being properly served from remote storage
             # https://github.com/pulp/pulp_python/issues/413
             if domain.storage_class != "pulpcore.app.models.storage.FileSystem":
-                if self.publication or self.repository:
-                    try:
-                        publication = self.publication or Publication.objects.filter(
-                            repository_version=self.repository.latest_version()
-                        ).latest("pulp_created")
-                    except ObjectDoesNotExist:
-                        return None
+                if publication:
                     if len(path.parts) == 2:
                         path = PurePath(f"simple/{canonicalize_name(path.parts[1])}")
                     rel_path = f"{path}/index.html"
@@ -112,10 +124,10 @@ def content_handler(self, path):
                     headers = {"Content-Type": "text/html"}
                     return ArtifactResponse(ca.artifact, headers=headers)
 
-        if name:
+        if name and repo_version:
             normalized = canonicalize_name(name)
             package_content = PythonPackageContent.objects.filter(
-                pk__in=self.publication.repository_version.content, name__normalize=normalized
+                pk__in=repo_version.content, name__normalize=normalized
             )
             # TODO Change this value to the Repo's serial value when implemented
             headers = {PYPI_LAST_SERIAL: str(PYPI_SERIAL_CONSTANT)}

pulp_python/app/serializers.py

@@ -74,9 +74,6 @@ class PythonDistributionSerializer(core_serializers.DistributionSerializer):
         queryset=core_models.Publication.objects.exclude(complete=False),
         allow_null=True,
     )
-    repository_version = core_serializers.RepositoryVersionRelatedField(
-        required=False, help_text=_("RepositoryVersion to be served."), allow_null=True
-    )
     base_url = serializers.SerializerMethodField(read_only=True)
     allow_uploads = serializers.BooleanField(
         default=True, help_text=_("Allow packages to be uploaded to this index.")
@@ -98,7 +95,6 @@ def get_base_url(self, obj):
     class Meta:
         fields = core_serializers.DistributionSerializer.Meta.fields + (
             "publication",
-            "repository_version",
             "allow_uploads",
             "remote",
         )

pyproject.toml

@@ -26,7 +26,7 @@ classifiers=[
 ]
 requires-python = ">=3.11"
 dependencies = [
-  "pulpcore>=3.85.3,<3.115",
+  "pulpcore>=3.106.0,<3.115",
   "pkginfo>=1.12.0,<1.13.0",
   "bandersnatch>=6.6.0,<6.7",
   "pypi-simple>=1.8.0,<2.0",