csrd-utils 0.3.39__tar.gz → 0.3.41__tar.gz

{csrd_utils-0.3.39 → csrd_utils-0.3.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.39
+Version: 0.3.41
 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.3.39 → csrd_utils-0.3.41}/pyproject.toml

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

{csrd_utils-0.3.39 → csrd_utils-0.3.41}/src/csrd_utils/__main__.py

@@ -187,6 +187,14 @@ def _prompt_int(label: str, default: int) -> int:
             print("ERROR: Enter a valid integer")
 
 
+def _normalize_service_name(name: str) -> str:
+    """Ensure service names consistently end with '-service'."""
+    normalized = name.strip()
+    if not normalized:
+        return normalized
+    return normalized if normalized.endswith("-service") else f"{normalized}-service"
+
+
 def _print_cancelled() -> None:
     # Avoid surfacing a traceback if a second Ctrl-C lands while printing.
     with suppress(KeyboardInterrupt):
@@ -204,9 +212,10 @@ def _collect_new_service_config(args: argparse.Namespace) -> GenerateServiceArgs
     if not interactive:
         has_database = args.database != "none"
         selected_database = "sqlite" if not has_database else args.database
+        normalized_name = _normalize_service_name(args.name)
         return GenerateServiceArgs(
             {
-                "name": args.name,
+                "name": normalized_name,
                 "output_dir": args.output,
                 "description": args.description,
                 "port": args.port,
@@ -227,8 +236,11 @@ def _collect_new_service_config(args: argparse.Namespace) -> GenerateServiceArgs
 
     print("Interactive mode: press Enter to accept defaults.")
 
-    name = _prompt_text("Service name", args.name or "my-service")
-    output_dir = Path(_prompt_text("Output directory", str(args.output)))
+    name = _normalize_service_name(_prompt_text("Service name", args.name or "my-service"))
+    if getattr(args, "output_locked", False):
+        output_dir = args.output
+    else:
+        output_dir = Path(_prompt_text("Output directory", str(args.output)))
     description = _prompt_text("Service description", args.description)
     port = _prompt_int("HTTP port", args.port)
     model_name = _prompt_text("Model name", args.model_name)
@@ -382,7 +394,7 @@ def _collect_new_workspace_config(args: argparse.Namespace) -> GenerateWorkspace
         else Path(_prompt_text("Output directory", str(args.output)))
     )
     generate = args.generate or _prompt_choice(
-        "Generate in workspace now", ["none", "service", "cluster"], "none"
+        "Generate in workspace now", ["none", "service", "cluster"], "service"
     )
     return GenerateWorkspaceArgs(
         {
@@ -413,6 +425,7 @@ def _default_service_namespace(output_dir: Path) -> argparse.Namespace:
     return argparse.Namespace(
         interactive=True,
         name=None,
+        output_locked=True,
         output=output_dir,
         description="A microservice using the csrd library stack",
         port=8080,
@@ -1159,7 +1172,7 @@ def main() -> int:
             workspace_root = _ensure_workspace_for_output(
                 service_config["output_dir"], allow_prompt=_service_is_interactive(args)
             )
-            service_config["output_dir"] = _workspace_services_dir(workspace_root)
+            service_config["output_dir"] = workspace_root
             generated = generate_service(**service_config)
             generated_cluster = _maybe_update_workspace_cluster(
                 workspace_root, service_config, generated
@@ -1205,9 +1218,9 @@ def main() -> int:
             generate_mode = workspace_config["generate"]
             if generate_mode == "service":
                 service_config = _collect_new_service_config(
-                    _default_service_namespace(_workspace_services_dir(workspace_root))
+                    _default_service_namespace(workspace_root)
                 )
-                service_config["output_dir"] = _workspace_services_dir(workspace_root)
+                service_config["output_dir"] = workspace_root
                 generated_service = generate_service(**service_config)
                 generated_cluster = _maybe_update_workspace_cluster(
                     workspace_root, service_config, generated_service

{csrd_utils-0.3.39 → csrd_utils-0.3.41}/src/csrd_utils/cluster.py

@@ -319,8 +319,8 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
         app_service: dict[str, Any] = {
             "image": f"ghcr.io/csrd-api/{name}:latest",
             "build": {
-                "context": f"./src/{name}",
-                "dockerfile": "Dockerfile",
+                "context": ".",
+                "dockerfile": f"Dockerfile.{name}",
             },
             "ports": [f"{service['port']}:{service['port']}"],
             "environment": _service_environment(service, services),