csrd-utils 0.5.4__tar.gz → 0.5.6__tar.gz

{csrd_utils-0.5.4 → csrd_utils-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.5.4
+Version: 0.5.6
 Summary: CLI utilities for csrd service generation and feature augmentation
 Project-URL: Repository, https://github.com/csrd-api/fastapi-common
 Project-URL: Documentation, https://github.com/csrd-api/fastapi-common/tree/main/packages/utils

{csrd_utils-0.5.4 → csrd_utils-0.5.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csrd-utils"
-version = "0.5.4"
+version = "0.5.6"
 description = "CLI utilities for csrd service generation and feature augmentation"
 license = { text = "MIT" }
 requires-python = ">=3.12"

{csrd_utils-0.5.4 → csrd_utils-0.5.6}/src/csrd_utils/__main__.py

@@ -42,48 +42,45 @@ def _parser_shape(
     return commands, options
 
 
-def _render_bash_completion(parser: argparse.ArgumentParser) -> str:
+def _render_bash_completion() -> str:
+    """Render a dynamic bash completion script.
+
+    Instead of baking a static word list, the script calls
+    ``csrd --_complete`` at tab-time so it always reflects the
+    currently installed version's commands and flags.
+    """
+    return (
+        "# bash completion for csrd — dynamic (calls csrd --_complete)\n"
+        "_csrd_completion() {\n"
+        "  local cur words\n"
+        '  cur="${COMP_WORDS[COMP_CWORD]}"\n'
+        '  words=$(csrd --_complete "${COMP_WORDS[@]:1:COMP_CWORD-1}" 2>/dev/null)\n'
+        '  COMPREPLY=( $(compgen -W "$words" -- "$cur") )\n'
+        "}\n"
+        "complete -F _csrd_completion csrd csrd-utils csrt\n"
+    )
+
+
+def _handle_complete(parser: argparse.ArgumentParser, words: list[str]) -> int:
+    """Print completion candidates for the given partial command line.
+
+    Called by the bash completion script via ``csrd --_complete <words>``.
+    """
     commands, options = _parser_shape(parser)
 
-    lines = [
-        "# bash completion for csrd",
-        "_csrd_completion() {",
-        "  local cur key token",
-        '  cur="${COMP_WORDS[COMP_CWORD]}"',
-        '  key=""',
-        "",
-        '  for token in "${COMP_WORDS[@]:1:COMP_CWORD-1}"; do',
-        '    case "$token" in',
-        "      -*) continue ;;",
-        "    esac",
-        '    if [[ -n "$key" ]]; then',
-        '      key="$key $token"',
-        "    else",
-        '      key="$token"',
-        "    fi",
-        "  done",
-        "",
-        '  case "$key" in',
-    ]
-
-    for chain in sorted(commands.keys()):
-        key = " ".join(chain)
-        command_candidates = commands.get(chain, [])
-        option_candidates = options.get(chain, [])
-        candidates = " ".join(command_candidates + option_candidates).strip()
-        if not candidates:
+    # Walk the word chain to find the deepest matching subcommand
+    chain: tuple[str, ...] = ()
+    for word in words:
+        if word.startswith("-"):
             continue
-        lines.append(f'    "{key}") COMPREPLY=( $(compgen -W "{candidates}" -- "$cur") ) ;;')
-
-    lines.extend(
-        [
-            "    *) COMPREPLY=() ;;",
-            "  esac",
-            "}",
-            "complete -F _csrd_completion csrd csrd-utils csrt",
-        ]
-    )
-    return "\n".join(lines) + "\n"
+        candidate = (*chain, word)
+        if candidate in commands:
+            chain = candidate
+
+    command_candidates = commands.get(chain, [])
+    option_candidates = options.get(chain, [])
+    print(" ".join(command_candidates + option_candidates))
+    return 0
 
 
 # ---------------------------------------------------------------------------
@@ -94,16 +91,17 @@ _COMPLETION_DIR = Path.home() / ".local" / "share" / "bash-completion" / "comple
 _COMPLETION_FILE = _COMPLETION_DIR / "csrd"
 
 
-def _install_completion(parser: argparse.ArgumentParser) -> int:
+def _install_completion() -> int:
     """Write the bash completion script to the user completions directory.
 
     bash-completion auto-loads files from ``~/.local/share/bash-completion/completions/``
-    so no ``.bashrc`` edit is needed.
+    so no ``.bashrc`` edit is needed.  The script is a thin shim that calls
+    ``csrd --_complete`` at tab-time, so it never goes stale after upgrades.
     """
 
     _COMPLETION_DIR.mkdir(parents=True, exist_ok=True)
     already = _COMPLETION_FILE.is_file()
-    _COMPLETION_FILE.write_text(_render_bash_completion(parser), encoding="utf-8")
+    _COMPLETION_FILE.write_text(_render_bash_completion(), encoding="utf-8")
     if already:
         print(f"Updated bash completion at {_COMPLETION_FILE}")
     else:
@@ -266,6 +264,11 @@ def main() -> int:
             sys.argv = [sys.argv[0], "compose", "apply", "--output", second, *raw_argv[2:]]
 
     parser = _build_parser()
+
+    # Hidden --_complete for dynamic tab completion (called by the bash shim)
+    if raw_argv and raw_argv[0] == "--_complete":
+        return _handle_complete(parser, raw_argv[1:])
+
     args = parser.parse_args()
 
     # ── generate ──────────────────────────────────────────────────────
@@ -379,10 +382,10 @@ def main() -> int:
     if args.command == "completion":
         shell = getattr(args, "completion_shell", None)
         if shell == "bash":
-            print(_render_bash_completion(parser), end="")
+            print(_render_bash_completion(), end="")
             return 0
         if shell == "install":
-            return _install_completion(parser)
+            return _install_completion()
         if shell == "uninstall":
             return _uninstall_completion()
 

{csrd_utils-0.5.4 → csrd_utils-0.5.6}/src/csrd_utils/compose/operations.py

@@ -9,6 +9,7 @@ the spec, renders all workspace files, scaffolds services, and optionally
 initializes a git repository.
 """
 
+import re
 from pathlib import Path
 
 from ..models import (
@@ -28,6 +29,32 @@ from .loader import default_spec, load_spec, save_spec, spec_file_path
 # Workspace rendering (orchestration)
 # ---------------------------------------------------------------------------
 
+_ENV_KEY_RE = re.compile(r"^([A-Z][A-Z0-9_]*)=", re.MULTILINE)
+
+
+def _merge_new_env_vars(env_path: Path, env_example_content: str) -> None:
+    """Append env vars from .env.example that are missing in .env.
+
+    Preserves all existing user values.  Only adds new keys with their
+    default values so services don't crash after adding augments.
+    """
+    existing = env_path.read_text(encoding="utf-8")
+    existing_keys = set(_ENV_KEY_RE.findall(existing))
+
+    new_lines: list[str] = []
+    for line in env_example_content.splitlines():
+        m = _ENV_KEY_RE.match(line)
+        if m and m.group(1) not in existing_keys:
+            new_lines.append(line)
+
+    if new_lines:
+        # Ensure trailing newline before appending
+        if existing and not existing.endswith("\n"):
+            existing += "\n"
+        existing += "\n# Added by csrd (new augment vars)\n"
+        existing += "\n".join(new_lines) + "\n"
+        env_path.write_text(existing, encoding="utf-8")
+
 
 def render_workspace(output_dir: Path, *, git_init: bool = False) -> Path:
     """Render deterministic workspace files from the current spec.
@@ -74,10 +101,13 @@ def render_workspace(output_dir: Path, *, git_init: bool = False) -> Path:
 
     # Seed .env from .env.example only on first render so services can
     # start immediately.  On subsequent renders the user may have set
-    # strong passwords or API keys — never overwrite those.
+    # strong passwords or API keys — never overwrite existing values.
+    # However, new keys added by augments/services must be appended.
     env_path = output_dir / ".env"
     if not env_path.exists():
         env_path.write_text(env_example_content, encoding="utf-8")
+    else:
+        _merge_new_env_vars(env_path, env_example_content)
     (output_dir / "README.md").write_text(_render_readme(spec), encoding="utf-8")
     (output_dir / ".gitignore").write_text(_render_gitignore(), encoding="utf-8")
     (output_dir / ".dockerignore").write_text(_render_dockerignore(), encoding="utf-8")