csrd-utils 0.3.43__tar.gz → 0.3.44__tar.gz

{csrd_utils-0.3.43 → csrd_utils-0.3.44}/PKG-INFO

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

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

{csrd_utils-0.3.43 → csrd_utils-0.3.44}/src/csrd_utils/__main__.py

@@ -598,7 +598,6 @@ def _is_service_root(path: Path) -> bool:
     return (
         path.is_dir()
         and (path / "requirements.txt").is_file()
-        and (path / "tests").is_dir()
         and (path / "pyproject.toml").is_file()
     )
 
@@ -651,8 +650,6 @@ def _workspace_root_for_service(service_root: Path) -> Path | None:
 def _validate_service_root(service_root: Path) -> None:
     if not service_root.is_dir():
         raise ValueError(f"Service path is not a directory: {service_root}")
-    if not (service_root / "tests").is_dir():
-        raise ValueError(f"Missing required directory: {service_root / 'tests'}")
     if not (service_root / "requirements.txt").is_file():
         raise ValueError(f"Missing required file: {service_root / 'requirements.txt'}")
     if not (service_root / "pyproject.toml").is_file():

{csrd_utils-0.3.43 → csrd_utils-0.3.44}/src/csrd_utils/augmentor.py

@@ -66,6 +66,20 @@ class ServiceAugmentor:
         )
         return candidate if candidate is not None else self.service_root / "src" / "app"
 
+    @property
+    def _workspace_root(self) -> Path | None:
+        parent = self.service_root.parent
+        if parent.name == "src" and (parent.parent / ".csrd-workspace").is_file():
+            return parent.parent
+        return None
+
+    @property
+    def _tests_dir(self) -> Path:
+        workspace_root = self._workspace_root
+        if workspace_root is not None:
+            return workspace_root / "tests"
+        return self.service_root / "tests"
+
     def load_feature(self, feature_name: str) -> bool:
         """
         Load and validate feature manifest.
@@ -108,7 +122,7 @@ class ServiceAugmentor:
         bool
             True if valid
         """
-        required_dirs = [str(self._pkg_dir.relative_to(self.service_root)), "tests"]
+        required_dirs = [str(self._pkg_dir.relative_to(self.service_root))]
         required_files = ["requirements.txt"]
 
         for d in required_dirs:
@@ -316,7 +330,12 @@ class ServiceAugmentor:
             return True  # Not required
 
         try:
-            conftest_path = self.service_root / "tests/conftest.py"
+            if self._workspace_root is not None:
+                conftest_path = (
+                    self._tests_dir / "acceptance" / self.service_root.name / "conftest.py"
+                )
+            else:
+                conftest_path = self._tests_dir / "conftest.py"
             if not conftest_path.exists():
                 print("⚠ conftest.py not found, skipping")
                 return True
@@ -401,7 +420,17 @@ class ServiceAugmentor:
             for src_file in test_dir.rglob("*"):
                 if src_file.is_file():
                     rel_path = src_file.relative_to(test_dir)
-                    dest_file = self.service_root / "tests" / rel_path
+                    if self._workspace_root is not None:
+                        parts = rel_path.parts
+                        if parts and parts[0] in {"unit", "acceptance"}:
+                            scoped_rel = Path(parts[0]) / self.service_root.name / Path(*parts[1:])
+                        elif rel_path.name == "conftest.py":
+                            scoped_rel = Path("acceptance") / self.service_root.name / "conftest.py"
+                        else:
+                            scoped_rel = Path("acceptance") / self.service_root.name / rel_path
+                        dest_file = self._tests_dir / scoped_rel
+                    else:
+                        dest_file = self._tests_dir / rel_path
 
                     dest_file.parent.mkdir(parents=True, exist_ok=True)
                     shutil.copy2(src_file, dest_file)

{csrd_utils-0.3.43 → csrd_utils-0.3.44}/src/csrd_utils/doctor.py

@@ -19,7 +19,7 @@ def run_doctor(service_root: Path) -> DoctorReport:
     errors: list[str] = []
     warnings: list[str] = []
 
-    required_dirs = ["tests"]
+    required_dirs: list[str] = []
     required_files = ["requirements.txt", "pyproject.toml"]
 
     compose_candidates = [root / "docker-compose.yml"]
@@ -65,9 +65,21 @@ def run_doctor(service_root: Path) -> DoctorReport:
     marker_files: dict[str, str] = {}
     if pkg_dir is not None:
         marker_files[f"{pkg_dir.name}/settings.py"] = "# [INSERT: fields]"
-    marker_files["tests/conftest.py"] = "# [INSERT: fixtures]"
+    workspace_root = None
+    if root.parent.name == "src" and (root.parent.parent / ".csrd-workspace").is_file():
+        workspace_root = root.parent.parent
+
+    if workspace_root is not None and pkg_dir is not None:
+        marker_files[f"tests/acceptance/{pkg_dir.name}/conftest.py"] = "# [INSERT: fixtures]"
+    else:
+        marker_files["tests/conftest.py"] = "# [INSERT: fixtures]"
+
     for rel, marker in marker_files.items():
-        path = root / rel
+        path = (
+            (workspace_root / rel)
+            if workspace_root is not None and rel.startswith("tests/")
+            else (root / rel)
+        )
         if path.exists():
             text = path.read_text(encoding="utf-8")
             if marker not in text:

{csrd_utils-0.3.43 → csrd_utils-0.3.44}/src/csrd_utils/generator.py

@@ -121,6 +121,7 @@ def generate_service(
 
     # Move docker files to workspace root and update Dockerfile
     _move_docker_files_to_workspace_root(generated_path, output_root, name)
+    _move_tests_to_workspace_root(generated_path, output_root, name)
 
     return generated_path
 
@@ -154,3 +155,41 @@ def _move_docker_files_to_workspace_root(
         )
         dockerfile_dst.write_text(dockerfile_content)
         dockerfile_src.unlink()
+
+
+def _move_tests_to_workspace_root(
+    service_path: Path, workspace_root: Path, service_name: str
+) -> None:
+    """Move generated tests into workspace-level namespaced suites."""
+    service_name_snake = service_name.replace("-", "_")
+    tests_src = service_path / "tests"
+    if not tests_src.is_dir():
+        return
+
+    tests_root = workspace_root / "tests"
+    unit_dst = tests_root / "unit" / service_name_snake
+    acceptance_dst = tests_root / "acceptance" / service_name_snake
+    unit_dst.mkdir(parents=True, exist_ok=True)
+    acceptance_dst.mkdir(parents=True, exist_ok=True)
+
+    def _copy_tree(src_dir: Path, dst_dir: Path) -> None:
+        if not src_dir.is_dir():
+            return
+        for src_file in src_dir.rglob("*"):
+            if src_file.is_file():
+                rel = src_file.relative_to(src_dir)
+                dst_file = dst_dir / rel
+                dst_file.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(src_file, dst_file)
+
+    _copy_tree(tests_src / "unit", unit_dst)
+    _copy_tree(tests_src / "acceptance", acceptance_dst)
+
+    # Service-level API tests belong under acceptance for workspace execution.
+    top_level_acceptance = ["test_items.py", "conftest.py"]
+    for filename in top_level_acceptance:
+        src_file = tests_src / filename
+        if src_file.is_file():
+            shutil.copy2(src_file, acceptance_dst / filename)
+
+    shutil.rmtree(tests_src, ignore_errors=True)