Merge pull request #143 from lbedner/services-cli-validation

Services CLI Validaiton

Author: lbedner

aegis/cli/interactive.py

@@ -7,7 +7,7 @@
 
 import typer
 
-from ..core.components import COMPONENTS, ComponentSpec, ComponentType
+from ..core.components import COMPONENTS, CORE_COMPONENTS, ComponentSpec, ComponentType
 
 
 def get_interactive_infrastructure_components() -> list[ComponentSpec]:
@@ -32,7 +32,9 @@ def interactive_component_selection() -> tuple[list[str], str]:
 
     typer.echo("🎯 Component Selection")
     typer.echo("=" * 40)
-    typer.echo("✅ Core components (backend + frontend) included automatically\n")
+    typer.echo(
+        f"✅ Core components ({' + '.join(CORE_COMPONENTS)}) included automatically\n"
+    )
 
     selected = []
     database_engine = None  # Track database engine selection

aegis/commands/components.py

@@ -4,16 +4,19 @@
 
 import typer
 
-from ..core.components import ComponentType, get_components_by_type
+from ..core.components import CORE_COMPONENTS, ComponentType, get_components_by_type
 
 
 def components_command() -> None:
     """List available components and their dependencies."""
 
     typer.echo("\n📦 CORE COMPONENTS")
     typer.echo("=" * 40)
-    typer.echo("  backend      - FastAPI backend server (always included)")
-    typer.echo("  frontend     - Flet frontend interface (always included)")
+    for component in CORE_COMPONENTS:
+        if component == "backend":
+            typer.echo("  backend      - FastAPI backend server (always included)")
+        elif component == "frontend":
+            typer.echo("  frontend     - Flet frontend interface (always included)")
 
     typer.echo("\n🏗️  INFRASTRUCTURE COMPONENTS")
     typer.echo("=" * 40)

aegis/commands/init.py

@@ -19,7 +19,7 @@
     extract_base_component_name,
     restore_engine_info,
 )
-from ..core.components import COMPONENTS, ComponentType
+from ..core.components import COMPONENTS, CORE_COMPONENTS, ComponentType
 from ..core.dependency_resolver import DependencyResolver
 from ..core.service_resolver import ServiceResolver
 from ..core.template_generator import TemplateGenerator
@@ -104,6 +104,35 @@ def init_command(
 
     # Resolve services to components if services were provided
     if selected_services:
+        # If user provided explicit components, validate compatibility first
+        if components is not None:  # User provided explicit --components
+            # Include core components (always present) for validation
+            components_for_validation = list(set(selected_components + CORE_COMPONENTS))
+            errors = ServiceResolver.validate_service_component_compatibility(
+                selected_services, components_for_validation
+            )
+            if errors:
+                typer.echo("❌ Service-component compatibility errors:", err=True)
+                for error in errors:
+                    typer.echo(f"   • {error}", err=True)
+
+                # Show suggestion
+                missing_components = (
+                    ServiceResolver.get_missing_components_for_services(
+                        selected_services, components_for_validation
+                    )
+                )
+                if missing_components:
+                    typer.echo(
+                        f"💡 Suggestion: Add missing components: --components {','.join(list(dict.fromkeys(selected_components + missing_components)))}",
+                        err=True,
+                    )
+                typer.echo(
+                    "   Alternatively, remove --components to let services auto-add their dependencies.",
+                    err=True,
+                )
+                raise typer.Exit(1)
+
         service_components, _ = ServiceResolver.resolve_service_dependencies(
             selected_services
         )
@@ -136,7 +165,7 @@ def init_command(
 
             # Calculate auto-added components using clean names
             clean_selected_only = clean_component_names(
-                [c for c in selected_components if c not in ["backend", "frontend"]]
+                [c for c in selected_components if c not in CORE_COMPONENTS]
             )
             auto_added = DependencyResolver.get_missing_dependencies(
                 clean_selected_only
@@ -153,7 +182,7 @@ def init_command(
     typer.echo()
     typer.echo(f"📁 Project Name: {project_name}")
     typer.echo("🏗️  Project Structure:")
-    typer.echo("   ✅ Core: backend, frontend")
+    typer.echo(f"   ✅ Core: {', '.join(CORE_COMPONENTS)}")
 
     # Show infrastructure components
     infra_components = []

aegis/core/components.py

@@ -16,6 +16,10 @@ class ComponentType(Enum):
     INFRASTRUCTURE = "infra"  # Redis, workers - foundation for services to use
 
 
+# Core components that are always included in every project
+CORE_COMPONENTS = ["backend", "frontend"]
+
+
 @dataclass
 class ComponentSpec:
     """Specification for a single component."""

aegis/core/template_generator.py

@@ -9,7 +9,7 @@
 from typing import Any
 
 from .component_utils import extract_base_component_name, extract_engine_info
-from .components import COMPONENTS
+from .components import COMPONENTS, CORE_COMPONENTS
 from .services import SERVICES
 
 
@@ -38,7 +38,7 @@ def __init__(
         self.selected_services = selected_services or []
 
         # Always include core components
-        all_components = ["backend", "frontend"] + selected_components
+        all_components = CORE_COMPONENTS + selected_components
         # Remove duplicates, preserve order
         self.components = list(dict.fromkeys(all_components))
 
@@ -74,7 +74,7 @@ def get_template_context(self) -> dict[str, Any]:
             Dictionary containing all template variables
         """
         # Store the originally selected components (without core)
-        selected_only = [c for c in self.components if c not in ["backend", "frontend"]]
+        selected_only = [c for c in self.components if c not in CORE_COMPONENTS]
 
         # Check for components using base names
         has_database = any(c.startswith("database") for c in self.components)

pyproject.toml

@@ -152,4 +152,6 @@ asyncio_default_fixture_loop_scope = "function"
 exclude = [
     "aegis/templates/**",
     "test-project/**",
+    "my-app/**",
+    "test-*/**",
 ]

tests/cli/test_services_cli.py

@@ -218,7 +218,7 @@ def test_init_with_services_and_components_together(self):
                     "--services",
                     "auth",
                     "--components",
-                    "worker",
+                    "database,worker",  # Auth needs database (backend always included), plus explicit worker
                     "--no-interactive",
                     "--yes",
                     "--output-dir",
@@ -234,12 +234,12 @@ def test_init_with_services_and_components_together(self):
             # Should show both services and components
             assert "🔧 Services: auth" in output
             assert "📦 Infrastructure:" in output
-            # Both auth (database) and worker (redis) dependencies should be present
-            assert (
-                ("database" in output and "redis" in output)
-                or "database, redis" in output
-                or "redis, database" in output
-            )
+            # Should have all components: backend, database (auth), worker and redis (worker dep)
+            assert "backend" in output
+            assert "database" in output
+            assert "worker" in output
+            # Worker adds redis as dependency
+            assert "redis" in output
 
     def test_init_services_help_text_accuracy(self):
         """Test that init command help shows correct services help text."""
@@ -478,3 +478,183 @@ def test_service_with_whitespace(self):
             )
 
             assert result.returncode == 0  # Should handle whitespace gracefully
+
+
+class TestServiceComponentCompatibilityValidation:
+    """Test service-component compatibility validation in CLI."""
+
+    def test_services_with_compatible_explicit_components_success(self):
+        """Test that services work when user provides compatible explicit components."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            result = subprocess.run(
+                [
+                    "uv",
+                    "run",
+                    "python",
+                    "-m",
+                    "aegis",
+                    "init",
+                    "test-compatible",
+                    "--services",
+                    "auth",
+                    "--components",
+                    "database",  # Auth requires database (backend is always included)
+                    "--no-interactive",
+                    "--yes",
+                    "--output-dir",
+                    temp_dir,
+                ],
+                capture_output=True,
+                text=True,
+            )
+
+            assert result.returncode == 0
+            assert "🔧 Services: auth" in result.stdout
+            assert "backend" in result.stdout
+            assert "database" in result.stdout
+
+    def test_services_with_insufficient_explicit_components_failure(self):
+        """Test that services fail when user provides insufficient explicit components."""
+        result = subprocess.run(
+            [
+                "uv",
+                "run",
+                "python",
+                "-m",
+                "aegis",
+                "init",
+                "test-insufficient",
+                "--services",
+                "auth",
+                "--components",
+                "worker",  # Auth requires database, but user only provided worker
+                "--no-interactive",
+                "--yes",
+                "--output-dir",
+                "/tmp",  # Won't be created due to validation failure
+            ],
+            capture_output=True,
+            text=True,
+        )
+
+        assert result.returncode == 1
+        assert "Service-component compatibility errors:" in result.stderr
+        assert "Service 'auth' requires component 'database'" in result.stderr
+        assert "💡 Suggestion:" in result.stderr
+        # Should suggest adding missing components (worker auto-adds redis dependency)
+        assert "database" in result.stderr
+
+    def test_services_with_no_explicit_components_auto_add(self):
+        """Test that services auto-add components when user doesn't provide --components."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            result = subprocess.run(
+                [
+                    "uv",
+                    "run",
+                    "python",
+                    "-m",
+                    "aegis",
+                    "init",
+                    "test-auto-add",
+                    "--services",
+                    "auth",
+                    "--no-interactive",
+                    "--yes",
+                    "--output-dir",
+                    temp_dir,
+                ],
+                capture_output=True,
+                text=True,
+            )
+
+            assert result.returncode == 0
+            assert "🔧 Services: auth" in result.stdout
+            # Should auto-add both required components
+            assert "backend" in result.stdout
+            assert "database" in result.stdout
+
+    def test_services_with_partial_explicit_components_failure(self):
+        """Test that services fail when explicit components are partially sufficient."""
+        result = subprocess.run(
+            [
+                "uv",
+                "run",
+                "python",
+                "-m",
+                "aegis",
+                "init",
+                "test-partial",
+                "--services",
+                "auth",
+                "--components",
+                "redis",  # Auth requires database (missing database, backend is always included)
+                "--no-interactive",
+                "--yes",
+                "--output-dir",
+                "/tmp",
+            ],
+            capture_output=True,
+            text=True,
+        )
+
+        assert result.returncode == 1
+        assert "Service-component compatibility errors:" in result.stderr
+        assert "Service 'auth' requires component 'database'" in result.stderr
+
+    def test_multiple_services_with_insufficient_components_failure(self):
+        """Test validation with multiple services and insufficient components."""
+        # Note: This test assumes we might add more services in the future
+        # For now, we only have auth service, so this tests the error handling pattern
+        result = subprocess.run(
+            [
+                "uv",
+                "run",
+                "python",
+                "-m",
+                "aegis",
+                "init",
+                "test-multi-insufficient",
+                "--services",
+                "auth",  # Only auth available for now
+                "--components",
+                "worker,scheduler",  # Missing database for auth
+                "--no-interactive",
+                "--yes",
+                "--output-dir",
+                "/tmp",
+            ],
+            capture_output=True,
+            text=True,
+        )
+
+        assert result.returncode == 1
+        assert "Service-component compatibility errors:" in result.stderr
+        assert "Service 'auth' requires component 'database'" in result.stderr
+
+    def test_services_error_message_suggests_alternatives(self):
+        """Test that error message suggests both adding components and removing --components."""
+        result = subprocess.run(
+            [
+                "uv",
+                "run",
+                "python",
+                "-m",
+                "aegis",
+                "init",
+                "test-suggestions",
+                "--services",
+                "auth",
+                "--components",
+                "redis",  # Wrong component for auth
+                "--no-interactive",
+                "--yes",
+                "--output-dir",
+                "/tmp",
+            ],
+            capture_output=True,
+            text=True,
+        )
+
+        assert result.returncode == 1
+        assert "💡 Suggestion: Add missing components" in result.stderr
+        assert "remove --components to let services auto-add" in result.stderr