csrd-utils 0.3.4__tar.gz → 0.3.6__tar.gz

{csrd_utils-0.3.4 → csrd_utils-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.4
+Version: 0.3.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
@@ -25,6 +25,7 @@ pip install "csrd-utils @ git+https://github.com/csrd-api/fastapi-common.git#sub
 
 ```bash
 csrd --help
+csrd --version
 csrd new service                                  # interactive prompts
 csrd new service --interactive --name items       # pre-fills name prompt with 'items'
 csrd new service --name inventory --no-interactive --output .

{csrd_utils-0.3.4 → csrd_utils-0.3.6}/README.md

@@ -12,6 +12,7 @@ pip install "csrd-utils @ git+https://github.com/csrd-api/fastapi-common.git#sub
 
 ```bash
 csrd --help
+csrd --version
 csrd new service                                  # interactive prompts
 csrd new service --interactive --name items       # pre-fills name prompt with 'items'
 csrd new service --name inventory --no-interactive --output .

{csrd_utils-0.3.4 → csrd_utils-0.3.6}/pyproject.toml

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

{csrd_utils-0.3.4 → csrd_utils-0.3.6}/src/csrd_utils/__main__.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import argparse
 import json
+from importlib.metadata import version
 from pathlib import Path
 from typing import TypedDict
 
@@ -166,10 +167,16 @@ def _collect_new_service_config(args: argparse.Namespace) -> GenerateServiceArgs
 
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="csrd", description="csrd utilities")
-    sub = parser.add_subparsers(dest="command")
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=f"csrd-utils {version('csrd-utils')}",
+    )
+    sub = parser.add_subparsers(dest="command", required=True)
 
     feature = sub.add_parser("feature", help="Feature operations")
-    feature_sub = feature.add_subparsers(dest="feature_command")
+    feature_sub = feature.add_subparsers(dest="feature_command", required=True)
 
     list_cmd = feature_sub.add_parser("list", help="List bundled features")
     list_cmd.set_defaults(plan=False)
@@ -187,7 +194,7 @@ def _build_parser() -> argparse.ArgumentParser:
     doctor.add_argument("--json", action="store_true", help="Print doctor report as JSON")
 
     new = sub.add_parser("new", help="Generate new assets")
-    new_sub = new.add_subparsers(dest="new_command")
+    new_sub = new.add_subparsers(dest="new_command", required=True)
     service = new_sub.add_parser("service", help="Generate a service from bundled template")
     service.add_argument("--name", help="Service name")
     service.add_argument("--output", type=Path, default=Path.cwd(), help="Output directory")

{csrd_utils-0.3.4 → csrd_utils-0.3.6}/src/csrd_utils/augmentor.py

@@ -400,6 +400,15 @@ class ServiceAugmentor:
             print("❌ Service validation failed")
             return False, []
 
+        # Step 2.5: Check if feature already applied (idempotency)
+        creates = self.manifest.get("creates", [])
+        if creates:
+            first_created_file = Path(creates[0])
+            full_path = self.service_root / first_created_file
+            if full_path.exists():
+                print(f"✅ Feature '{feature_name}' already applied (detected {creates[0]})")
+                return True, []
+
         # Step 3: Check requirements
         req_errors = self.validate_requirements()
         if req_errors:

{csrd_utils-0.3.4 → csrd_utils-0.3.6}/src/csrd_utils/generator.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import os
+import shutil
 from pathlib import Path
 from typing import Any
 
@@ -94,14 +96,28 @@ def generate_service(
         has_structured_logging=has_structured_logging,
     )
 
-    with templates_path() as template_root:
-        template = template_root / "cookiecutter-service"
-        generated = cookiecutter(
-            str(template),
-            no_input=True,
-            extra_context=context,
-            output_dir=str(output_root),
-            overwrite_if_exists=overwrite_if_exists,
-        )
+    # Suppress bytecode generation during template rendering.
+    old_dontwritebytecode = os.environ.get("PYTHONDONTWRITEBYTECODE")
+    try:
+        os.environ["PYTHONDONTWRITEBYTECODE"] = "1"
+        with templates_path() as template_root:
+            template = template_root / "cookiecutter-service"
+            generated = cookiecutter(
+                str(template),
+                no_input=True,
+                extra_context=context,
+                output_dir=str(output_root),
+                overwrite_if_exists=overwrite_if_exists,
+            )
+    finally:
+        if old_dontwritebytecode is None:
+            os.environ.pop("PYTHONDONTWRITEBYTECODE", None)
+        else:
+            os.environ["PYTHONDONTWRITEBYTECODE"] = old_dontwritebytecode
+
+    # Clean up any __pycache__ that may have been created despite PYTHONDONTWRITEBYTECODE.
+    generated_path = Path(generated).resolve()
+    for pycache_dir in generated_path.rglob("__pycache__"):
+        shutil.rmtree(pycache_dir, ignore_errors=True)
 
-    return Path(generated).resolve()
+    return generated_path