Merge pull request #18 from lbedner/db-cli-registry

Setup DB CLI Registry

Author: lbedner

aegis/__main__.py

@@ -13,7 +13,12 @@
 import typer
 
 from aegis import __version__
-from aegis.core.components import COMPONENTS, ComponentType, get_components_by_type
+from aegis.core.components import (
+    COMPONENTS,
+    ComponentSpec,
+    ComponentType,
+    get_components_by_type,
+)
 from aegis.core.dependency_resolver import DependencyResolver
 from aegis.core.template_generator import TemplateGenerator
 
@@ -22,7 +27,7 @@
     name="aegis",
     help=(
         "Aegis Stack CLI - Component generation and project management. "
-        "Available components: redis, worker, scheduler"
+        "Available components: redis, worker, scheduler, database"
     ),
     add_completion=False,
 )
@@ -138,7 +143,7 @@ def init(
         "--components",
         "-c",
         callback=validate_and_resolve_components,
-        help="Comma-separated list of components (redis,worker,scheduler)",
+        help="Comma-separated list of components (redis,worker,scheduler,database)",
     ),
     interactive: bool = typer.Option(
         True,
@@ -166,8 +171,8 @@ def init(
     Examples:\n
         - aegis init my-app\n
         - aegis init my-app --components redis,worker\n
-        - aegis init my-app --components redis,worker,scheduler --no-interactive\n
-    """
+        - aegis init my-app --components redis,worker,scheduler,database --no-interactive\n
+    """  # noqa
 
     # Validate project name first
     validate_project_name(project_name)
@@ -304,6 +309,18 @@ def init(
         raise typer.Exit(1)
 
 
+def get_interactive_infrastructure_components() -> list[ComponentSpec]:
+    """Get infrastructure components available for interactive selection."""
+    # Get all infrastructure components
+    infra_components = []
+    for component_spec in COMPONENTS.values():
+        if component_spec.type == ComponentType.INFRASTRUCTURE:
+            infra_components.append(component_spec)
+
+    # Sort by name for consistent ordering
+    return sorted(infra_components, key=lambda x: x.name)
+
+
 def interactive_component_selection() -> list[str]:
     """Interactive component selection with dependency awareness."""
 
@@ -313,20 +330,41 @@ def interactive_component_selection() -> list[str]:
 
     selected = []
 
-    # Infrastructure components
+    # Get all infrastructure components from registry
+    infra_components = get_interactive_infrastructure_components()
+
     typer.echo("🏗️  Infrastructure Components:")
-    if typer.confirm("  Add Redis (caching, message queues)?"):
-        selected.append("redis")
-
-    if "redis" in selected:
-        if typer.confirm("  Add worker infrastructure (background tasks)?"):
-            selected.append("worker")
-    else:
-        if typer.confirm("  Add worker infrastructure? (will auto-add Redis)"):
-            selected.extend(["redis", "worker"])
-
-    if typer.confirm("  Add scheduler infrastructure (scheduled tasks)?"):
-        selected.append("scheduler")
+
+    # Process components in a specific order to handle dependencies
+    component_order = ["redis", "worker", "scheduler", "database"]
+
+    for component_name in component_order:
+        # Find the component spec
+        component_spec = next(
+            (c for c in infra_components if c.name == component_name), None
+        )
+        if not component_spec:
+            continue  # Skip if component doesn't exist in registry
+
+        # Handle special worker dependency logic
+        if component_name == "worker":
+            if "redis" in selected:
+                # Redis already selected, simple worker prompt
+                prompt = f"  Add {component_spec.description.lower()}?"
+                if typer.confirm(prompt):
+                    selected.append("worker")
+            else:
+                # Redis not selected, offer to add both
+                prompt = (
+                    f"  Add {component_spec.description.lower()}? (will auto-add Redis)"
+                )
+                if typer.confirm(prompt):
+                    selected.extend(["redis", "worker"])
+        else:
+            # Standard prompt for other components
+            prompt = f"  Add {component_spec.description}?"
+            if typer.confirm(prompt):
+                selected.append(component_name)
 
     return selected
 

aegis/core/components.py

@@ -86,6 +86,13 @@ def __post_init__(self) -> None:
         docker_services=["scheduler"],
         template_files=["app/components/scheduler.py", "app/entrypoints/scheduler.py"],
     ),
+    "database": ComponentSpec(
+        name="database",
+        type=ComponentType.INFRASTRUCTURE,
+        description="SQLite database with SQLModel ORM",
+        pyproject_deps=["sqlmodel>=0.0.14", "sqlalchemy>=2.0.0", "aiosqlite>=0.19.0"],
+        template_files=["app/core/db.py"],
+    ),
 }
 
 

aegis/core/template_generator.py

@@ -49,6 +49,7 @@ def get_template_context(self) -> dict[str, Any]:
             "include_redis": "yes" if "redis" in self.components else "no",
             "include_worker": "yes" if "worker" in self.components else "no",
             "include_scheduler": "yes" if "scheduler" in self.components else "no",
+            "include_database": "yes" if "database" in self.components else "no",
             # Derived flags for template logic
             "has_background_infrastructure": any(
                 name in self.components for name in ["worker", "scheduler"]

aegis/templates/cookiecutter-aegis-project/cookiecutter.json

@@ -22,6 +22,6 @@
   "_scheduler_deps": "{% if cookiecutter.include_scheduler == 'yes' %}apscheduler>=3.10.0{% endif %}",
   "_redis_deps": "{% if cookiecutter.include_redis == 'yes' %}redis>=5.0.0{% endif %}",
   "_worker_deps": "{% if cookiecutter.include_worker == 'yes' %}arq>=0.25.0{% endif %}",
-  "_database_deps": "{% if cookiecutter.include_database == 'yes' %}sqlalchemy[asyncio]>=2.0.0,asyncpg>=0.29.0,alembic>=1.13.0{% endif %}",
+  "_database_deps": "{% if cookiecutter.include_database == 'yes' %}sqlmodel>=0.0.14,sqlalchemy>=2.0.0,aiosqlite>=0.19.0{% endif %}",
   "_cache_deps": "{% if cookiecutter.include_cache == 'yes' %}redis[hiredis]>=5.0.0{% endif %}"
 }

aegis/templates/cookiecutter-aegis-project/hooks/post_gen_project.py

@@ -39,6 +39,7 @@ def process_j2_templates():
             "author_email": "{{ cookiecutter.author_email }}",
             "version": "{{ cookiecutter.version }}",
             "python_version": "{{ cookiecutter.python_version }}",
+            "include_redis": "{{ cookiecutter.include_redis }}",
             "include_scheduler": "{{ cookiecutter.include_scheduler }}",
             "include_worker": "{{ cookiecutter.include_worker }}",
             "include_database": "{{ cookiecutter.include_database }}",
@@ -138,10 +139,7 @@ def main():
         remove_file("tests/services/test_worker_health_registration.py")
 
     if "{{ cookiecutter.include_database }}" != "yes":
-        # remove_file("app/services/database_service.py")
-        # remove_dir("app/models")
-        # remove_dir("alembic")
-        pass  # Placeholder for database component
+        remove_file("app/core/db.py")
 
     if "{{ cookiecutter.include_cache }}" != "yes":
         # remove_file("app/services/cache_service.py")

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

@@ -173,6 +173,11 @@ async def startup_hook() -> None:
     logger.info("Worker component health check registered")
     {%- endif %}
 
-    # Future: Database and cache component detection will be added here
+    {%- if cookiecutter.include_redis == "yes" %}
+    # Register cache health check (Redis connectivity and operations)
+    from app.services.system.health import check_cache_health
+    register_health_check("cache", check_cache_health)
+    logger.info("Cache component health check registered")
+    {%- endif %}
 
     logger.info("✅ Component health detection complete")

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/components/scheduler/main.py

@@ -11,7 +11,7 @@
 
 from app.core.log import logger
 from app.services.system.health import check_system_status, register_health_check
-from app.services.system.models import ComponentStatus
+from app.services.system.models import ComponentStatus, ComponentStatusType
 
 # Global scheduler instance for health checking
 _scheduler: AsyncIOScheduler | None = None
@@ -24,15 +24,15 @@ async def _check_scheduler_health() -> ComponentStatus:
     if _scheduler is None:
         return ComponentStatus(
             name="scheduler",
-            healthy=False,
+            status=ComponentStatusType.UNHEALTHY,
             message="Scheduler not initialized",
             response_time_ms=None,
         )
 
     if not _scheduler.running:
         return ComponentStatus(
             name="scheduler",
-            healthy=False,
+            status=ComponentStatusType.UNHEALTHY,
             message="Scheduler is not running",
             response_time_ms=None,
         )
@@ -46,9 +46,14 @@ async def _check_scheduler_health() -> ComponentStatus:
         state = _scheduler.state
         healthy = state == 1  # STATE_RUNNING = 1
 
+        status = (
+            ComponentStatusType.HEALTHY
+            if healthy
+            else ComponentStatusType.UNHEALTHY
+        )
         return ComponentStatus(
             name="scheduler",
-            healthy=healthy,
+            status=status,
             message=f"Scheduler running with {job_count} jobs",
             response_time_ms=None,
             metadata={
@@ -60,7 +65,7 @@ async def _check_scheduler_health() -> ComponentStatus:
     except Exception as e:
         return ComponentStatus(
             name="scheduler",
-            healthy=False,
+            status=ComponentStatusType.UNHEALTHY,
             message=f"Scheduler health check failed: {str(e)}",
             response_time_ms=None,
         )

…cutter.project_slug}}/app/core/config.py …ter.project_slug}}/app/core/config.py.j2aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/core/config.py renamed to aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/core/config.py.j2 aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/core/config.py renamed to aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/core/config.py.j2

@@ -50,24 +50,36 @@ class Settings(BaseSettings):
     DISK_THRESHOLD_PERCENT: float = 85.0
     CPU_THRESHOLD_PERCENT: float = 95.0
 
+{% if cookiecutter.include_redis == "yes" %}
     # Redis settings for arq background tasks
     REDIS_URL: str = "redis://localhost:6379"
     REDIS_DB: int = 0
+{% endif %}
 
+{% if cookiecutter.include_worker == "yes" %}
     # arq worker settings (shared across all workers)
     WORKER_KEEP_RESULT_SECONDS: int = 3600  # Keep job results for 1 hour
     WORKER_MAX_TRIES: int = 3
 
     # PURE ARQ IMPLEMENTATION - NO CONFIGURATION NEEDED!
     # Worker configuration comes from individual WorkerSettings classes
     # in app/components/worker/queues/ - just import and use as arq intended!
+{% endif %}
+
+{% if cookiecutter.include_database == "yes" %}
+    # Database settings (SQLite)
+    DATABASE_URL: str = "sqlite:///data/app.db"
+    DATABASE_ENGINE_ECHO: bool = False
+    DATABASE_CONNECT_ARGS: dict[str, Any] = {"check_same_thread": False}
+{% endif %}
 
     model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
 
 
 settings = Settings()
 
 
+{% if cookiecutter.include_worker == "yes" %}
 # Pure arq queue helper functions - use dynamic discovery
 def get_available_queues() -> list[str]:
     """Get all available queue names via dynamic discovery."""
@@ -104,3 +116,4 @@ def is_valid_queue(queue_name: str) -> bool:
     except ImportError:
         # Worker components not available, no queues are valid
         return False
+{% endif %}

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/core/db.py

@@ -0,0 +1,67 @@
+# app/core/db.py
+"""
+Database configuration and session management.
+
+This module provides SQLite database connectivity using SQLModel and SQLAlchemy.
+Includes proper session management with transaction handling and foreign key support.
+"""
+
+from collections.abc import Generator
+from contextlib import contextmanager
+from typing import Any
+
+from sqlalchemy import create_engine, event
+from sqlalchemy.orm import sessionmaker
+from sqlmodel import Session
+
+from app.core.config import settings
+
+# Create SQLite engine with proper configuration
+engine = create_engine(
+    settings.DATABASE_URL,
+    connect_args=settings.DATABASE_CONNECT_ARGS,
+    echo=settings.DATABASE_ENGINE_ECHO,
+)
+
+
+# Enable foreign key constraints for SQLite
+@event.listens_for(engine, "connect")
+def set_sqlite_pragma(dbapi_connection: Any, connection_record: Any) -> None:
+    """Enable foreign key constraints in SQLite."""
+    cursor = dbapi_connection.cursor()
+    cursor.execute("PRAGMA foreign_keys=ON")
+    cursor.close()
+
+
+# Configure session factory with SQLModel Session
+SessionLocal = sessionmaker(
+    class_=Session, bind=engine, autoflush=False, autocommit=False
+)
+
+
+@contextmanager
+def db_session(autocommit: bool = True) -> Generator[Session, None, None]:
+    """
+    Database session context manager with automatic transaction handling.
+
+    Args:
+        autocommit: Whether to automatically commit the transaction on success
+
+    Yields:
+        Session: Database session instance
+
+    Example:
+        with db_session() as session:
+            # Your database operations here
+            result = session.query(MyModel).first()
+    """
+    db_session: Session = SessionLocal()
+    try:
+        yield db_session
+        if autocommit:
+            db_session.commit()
+    except Exception:
+        db_session.rollback()
+        raise
+    finally:
+        db_session.close()

…ect_slug}}/app/services/system/health.py …_slug}}/app/services/system/health.py.j2aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/services/system/health.py renamed to aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/services/system/health.py.j2 aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/services/system/health.py renamed to aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/app/services/system/health.py.j2

@@ -472,6 +472,7 @@ async def _check_cpu_usage() -> ComponentStatus:
         )
 
 
+{% if cookiecutter.include_redis == "yes" %}
 async def check_cache_health() -> ComponentStatus:
     """
     Check cache connectivity and basic functionality.
@@ -558,8 +559,10 @@ async def check_cache_health() -> ComponentStatus:
                 "error": str(e),
             },
         )
+{% endif %}
 
 
+{% if cookiecutter.include_worker == "yes" %}
 async def check_worker_health() -> ComponentStatus:
     """
     Check arq worker status using arq's native health checks and queue configuration.
@@ -921,3 +924,4 @@ async def check_worker_health() -> ComponentStatus:
             },
             sub_components={},
         )
+{% endif %}