funcd-bundle 0.3.0__tar.gz → 0.3.2__tar.gz

{funcd_bundle-0.3.0 → funcd_bundle-0.3.2}/.gitignore

@@ -8,3 +8,5 @@ __pycache__/
 .DS_Store
 # the PyPI build (wheel + sdist), built at publish time
 dist/
+# scripts/agent/d's cached dev-shell environment
+.cache/

{funcd_bundle-0.3.0 → funcd_bundle-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: funcd-bundle
-Version: 0.3.0
+Version: 0.3.2
 Summary: Bundle a Python funcd function and its locked dependencies for the funcd runtime
 Project-URL: Homepage, https://github.com/pyvvo/funcd-python
 Project-URL: Repository, https://github.com/pyvvo/funcd-python

{funcd_bundle-0.3.0 → funcd_bundle-0.3.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "funcd-bundle"
 # Not bumped per release: the vX.Y.Z git tag is the version, stamped into the build at publish time.
-version = "0.3.0"
+version = "0.3.2"
 description = "Bundle a Python funcd function and its locked dependencies for the funcd runtime"
 authors = [{ name = "The funcd Authors" }]
 readme = "README.md"

{funcd_bundle-0.3.0 → funcd_bundle-0.3.2}/src/funcd_bundle/bundle.py

@@ -264,8 +264,8 @@ def _install_in_container(
     env = ["-e", "FUNCD_BUNDLE_DIR=/out", "-e", "PYTHONPATH=/out", "-w", "/src"]
     cid = _create(platform, env, ["sh", "-c", "; ".join(steps)])
     try:
-        _copy_in(cid, inputs, "/in")
-        _copy_in(cid, project, "/src")
+        _copy_in(cid, inputs, "/in", NOT_COPIED)
+        _copy_in(cid, project, "/src", NOT_COPIED)
         _start(cid, "hermetic install")
         _copy_out(cid, "/out", out)
     finally:
@@ -277,7 +277,8 @@ def _check(out: Path, platform: str, modules: list[str]) -> None:
     code = "; ".join(f"import {m}" for m in modules)
     cid = _create(platform, ["-e", "PYTHONPATH=/bundle"], ["python", "-c", code])
     try:
-        _copy_in(cid, out, "/bundle")
+        # a vendored package may hold a dist or node_modules directory of its own: check the tree as built
+        _copy_in(cid, out, "/bundle", frozenset({"__pycache__"}))
         _start(cid, f"import check ({', '.join(modules)}) on {platform}")
     finally:
         _run(["docker", "rm", "-f", cid])
@@ -294,13 +295,11 @@ def _start(cid: str, what: str) -> None:
         raise BundleError(f"{what} failed:\n{detail}")
 
 
-def _copy_in(cid: str, src: Path, dest: str) -> None:
-    """Stream src into the container at dest as a tar (no bind mount), leaving out caches and virtualenvs."""
+def _copy_in(cid: str, src: Path, dest: str, skip: frozenset[str]) -> None:
+    """Stream src into the container at dest as a tar (no bind mount), leaving out the names in skip."""
     buf = io.BytesIO()
     with tarfile.open(fileobj=buf, mode="w") as tar:
-        tar.add(
-            src, arcname=dest.lstrip("/"), filter=lambda ti: None if Path(ti.name).name in NOT_COPIED else ti
-        )
+        tar.add(src, arcname=dest.lstrip("/"), filter=lambda ti: None if Path(ti.name).name in skip else ti)
     _run(["docker", "cp", "-", f"{cid}:/"], stdin=buf.getvalue())
 
 
@@ -330,8 +329,14 @@ def _copy_handler(project: Path, fn: Function, out: Path) -> list[Path]:
 
         shutil.copytree(source, out, dirs_exist_ok=True, ignore=ignore)
         sources = [p for p in source.rglob("*.py") if not SKIPPED.intersection(p.relative_to(source).parts)]
-    # inside the bundle the handler sits at the root, so a `main` must name it there (funcdctl dev reads it)
-    text = MAIN_LINE.sub(f"main: {fn.handler.name}", fn.manifest.read_text())
+    # inside the bundle the handler sits at the root, so `main` must name it there (funcdctl dev reads it); a
+    # manifest without one gets one, else the bundle's generic manifest would default to handler.py
+    main = f"main: {fn.handler.name}"
+    text, found = MAIN_LINE.subn(main, fn.manifest.read_text())
+    if not found:
+        if text and not text.endswith("\n"):
+            text += "\n"
+        text += main + "\n"
     (out / GENERIC_MANIFEST).write_text(text)
     return sources
 

{funcd_bundle-0.3.0 → funcd_bundle-0.3.2}/src/funcd_bundle/cli.py

@@ -33,7 +33,12 @@ def main(argv: list[str] | None = None) -> int:
         unknown = [n for n in args.names if n not in functions]
         if unknown:
             parser.error(f"unknown function(s) {', '.join(unknown)}; found {', '.join(functions)}")
-        hermetic = args.hermetic or settings(project).hermetic
+        conf = settings(project)
+        hermetic = args.hermetic or conf.hermetic
+        if conf.post_install and not hermetic:
+            parser.error(
+                "[tool.funcd-bundle] post-install needs a hermetic build (hermetic = true or --hermetic)"
+            )
         platforms = args.platform or [host_platform()]
         for name in args.names or list(functions):
             for platform in platforms:

{funcd_bundle-0.3.0 → funcd_bundle-0.3.2}/tests/test_bundle.py

@@ -7,6 +7,7 @@ Each skips with the reason when its requirement is absent. CI has both.
 from __future__ import annotations
 
 import os
+import re
 import shutil
 import socket
 import subprocess
@@ -18,6 +19,7 @@ import pytest
 
 from funcd_bundle import BundleError, bundle, discover, host_platform
 from funcd_bundle.bundle import _check
+from funcd_bundle.cli import main
 
 FOREIGN = {"linux/arm64": "linux/amd64", "linux/amd64": "linux/arm64"}
 ELF_MACHINE = {"linux/amd64": 0x3E, "linux/arm64": 0xB7}
@@ -176,8 +178,12 @@ def test_scenario_bundle_includes_workspace_package(workspace: Path, tmp_path: P
 def test_scenario_bundle_check_catches_mismatch(workspace: Path, tmp_path: Path) -> None:
     foreign = FOREIGN[host_platform()]
     out = bundle(workspace, "reader", foreign, tmp_path / "reader", hermetic=False, check=False)
-    with pytest.raises(BundleError, match="import check"):
+    with pytest.raises(BundleError, match="import check") as err:
         _check(out, host_platform(), ["orjson"])
+    detail = str(err.value).split("\n", 1)[1]
+    assert re.search("ModuleNotFoundError|ImportError", detail), (
+        f"the import error itself is reported: {detail}"
+    )
 
 
 # scenario: bundle-hermetic-post-install
@@ -218,6 +224,24 @@ def test_post_install_needs_hermetic(tmp_path: Path) -> None:
         bundle(tmp_path, tmp_path.name, host_platform(), tmp_path / "out", hermetic=False, check=False)
 
 
+def test_cli_post_install_needs_hermetic(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    _write(
+        tmp_path,
+        {
+            "pyproject.toml": (
+                '[project]\nname = "x"\nversion = "0"\n\n[tool.funcd-bundle]\npost-install = ["true"]\n'
+            ),
+            "funcdctl.yaml": MANIFEST,
+            "src/handler.py": "",
+        },
+    )
+    monkeypatch.chdir(tmp_path)
+    with pytest.raises(SystemExit) as exit_:
+        main(["--out", str(tmp_path / "out")])
+    assert exit_.value.code == 2, "a post-install without hermetic is a usage error"
+    assert not (tmp_path / "out").exists(), "nothing is bundled"
+
+
 def test_default_handler_follows_funcdctl(tmp_path: Path) -> None:
     _write(
         tmp_path, {"counter.funcdctl.yaml": "runtime: python314\n", "counter.py": "def handle(c, e): ...\n"}
@@ -231,6 +255,26 @@ def test_default_handler_follows_funcdctl(tmp_path: Path) -> None:
     )
 
 
+def test_issue_154_stem_manifest_without_main_names_bundled_handler(tmp_path: Path) -> None:
+    manifest = "runtime: python314\nhandler: handle\n"
+    project = tmp_path / "project"
+    _write(
+        project,
+        {
+            "pyproject.toml": '[project]\nname = "extract"\nversion = "0.1.0"\nrequires-python = ">=3.12"\n',
+            "extract.funcdctl.yaml": manifest,
+            "extract.py": "def handle(ctx, event): ...\n",
+        },
+    )
+    _uv("lock", "--offline", "--python", "3.14", cwd=project)
+    out = bundle(project, "extract", host_platform(), tmp_path / "extract", hermetic=False, check=False)
+
+    assert discover(out)["extract"].handler == out / "extract.py", (
+        "the bundle's generic manifest resolves to the bundled handler, not handler.py"
+    )
+    assert (out / "funcdctl.yaml").read_text() == manifest + "main: extract.py\n"
+
+
 def test_missing_handler_is_named(tmp_path: Path) -> None:
     _write(tmp_path, {"funcdctl.yaml": "runtime: python314\nmain: src/nope.py\n"})
     with pytest.raises(BundleError, match="nope.py"):