pulp-python 3.30.0__py3-none-any.whl → 3.30.1__py3-none-any.whl

pulp_python/app/__init__.py

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

pulp_python/app/pypi/views.py

@@ -7,6 +7,7 @@ from urllib.parse import urljoin, urlparse, urlunsplit
 from django.contrib.sessions.models import Session
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
+from django.db.models import OuterRef, Subquery
 from django.db.utils import DatabaseError
 from django.http.response import (
     Http404,
@@ -25,6 +26,7 @@ from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, Templat
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
+from pulpcore.plugin.models import RepositoryContent
 from pulpcore.plugin.tasking import dispatch
 from pulpcore.plugin.util import get_domain, get_url
 from pulpcore.plugin.viewsets import OperationPostponedResponse
@@ -366,13 +368,20 @@ class SimpleView(PackageUploadMixin, ViewSet):
             return redirect(urljoin(self.base_content_url, f"{path}/simple/{normalized}/"))
         if content is not None:
             local_packages = content.filter(name_normalized=normalized)
-            packages = local_packages.values(
+            repo_added_subquery = RepositoryContent.objects.filter(
+                content_id=OuterRef("pk"),
+                repository=repo_ver.repository,
+                version_removed=None,
+            ).values("pulp_created")[:1]
+            packages = local_packages.annotate(
+                repo_added_time=Subquery(repo_added_subquery)
+            ).values(
                 "filename",
                 "sha256",
                 "metadata_sha256",
                 "requires_python",
                 "size",
-                "pulp_created",
+                "repo_added_time",
                 "version",
             )
             provenances = PackageProvenance.objects.filter(package__in=local_packages).values_list(
@@ -382,7 +391,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
                 p["filename"]: {
                     **p,
                     "url": urljoin(self.base_content_url, f"{path}/{p['filename']}"),
-                    "upload_time": p["pulp_created"],
+                    "upload_time": p["repo_added_time"],
                     "provenance": (
                         self.get_provenance_url(normalized, p["version"], p["filename"])
                         if p["filename"] in provenances
@@ -464,7 +473,11 @@ class MetadataView(PyPIMixin, ViewSet):
             if settings.DOMAIN_ENABLED:
                 domain = get_domain()
             json_body = python_content_to_json(
-                path, package_content, version=version, domain=domain
+                path,
+                package_content,
+                version=version,
+                domain=domain,
+                repository_version=repo_ver,
             )
             if json_body:
                 return Response(data=json_body, headers=headers)

pulp_python/app/utils.py

@@ -11,6 +11,7 @@ from datetime import timezone
 import pkginfo
 from aiohttp.client_exceptions import ClientError
 from django.conf import settings
+from django.db.models import OuterRef, Subquery
 from django.db.utils import IntegrityError
 from jinja2 import Template
 from packaging.requirements import Requirement
@@ -19,7 +20,7 @@ from packaging.version import InvalidVersion, parse
 from pypi_simple import ACCEPT_JSON_PREFERRED, ProjectPage
 
 from pulpcore.plugin.exceptions import TimeoutException
-from pulpcore.plugin.models import Artifact, Remote
+from pulpcore.plugin.models import Artifact, Remote, RepositoryContent
 from pulpcore.plugin.util import get_domain
 
 log = logging.getLogger(__name__)
@@ -359,7 +360,9 @@ def fetch_json_release_metadata(name: str, version: str, remotes: set[Remote]) -
         raise Exception(f"Failed to fetch {url} from any remote.")
 
 
-def python_content_to_json(base_path, content_query, version=None, domain=None):
+def python_content_to_json(
+    base_path, content_query, version=None, domain=None, repository_version=None
+):
     """
     Converts a QuerySet of PythonPackageContent into the PyPi JSON format
     https://www.python.org/dev/peps/pep-0566/
@@ -371,6 +374,13 @@ def python_content_to_json(base_path, content_query, version=None, domain=None):
 
     Returns None if version is specified but not found within content_query
     """
+    if repository_version:
+        repo_added_subquery = RepositoryContent.objects.filter(
+            content_id=OuterRef("pk"),
+            repository=repository_version.repository,
+            version_removed=None,
+        ).values("pulp_created")[:1]
+        content_query = content_query.annotate(repo_added_time=Subquery(repo_added_subquery))
     full_metadata = {"last_serial": 0}  # For now the serial field isn't supported by Pulp
     latest_content = latest_content_version(content_query, version)
     if not latest_content:
@@ -515,8 +525,10 @@ def python_content_to_download_info(content, base_path, domain=None):
         "python_version": content.python_version,
         "requires_python": content.requires_python or None,
         "size": content.size,
-        "upload_time": str(content.pulp_created),
-        "upload_time_iso_8601": str(content.pulp_created.isoformat()),
+        "upload_time": str(getattr(content, "repo_added_time", None) or content.pulp_created),
+        "upload_time_iso_8601": str(
+            (getattr(content, "repo_added_time", None) or content.pulp_created).isoformat()
+        ),
         "url": url,
         "yanked": False,
         "yanked_reason": None,

pulp_python/tests/functional/api/test_pypi_apis.py

@@ -1,4 +1,6 @@
 import subprocess
+import time
+from datetime import datetime
 from urllib.parse import urljoin
 
 import pytest
@@ -6,6 +8,7 @@ import requests
 
 from pulp_python.tests.functional.constants import (
     PYPI_SERIAL_CONSTANT,
+    PYPI_SIMPLE_V1_JSON,
     PYTHON_EGG_FILENAME,
     PYTHON_EGG_SHA256,
     PYTHON_MD_PROJECT_SPECIFIER,
@@ -13,6 +16,8 @@ from pulp_python.tests.functional.constants import (
     PYTHON_WHEEL_FILENAME,
     PYTHON_WHEEL_SHA256,
     SHELF_PYTHON_JSON,
+    TWINE_WHEEL_FILENAME,
+    TWINE_WHEEL_URL,
 )
 from pulp_python.tests.functional.utils import ensure_metadata
 
@@ -328,3 +333,41 @@ def assert_download_info(expected, received, message="Failed to match"):
                 matched = True
                 break
         assert matched is True, message
+
+
+@pytest.mark.parallel
+def test_upload_time_reflects_repo_addition(
+    monitor_task,
+    python_bindings,
+    python_content_factory,
+    python_distribution_factory,
+    python_repo_factory,
+):
+    """
+    Test that upload_time reflects repository addition time instead of content creation time.
+    Checks both Simple and JSON APIs.
+    """
+    content = python_content_factory(TWINE_WHEEL_FILENAME, url=TWINE_WHEEL_URL)
+    content_created = datetime.fromisoformat(
+        str(python_bindings.ContentPackagesApi.read(content.pulp_href).pulp_created)
+    )
+    time.sleep(2)
+
+    repo = python_repo_factory()
+    body = {"add_content_units": [content.pulp_href]}
+    monitor_task(python_bindings.RepositoriesPythonApi.modify(repo.pulp_href, body).task)
+    distro = python_distribution_factory(repository=repo)
+
+    # Simple API
+    headers = {"Accept": PYPI_SIMPLE_V1_JSON}
+    resp = requests.get(f"{urljoin(distro.base_url, 'simple/')}twine", headers=headers)
+    assert resp.status_code == 200
+    simple_time = datetime.fromisoformat(resp.json()["files"][0]["upload-time"])
+    assert simple_time > content_created
+
+    # JSON API
+    json_resp = requests.get(urljoin(distro.base_url, "pypi/twine/json"))
+    assert json_resp.status_code == 200
+    json_time = datetime.fromisoformat(json_resp.json()["urls"][0]["upload_time"])
+    assert json_time > content_created
+    assert json_time == simple_time

pulp_python/tests/functional/api/test_pypi_simple_api.py

@@ -5,6 +5,9 @@ import requests
 
 from pulp_python.tests.functional.constants import (
     PYPI_SERIAL_CONSTANT,
+    PYPI_SIMPLE_V1_HTML,
+    PYPI_SIMPLE_V1_JSON,
+    PYPI_TEXT_HTML,
     PYTHON_SM_FIXTURE_CHECKSUMS,
     PYTHON_SM_FIXTURE_RELEASES,
     PYTHON_SM_PROJECT_SPECIFIER,
@@ -27,10 +30,6 @@ from pulp_python.tests.functional.utils import ensure_simple
 
 API_VERSION = "1.1"
 
-PYPI_TEXT_HTML = "text/html"
-PYPI_SIMPLE_V1_HTML = "application/vnd.pypi.simple.v1+html"
-PYPI_SIMPLE_V1_JSON = "application/vnd.pypi.simple.v1+json"
-
 
 @pytest.mark.parallel
 def test_simple_html_index_api(

pulp_python/tests/functional/constants.py

@@ -382,3 +382,7 @@ VULNERABILITY_REPORT_TEST_PACKAGES = [
 ]
 
 PYPI_SERIAL_CONSTANT = 1000000000
+
+PYPI_TEXT_HTML = "text/html"
+PYPI_SIMPLE_V1_HTML = "application/vnd.pypi.simple.v1+html"
+PYPI_SIMPLE_V1_JSON = "application/vnd.pypi.simple.v1+json"

{pulp_python-3.30.0.dist-info → pulp_python-3.30.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.30.0
+Version: 3.30.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.30.0.dist-info → pulp_python-3.30.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_python/__init__.py,sha256=GIuTLoBTc-07dSLJUh8xrZPRz8x-jJ61pfR0J1IjnzI,65
 pulp_python/pytest_plugin.py,sha256=LNnLjOkeEu2X4gJi614bHVmbsHyEwooHYIeecr96Qy4,8606
-pulp_python/app/__init__.py,sha256=y_CC6G_mwMgeCLPJVhbg_XELv0W3VVqwiJh9dEizSWA,2490
+pulp_python/app/__init__.py,sha256=kvIZAie_YepDZxtZCUo9YVSjAZXhIjWL7sq7aSI88L8,2490
 pulp_python/app/global_access_conditions.py,sha256=MZJtyoVsr-4hRaty6mKDqh3caOHd5UKJjEWLV2crOLs,1080
 pulp_python/app/modelresource.py,sha256=4SFAdqk6lozi_cZz4uqDIqhqPAZF-7l5jJwPn-xGZFs,1249
 pulp_python/app/models.py,sha256=Y7MDTl2nKz1dz2S4KQIQQ4oWcYgBA4TyDVxJGBYPHY4,17705
@@ -9,7 +9,7 @@ pulp_python/app/replica.py,sha256=qiWRP7tM_v4yP_XLIQfumfGolru-Jt6ZA0KVb-9g2cA,18
 pulp_python/app/serializers.py,sha256=Wg83g7LE9Qkf1S7hkkvG2_EJUi7D12l8UyCA1wmwf-I,33819
 pulp_python/app/settings.py,sha256=Cyc_p6U0HQjKpyrRL6JFrK3R7RMQJ9MAgNMJCfzPEiA,255
 pulp_python/app/urls.py,sha256=M2xjQ0j47BwQVpi75QCa5eUnQDcroKv3Cee7UrQ3QcA,1387
-pulp_python/app/utils.py,sha256=3XNXNtpr9-DgiKBh5fLGvQYMmtqqZubsNC9vsreumYY,26742
+pulp_python/app/utils.py,sha256=f9sCzZ58Sf7EBNqzBG0NBGtWE6gE2eIcnoSTAhdVIIg,27303
 pulp_python/app/viewsets.py,sha256=EyeuNNvklB74tSyL4MRfTnh4a5KVv2kUPgmeTUd6oSY,34209
 pulp_python/app/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,7 +40,7 @@ pulp_python/app/migrations/0022_pythonblocklistentry.py,sha256=EbtjZuN65myTAHVWr
 pulp_python/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/serializers.py,sha256=rE0Cci2IMg4NbNWlVdo-8zPaJCAUq2Re57q_T3jMt0Y,5030
-pulp_python/app/pypi/views.py,sha256=ksvj34QMHEXnevzsPNTeiGjrNrUpfGvLJ8zH_P4Faqg,21126
+pulp_python/app/pypi/views.py,sha256=D2lsHijKp3ZJemt-iwWxjJEin5rAkc0pZzi9kZyQgwk,21651
 pulp_python/app/tasks/__init__.py,sha256=lTFpVvpDKbqv9RC0b2RYU8Bo6svDjrA-djt16pADFr8,284
 pulp_python/app/tasks/publish.py,sha256=bjsJzqJbLu7TF5rLb-UsZMmlNnc_LKw-sdHX9Gcatbw,4334
 pulp_python/app/tasks/repair.py,sha256=5InzdbjW8y3AC4Vj2PsNLm3wGGTr8D3LcfPw_WA2Fks,12257
@@ -52,7 +52,7 @@ pulp_python/app/webserver_snippets/apache.conf,sha256=3frHSl2YV_8pJPscaFxMVo7Hmx
 pulp_python/app/webserver_snippets/nginx.conf,sha256=gMqZGFefsTJVVx9YRxpHVS7NMEll9CzOseYdtLr3Avc,344
 pulp_python/tests/__init__.py,sha256=4Yz43a8s-KyhdHFb5eEhIIvH72807Y84uAHnG5bO5y0,31
 pulp_python/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulp_python/tests/functional/constants.py,sha256=SvzlxGQz1I-p3JEBSqNz9qoAYfq5yhGsqtYoJpCOioU,13819
+pulp_python/tests/functional/constants.py,sha256=4e_zssE9G1bSNNJxYo7VgwvojUL_NocG5mUH996KBJs,13969
 pulp_python/tests/functional/utils.py,sha256=GWnXrsQGZd0Ngewa_9yce58Qc3z7FbrlRvqao_8ZML0,5901
 pulp_python/tests/functional/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/functional/api/test_attestations.py,sha256=cyZl4jCL-Q5Qu7XpxLc5_YmCzyc1Ctfl1IvSJ6YPQQU,8640
@@ -66,8 +66,8 @@ pulp_python/tests/functional/api/test_domains.py,sha256=BnWBwid_RA0xenBBHwvkT5_2
 pulp_python/tests/functional/api/test_download_content.py,sha256=5IuaHXyLakPkjm5sLTxtTl7Dq0yl7N36HpObnIa0Sks,4950
 pulp_python/tests/functional/api/test_export_import.py,sha256=rHns9wdaeP-vtfW_qoGHU9EVuJ4YuWE0-rjl_8otAgU,4530
 pulp_python/tests/functional/api/test_full_mirror.py,sha256=eU5HzgBBFOnX1q4m8ELx-t-I3U4TWXL-LNrlc2BcWVc,12045
-pulp_python/tests/functional/api/test_pypi_apis.py,sha256=kvKp29yfv9ZqbMs7knYO48mLXt7ZEVIdZLUEjgeztzc,11691
-pulp_python/tests/functional/api/test_pypi_simple_api.py,sha256=td_I42mAHVzdXbHsngRbwrNYIsnEewKXA1NC6TfNZZY,7251
+pulp_python/tests/functional/api/test_pypi_apis.py,sha256=mhST0GV-uDrVPsBWYRGaJx1pp9htzbYiUGuIGOI0s_s,13218
+pulp_python/tests/functional/api/test_pypi_simple_api.py,sha256=tOUl8WXgJkMoxGyLbA-WorCxIRKfGWM-27_dK_Jc0Q4,7171
 pulp_python/tests/functional/api/test_rbac.py,sha256=-xNWqvKKU-v1uC6tCRGBK0aWaff25K9C-AfzQkdHhhI,10513
 pulp_python/tests/functional/api/test_repair.py,sha256=4FR7jx_LA2K-pnRJXKkhq-1uUoWXST1leZ9XdyhGM2U,12909
 pulp_python/tests/functional/api/test_sync.py,sha256=TTHR1CpZeRoD97RKxj2pZPsP0OS9ibYKGPOh1WfKISg,13801
@@ -77,9 +77,9 @@ pulp_python/tests/functional/assets/shelf-reader-0.1.tar.gz.publish.attestation,
 pulp_python/tests/functional/assets/shelf_reader-0.1-py2-none-any.whl.publish.attestation,sha256=muTQ8dqYSSdx76DlaPjB1REcNIS-aak-Na0TkASxu8M,10426
 pulp_python/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6qg5JehGH3Pds,229
-pulp_python-3.30.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_python-3.30.0.dist-info/METADATA,sha256=qoGeUKqhylMVAFH-ZVkJ-Bzmj1-opwBmZGX5bTmL1wY,1744
-pulp_python-3.30.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pulp_python-3.30.0.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
-pulp_python-3.30.0.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
-pulp_python-3.30.0.dist-info/RECORD,,
+pulp_python-3.30.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_python-3.30.1.dist-info/METADATA,sha256=BcaJBgi3HQekc7OK4Ub3IBxMf5q42FQJDfnfRvQbevY,1744
+pulp_python-3.30.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pulp_python-3.30.1.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
+pulp_python-3.30.1.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
+pulp_python-3.30.1.dist-info/RECORD,,