Fix pull-through not saving metadata artifact

fixes: #1087

Author: gerrod3

CHANGES/1087.bugfix

@@ -0,0 +1 @@
+Fixed pull-through PEP 658 metadata not being saved correctly with the package.

pulp_python/app/models.py

@@ -25,6 +25,7 @@
 from .provenance import Provenance
 from .utils import (
     artifact_to_python_content_data,
+    artifact_to_metadata_artifact,
     canonicalize_name,
     python_content_to_json,
     PYPI_LAST_SERIAL,
@@ -215,7 +216,10 @@ def init_from_artifact_and_relative_path(artifact, relative_path):
         """Used when downloading package from pull-through cache."""
         path = PurePath(relative_path)
         data = artifact_to_python_content_data(path.name, artifact, domain=get_domain())
-        return PythonPackageContent(**data)
+        artifacts = {path.name: artifact}
+        if metadata_artifact := artifact_to_metadata_artifact(path.name, artifact):
+            artifacts[f"{path.name}.metadata"] = metadata_artifact
+        return PythonPackageContent(**data), artifacts
 
     def __str__(self):
         """

pulp_python/tests/functional/api/test_full_mirror.py

@@ -238,3 +238,50 @@ def test_pull_through_metadata(python_remote_factory, python_distribution_factor
     r = requests.get(url2)
     assert r.status_code == 200
     assert sha256(r.content).hexdigest() == package2.metadata_digests["sha256"]
+
+
+@pytest.mark.parallel
+def test_pull_through_metadata_with_repo(
+    python_repo_factory,
+    python_remote_factory,
+    python_distribution_factory,
+    pulpcore_bindings,
+):
+    """Tests that metadata is correctly saved when using pull-through with a repository."""
+    remote = python_remote_factory(url=PYPI_URL, includes=["pip"])
+    repo = python_repo_factory()
+    distro = python_distribution_factory(repository=repo.pulp_href, remote=remote.pulp_href)
+
+    pip_url = f"{distro.base_url}simple/pip/"
+    project_page = ProjectPage.from_response(requests.get(pip_url), "pip")
+    filename = "pip-26.0.1-py3-none-any.whl"
+    package = next(p for p in project_page.packages if p.filename == filename)
+    assert package.has_metadata
+    assert "?redirect=" in package.url
+
+    # Retrieve the metadata and assert the content was not saved to the repository
+    parts = urlsplit(package.url)
+    url = urlunsplit((parts[0], parts[1], parts[2] + ".metadata", parts[3], parts[4]))
+    r = requests.get(url)
+    assert r.status_code == 200
+    assert sha256(r.content).hexdigest() == package.metadata_digests["sha256"]
+    project_page = ProjectPage.from_response(requests.get(pip_url), "pip")
+    package = next(p for p in project_page.packages if p.filename == filename)
+    assert package.has_metadata
+    assert "?redirect=" in package.url
+
+    # Now retrieve the package and assert the content was saved with metadata
+    r = requests.get(package.url)
+    assert r.status_code == 200
+    pa = pulpcore_bindings.ArtifactsApi.list(sha256=package.digests["sha256"])
+    assert pa.count == 1
+    ma = pulpcore_bindings.ArtifactsApi.list(sha256=package.metadata_digests["sha256"])
+    assert ma.count == 1
+
+    # Check the simple page is updated to point to the local repository
+    project_page = ProjectPage.from_response(requests.get(pip_url), "pip")
+    package = next(p for p in project_page.packages if p.filename == filename)
+    assert "?redirect=" not in package.url
+    r = requests.get(package.metadata_url)
+    assert r.status_code == 200
+    assert sha256(r.content).hexdigest() == package.metadata_digests["sha256"]