Serve Python content form a repository version

closes #1324
Assisted by: Claude Sonnet 4

Author: jobselko

CHANGES/1324.feature

@@ -0,0 +1 @@
+Added support for serving Python content form a repository version.

pulp-glue/src/pulp_glue/python/context.py

@@ -72,6 +72,11 @@ def preprocess_entity(self, body: EntityDefinition, partial: bool = False) -> En
                 body["publication"] = None
             if "repository" not in body and "publication" in body:
                 body["repository"] = None
+
+        version = body.pop("version", None)
+        if version is not None:
+            repository_href = body.pop("repository")
+            body["repository_version"] = f"{repository_href}versions/{version}/"
         return body
 
 

src/pulpcore/cli/python/distribution.py

@@ -1,6 +1,13 @@
+import typing as t
+
 import click
 
-from pulp_glue.common.context import PluginRequirement
+from pulp_glue.common.context import (
+    EntityDefinition,
+    EntityFieldDefinition,
+    PluginRequirement,
+    PulpEntityContext,
+)
 from pulp_glue.common.i18n import get_translation
 from pulp_glue.python.context import (
     PulpPythonDistributionContext,
@@ -20,13 +27,13 @@
     label_command,
     list_command,
     name_option,
+    pass_entity_context,
     pass_pulp_context,
     pulp_group,
     pulp_labels_option,
     pulp_option,
     resource_option,
     show_command,
-    update_command,
 )
 
 translation = get_translation(__package__)
@@ -40,6 +47,7 @@
     context_table={"python:python": PulpPythonRepositoryContext},
     help=_(
         "Repository to be used for auto-distributing."
+        " When used with --version, this will create repository_version instead."
         " When set, this will unset the 'publication'."
         " Specified as '[[<plugin>:]<type>:]<name>' or as href."
     ),
@@ -75,6 +83,12 @@ def distribution(ctx: click.Context, pulp_ctx: PulpCLIContext, /, distribution_t
         ),
     ),
     repository_option,
+    pulp_option(
+        "--version",
+        type=int,
+        help=_("A repository version number, leave blank for latest."),
+        needs_plugins=[PluginRequirement("python", specifier=">=3.21.0")],
+    ),
     content_guard_option,
     pulp_option(
         "--allow-uploads/--block-uploads",
@@ -96,8 +110,77 @@ def distribution(ctx: click.Context, pulp_ctx: PulpCLIContext, /, distribution_t
 distribution.add_command(list_command(decorators=distribution_filter_options))
 distribution.add_command(show_command(decorators=lookup_options))
 distribution.add_command(create_command(decorators=create_options))
-distribution.add_command(
-    update_command(decorators=lookup_options + update_options + [click.option("--base-path")])
-)
 distribution.add_command(destroy_command(decorators=lookup_options))
 distribution.add_command(label_command(decorators=nested_lookup_options))
+
+
+def apply_decorators(decorators_list: list[t.Callable[..., t.Any]]) -> t.Callable[..., t.Any]:
+    def decorator(func: t.Callable[..., t.Any]) -> t.Callable[..., t.Any]:
+        for d in decorators_list:
+            func = d(func)
+        return func
+
+    return decorator
+
+
+@distribution.command()
+@apply_decorators(lookup_options + update_options + [click.option("--base-path")])
+@pass_entity_context
+def update(
+    distribution_ctx: PulpEntityContext,
+    /,
+    publication: str | None,
+    repository: EntityFieldDefinition,
+    version: int | None,
+    content_guard: EntityFieldDefinition,
+    allow_uploads: bool | None,
+    remote: EntityFieldDefinition,
+    pulp_labels: dict[str, str] | None,
+    base_path: str | None,
+) -> None:
+    """
+    Update a Python distribution.
+    """
+    assert isinstance(distribution_ctx, PulpPythonDistributionContext)
+
+    dist_body: EntityDefinition = distribution_ctx.entity
+    body: EntityDefinition = dict()
+
+    if publication is not None:
+        body["publication"] = publication
+    if content_guard is not None:
+        body["content_guard"] = content_guard
+    if allow_uploads is not None:
+        body["allow_uploads"] = allow_uploads
+    if remote is not None:
+        body["remote"] = remote
+    if pulp_labels is not None:
+        body["pulp_labels"] = pulp_labels
+    if base_path is not None:
+        body["base_path"] = base_path
+
+    if repository is not None and isinstance(repository, PulpPythonRepositoryContext):
+        repo = repository.entity
+        if version is not None:
+            if dist_body.get("repository"):
+                distribution_ctx.update(body={"repository": ""}, non_blocking=True)
+            body["repository_version"] = f"{repo['versions_href']}{version}/"
+        else:
+            if dist_body.get("repository_version"):
+                distribution_ctx.update(body={"repository_version": ""}, non_blocking=True)
+            body["repository"] = repo["pulp_href"]
+    elif version is not None:
+        if dist_body.get("repository"):
+            distribution_ctx.update(body={"repository": ""}, non_blocking=True)
+            body["repository_version"] = f"{dist_body['repository']}versions/{version}/"
+        elif dist_body.get("repository_version"):
+            repository_href = dist_body["repository_version"].partition("versions")[0]
+            body["repository_version"] = f"{repository_href}versions/{version}/"
+        else:
+            raise click.ClickException(
+                _(
+                    "Distribution doesn't have a repository set, "
+                    "please specify the repository to use with --repository"
+                )
+            )
+    distribution_ctx.update(body=body)

tests/scripts/pulp_python/test_distribution.sh

@@ -10,6 +10,7 @@ cleanup() {
   pulp python repository destroy --name "cli_test_python_distribution_repository" || true
   pulp python remote destroy --name "cli_test_python_distribution_remote" || true
   pulp python distribution destroy --name "cli_test_python_distro" || true
+  pulp python distribution destroy --name "cli_test_python_distro_repo_version" || true
 }
 trap cleanup EXIT
 
@@ -42,3 +43,23 @@ expect_succ pulp python distribution update \
 --remote "cli_test_python_distribution_remote"
 
 expect_succ pulp python distribution destroy --distribution "cli_test_python_distro"
+
+# Test repository_version functionality
+expect_succ pulp python distribution create \
+  --name "cli_test_python_distro_repo_version" \
+  --base-path "cli_test_python_distro_repo_version" \
+  --repository "cli_test_python_distribution_repository" \
+  --version 0
+expect_succ pulp python distribution show --distribution "cli_test_python_distro_repo_version"
+echo "$OUTPUT" | jq -e '.repository_version | contains("/versions/0/")'
+echo "$OUTPUT" | jq -e '.repository == null'
+
+expect_succ pulp python distribution update \
+  --distribution "cli_test_python_distro_repo_version" \
+  --repository "cli_test_python_distribution_repository" \
+  --version 1
+expect_succ pulp python distribution show --distribution "cli_test_python_distro_repo_version"
+echo "$OUTPUT" | jq -e '.repository_version | contains("/versions/1/")'
+echo "$OUTPUT" | jq -e '.repository == null'
+
+expect_succ pulp python distribution destroy --distribution "cli_test_python_distro_repo_version"