funcd-bundle 0.3.1__tar.gz → 0.3.3__tar.gz

{funcd_bundle-0.3.1 → funcd_bundle-0.3.3}/.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.1 → funcd_bundle-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: funcd-bundle
-Version: 0.3.1
+Version: 0.3.3
 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.1 → funcd_bundle-0.3.3}/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.1"
+version = "0.3.3"
 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.1 → funcd_bundle-0.3.3}/src/funcd_bundle/bundle.py

@@ -16,7 +16,6 @@ import csv
 import io
 import os
 import platform as host
-import re
 import shlex
 import shutil
 import subprocess
@@ -38,7 +37,6 @@ DEFAULT_HANDLER = "handler.py"
 RUNTIME_PACKAGE = "funcd-shim"
 PLATFORMS = {"linux/amd64": "x86_64", "linux/arm64": "aarch64"}
 SKIPPED = {"__pycache__", "tests"}
-MAIN_LINE = re.compile(r"^main:.*$", re.MULTILINE)
 # never streamed into a container: caches, virtualenvs and build outputs
 NOT_COPIED = frozenset(
     {".venv", ".git", "node_modules", "__pycache__", "dist", ".mypy_cache", ".pytest_cache", ".ruff_cache"}
@@ -329,12 +327,31 @@ 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())
-    (out / GENERIC_MANIFEST).write_text(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
+    (out / GENERIC_MANIFEST).write_text(_with_main(fn.manifest.read_text(), fn.handler.name))
     return sources
 
 
+def _with_main(text: str, handler: str) -> str:
+    """The manifest with its top-level `main` set to handler. The YAML parser finds the key, however it is
+    written; the rest stays as written, since a PyYAML dump would re-resolve YAML 1.1 scalars funcd reads as
+    YAML 1.2 text."""
+    entry = f"main: {handler}"
+    root = yaml.compose(text, Loader=yaml.SafeLoader)
+    if isinstance(root, yaml.MappingNode):
+        for key, value in root.value:
+            if isinstance(key, yaml.ScalarNode) and key.value == "main":
+                start, end = key.start_mark.index, value.end_mark.index
+                # a block scalar's span ends past its line break
+                if text[start:end].endswith("\n"):
+                    entry += "\n"
+                return text[:start] + entry + text[end:]
+    if text and not text.endswith("\n"):
+        text += "\n"
+    return text + entry + "\n"
+
+
 def _top_level_modules(out: Path) -> set[str]:
     """The importable top-level names of the vendored distributions, from each RECORD."""
     names: set[str] = set()

{funcd_bundle-0.3.1 → funcd_bundle-0.3.3}/tests/test_bundle.py

@@ -255,6 +255,53 @@ 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"
+
+
+@pytest.mark.parametrize(
+    "main",
+    [
+        '"main": src/handler.py\n',
+        "'main': src/handler.py\n",
+        "main:\n  src/handler.py\n",
+    ],
+    ids=["double-quoted-key", "single-quoted-key", "value-on-next-line"],
+)
+def test_issue_r29_main_key_is_rewritten_not_duplicated(tmp_path: Path, main: str) -> None:
+    project = tmp_path / "reader"
+    _write(
+        project,
+        {
+            "pyproject.toml": '[project]\nname = "reader"\nversion = "0.1.0"\nrequires-python = ">=3.12"\n',
+            "funcdctl.yaml": "runtime: python314\n" + main + "handler: handle\n",
+            "src/handler.py": "def handle(ctx, event): ...\n",
+        },
+    )
+    _uv("lock", "--offline", "--python", "3.14", cwd=project)
+    out = bundle(project, "reader", host_platform(), tmp_path / "out", hermetic=False, check=False)
+
+    assert (out / "funcdctl.yaml").read_text() == "runtime: python314\nmain: handler.py\nhandler: handle\n", (
+        "the manifest's one main names the bundled handler"
+    )
+
+
 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"):