ellf-cli 20.0.4__tar.gz → 20.0.6__tar.gz

{ellf_cli-20.0.4/ellf_cli.egg-info → ellf_cli-20.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 20.0.4
+Version: 20.0.6
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-20.0.4 → ellf_cli-20.0.6}/README.md

@@ -1647,7 +1647,7 @@ Upload and advertise a recipes package from your Python environment.
 | `name_or_path` | `str` | Path or name of importable module with the recipes |  |
 | `--is-module`, `-m` | `bool` | Code to publish is an importable module | `False` |
 | `--is-path`, `-p` | `bool` | Code to publish is a path | `False` |
-| `--package-version` | `str` | Version identifier for the package | `None` |
+| `--package-version` | `str` | Version identifier for a module or loose source files (a built package or package directory uses its own version) | `None` |
 | `--requirements`, `-r` | `str` | Path to a requirements.txt to install into the image (default: auto-detected from the package's own metadata) | `None` |
 
 #### `ellf publish data`

{ellf_cli-20.0.4 → ellf_cli-20.0.6}/ellf_cli/commands/publish_code.py

@@ -455,7 +455,11 @@ def _run_image_build(
         "--is-module", short="-m", help="Code to publish is an importable module"
     ),
     is_path=Arg("--is-path", short="-p", help="Code to publish is a path"),
-    package_version=Arg("--package-version", help="Version identifier for the package"),
+    package_version=Arg(
+        "--package-version",
+        help="Version identifier for a module or loose source files "
+        "(a built package or package directory uses its own version)",
+    ),
     requirements=Arg(
         "--requirements",
         short="-r",
@@ -485,16 +489,27 @@ def publish_code(
     source_dir: Path | None = None
     if is_path:
         path = Path(name_or_path)
+        is_built = (path.is_dir() and _is_package_dir(path)) or (
+            path.is_file() and not path.name.endswith(".py")
+        )
+        if is_built and package_version is not None:
+            raise CLIError(Messages.E196.format(path=name_or_path))
         if path.is_dir() and _is_package_dir(path):
             msg.info(f"Building sdist from {name_or_path}")
             source_dir = path
             package = DistPackage(_make_sdist_if_dir(path))
         elif not path.is_file():
             msg.info(f"Interpreting {name_or_path} as directory of code")
-            package = FilesPackage(name=path.name, path=path)
+            package = FilesPackage(
+                name=path.name, path=path, version_arg=package_version
+            )
         elif path.name.endswith(".py"):
             msg.info(f"Interpreting {name_or_path} as Python source file")
-            package = FilesPackage(name=path.name.replace(".py", ""), path=path)
+            package = FilesPackage(
+                name=path.name.replace(".py", ""),
+                path=path,
+                version_arg=package_version,
+            )
         else:
             package = DistPackage(_make_sdist_if_dir(Path(name_or_path)))
         contents = package.get_bytes()
@@ -525,6 +540,15 @@ def publish_code(
             + ", ".join(package_requirements)
         )
 
+    # The image tag is name-version, so building an already-published
+    # version would overwrite the image its tasks run before PAM refuses it.
+    if auth.client.package.exists(
+        name=package.name.replace("_", "-"),
+        version=package.version,
+        cluster_id=auth.cluster_id,
+    ):
+        raise CLIError(Messages.E197.format(name=package.name, version=package.version))
+
     # Look up the base container from the latest ellf-recipes package
     with loading("Resolving base container image"):
         base_package = auth.client.package.latest(

{ellf_cli-20.0.4 → ellf_cli-20.0.6}/ellf_cli/ellf.json

@@ -1,7 +1,7 @@
 {
   "prog": "ellf",
   "help": "Ellf Command Line Interface.",
-  "version": "20.0.4",
+  "version": "20.0.6",
   "extra_key": "_extra",
   "commands": {
     "actions": {
@@ -6450,9 +6450,9 @@
             "id": "package_version",
             "option": "--package-version",
             "short": null,
-            "orig_help": "Version identifier for the package",
+            "orig_help": "Version identifier for a module or loose source files (a built package or package directory uses its own version)",
             "default": null,
-            "help": "Version identifier for the package (str)",
+            "help": "Version identifier for a module or loose source files (a built package or package directory uses its own version) (str)",
             "action": null,
             "choices": null,
             "has_converter": false,

{ellf_cli-20.0.4 → ellf_cli-20.0.6}/ellf_cli/messages.py

@@ -319,6 +319,16 @@ ellf secret create my-credentials OPENAI_API_KEY="sk-..." CUSTOM_SECRET=-
     E193 = "Deleting a project has to be confirmed via a terminal. Run `ellf projects delete {name}` again in an interactive terminal session."
     E194 = "Wrong project name, so {name} was not deleted"
     E195 = "Login failed: the login was cancelled in the browser, or its code has expired. Run `ellf login` to try again."
+    E196 = (
+        "--package-version can't override the version of a built package: "
+        "{path} takes its version from its own metadata. Change the version "
+        "there, or drop --package-version."
+    )
+    E197 = (
+        "{name} {version} is already published on this cluster. Bump the "
+        "package version to publish new code: the image is only rebuilt for "
+        "a new version."
+    )
 
 
 #  fmt: on

ellf_cli-20.0.6/ellf_cli/version/20.0.4_2026-10-14-16-20-24_patch_c6672844-8227-4e0a-9fb5-36af7e7141dc

@@ -0,0 +1,3 @@
+20.0.4
+patch
+c6672844-8227-4e0a-9fb5-36af7e7141dc

ellf_cli-20.0.6/ellf_cli/version/20.0.5_2026-10-15-08-53-28_patch_10154146-8afd-4632-b250-9b4b9f5bf67c

@@ -0,0 +1,3 @@
+20.0.5
+patch
+10154146-8afd-4632-b250-9b4b9f5bf67c

{ellf_cli-20.0.4 → ellf_cli-20.0.6/ellf_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 20.0.4
+Version: 20.0.6
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-20.0.4 → ellf_cli-20.0.6}/ellf_cli.egg-info/SOURCES.txt

@@ -333,6 +333,8 @@ ellf_cli/version/20.0.0_2026-10-10-09-36-17_patch_d2618f39-cdc9-4d3a-ba40-1a0ad6
 ellf_cli/version/20.0.1_2026-10-11-10-24-33_patch_e29a8713-eecb-4eb1-9641-789d3cfab21a
 ellf_cli/version/20.0.2_2026-10-12-07-22-24_patch_f4053ad1-8fcd-4591-a68d-bf1e23485ba7
 ellf_cli/version/20.0.3_2026-10-14-14-29-16_patch_070af1c4-f9d9-4f97-8112-058de90d3ea8
+ellf_cli/version/20.0.4_2026-10-14-16-20-24_patch_c6672844-8227-4e0a-9fb5-36af7e7141dc
+ellf_cli/version/20.0.5_2026-10-15-08-53-28_patch_10154146-8afd-4632-b250-9b4b9f5bf67c
 ellf_cli/version/__init__.py
 ellf_cli/version/read_version.py
 tests/test_agents.py
@@ -378,6 +380,7 @@ tests/test_publish_build_poll.py
 tests/test_publish_data.py
 tests/test_publish_import_root.py
 tests/test_publish_requirements.py
+tests/test_publish_versions.py
 tests/test_pypi_auth.py
 tests/test_query.py
 tests/test_recipe_file.py

ellf_cli-20.0.6/tests/test_publish_versions.py

@@ -0,0 +1,90 @@
+"""Version handling in `ellf publish code`.
+
+The image is tagged name-version, so building a version that's already
+published would overwrite the image its tasks run before PAM refuses it.
+"""
+
+import contextlib
+from pathlib import Path
+from types import SimpleNamespace
+from uuid import uuid4
+
+import pytest
+
+from ellf_cli.commands import publish_code
+from ellf_cli.errors import CLIError
+
+
+class FakePackages:
+    def __init__(self, published: set[tuple[str, str]]):
+        self.published = published
+        self.queries: list[dict] = []
+
+    def exists(self, **query):
+        self.queries.append(query)
+        return object() if (query["name"], query["version"]) in self.published else None
+
+    def latest(self, body):
+        return SimpleNamespace(
+            container="reg.example/recipes:pt-recipes.ellf-recipes.1"
+        )
+
+
+@pytest.fixture
+def publish(monkeypatch):
+    def run(path: Path, *, published=(), package_version=None):
+        packages = FakePackages(set(published))
+        auth = SimpleNamespace(
+            broker_host="https://cluster.example",
+            cluster_id=uuid4(),
+            client=SimpleNamespace(package=packages),
+        )
+        builds: list[dict] = []
+        monkeypatch.setattr(publish_code, "get_auth_state", lambda: auth)
+        monkeypatch.setattr(
+            publish_code, "_import_root", lambda *_: contextlib.nullcontext(None)
+        )
+        monkeypatch.setattr(
+            publish_code, "_run_create_meta", lambda *_a, **_k: '[{"name": "r"}]'
+        )
+        monkeypatch.setattr(publish_code, "_extract_requirements", lambda *_: [])
+
+        def _build(_auth, **kwargs):
+            builds.append(kwargs)
+            raise RuntimeError("stop after build")
+
+        monkeypatch.setattr(publish_code, "_run_image_build", _build)
+        try:
+            publish_code.publish_code(
+                str(path), is_path=True, package_version=package_version
+            )
+        except RuntimeError:
+            pass
+        return packages, builds
+
+    return run
+
+
+def _write_package_dir(tmp_path: Path) -> Path:
+    (tmp_path / "setup.py").write_text("from setuptools import setup\nsetup()\n")
+    return tmp_path
+
+
+def test_package_version_is_rejected_for_a_built_package(publish, tmp_path):
+    with pytest.raises(CLIError, match="can't override the version"):
+        publish(_write_package_dir(tmp_path), package_version="0.1.1")
+
+
+def test_package_version_applies_to_a_source_file(publish, tmp_path):
+    recipe = tmp_path / "my_recipes.py"
+    recipe.write_text("")
+    packages, builds = publish(recipe, package_version="0.1.1")
+    assert packages.queries[0]["version"] == "0.1.1"
+    assert builds[0]["package_version"] == "0.1.1"
+
+
+def test_published_version_is_refused_before_building(publish, tmp_path):
+    recipe = tmp_path / "my_recipes.py"
+    recipe.write_text("")
+    with pytest.raises(CLIError, match="already published"):
+        publish(recipe, package_version="0.1.0", published={("my-recipes", "0.1.0")})