pulp-python 3.14.0__tar.gz → 3.15.1__tar.gz

{pulp_python-3.14.0 → pulp_python-3.15.1}/CHANGES.md

@@ -8,6 +8,24 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.15.1 (2025-06-10) {: #3.15.1 }
+
+#### Bugfixes {: #3.15.1-bugfix }
+
+- Fixed pull-through caching not working for indexes that use relative URLs.
+  [#842](https://github.com/pulp/pulp_python/issues/842)
+
+---
+
+## 3.15.0 (2025-05-13) {: #3.15.0 }
+
+#### Features {: #3.15.0-feature }
+
+- Added new `repair_metadata` endpoint to `Repository` for fixing packages' metadata.
+  [#805](https://github.com/pulp/pulp_python/issues/805)
+
+---
+
 ## 3.14.0 (2025-04-10) {: #3.14.0 }
 
 #### Features {: #3.14.0-feature }
@@ -28,6 +46,20 @@
 
 ---
 
+## 3.13.5 (2025-04-23) {: #3.13.5 }
+
+No significant changes.
+
+---
+
+## 3.13.4 (2025-04-10) {: #3.13.4 }
+
+#### Misc {: #3.13.4-misc }
+
+- [#809](https://github.com/pulp/pulp_python/issues/809)
+
+---
+
 ## 3.13.3 (2025-04-07) {: #3.13.3 }
 
 #### Bugfixes {: #3.13.3-bugfix }
@@ -115,7 +147,7 @@ No significant changes.
 
 ---
 
-# ## 3.12.2 (2024-08-21) {: #3.12.2 }
+## 3.12.2 (2024-08-21) {: #3.12.2 }
 
 #### Bugfixes {: #3.12.2-bugfix }
 
@@ -126,7 +158,6 @@ No significant changes.
 
 ## 3.12.1 (2024-06-27) {: #3.12.1 }
 
-
 #### Bugfixes {: #3.12.1-bugfix }
 
 - Fixed the `package_types` filter breaking other remote filters.
@@ -136,7 +167,6 @@ No significant changes.
 
 ## 3.12.0 (2024-06-25) {: #3.12.0 }
 
-
 #### Features {: #3.12.0-feature }
 
 - Added RBAC support.
@@ -162,6 +192,12 @@ No significant changes.
 
 ---
 
+## 3.11.5 (2025-04-15) {: #3.11.5 }
+
+No significant changes.
+
+---
+
 ## 3.11.4 (2025-02-20) {: #3.11.4 }
 
 #### Bugfixes {: #3.11.4-bugfix }
@@ -175,7 +211,7 @@ No significant changes.
 
 ---
 
-# ## 3.11.3 (2024-08-21) {: #3.11.3 }
+## 3.11.3 (2024-08-21) {: #3.11.3 }
 
 #### Bugfixes {: #3.11.3-bugfix }
 
@@ -188,7 +224,6 @@ No significant changes.
 
 ## 3.11.2 (2024-06-27) {: #3.11.2 }
 
-
 #### Bugfixes {: #3.11.2-bugfix }
 
 - Fixed the `package_types` filter breaking other remote filters.
@@ -406,7 +441,7 @@ No significant changes.
 
 ---
 
-3.4.0 (2021-06-17)
+## 3.4.0 (2021-06-17) {: #3.4.0 }
 
 ### Features
 

{pulp_python-3.14.0 → pulp_python-3.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.14.0
+Version: 3.15.1
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python/app/__init__.py

@@ -10,7 +10,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.14.0"
+    version = "3.15.1"
     python_package_name = "pulp-python"
     domain_compatible = True
 

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python/app/pypi/views.py

@@ -260,9 +260,9 @@ class SimpleView(PackageUploadMixin, ViewSet):
             return HttpResponse(f"{remote.url} timed out while fetching {package}.", status=504)
 
         if d.headers["content-type"] == "application/vnd.pypi.simple.v1+json":
-            page = ProjectPage.from_json_data(json.load(open(d.path, "rb")), base_url=remote.url)
+            page = ProjectPage.from_json_data(json.load(open(d.path, "rb")), base_url=url)
         else:
-            page = ProjectPage.from_html(package, open(d.path, "rb").read(), base_url=remote.url)
+            page = ProjectPage.from_html(package, open(d.path, "rb").read(), base_url=url)
         packages = [
             parse_package(p) for p in page.packages if rfilter.filter_release(package, p.version)
         ]

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python/app/tasks/__init__.py

@@ -3,5 +3,6 @@ Asynchronous task definitions.
 """
 
 from .publish import publish  # noqa:F401
+from .repair import repair  # noqa:F401
 from .sync import sync  # noqa:F401
 from .upload import upload, upload_group  # noqa:F401

pulp_python-3.15.1/pulp_python/app/tasks/repair.py

@@ -0,0 +1,89 @@
+import logging
+import uuid
+from gettext import gettext as _
+
+from django.db.models.query import QuerySet
+from pulpcore.plugin.models import ProgressReport
+from pulpcore.plugin.util import get_domain
+
+from pulp_python.app.models import PythonPackageContent, PythonRepository
+from pulp_python.app.utils import artifact_to_python_content_data
+
+log = logging.getLogger(__name__)
+
+
+def repair(repository_pk: uuid.UUID) -> None:
+    """
+    Repairs metadata of all packages for the specified repository.
+
+    Args:
+        repository_pk (uuid.UUID): The primary key of the repository to repair.
+
+    Returns:
+        None
+    """
+    repository = PythonRepository.objects.get(pk=repository_pk)
+
+    log.info(
+        _(
+            "Repairing packages' metadata for the latest version of repository {}."
+        ).format(repository.name)
+    )
+    content_set = repository.latest_version().content.values_list("pk", flat=True)
+    content = PythonPackageContent.objects.filter(pk__in=content_set)
+
+    num_repaired = repair_metadata(content)
+    log.info(_("{} packages' metadata repaired.").format(num_repaired))
+
+
+def repair_metadata(content: QuerySet[PythonPackageContent]) -> int:
+    """
+    Repairs metadata for a queryset of PythonPackageContent objects
+    and updates the progress report.
+
+    Args:
+        content (QuerySet[PythonPackageContent]): The queryset of items to repair.
+
+    Returns:
+        int: The number of packages that were repaired.
+    """
+    # TODO: Add on_demand content repair
+    immediate_content = content.filter(contentartifact__artifact__isnull=False)
+    domain = get_domain()
+
+    batch = []
+    set_of_update_fields = set()
+    total_repaired = 0
+
+    progress_report = ProgressReport(
+        message="Repairing packages' metadata",
+        code="repair.metadata",
+        total=immediate_content.count(),
+    )
+    progress_report.save()
+    with progress_report:
+        for package in progress_report.iter(
+            immediate_content.prefetch_related("_artifacts").iterator(chunk_size=1000)
+        ):
+            new_data = artifact_to_python_content_data(
+                package.filename, package._artifacts.get(), domain
+            )
+            changed = False
+            for field, value in new_data.items():
+                if getattr(package, field) != value:
+                    setattr(package, field, value)
+                    set_of_update_fields.add(field)
+                    changed = True
+            if changed:
+                batch.append(package)
+            if len(batch) == 1000:
+                total_repaired += len(batch)
+                PythonPackageContent.objects.bulk_update(batch, set_of_update_fields)
+                batch = []
+                set_of_update_fields.clear()
+
+    if batch:
+        total_repaired += len(batch)
+        PythonPackageContent.objects.bulk_update(batch, set_of_update_fields)
+
+    return total_repaired

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python/app/viewsets.py

@@ -83,7 +83,7 @@ class PythonRepositoryViewSet(
                 ],
             },
             {
-                "action": ["modify"],
+                "action": ["modify", "repair_metadata"],
                 "principal": "authenticated",
                 "effect": "allow",
                 "condition": [
@@ -122,6 +122,25 @@ class PythonRepositoryViewSet(
         "python.pythonrepository_viewer": ["python.view_pythonrepository"],
     }
 
+    @extend_schema(
+        summary="Repair metadata",
+        responses={202: AsyncOperationResponseSerializer},
+    )
+    @action(detail=True, methods=["post"], serializer_class=None)
+    def repair_metadata(self, request, pk):
+        """
+        Trigger an asynchronous task to repair Python metadata. This task will repair metadata
+        of all packages for the specified `Repository`, without creating a new `RepositoryVersion`.
+        """
+        repository = self.get_object()
+
+        result = dispatch(
+            tasks.repair,
+            exclusive_resources=[repository],
+            kwargs={"repository_pk": str(repository.pk)},
+        )
+        return core_viewsets.OperationPostponedResponse(result, request)
+
     @extend_schema(
         summary="Sync from remote",
         responses={202: AsyncOperationResponseSerializer}

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python/tests/functional/api/test_repair.py

@@ -1,7 +1,11 @@
 import pytest
 import subprocess
+from urllib.parse import urljoin
 
-from pulp_python.tests.functional.constants import PYTHON_EGG_FILENAME
+from pulp_python.tests.functional.constants import (
+    PYTHON_EGG_FILENAME,
+    PYTHON_FIXTURES_URL,
+)
 
 
 @pytest.fixture
@@ -76,3 +80,47 @@ def test_metadata_repair_command(
     assert content.packagetype == "sdist"
     assert content.requires_python == ""  # technically null
     assert content.author == "Austin Macdonald"
+
+
+def test_metadata_repair_endpoint(
+    create_content_direct,
+    download_python_file,
+    monitor_task,
+    move_to_repository,
+    python_bindings,
+    python_repo,
+):
+    """
+    Test repairing of package metadata via `Repositories.repair_metadata` endpoint.
+    """
+    python_egg_filename = "scipy-1.1.0.tar.gz"
+    python_egg_url = urljoin(
+        urljoin(PYTHON_FIXTURES_URL, "packages/"), python_egg_filename
+    )
+    python_file = download_python_file(python_egg_filename, python_egg_url)
+
+    data = {
+        "name": "scipy",
+        # Wrong metadata
+        "author": "ME",
+        "packagetype": "bdist",
+        "requires_python": ">=3.8",
+        "version": "0.2",
+    }
+    content = create_content_direct(python_file, python_egg_filename, data)
+    for field, wrong_value in data.items():
+        if field == "python_version":
+            continue
+        assert getattr(content, field) == wrong_value
+    move_to_repository(python_repo.pulp_href, [content.pulp_href])
+
+    response = python_bindings.RepositoriesPythonApi.repair_metadata(
+        python_repo.pulp_href
+    )
+    monitor_task(response.task)
+
+    content = python_bindings.ContentPackagesApi.read(content.pulp_href)
+    assert content.version == "1.1.0"
+    assert content.packagetype == "sdist"
+    assert content.requires_python == ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
+    assert content.author == ""

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.14.0
+Version: 3.15.1
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.14.0 → pulp_python-3.15.1}/pulp_python.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ pulp_python/app/pypi/serializers.py
 pulp_python/app/pypi/views.py
 pulp_python/app/tasks/__init__.py
 pulp_python/app/tasks/publish.py
+pulp_python/app/tasks/repair.py
 pulp_python/app/tasks/sync.py
 pulp_python/app/tasks/upload.py
 pulp_python/app/webserver_snippets/__init__.py

{pulp_python-3.14.0 → pulp_python-3.15.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-python"
-version = "3.14.0"
+version = "3.15.1"
 description = "pulp-python plugin for the Pulp Project"
 readme = "README.md"
 authors = [
@@ -77,7 +77,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.14.0"
+current_version = "3.15.1"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"