Merge pull request #174 from lbedner/services-health-check

Services Health Check Initial Implementation

Author: lbedner

aegis/cli/interactive.py

@@ -171,7 +171,27 @@ def interactive_project_selection() -> tuple[list[str], str, list[str]]:
             for service_name, service_spec in auth_services.items():
                 prompt = f"  Add {service_spec.description.lower()}?"
                 if typer.confirm(prompt):
-                    selected_services.append(service_name)
+                    # Auth service requires database - provide explicit confirmation
+                    typer.echo("\n🗃️  Database Required:")
+                    typer.echo("  Authentication requires a database for user storage")
+                    typer.echo("  (user accounts, sessions, JWT tokens)")
+
+                    # Check if database is already selected
+                    database_already_selected = any(
+                        "database" in comp for comp in selected
+                    )
+
+                    if database_already_selected:
+                        typer.echo("✅ Database component already selected")
+                        selected_services.append(service_name)
+                    else:
+                        auth_confirm_prompt = "  Continue and add database component?"
+                        if typer.confirm(auth_confirm_prompt, default=True):
+                            selected_services.append(service_name)
+                            # Note: Database will be auto-added by service resolution in init.py
+                            typer.echo("✅ Authentication + Database configured")
+                        else:
+                            typer.echo("⏹️  Authentication service cancelled")
 
         # Future service types can be added here as they become available
         # payment_services = get_services_by_type(ServiceType.PAYMENT)

aegis/commands/init.py

@@ -102,10 +102,13 @@ def init_command(
     selected_services = cast(list[str], services) if services else []
     scheduler_backend = "memory"  # Default to in-memory scheduler
 
-    # 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
+    # Resolve services to components if services were provided (non-interactive mode only)
+    if selected_services and not interactive:
+        # Check if --components was explicitly provided
+        components_explicitly_provided = components is not None
+
+        if components_explicitly_provided:
+            # In non-interactive mode with explicit --components, validate compatibility
             # Include core components (always present) for validation
             components_for_validation = list(set(selected_components + CORE_COMPONENTS))
             errors = ServiceResolver.validate_service_component_compatibility(
@@ -124,15 +127,30 @@ def init_command(
                 )
                 if missing_components:
                     typer.echo(
-                        f"💡 Suggestion: Add missing components: --components {','.join(list(dict.fromkeys(selected_components + missing_components)))}",
+                        f"💡 Suggestion: Add missing components --components {','.join(sorted(set(selected_components + missing_components)))}",
+                        err=True,
+                    )
+                    typer.echo(
+                        "   Or remove --components to let services auto-add dependencies.",
                         err=True,
                     )
                 typer.echo(
-                    "   Alternatively, remove --components to let services auto-add their dependencies.",
+                    "   Alternatively, use interactive mode to auto-add service dependencies.",
                     err=True,
                 )
                 raise typer.Exit(1)
+        else:
+            # No --components provided, auto-add required components for services
+            service_components, _ = ServiceResolver.resolve_service_dependencies(
+                selected_services
+            )
+            if service_components:
+                typer.echo(
+                    f"📦 Services require components: {', '.join(sorted(service_components))}"
+                )
+            selected_components = service_components
 
+        # Resolve service dependencies and merge with any explicitly selected components
         service_components, _ = ServiceResolver.resolve_service_dependencies(
             selected_services
         )
@@ -178,6 +196,43 @@ def init_command(
         # Merge interactively selected services with any already selected services
         selected_services = list(set(selected_services + interactive_services))
 
+        # Handle service dependencies for interactively selected services
+        if interactive_services:
+            # Track originally selected components before service resolution
+            originally_selected_components = selected_components.copy()
+
+            service_components, _ = ServiceResolver.resolve_service_dependencies(
+                interactive_services
+            )
+            # Merge service-required components with selected components
+            all_components = list(set(selected_components + service_components))
+            selected_components = all_components
+
+            # Show which components were auto-added by services
+            service_added_components = [
+                comp
+                for comp in service_components
+                if comp not in originally_selected_components
+                and comp not in CORE_COMPONENTS
+            ]
+            if service_added_components:
+                # Create a mapping of which services require which components
+                service_component_map = {}
+                for service_name in interactive_services:
+                    service_deps = ServiceResolver.resolve_service_dependencies(
+                        [service_name]
+                    )[0]
+                    for comp in service_deps:
+                        if comp in service_added_components:
+                            if comp not in service_component_map:
+                                service_component_map[comp] = []
+                            service_component_map[comp].append(service_name)
+
+                typer.echo("\n📦 Auto-added by services:")
+                for comp, requiring_services in service_component_map.items():
+                    services_str = ", ".join(requiring_services)
+                    typer.echo(f"   • {comp} (required by {services_str})")
+
     # Create template generator with scheduler backend context
     template_gen = TemplateGenerator(
         project_name, list(selected_components), scheduler_backend, selected_services

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/cli/health.py.j2

@@ -338,15 +338,35 @@ def _display_health_status(
         f"Health Percentage: [bold]"
         f"{health_percentage:.{CLI.HEALTH_PERCENTAGE_DECIMALS}f}%[/bold]",
         f"Components: {healthy_count}/" + f"{total_count} healthy",
-        f"Timestamp: {timestamp}",
     ]
 
+    # Add service information if available (DetailedHealthResponse)
+    if hasattr(health_data, "has_services") and health_data.has_services:
+        healthy_services_count = len(health_data.healthy_services)
+        total_services_count = len(health_data.service_names)
+        if healthy_services_count == total_services_count:
+            service_status_color = "green"
+        elif healthy_services_count > 0:
+            service_status_color = "yellow"
+        else:
+            service_status_color = "red"
+
+        panel_content.append(
+            f"Services: [bold {service_status_color}]{healthy_services_count}/"
+            f"{total_services_count} healthy[/bold {service_status_color}]"
+        )
+
+    panel_content.append(f"Timestamp: {timestamp}")
+
     console.print(
         Panel("\n".join(panel_content), title=title, border_style=overall_color)
     )
 
-    # Component Tree Display
-    console.print("\n[bold magenta]Component Tree:[/bold magenta]")
+    # Component and Service Tree Display
+    tree_title = "Component Tree"
+    if hasattr(health_data, "has_services") and health_data.has_services:
+        tree_title = "Component & Service Tree"
+    console.print(f"\n[bold magenta]{tree_title}:[/bold magenta]")
 
     # Sort components: unhealthy first, then by name
     sorted_components = sorted(components.items(), key=lambda x: (x[1].healthy, x[0]))

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/cli/load_test.py.j2

@@ -115,7 +115,9 @@ def run_load_test(
             )
         else:
             rprint("\n💡 [yellow]Use this command to check results later:[/yellow]")
-            rprint(f"   [bold]{{ cookiecutter.project_slug }} load-test results {task_id}[/bold]")
+            rprint(
+                f"   [bold]{{ cookiecutter.project_slug }} load-test results {task_id}[/bold]"
+            )
 
     except Exception as e:
         rprint(f"❌ [red]Failed to start load test:[/red] {e}")

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/components/backend/api/health.py

@@ -59,6 +59,11 @@ async def detailed_health() -> DetailedHealthResponse:
             healthy_components=system_status.healthy_components,
             unhealthy_components=system_status.unhealthy_components,
             health_percentage=system_status.health_percentage,
+            # Service-specific information
+            has_services=system_status.has_services,
+            service_names=system_status.service_names,
+            healthy_services=system_status.healthy_services,
+            unhealthy_services=system_status.unhealthy_services,
         )
 
     except HTTPException:
@@ -119,6 +124,31 @@ async def system_dashboard() -> dict[str, Any]:
                     "healthy_components": len(system_status.healthy_components),
                     "unhealthy_components": len(system_status.unhealthy_components),
                     "recent_alerts": recent_alerts,
+                    # Service summary information
+                    "has_services": system_status.has_services,
+                    "total_services": len(system_status.service_names),
+                    "healthy_services": len(system_status.healthy_services),
+                    "unhealthy_services": len(system_status.unhealthy_services),
+                },
+                # Services section for frontend consumption
+                "services": {
+                    "enabled": system_status.has_services,
+                    "services": {
+                        name: {
+                            "name": name,
+                            "healthy": service.healthy,
+                            "message": service.message,
+                            "response_time_ms": service.response_time_ms,
+                            "metadata": service.metadata,
+                        }
+                        for name, service in (
+                            system_status.services_status.sub_components.items()
+                            if system_status.services_status
+                            else {}
+                        ).items()
+                    }
+                    if system_status.has_services
+                    else {},
                 },
                 "system_info": system_status.system_info,
                 "timestamp": system_status.timestamp.isoformat(),

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/components/backend/startup/component_health.py.j2

@@ -386,4 +386,26 @@ async def startup_hook() -> None:
     logger.info("Database component health check registered")
     {%- endif %}
 
-    logger.info("✅ Component health detection complete")
+    logger.info("✅ Component health detection complete")
+
+    # ==========================================
+    # Service Health Checks Registration
+    # ==========================================
+
+    from app.services.system.health import register_service_health_check
+
+    logger.info("🔧 Registering service health checks...")
+
+    {%- if cookiecutter.include_auth == "yes" %}
+    # Register auth service health check
+    from app.services.auth.health import check_auth_service_health
+    register_service_health_check("auth", check_auth_service_health)
+    logger.info("Auth service health check registered")
+    {%- endif %}
+
+    # Future services will be registered here:
+    # if cookiecutter.include_payment == "yes":
+    #     from app.services.payment.health import check_payment_service_health
+    #     register_service_health_check("payment", check_payment_service_health)
+
+    logger.info("✅ Service health detection complete")

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/components/frontend/dashboard/cards/__init__.py.j2

@@ -1,7 +1,11 @@
 """Dashboard component cards."""
 
+from .ai_card import AICard
+from .auth_card import AuthCard
 from .fastapi_card import FastAPICard
 from .flet_card import FletCard
+from .payment_card import PaymentCard
+from .services_card import ServicesCard
 {%- if cookiecutter.include_database == "yes" %}
 from .database_card import DatabaseCard
 {%- endif %}
@@ -16,8 +20,12 @@ from .worker_card import WorkerCard
 {%- endif %}
 
 __all__ = [
+    "AICard",
+    "AuthCard",
     "FastAPICard",
     "FletCard",
+    "PaymentCard",
+    "ServicesCard",
     {%- if cookiecutter.include_database == "yes" %}
     "DatabaseCard",
     {%- endif %}