toolfuncs 0.3.2__tar.gz → 0.3.4__tar.gz

{toolfuncs-0.3.2 → toolfuncs-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: toolfuncs
-Version: 0.3.2
+Version: 0.3.4
 Summary: Executable typed Python function tools discovered through PATH
 Project-URL: Repository, https://github.com/nimashoghi/toolfuncs
 Project-URL: Issues, https://github.com/nimashoghi/toolfuncs/issues

{toolfuncs-0.3.2 → toolfuncs-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toolfuncs"
-version = "0.3.2"
+version = "0.3.4"
 description = "Executable typed Python function tools discovered through PATH"
 readme = "README.md"
 authors = [

{toolfuncs-0.3.2 → toolfuncs-0.3.4}/src/toolfuncs/__init__.py

@@ -29,7 +29,7 @@ from .sdk import (
     validators,
 )
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 __all__ = [
     "ALLOW_FLOATING_VCS_SHEBANG",

{toolfuncs-0.3.2 → toolfuncs-0.3.4}/src/toolfuncs/__main__.py

@@ -4,13 +4,15 @@ from __future__ import annotations
 
 import json
 import sys
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
+from contextlib import contextmanager
 from dataclasses import asdict
 from pathlib import Path
 from typing import Any
 
 from pydantic_core import to_jsonable_python
 
+from . import __version__
 from ._setup import setup
 from ._tools import (
     ALLOW_FLOATING_VCS_SHEBANG,
@@ -24,6 +26,7 @@ from .sdk import _run
 
 _HELP = f"""\
 Usage:
+  toolfuncs --version
   toolfuncs list
   toolfuncs setup [--bin-dir DIRECTORY]
 
@@ -35,6 +38,18 @@ Floating Git revisions require the explicit shebang:
 """
 
 
+@contextmanager
+def _tool_program_name(source: Path) -> Iterator[None]:
+    """Expose the source executable as the invoked app's program name."""
+
+    previous = sys.argv[0]
+    sys.argv[0] = source.name
+    try:
+        yield
+    finally:
+        sys.argv[0] = previous
+
+
 def main(argv: Sequence[str] | None = None) -> int:
     """Run a source supplied by its shebang or dispatch a management command."""
 
@@ -42,13 +57,20 @@ def main(argv: Sequence[str] | None = None) -> int:
     if not tokens or tokens[0] in {"-h", "--help", "help"}:
         print(_HELP, end="")
         return 0
+    if tokens[0] in {"-V", "--version"}:
+        if len(tokens) != 1:
+            raise SystemExit("toolfuncs --version accepts no arguments")
+        print(__version__)
+        return 0
 
     command = tokens.pop(0)
     if command == "__run-source":
         if not tokens:
             raise SystemExit("toolfuncs internal error: missing prepared source")
         source = Path(tokens.pop(0))
-        result = _run(_load_prepared_source(source), tokens)
+        module = _load_prepared_source(source)
+        with _tool_program_name(source):
+            result = _run(module, tokens)
         return result if isinstance(result, int) else 0
     if command == "__validate-source":
         if len(tokens) != 1:
@@ -68,7 +90,9 @@ def main(argv: Sequence[str] | None = None) -> int:
     source = Path(command)
     if not source.is_file():
         raise SystemExit(f"unknown toolfuncs command or missing source: {command}")
-    result = _run(_load_source(source), tokens)
+    module = _load_source(source)
+    with _tool_program_name(source):
+        result = _run(module, tokens)
     return result if isinstance(result, int) else 0
 
 

{toolfuncs-0.3.2 → toolfuncs-0.3.4}/tests/test_sdk_cli.py

@@ -25,6 +25,15 @@ from .conftest import run_python
 _INSTALL_HOOKS = setup_impl._install_hooks
 
 
+@pytest.mark.parametrize("flag", ["--version", "-V"])
+def test_cli_prints_installed_version(tmp_path: Path, flag: str) -> None:
+    completed = run_python(["-m", "toolfuncs", flag], cwd=tmp_path)
+
+    assert completed.returncode == 0
+    assert completed.stdout == "0.3.4\n"
+    assert completed.stderr == ""
+
+
 @pytest.fixture(autouse=True)
 def _avoid_installing_live_agent_hooks(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(setup_impl, "_install_hooks", lambda _hook_wrapper: None)
@@ -81,6 +90,43 @@ def test_runtime_requires_a_module_level_app(tmp_path: Path) -> None:
     assert "must define 'app'" in completed.stderr
 
 
+@pytest.mark.parametrize("prepared", [False, True])
+@pytest.mark.parametrize(
+    ("app_definition", "expected_name"),
+    [
+        ("app = toolfuncs.App()", "named_tool"),
+        ("app = toolfuncs.App(name='explicit')", "explicit"),
+    ],
+)
+def test_runtime_uses_source_name_unless_app_name_is_explicit(
+    tmp_path: Path,
+    prepared: bool,
+    app_definition: str,
+    expected_name: str,
+) -> None:
+    source = tmp_path / "named_tool"
+    _write_executable(
+        source,
+        _script(
+            "Named tool",
+            "import toolfuncs\n\n"
+            f"{app_definition}\n\n"
+            "@app.command\n"
+            "def ping() -> str:\n"
+            "    return 'pong'\n",
+        ),
+    )
+    runtime_prefix = ["__run-source"] if prepared else []
+
+    completed = run_python(
+        ["-m", "toolfuncs", *runtime_prefix, str(source), "--help"],
+        cwd=tmp_path,
+    )
+
+    assert completed.returncode == 0, completed.stderr
+    assert completed.stdout.splitlines()[0] == f"Usage: {expected_name} COMMAND"
+
+
 def test_prepared_runtime_does_not_run_an_inner_installer(tmp_path: Path) -> None:
     source = tmp_path / "prepared"
     _write_executable(
@@ -162,6 +208,14 @@ def test_direct_command_dynamic_import_and_static_listing(tmp_path: Path) -> Non
         text=True,
         check=False,
     )
+    helped = subprocess.run(
+        [str(source), "--help"],
+        cwd=tmp_path,
+        env={**os.environ, **environment},
+        capture_output=True,
+        text=True,
+        check=False,
+    )
     imported = run_python(
         ["-c", "from toolfuncs import greet; print(greet.hello('Ada')['message'])"],
         cwd=tmp_path,
@@ -171,6 +225,8 @@ def test_direct_command_dynamic_import_and_static_listing(tmp_path: Path) -> Non
 
     assert direct.returncode == 0, direct.stderr
     assert json.loads(direct.stdout) == {"message": "Hello, Ada!"}
+    assert helped.returncode == 0, helped.stderr
+    assert helped.stdout.splitlines()[0] == "Usage: greet COMMAND"
     assert imported.returncode == 0, imported.stderr
     assert imported.stdout == "Hello, Ada.\n"
     record = next(item for item in json.loads(listed.stdout) if item["name"] == "greet")

{toolfuncs-0.3.2 → toolfuncs-0.3.4}/uv.lock

@@ -601,7 +601,7 @@ wheels = [
 
 [[package]]
 name = "toolfuncs"
-version = "0.3.2"
+version = "0.3.4"
 source = { editable = "." }
 dependencies = [
     { name = "cyclopts" },