csrd-utils 0.3.45__tar.gz → 0.3.46__tar.gz

{csrd_utils-0.3.45 → csrd_utils-0.3.46}/PKG-INFO

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

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

{csrd_utils-0.3.45 → csrd_utils-0.3.46}/src/csrd_utils/__main__.py

@@ -784,9 +784,7 @@ def _extract_service(config: ExtractWorkspaceServiceArgs) -> dict[str, object]:
         _load_workspace_cluster_spec(target_workspace), source_service_spec, target_workspace.name
     )
     _save_workspace_cluster_spec(target_workspace, target_spec)
-    target_cluster_root = generate_cluster(
-        target_spec, target_workspace, force=True, workspace_mode=True
-    )
+    target_cluster_root = generate_cluster(target_spec, target_workspace, force=True)
 
     source_cluster_root = None
     if mode == "move":
@@ -795,9 +793,7 @@ def _extract_service(config: ExtractWorkspaceServiceArgs) -> dict[str, object]:
             _load_workspace_cluster_spec(source_workspace), service_root.name, source_workspace.name
         )
         _save_workspace_cluster_spec(source_workspace, source_spec)
-        source_cluster_root = generate_cluster(
-            source_spec, source_workspace, force=True, workspace_mode=True
-        )
+        source_cluster_root = generate_cluster(source_spec, source_workspace, force=True)
 
     return {
         "ok": True,
@@ -897,7 +893,7 @@ def _maybe_update_workspace_cluster(
             service_config,
             overwrite=service_config["overwrite_if_exists"],
         )
-        return generate_cluster(updated_spec, workspace_root, force=True, workspace_mode=True)
+        return generate_cluster(updated_spec, workspace_root, force=True)
 
     service_roots = _workspace_service_roots(workspace_root)
     generated_name = generated_service.name
@@ -914,7 +910,7 @@ def _maybe_update_workspace_cluster(
     }
     normalized = normalize_cluster_spec(bootstrap_spec)
     _save_workspace_cluster_spec(workspace_root, normalized)
-    return generate_cluster(normalized, workspace_root, force=True, workspace_mode=True)
+    return generate_cluster(normalized, workspace_root, force=True)
 
 
 def _build_parser() -> argparse.ArgumentParser:

{csrd_utils-0.3.45 → csrd_utils-0.3.46}/src/csrd_utils/cluster.py

@@ -426,6 +426,21 @@ def _build_readme(spec: ClusterSpec) -> str:
         lines.append(f"- `{service['name']}` ({service['type']}) on port `{service['port']}`")
     lines.extend(
         [
+            "",
+            "## Tests",
+            "",
+            "From the workspace root, run all tests:",
+            "",
+            "```bash",
+            "pytest",
+            "```",
+            "",
+            "Run tests for a specific service:",
+            "",
+            "```bash",
+            "pytest tests/unit/{service_name}",
+            "pytest tests/acceptance/{service_name}",
+            "```",
             "",
             "## Run",
             "",
@@ -456,23 +471,20 @@ def _build_smoke(spec: ClusterSpec) -> str:
     return "\n".join(lines) + "\n"
 
 
-def generate_cluster(
-    spec: ClusterSpec, output_dir: Path, force: bool = False, workspace_mode: bool = False
-) -> Path:
-    normalized = normalize_cluster_spec(spec)
-
-    if workspace_mode:
-        # In workspace mode, write files directly to output_dir (workspace root)
-        cluster_root = output_dir.resolve()
-    else:
-        # In standalone mode, create a subdirectory with cluster name
-        cluster_root = output_dir.resolve() / normalized["cluster"]["name"]
+def generate_cluster(spec: ClusterSpec, output_dir: Path, force: bool = False) -> Path:
+    """Generate cluster scaffold in workspace mode.
 
+    Always operates at workspace root (no standalone mode).
+    """
+    normalized = normalize_cluster_spec(spec)
+    cluster_root = output_dir.resolve()
     cluster_root.mkdir(parents=True, exist_ok=True)
 
-    if any(cluster_root.iterdir()) and not force:
+    # In workspace mode, check if we'd overwrite existing cluster artifacts
+    compose_file = cluster_root / "docker-compose.yml"
+    if compose_file.exists() and not force:
         raise FileExistsError(
-            f"Target directory already exists and is not empty: {cluster_root}. Use --force to overwrite."
+            f"Cluster files already exist in {cluster_root}. Use --force to overwrite."
         )
 
     compose = render_compose(normalized)
@@ -480,7 +492,12 @@ def generate_cluster(
         yaml.safe_dump(compose, sort_keys=False), encoding="utf-8"
     )
     (cluster_root / ".env.example").write_text(_build_env(normalized), encoding="utf-8")
-    (cluster_root / "README.md").write_text(_build_readme(normalized), encoding="utf-8")
+
+    # In workspace mode, preserve existing README (workspace-level, not cluster-specific)
+    readme_path = cluster_root / "README.md"
+    if not readme_path.exists():
+        readme_path.write_text(_build_readme(normalized), encoding="utf-8")
+
     smoke_path = cluster_root / "smoke.sh"
     smoke_path.write_text(_build_smoke(normalized), encoding="utf-8")
     smoke_path.chmod(0o755)

{csrd_utils-0.3.45 → csrd_utils-0.3.46}/src/csrd_utils/generator.py

@@ -9,14 +9,64 @@ from cookiecutter.main import cookiecutter
 
 from .resources import templates_path
 
-_WORKSPACE_PYTEST_TOML = """\
-# Workspace-level tool configuration.
-# Add [project] and [build-system] sections if you need to publish this workspace as a package.
+_WORKSPACE_PYPROJECT_BASE = """\
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "workspace"
+version = "0.1.0"
+description = "Multi-service workspace"
+readme = "README.md"
+requires-python = ">=3.12"
+license = {text = "MIT"}
+
+dependencies = [
+    "fastapi>=0.110",
+    "uvicorn[standard]>=0.27",
+    "pydantic[email]>=2.5",
+    "csrd-versioning @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/versioning",
+    "csrd-lifespan @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/lifespan",
+    "csrd-repository @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/repository",
+    "csrd-context @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/context",
+    "httpx>=0.25",
+    "celery[redis]>=5.3",
+    "celery[amqp]>=5.3",
+    "redis>=5.0",
+    "csrd-logging @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/logging",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=7.4",
+    "pytest-asyncio>=0.21",
+    "mypy>=1.7",
+    "ruff>=0.1",
+]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 testpaths = ["tests"]
 pythonpath = ["src"]
+
+[tool.mypy]
+python_version = "3.12"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = true
+strict = true
+
+[tool.ruff]
+target-version = "py312"
+line-length = 100
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "I", "N", "UP", "BLE", "FBT", "A", "C4", "PIE", "SIM", "RUF"]
+ignore = ["E501"]
+
+[tool.ruff.lint.isort]
+known-first-party = [""]
 """
 
 _WORKSPACE_README = """\
@@ -257,25 +307,21 @@ def _move_tests_to_workspace_root(
 
 
 def _write_workspace_pyproject(workspace_root: Path) -> None:
-    """Write or update workspace-level pyproject.toml with pytest configuration.
+    """Write workspace-level pyproject.toml with full build/project/tool configuration.
 
-    If the file does not exist it is created from scratch.  If it already exists
-    and already contains a ``[tool.pytest.ini_options]`` section it is left
-    untouched (the user may have customised it).  Otherwise the pytest block is
-    appended so that a second ``generate_service`` call on the same workspace
-    gains the config without clobbering prior edits.
+    Creates complete pyproject.toml on first generation. On subsequent generations,
+    only writes if the file doesn't exist or lacks [project] section (user customization).
     """
     dst = workspace_root / "pyproject.toml"
     if dst.exists():
         existing = dst.read_text(encoding="utf-8")
-        if "[tool.pytest.ini_options]" in existing:
+        # If user already has a [project] section, assume they customized it
+        if "[project]" in existing:
             return
-        dst.write_text(
-            existing.rstrip() + "\n\n" + _WORKSPACE_PYTEST_TOML,
-            encoding="utf-8",
-        )
+        # Otherwise write the full base config
+        dst.write_text(_WORKSPACE_PYPROJECT_BASE, encoding="utf-8")
     else:
-        dst.write_text(_WORKSPACE_PYTEST_TOML, encoding="utf-8")
+        dst.write_text(_WORKSPACE_PYPROJECT_BASE, encoding="utf-8")
 
 
 def _write_workspace_readme(workspace_root: Path) -> None:

csrd_utils-0.3.45/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}/pyproject.toml

@@ -1,58 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "{{ cookiecutter.service_name }}"
-version = "0.1.0"
-description = "{{ cookiecutter.service_description }}"
-readme = "README.md"
-requires-python = ">=3.12"
-license = {text = "MIT"}
-authors = [{name = "Generated by csrd", email = "generated@csrd.local"}]
-keywords = ["fastapi", "microservice", "csrd"]
-
-dependencies = [
-    "fastapi>=0.110",
-    "uvicorn[standard]>=0.27",
-    "pydantic[email]>=2.5",
-    "csrd-versioning @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/versioning",
-    "csrd-lifespan @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/lifespan",
-    "csrd-repository @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/repository",
-    "csrd-context @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/context",
-    "httpx>=0.25",
-    "celery[redis]>=5.3",
-    "celery[amqp]>=5.3",
-    "redis>=5.0",
-    "csrd-logging @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/logging",
-]
-
-[project.optional-dependencies]
-dev = [
-    "pytest>=7.4",
-    "pytest-asyncio>=0.21",
-    "mypy>=1.7",
-    "ruff>=0.1",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = ["{{cookiecutter.__service_name_snake}}"]
-
-
-[tool.mypy]
-python_version = "3.12"
-warn_return_any = true
-warn_unused_configs = true
-disallow_untyped_defs = true
-strict = true
-
-[tool.ruff]
-target-version = "py312"
-line-length = 100
-
-[tool.ruff.lint]
-select = ["E", "F", "W", "I", "N", "UP", "BLE", "FBT", "A", "C4", "PIE", "SIM", "RUF"]
-ignore = ["E501"]
-
-[tool.ruff.lint.isort]
-known-first-party = ["{{cookiecutter.__service_name_snake}}"]