Merge pull request #142 from lbedner/handle-service-selections

Can Now Select Auth Service

Author: lbedner

aegis/__main__.py

@@ -12,6 +12,7 @@
 
 from .commands.components import components_command
 from .commands.init import init_command
+from .commands.services import services_command
 from .commands.version import version_command
 
 # Create the main Typer application
@@ -32,6 +33,7 @@
 # Register commands
 app.command(name="version")(version_command)
 app.command(name="components")(components_command)
+app.command(name="services")(services_command)
 app.command(name="init")(init_command)
 
 

aegis/cli/callbacks.py

@@ -24,6 +24,11 @@ def validate_and_resolve_components(
     if not value:
         return None
 
+    # Skip validation during help generation, but not for tests
+    # Mock objects don't have a real resilient_parsing attribute set to True
+    if hasattr(ctx, "resilient_parsing") and ctx.resilient_parsing is True:
+        return None
+
     # Parse comma-separated string
     components_raw = [c.strip() for c in value.split(",")]
 
@@ -74,6 +79,11 @@ def validate_and_resolve_services(
     if not value:
         return None
 
+    # Skip validation during help generation, but not for tests
+    # Mock objects don't have a real resilient_parsing attribute set to True
+    if hasattr(ctx, "resilient_parsing") and ctx.resilient_parsing is True:
+        return None
+
     # Parse comma-separated string
     services_raw = [s.strip() for s in value.split(",")]
 

aegis/commands/init.py

@@ -142,11 +142,11 @@ def init_command(
                 clean_selected_only
             )
             if auto_added:
-                typer.echo(f"\\n📦 Auto-added dependencies: {', '.join(auto_added)}")
+                typer.echo(f"\n📦 Auto-added dependencies: {', '.join(auto_added)}")
 
     # Create template generator with scheduler backend context
     template_gen = TemplateGenerator(
-        project_name, list(selected_components), scheduler_backend
+        project_name, list(selected_components), scheduler_backend, selected_services
     )
 
     # Show selected configuration
@@ -176,28 +176,28 @@ def init_command(
     # Show template files that will be generated
     template_files = template_gen.get_template_files()
     if template_files:
-        typer.echo("\\n📄 Component Files:")
+        typer.echo("\n📄 Component Files:")
         for file_path in template_files:
             typer.echo(f"   • {file_path}")
 
     # Show entrypoints that will be created
     entrypoints = template_gen.get_entrypoints()
     if entrypoints:
-        typer.echo("\\n🚀 Entrypoints:")
+        typer.echo("\n🚀 Entrypoints:")
         for entrypoint in entrypoints:
             typer.echo(f"   • {entrypoint}")
 
     # Show worker queues that will be created
     worker_queues = template_gen.get_worker_queues()
     if worker_queues:
-        typer.echo("\\n👷 Worker Queues:")
+        typer.echo("\n👷 Worker Queues:")
         for queue in worker_queues:
             typer.echo(f"   • {queue}")
 
     # Show dependency information using template generator
     deps = template_gen._get_pyproject_deps()
     if deps:
-        typer.echo("\\n📦 Dependencies to be installed:")
+        typer.echo("\n📦 Dependencies to be installed:")
         for dep in deps:
             typer.echo(f"   • {dep}")
 

aegis/commands/services.py

@@ -0,0 +1,52 @@
+"""
+Services command implementation.
+"""
+
+import typer
+
+from ..core.services import ServiceType, get_services_by_type
+
+
+def services_command() -> None:
+    """List available services and their dependencies."""
+
+    typer.echo("\n🔧 AVAILABLE SERVICES")
+    typer.echo("=" * 40)
+
+    # Group services by type
+    service_types = [
+        (ServiceType.AUTH, "🔐 Authentication Services"),
+        (ServiceType.PAYMENT, "💰 Payment Services"),
+        (ServiceType.AI, "🤖 AI & Machine Learning Services"),
+        (ServiceType.NOTIFICATION, "📧 Notification Services"),
+        (ServiceType.ANALYTICS, "📊 Analytics Services"),
+        (ServiceType.STORAGE, "💾 Storage Services"),
+    ]
+
+    services_found = False
+    for service_type, header in service_types:
+        type_services = get_services_by_type(service_type)
+        if type_services:
+            services_found = True
+            typer.echo(f"\n{header}")
+            typer.echo("-" * 40)
+
+            for name, spec in type_services.items():
+                typer.echo(f"  {name:12} - {spec.description}")
+                if spec.required_components:
+                    typer.echo(
+                        f"               Requires components: {', '.join(spec.required_components)}"
+                    )
+                if spec.recommended_components:
+                    typer.echo(
+                        f"               Recommends components: {', '.join(spec.recommended_components)}"
+                    )
+                if spec.required_services:
+                    typer.echo(
+                        f"               Requires services: {', '.join(spec.required_services)}"
+                    )
+
+    if not services_found:
+        typer.echo("  No services available yet.")
+
+    typer.echo("\n💡 Use 'aegis init PROJECT_NAME --services auth' to add services")

aegis/core/template_generator.py

@@ -10,6 +10,7 @@
 
 from .component_utils import extract_base_component_name, extract_engine_info
 from .components import COMPONENTS
+from .services import SERVICES
 
 
 class TemplateGenerator:
@@ -20,6 +21,7 @@ def __init__(
         project_name: str,
         selected_components: list[str],
         scheduler_backend: str = "memory",
+        selected_services: list[str] | None = None,
     ):
         """
         Initialize template generator.
@@ -28,10 +30,12 @@ def __init__(
             project_name: Name of the project being generated
             selected_components: List of component names to include
             scheduler_backend: Scheduler backend: "memory", "sqlite", "postgres"
+            selected_services: List of service names to include
         """
         self.project_name = project_name
         self.project_slug = project_name.lower().replace(" ", "-").replace("_", "-")
         self.scheduler_backend = scheduler_backend
+        self.selected_services = selected_services or []
 
         # Always include core components
         all_components = ["backend", "frontend"] + selected_components
@@ -98,6 +102,8 @@ def get_template_context(self) -> dict[str, Any]:
                 name in self.components for name in ["worker", "scheduler"]
             ),
             "needs_redis": "redis" in self.components,
+            # Service flags for template conditionals
+            "include_auth": "yes" if "auth" in self.selected_services else "no",
             # Dependency lists for templates
             "selected_components": selected_only,  # Original selection for context
             "docker_services": self._get_docker_services(),
@@ -127,11 +133,20 @@ def _get_pyproject_deps(self) -> list[str]:
             Sorted list of Python package dependencies
         """
         deps = []
+        # Collect component dependencies
         for component_name in self.components:
             if component_name in self.component_specs:
                 spec = self.component_specs[component_name]
                 if spec.pyproject_deps:
                     deps.extend(spec.pyproject_deps)
+
+        # Collect service dependencies
+        for service_name in self.selected_services:
+            if service_name in SERVICES:
+                service_spec = SERVICES[service_name]
+                if service_spec.pyproject_deps:
+                    deps.extend(service_spec.pyproject_deps)
+
         return sorted(set(deps))  # Sort and deduplicate
 
     def get_template_files(self) -> list[str]:
@@ -142,12 +157,21 @@ def get_template_files(self) -> list[str]:
             List of template file paths
         """
         files = []
+        # Collect component template files
         for component_name in self.components:
             base_name = extract_base_component_name(component_name)
             if base_name in self.component_specs:
                 spec = self.component_specs[base_name]
                 if spec.template_files:
                     files.extend(spec.template_files)
+
+        # Collect service template files
+        for service_name in self.selected_services:
+            if service_name in SERVICES:
+                service_spec = SERVICES[service_name]
+                if service_spec.template_files:
+                    files.extend(service_spec.template_files)
+
         return list(dict.fromkeys(files))  # Preserve order, remove duplicates
 
     def get_entrypoints(self) -> list[str]:

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

@@ -17,6 +17,9 @@
   "scheduler_backend": "memory",
   "scheduler_with_persistence": "no",
 
+  "_comment_services": "Service selection - these will be set by our CLI",
+  "include_auth": "no",
+  
   "_comment_internal": "Internal variables for template logic",
   "_has_additional_components": "{% if cookiecutter.include_scheduler == 'yes' or cookiecutter.include_redis == 'yes' or cookiecutter.include_worker == 'yes' or cookiecutter.include_database == 'yes' or cookiecutter.include_cache == 'yes' %}yes{% else %}no{% endif %}",
 
@@ -25,5 +28,8 @@
   "_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' %}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 %}"
+  "_cache_deps": "{% if cookiecutter.include_cache == 'yes' %}redis[hiredis]>=5.0.0{% endif %}",
+  
+  "_comment_service_dependencies": "Service-specific dependencies",
+  "_auth_deps": "{% if cookiecutter.include_auth == 'yes' %}python-jose[cryptography]==3.3.0,passlib[bcrypt]==1.7.4,python-multipart==0.0.9{% endif %}"
 }

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

@@ -45,6 +45,7 @@ def process_j2_templates():
             "include_worker": "{{ cookiecutter.include_worker }}",
             "include_database": "{{ cookiecutter.include_database }}",
             "include_cache": "{{ cookiecutter.include_cache }}",
+            "include_auth": "{{ cookiecutter.include_auth }}",
         }
     }
 
@@ -173,6 +174,18 @@ def main():
         # remove_file("app/services/cache_service.py")
         pass  # Placeholder for cache component
 
+    # Remove services not selected
+    if "{{ cookiecutter.include_auth }}" != "yes":
+        # Remove auth service files
+        remove_dir("app/components/backend/api/auth")
+        remove_file("app/models/user.py")
+        remove_dir("app/services/auth")
+        remove_file("app/core/security.py")
+        # Remove auth-related tests if they exist
+        remove_file("tests/api/test_auth_endpoints.py")
+        remove_file("tests/services/test_auth_service.py")
+        remove_file("tests/models/test_user.py")
+
     # Clean up empty docs/components directory if no components selected
     if (
         "{{ cookiecutter.include_scheduler }}" != "yes"

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

@@ -0,0 +1 @@
+"""Auth API endpoints."""

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

@@ -0,0 +1,64 @@
+"""Authentication API routes."""
+
+from app.core.db import get_db_session
+from app.core.security import create_access_token, verify_password
+from app.models.user import UserCreate, UserResponse
+from app.services.auth.auth_service import get_current_user_from_token
+from app.services.auth.user_service import UserService
+from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from sqlmodel import Session
+
+router = APIRouter(prefix="/auth", tags=["authentication"])
+
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="auth/token")
+
+
+@router.post("/register", response_model=UserResponse)
+async def register(user_data: UserCreate, db: Session = Depends(get_db_session)):
+    """Register a new user."""
+    user_service = UserService(db)
+
+    # Check if user already exists
+    existing_user = user_service.get_user_by_email(user_data.email)
+    if existing_user:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST, detail="Email already registered"
+        )
+
+    # Create new user
+    user = user_service.create_user(user_data)
+    return UserResponse.model_validate(user)
+
+
+@router.post("/token")
+async def login(
+    form_data: OAuth2PasswordRequestForm = Depends(),
+    db: Session = Depends(get_db_session),
+):
+    """Login and get access token."""
+    user_service = UserService(db)
+
+    # Get user by email (username field in OAuth2 form)
+    user = user_service.get_user_by_email(form_data.username)
+
+    if not user or not verify_password(form_data.password, user.hashed_password):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Incorrect email or password",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+    # Create access token
+    access_token = create_access_token(data={"sub": user.email})
+    return {"access_token": access_token, "token_type": "bearer"}
+
+
+@router.get("/me", response_model=UserResponse)
+async def get_current_user(
+    token: str = Depends(oauth2_scheme),
+    db: Session = Depends(get_db_session),
+):
+    """Get current authenticated user."""
+    user = await get_current_user_from_token(token, db)
+    return UserResponse.model_validate(user)

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

@@ -55,6 +55,11 @@ class Settings(BaseSettings):
     # Flet frontend settings
     FLET_ASSETS_DIR: str = "assets"  # Directory for Flet static assets (images, etc.)
 
+    # Authentication settings
+    SECRET_KEY: str = "change-this-secret-key-in-production-use-env-variable"
+    JWT_ALGORITHM: str = "HS256"
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
+
 {% if cookiecutter.include_redis == "yes" %}
     # Redis settings for arq background tasks
     REDIS_URL: str = "redis://redis:6379"  # Docker service name by default