fastapi-spawn 0.4.21__tar.gz → 0.4.24__tar.gz

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-spawn
-Version: 0.4.21
+Version: 0.4.24
 Summary: A powerful CLI tool to scaffold production-ready FastAPI projects with flexible database, auth, broker, and deployment options.
 Project-URL: Homepage, https://github.com/Bishwajitgarai/fastapi-spawn
 Project-URL: Documentation, https://github.com/Bishwajitgarai/fastapi-spawn#readme
@@ -72,6 +72,11 @@ uv pip install fastapi-spawn
 # Interactive TUI — guided step-by-step
 fastapi-spawn new my-api
 
+# Or use a preset template (New in 0.4.24!)
+fastapi-spawn start basic my-api
+fastapi-spawn start full-local my-api
+fastapi-spawn start full my-api
+
 # Full stack one-liner
 fastapi-spawn new my-api \
   --db postgresql \
@@ -587,6 +592,13 @@ $ fastapi-spawn add websockets
 | `beanie` | mongodb |
 | `none` | any |
 
+## Recent Updates (v0.4.22)
+
+- **Ollama Integration**: Updated default model to `tinyllama` for faster testing.
+- **Supabase Fixes**: Fixed missing environment variables in configuration templates.
+- **Frontend & Admin Mounted**: Automatically mounts the static frontend at `/` and the `sqladmin` dashboard at `/admin` (if enabled).
+- **Service Health Checks**: Added connection checks for Elasticsearch, OpenSearch, Kafka, Vespa, Ollama, DuckDB, Chroma, and Supabase in the generated `/health/services` endpoint.
+
 ---
 
 ## Contributing

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/README.md

@@ -31,6 +31,11 @@ uv pip install fastapi-spawn
 # Interactive TUI — guided step-by-step
 fastapi-spawn new my-api
 
+# Or use a preset template (New in 0.4.24!)
+fastapi-spawn start basic my-api
+fastapi-spawn start full-local my-api
+fastapi-spawn start full my-api
+
 # Full stack one-liner
 fastapi-spawn new my-api \
   --db postgresql \
@@ -546,6 +551,13 @@ $ fastapi-spawn add websockets
 | `beanie` | mongodb |
 | `none` | any |
 
+## Recent Updates (v0.4.22)
+
+- **Ollama Integration**: Updated default model to `tinyllama` for faster testing.
+- **Supabase Fixes**: Fixed missing environment variables in configuration templates.
+- **Frontend & Admin Mounted**: Automatically mounts the static frontend at `/` and the `sqladmin` dashboard at `/admin` (if enabled).
+- **Service Health Checks**: Added connection checks for Elasticsearch, OpenSearch, Kafka, Vespa, Ollama, DuckDB, Chroma, and Supabase in the generated `/health/services` endpoint.
+
 ---
 
 ## Contributing

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/__init__.py

@@ -1,6 +1,6 @@
 """fastapi-spawn — Production-ready FastAPI project scaffolding CLI."""
 
-__version__ = "0.4.21"
+__version__ = "0.4.22"
 __author__ = "Bishwajit Garai"
 __email__ = "bishwajitgarai@gmail.com"
 __license__ = "MIT"

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/cli.py

@@ -219,6 +219,101 @@ def new(
     if not dry_run:
         console.print(f"\n[bold green]✓ Project created:[/bold green] {project_path.resolve()}")
         _print_next_steps(config)
+@app.command("start", help="Create a project using a preset template.")
+def start(
+    preset: str = typer.Argument(..., help="Preset name (basic, full)"),
+    project_name: str = typer.Argument(..., help="Name of the new project"),
+    output: Path = typer.Option(Path("."), "--output", "-o", help="Output directory"),
+    force: bool = typer.Option(False, "--force", "-f", help="Overwrite existing directory"),
+) -> None:
+    _print_banner()
+    
+    if preset == "basic":
+        config = ProjectConfig(
+            project_name=project_name,
+            db=Database.sqlite,
+            orm=ORM.sqlalchemy,
+            migration=MigrationTool.alembic,
+            auth=AuthType.jwt,
+            broker=Broker.none,
+            cache=Cache.none,
+            storage=Storage.local,
+            ai=AIProvider.none,
+            api_extra=APIExtra.none,
+            monitoring=MonitoringProvider.none,
+            log_lib=LogLibrary.loguru,
+            log_dest=LogDestination.local,
+            email=EmailProvider.none,
+            notify=NotificationProvider.none,
+            vector_db=VectorDB.none,
+            stack=Stack.minimal,
+            ci=CIProvider.none,
+            include_docker=True,
+            include_tests=True,
+            force=force,
+        )
+    elif preset == "full-local":
+        config = ProjectConfig(
+            project_name=project_name,
+            db=Database.postgresql,
+            orm=ORM.sqlalchemy,
+            migration=MigrationTool.alembic,
+            auth=AuthType.jwt,
+            broker=Broker.none,
+            cache=Cache.none,
+            storage=Storage.local,
+            ai=AIProvider.none,
+            api_extra=APIExtra.none,
+            monitoring=MonitoringProvider.none,
+            log_lib=LogLibrary.loguru,
+            log_dest=LogDestination.local,
+            email=EmailProvider.none,
+            notify=NotificationProvider.none,
+            vector_db=VectorDB.chroma,
+            stack=Stack.standard,
+            ci=CIProvider.none,
+            include_docker=True,
+            include_tests=True,
+            force=force,
+        )
+    elif preset == "full":
+        config = ProjectConfig(
+            project_name=project_name,
+            db=Database.postgresql,
+            orm=ORM.sqlalchemy,
+            migration=MigrationTool.alembic,
+            auth=AuthType.jwt,
+            broker=Broker.redis,
+            cache=Cache.redis,
+            storage=Storage.s3,
+            ai=AIProvider.openai,
+            api_extra=APIExtra.websockets,
+            monitoring=MonitoringProvider.both,
+            log_lib=LogLibrary.loguru,
+            log_dest=LogDestination.local,
+            email=EmailProvider.none,
+            notify=NotificationProvider.none,
+            vector_db=VectorDB.qdrant,
+            stack=Stack.full,
+            ci=CIProvider.github,
+            include_docker=True,
+            include_tests=True,
+            force=force,
+        )
+    else:
+        rprint(f"[bold red]✗ Error:[/bold red] Unknown preset '{preset}'. Available presets: basic, full-local, full")
+        raise typer.Exit(1)
+
+    _print_summary(config)
+
+    try:
+        generator = ProjectGenerator(config, output)
+        project_path = generator.generate()
+        rprint(f"\n[bold green]✓ Project created:[/bold green] {project_path.resolve()}")
+        _print_next_steps(config)
+    except Exception as exc:
+        rprint(f"\n[bold red]✗ Generation failed:[/bold red] {exc}")
+        raise typer.Exit(1) from exc
 
 
 # ── `list-templates` command ───────────────────────────────────────────────────

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/interactive.py

@@ -19,6 +19,10 @@ from fastapi_spawn.constants import (
     ORM,
     ORM_DB_COMPAT,
     Stack,
+    Storage,
+    AIProvider,
+    MonitoringProvider,
+    VectorDB,
 )
 from fastapi_spawn.validators import questionary_validator, validate_project_name
 
@@ -47,8 +51,8 @@ def prompt_project_name(default: str = "") -> str:
 
 def prompt_database() -> Database:
     choices = [
-        questionary.Choice(title=label, value=db)
-        for db, label in DB_LABELS.items()
+        questionary.Choice(title=f"{i}) {label}", value=db)
+        for i, (db, label) in enumerate(DB_LABELS.items(), 1)
     ]
     return questionary.select(
         "Database backend:",
@@ -68,7 +72,7 @@ def prompt_orm(db: Database) -> ORM:
         orm for orm in ORM
         if db in ORM_DB_COMPAT.get(orm, compatible)
     ]
-    choices = [questionary.Choice(title=o.value, value=o) for o in valid_orms]
+    choices = [questionary.Choice(title=f"{i}) {o.value}", value=o) for i, o in enumerate(valid_orms, 1)]
     if not choices:
         return ORM.none
     return questionary.select(
@@ -80,8 +84,8 @@ def prompt_orm(db: Database) -> ORM:
 
 def prompt_auth() -> AuthType:
     choices = [
-        questionary.Choice(title=label, value=auth)
-        for auth, label in AUTH_LABELS.items()
+        questionary.Choice(title=f"{i}) {label}", value=auth)
+        for i, (auth, label) in enumerate(AUTH_LABELS.items(), 1)
     ]
     return questionary.select(
         "Authentication strategy:",
@@ -92,8 +96,8 @@ def prompt_auth() -> AuthType:
 
 def prompt_broker() -> Broker:
     choices = [
-        questionary.Choice(title=label, value=broker)
-        for broker, label in BROKER_LABELS.items()
+        questionary.Choice(title=f"{i}) {label}", value=broker)
+        for i, (broker, label) in enumerate(BROKER_LABELS.items(), 1)
     ]
     return questionary.select(
         "Message broker:",
@@ -104,8 +108,8 @@ def prompt_broker() -> Broker:
 
 def prompt_cache() -> Cache:
     choices = [
-        questionary.Choice(title=c.value, value=c)
-        for c in Cache
+        questionary.Choice(title=f"{i}) {c.value}", value=c)
+        for i, c in enumerate(Cache, 1)
     ]
     return questionary.select(
         "Cache layer:",
@@ -116,8 +120,8 @@ def prompt_cache() -> Cache:
 
 def prompt_stack() -> Stack:
     choices = [
-        questionary.Choice(title=f"{s.value}  —  {STACK_DESCRIPTIONS[s]}", value=s)
-        for s in Stack
+        questionary.Choice(title=f"{i}) {s.value}  —  {STACK_DESCRIPTIONS[s]}", value=s)
+        for i, s in enumerate(Stack, 1)
     ]
     return questionary.select(
         "Deployment stack:",
@@ -128,8 +132,8 @@ def prompt_stack() -> Stack:
 
 def prompt_ci() -> CIProvider:
     choices = [
-        questionary.Choice(title=c.value, value=c)
-        for c in CIProvider
+        questionary.Choice(title=f"{i}) {c.value}", value=c)
+        for i, c in enumerate(CIProvider, 1)
     ]
     return questionary.select(
         "CI/CD provider:",
@@ -140,8 +144,8 @@ def prompt_ci() -> CIProvider:
 
 def prompt_log_lib() -> LogLibrary:
     choices = [
-        questionary.Choice(title=l.value, value=l)
-        for l in LogLibrary
+        questionary.Choice(title=f"{i}) {l.value}", value=l)
+        for i, l in enumerate(LogLibrary, 1)
     ]
     return questionary.select(
         "Logging library:",
@@ -150,6 +154,74 @@ def prompt_log_lib() -> LogLibrary:
     ).unsafe_ask()
 
 
+def prompt_storage() -> Storage:
+    use_storage = questionary.confirm(
+        "Do you need file storage?", default=False, style=SPAWN_STYLE
+    ).unsafe_ask()
+    if not use_storage:
+        return Storage.none
+    choices = [
+        questionary.Choice(title=f"{i}) {s.value}", value=s)
+        for i, s in enumerate(Storage, 1) if s != Storage.none
+    ]
+    return questionary.select(
+        "Storage provider:",
+        choices=choices,
+        style=SPAWN_STYLE,
+    ).unsafe_ask()
+
+
+def prompt_ai() -> AIProvider:
+    use_ai = questionary.confirm(
+        "Do you need AI/LLM integration?", default=False, style=SPAWN_STYLE
+    ).unsafe_ask()
+    if not use_ai:
+        return AIProvider.none
+    choices = [
+        questionary.Choice(title=f"{i}) {a.value}", value=a)
+        for i, a in enumerate(AIProvider, 1) if a != AIProvider.none
+    ]
+    return questionary.select(
+        "AI provider:",
+        choices=choices,
+        style=SPAWN_STYLE,
+    ).unsafe_ask()
+
+
+def prompt_vector_db() -> VectorDB:
+    use_vdb = questionary.confirm(
+        "Do you need a Vector Database?", default=False, style=SPAWN_STYLE
+    ).unsafe_ask()
+    if not use_vdb:
+        return VectorDB.none
+    choices = [
+        questionary.Choice(title=f"{i}) {v.value}", value=v)
+        for i, v in enumerate(VectorDB, 1) if v != VectorDB.none
+    ]
+    return questionary.select(
+        "Vector database:",
+        choices=choices,
+        style=SPAWN_STYLE,
+    ).unsafe_ask()
+
+
+def prompt_monitoring() -> MonitoringProvider:
+    use_mon = questionary.confirm(
+        "Do you need Monitoring?", default=False, style=SPAWN_STYLE
+    ).unsafe_ask()
+    if not use_mon:
+        return MonitoringProvider.none
+    choices = [
+        questionary.Choice(title=f"{i}) {m.value}", value=m)
+        for i, m in enumerate(MonitoringProvider, 1) if m != MonitoringProvider.none
+    ]
+    return questionary.select(
+        "Monitoring provider:",
+        choices=choices,
+        style=SPAWN_STYLE,
+    ).unsafe_ask()
+
+
 def prompt_flags() -> tuple[bool, bool]:
     """Returns (include_docker, include_tests)."""
     include_docker = questionary.confirm(
@@ -175,6 +247,10 @@ def run_interactive_flow(project_name: str = "") -> dict:
     stack = prompt_stack()
     ci = prompt_ci()
     log_lib = prompt_log_lib()
+    storage = prompt_storage()
+    ai = prompt_ai()
+    vector_db = prompt_vector_db()
+    monitoring = prompt_monitoring()
     include_docker, include_tests = prompt_flags()
 
     return {
@@ -187,6 +263,10 @@ def run_interactive_flow(project_name: str = "") -> dict:
         "stack": stack,
         "ci": ci,
         "log_lib": log_lib,
+        "storage": storage,
+        "ai": ai,
+        "vector_db": vector_db,
+        "monitoring": monitoring,
         "include_docker": include_docker,
         "include_tests": include_tests,
     }

fastapi_spawn-0.4.24/fastapi_spawn/templates/app/api/v1/health/router.py.j2

@@ -0,0 +1,85 @@
+"""Health check endpoints — /health, /readiness, /liveness."""
+
+from __future__ import annotations
+
+import time
+
+from fastapi import APIRouter
+from pydantic import BaseModel
+
+router = APIRouter(prefix="/health")
+
+_start_time = time.time()
+
+
+class HealthResponse(BaseModel):
+    status: str
+    uptime_seconds: float
+    version: str = "0.1.0"
+    service: str = "{{ project_name }}"
+
+
+@router.get("", response_model=HealthResponse, summary="Basic health check")
+async def health() -> HealthResponse:
+    """Returns service status and uptime."""
+    return HealthResponse(
+        status="ok",
+        uptime_seconds=round(time.time() - _start_time, 2),
+    )
+
+
+@router.get("/services", summary="Check external services status")
+async def check_services() -> dict:
+    """Checks connection to external services."""
+    results = {}
+    
+{% if vector_db == "elasticsearch" %}
+    try:
+        import urllib.request
+        from app.core.config import settings
+        response = urllib.request.urlopen(settings.elasticsearch_url, timeout=5)
+        if response.status == 200:
+            results["elasticsearch"] = "connected"
+        else:
+            results["elasticsearch"] = f"failed with status {response.status}"
+    except Exception as e:
+        results["elasticsearch"] = f"error: {e}"
+{% endif %}
+
+{% if vector_db == "opensearch" %}
+    try:
+        import urllib.request
+        from app.core.config import settings
+        response = urllib.request.urlopen(settings.opensearch_url, timeout=5)
+        if response.status == 200:
+            results["opensearch"] = "connected"
+        else:
+            results["opensearch"] = f"failed with status {response.status}"
+    except Exception as e:
+        results["opensearch"] = f"error: {e}"
+{% endif %}
+
+{% if broker == "kafka" %}
+    try:
+        from app.core.kafka import kafka_producer
+        if kafka_producer.producer:
+            results["kafka"] = "connected"
+        else:
+            results["kafka"] = "not_started"
+    except Exception as e:
+        results["kafka"] = f"error: {e}"
+{% endif %}
+
+    return results
+
+
+@router.get("/readiness", summary="Readiness probe (Kubernetes)")
+async def readiness() -> dict:
+    """Indicates whether the service is ready to accept traffic."""
+    return {"status": "ready"}
+
+
+@router.get("/liveness", summary="Liveness probe (Kubernetes)")
+async def liveness() -> dict:
+    """Indicates whether the service process is alive."""
+    return {"status": "alive"}

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/app/api/v1/router.py.j2

@@ -7,6 +7,12 @@ from app.api.v1.auth.router import router as auth_router
 {% if has_websockets %}
 from app.api.v1.ws.router import router as ws_router
 {% endif %}
+{% if "rbac" in extras %}
+from app.api.v1.permissions.router import router as permissions_router
+{% endif %}
+{% if "uploads" in extras %}
+from app.api.v1.uploads.router import router as uploads_router
+{% endif %}
 
 
 router = APIRouter()
@@ -18,3 +24,9 @@ router.include_router(auth_router)
 {% if has_websockets %}
 router.include_router(ws_router)
 {% endif %}
+{% if "rbac" in extras %}
+router.include_router(permissions_router)
+{% endif %}
+{% if "uploads" in extras %}
+router.include_router(uploads_router)
+{% endif %}

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/app/api/v1/uploads/router.py.j2

@@ -2,6 +2,7 @@ from fastapi import APIRouter, UploadFile, File, HTTPException
 import shutil
 import os
 import uuid
+from app.core.config import settings
 
 router = APIRouter(
     prefix="/uploads",
@@ -25,7 +26,7 @@ async def upload_file(file: UploadFile = File(...)):
     safe_filename = f"{uuid.uuid4().hex}{ext}"
     
     # Save locally as an example
-    upload_dir = "media"
+    upload_dir = settings.LOCAL_STORAGE_DIR
     os.makedirs(upload_dir, exist_ok=True)
     file_path = os.path.join(upload_dir, safe_filename)
     

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/app/core/config.py.j2

@@ -49,6 +49,7 @@ class Settings(BaseSettings):
     LOG_LEVEL: str = "INFO"
     LOG_DIR: str = "logs"
     LOG_BACKUP_DAYS: int = 30
+    LOCAL_STORAGE_DIR: str = "media"
 
 {% if db == "postgresql" %}
     # ── PostgreSQL ─────────────────────────────────────────────────────────
@@ -178,13 +179,18 @@ class Settings(BaseSettings):
     # ── Ollama (local) ─────────────────────────────────────────────────────
     OLLAMA_HOST: str = "localhost"
     OLLAMA_PORT: str = "11434"
-    OLLAMA_MODEL: str = "llama3"
+    OLLAMA_MODEL: str = "tinyllama"
 
     @property
     def ollama_url(self) -> str:
         return f"http://{self.OLLAMA_HOST}:{self.OLLAMA_PORT}"
 
 {% endif %}
+{% if db == "supabase" or vector_db == "supabase" %}
+    # ── Supabase ───────────────────────────────────────────────────────────
+    SUPABASE_URL: str = ""
+    SUPABASE_KEY: str = ""
+{% endif %}
 {% if has_sentry %}
     # ── Sentry ─────────────────────────────────────────────────────────────
     SENTRY_DSN: str = ""

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/app/db/session.py.j2

@@ -72,6 +72,11 @@ from beanie import init_beanie
 
 from app.core.config import settings
 
+# Workaround for Beanie/Motor compatibility issue on Python 3.12
+if not hasattr(motor.motor_asyncio.AsyncIOMotorClient, "append_metadata"):
+    def append_metadata(self, metadata):
+        pass
+    motor.motor_asyncio.AsyncIOMotorClient.append_metadata = append_metadata
 
 async def init_db() -> None:
     client = motor.motor_asyncio.AsyncIOMotorClient(settings.mongodb_url)

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/app/main.py.j2

@@ -66,6 +66,25 @@ def create_application() -> FastAPI:
     application.include_router(graphql_router, prefix="/graphql")
 {% endif %}
 
+{% if "admin" in extras %}
+    # Mount Admin
+    try:
+        from app.admin.setup import setup_admin
+        from app.db.session import engine
+        setup_admin(application, engine)
+    except Exception as e:
+        import logging
+        logging.warning(f"Failed to setup admin: {e}")
+{% endif %}
+
+    # Mount StaticFiles for frontend (must be last)
+    from fastapi.staticfiles import StaticFiles
+    import os
+    current_dir = os.path.dirname(__file__)
+    frontend_path = os.path.join(current_dir, "frontend")
+    if os.path.exists(frontend_path):
+        application.mount("/", StaticFiles(directory=frontend_path, html=True), name="frontend")
+
     return application
 
 

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/base/env_example.j2

@@ -174,7 +174,7 @@ GEMINI_MODEL=gemini-1.5-pro
 # Ollama — local LLM, no API key (active)
 OLLAMA_HOST=localhost
 OLLAMA_PORT=11434
-OLLAMA_MODEL=llama3
+OLLAMA_MODEL=tinyllama
 {% elif ai == "langchain" %}
 # LangChain (active) — uses OpenAI backend by default
 OPENAI_API_KEY=sk-placeholder
@@ -192,7 +192,7 @@ OPENAI_BASE_URL=
 # OpenAI:     OPENAI_API_KEY=sk-placeholder | OPENAI_MODEL=gpt-4o | OPENAI_EMBEDDING_MODEL=text-embedding-3-small | OPENAI_BASE_URL=
 # Anthropic:  ANTHROPIC_API_KEY=sk-ant-placeholder | ANTHROPIC_MODEL=claude-3-5-sonnet-20241022
 # Gemini:     GEMINI_API_KEY=CHANGE_ME | GEMINI_MODEL=gemini-1.5-pro
-# Ollama:     OLLAMA_HOST=localhost | OLLAMA_PORT=11434 | OLLAMA_MODEL=llama3  (no API key)
+# Ollama:     OLLAMA_HOST=localhost | OLLAMA_PORT=11434 | OLLAMA_MODEL=tinyllama  (no API key)
 # LangChain:  uses OPENAI_* vars above
 # LlamaIndex: uses OPENAI_* vars above
 {% endif %}

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/fastapi_spawn/templates/base/pyproject.toml.j2

@@ -42,8 +42,8 @@ dependencies = [
     "aerich>=0.7.2",
 {% endif %}
 {% if has_mongo and orm == "beanie" %}
-    "beanie>=1.25.0",
-    "motor>=3.4.0",
+    "beanie>=1.27.0",
+    "motor>=3.3.0",
 {% endif %}
 
 {% if auth == "jwt" or auth == "oauth2" %}

fastapi_spawn-0.4.24/fastapi_spawn/templates/docker/docker-compose.yml.j2

@@ -0,0 +1,272 @@
+services:
+  app:
+    build: .
+    ports:
+      - "8000:8000"
+    env_file:
+      - .env
+{% if (has_relational_db and db != "sqlite") or has_mongo or broker == "redis" or cache == "redis" or broker == "rabbitmq" %}
+    depends_on:
+{% if has_relational_db and db == "postgresql" %}
+      postgres:
+        condition: service_healthy
+{% endif %}
+{% if has_relational_db and db == "mysql" %}
+      mysql:
+        condition: service_healthy
+{% endif %}
+{% if has_mongo %}
+      mongodb:
+        condition: service_healthy
+{% endif %}
+{% if broker == "redis" or cache == "redis" %}
+      redis:
+        condition: service_healthy
+{% endif %}
+{% if broker == "rabbitmq" %}
+      rabbitmq:
+        condition: service_healthy
+{% endif %}
+{% endif %}
+    volumes:
+      - .:/app
+{% if (has_relational_db and db != "sqlite") or has_mongo or broker == "redis" or cache == "redis" or broker == "rabbitmq" or vector_db == "qdrant" or vector_db == "elasticsearch" or vector_db == "opensearch" or ai == "ollama" %}
+    environment:
+{% if has_relational_db and db == "postgresql" %}
+      - POSTGRES_HOST=postgres
+{% endif %}
+{% if has_relational_db and db == "mysql" %}
+      - MYSQL_HOST=mysql
+{% endif %}
+{% if has_mongo %}
+      - MONGODB_HOST=mongodb
+{% endif %}
+{% if broker == "redis" or cache == "redis" %}
+      - REDIS_HOST=redis
+{% endif %}
+{% if broker == "rabbitmq" %}
+      - RABBITMQ_HOST=rabbitmq
+{% endif %}
+{% if vector_db == "elasticsearch" %}
+      - ELASTICSEARCH_HOST=elasticsearch
+{% endif %}
+{% if vector_db == "opensearch" %}
+      - OPENSEARCH_HOST=opensearch
+{% endif %}
+{% if vector_db == "qdrant" %}
+      - QDRANT_HOST=qdrant
+{% endif %}
+{% if ai == "ollama" %}
+      - OLLAMA_HOST=ollama
+{% endif %}
+{% endif %}
+    restart: unless-stopped
+
+{% if has_broker and broker != "kafka" %}
+  worker:
+    build: .
+    command: celery -A tasks.celery_app worker --loglevel=info --concurrency=2
+    env_file:
+      - .env
+    depends_on:
+      - app
+    environment:
+{% if has_relational_db and db == "postgresql" %}
+      - POSTGRES_HOST=postgres
+{% endif %}
+{% if has_relational_db and db == "mysql" %}
+      - MYSQL_HOST=mysql
+{% endif %}
+{% if broker == "redis" or cache == "redis" %}
+      - REDIS_HOST=redis
+{% endif %}
+{% if broker == "rabbitmq" %}
+      - RABBITMQ_HOST=rabbitmq
+{% endif %}
+    restart: unless-stopped
+{% endif %}
+
+{% if has_relational_db and db == "postgresql" %}
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_DB: {{ slug }}_db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d {{ slug }}_db"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+{% endif %}
+
+{% if has_relational_db and db == "mysql" %}
+  mysql:
+    image: mysql:8
+    environment:
+      MYSQL_DATABASE: {{ slug }}_db
+      MYSQL_ROOT_PASSWORD: ${MYSQL_PASSWORD:-mysql}
+    ports:
+      - "3306:3306"
+    volumes:
+      - mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+{% endif %}
+
+{% if has_mongo %}
+  mongodb:
+    image: mongo:7
+    ports:
+      - "27017:27017"
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=${MONGODB_USER:-mongo}
+      - MONGO_INITDB_ROOT_PASSWORD=${MONGODB_PASSWORD:-mongo}
+    volumes:
+      - mongo_data:/data/db
+    healthcheck:
+      test: ["CMD-SHELL", "mongosh --eval 'db.runCommand({ping: 1})' --quiet"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+{% endif %}
+
+{% if broker == "redis" or cache == "redis" %}
+  redis:
+    image: redis:7-alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis_data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 3s
+      retries: 3
+{% endif %}
+
+{% if broker == "rabbitmq" %}
+  rabbitmq:
+    image: rabbitmq:3-management-alpine
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    environment:
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER:-guest}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD:-guest}
+    healthcheck:
+      test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+{% endif %}
+
+{% if vector_db == "qdrant" %}
+  qdrant:
+    image: qdrant/qdrant:latest
+    ports:
+      - "6333:6333"
+    volumes:
+      - qdrant_data:/qdrant/storage
+{% endif %}
+
+{% if vector_db == "elasticsearch" %}
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ports:
+      - "9200:9200"
+    volumes:
+      - es_data:/usr/share/elasticsearch/data
+{% endif %}
+
+{% if vector_db == "opensearch" %}
+  opensearch:
+    image: opensearchproject/opensearch:2.11.0
+    environment:
+      - discovery.type=single-node
+      - plugins.security.disabled=true
+      - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m
+    ports:
+      - "9200:9200"
+    volumes:
+      - opensearch_data:/usr/share/opensearch/data
+{% endif %}
+
+{% if ai == "ollama" %}
+  ollama:
+    image: ollama/ollama:latest
+    ports:
+      - "11434:11434"
+    volumes:
+      - ollama_data:/root/.ollama
+{% endif %}
+
+{% if broker == "kafka" %}
+  kafka:
+    image: confluentinc/cp-kafka:7.5.0
+    ports:
+      - "9092:9092"
+    environment:
+      - KAFKA_NODE_ID=1
+      - KAFKA_PROCESS_ROLES=broker,controller
+      - KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
+      - KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER
+      - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      - KAFKA_CONTROLLER_QUORUM_VOTERS=1@localhost:9093
+      - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
+      - KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1
+      - KAFKA_TRANSACTION_STATE_LOG_MIN_ISR=1
+      - CLUSTER_ID=MkU3OEVBNTcwNTJENDM2Qk
+{% endif %}
+
+{% if vector_db == "vespa" %}
+  vespa:
+    image: vespaengine/vespa
+    ports:
+      - "8080:8080"
+    volumes:
+      - vespa_data:/opt/vespa/var
+{% endif %}
+
+{% if (has_relational_db and db != "sqlite") or has_mongo or broker == "redis" or cache == "redis" or vector_db == "qdrant" or vector_db == "elasticsearch" or vector_db == "opensearch" or ai == "ollama" or vector_db == "vespa" %}
+volumes:
+{% if has_relational_db and db == "postgresql" %}
+  postgres_data:
+{% endif %}
+{% if has_relational_db and db == "mysql" %}
+  mysql_data:
+{% endif %}
+{% if has_mongo %}
+  mongo_data:
+{% endif %}
+{% if broker == "redis" or cache == "redis" %}
+  redis_data:
+{% endif %}
+{% if vector_db == "qdrant" %}
+  qdrant_data:
+{% endif %}
+{% if vector_db == "elasticsearch" %}
+  es_data:
+{% endif %}
+{% if vector_db == "opensearch" %}
+  opensearch_data:
+{% endif %}
+{% if ai == "ollama" %}
+  ollama_data:
+{% endif %}
+{% if vector_db == "vespa" %}
+  vespa_data:
+{% endif %}
+{% endif %}

{fastapi_spawn-0.4.21 → fastapi_spawn-0.4.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi-spawn"
-version = "0.4.21"
+version = "0.4.24"
 description = "A powerful CLI tool to scaffold production-ready FastAPI projects with flexible database, auth, broker, and deployment options."
 readme = "README.md"
 license = { text = "MIT" }

fastapi_spawn-0.4.21/fastapi_spawn/templates/app/api/v1/health/router.py.j2

@@ -1,40 +0,0 @@
-"""Health check endpoints — /health, /readiness, /liveness."""
-
-from __future__ import annotations
-
-import time
-
-from fastapi import APIRouter
-from pydantic import BaseModel
-
-router = APIRouter(prefix="/health")
-
-_start_time = time.time()
-
-
-class HealthResponse(BaseModel):
-    status: str
-    uptime_seconds: float
-    version: str = "0.1.0"
-    service: str = "{{ project_name }}"
-
-
-@router.get("", response_model=HealthResponse, summary="Basic health check")
-async def health() -> HealthResponse:
-    """Returns service status and uptime."""
-    return HealthResponse(
-        status="ok",
-        uptime_seconds=round(time.time() - _start_time, 2),
-    )
-
-
-@router.get("/readiness", summary="Readiness probe (Kubernetes)")
-async def readiness() -> dict:
-    """Indicates whether the service is ready to accept traffic."""
-    return {"status": "ready"}
-
-
-@router.get("/liveness", summary="Liveness probe (Kubernetes)")
-async def liveness() -> dict:
-    """Indicates whether the service process is alive."""
-    return {"status": "alive"}

fastapi_spawn-0.4.21/fastapi_spawn/templates/docker/docker-compose.yml.j2

@@ -1,111 +0,0 @@
-services:
-  app:
-    build: .
-    ports:
-      - "8000:8000"
-    env_file:
-      - .env
-    depends_on:
-{% if has_relational_db and db == "postgresql" %}
-      - postgres
-{% endif %}
-{% if has_mongo %}
-      - mongodb
-{% endif %}
-{% if broker == "redis" or cache == "redis" %}
-      - redis
-{% endif %}
-{% if broker == "rabbitmq" %}
-      - rabbitmq
-{% endif %}
-    volumes:
-      - .:/app
-    environment:
-{% if has_relational_db and db == "postgresql" %}
-      - POSTGRES_HOST=postgres
-{% endif %}
-{% if broker == "redis" or cache == "redis" %}
-      - REDIS_HOST=redis
-{% endif %}
-    restart: unless-stopped
-
-{% if has_broker and broker != "kafka" %}
-  worker:
-    build: .
-    command: celery -A tasks.celery_app worker --loglevel=info --concurrency=2
-    env_file:
-      - .env
-    depends_on:
-      - app
-    environment:
-{% if has_relational_db and db == "postgresql" %}
-      - POSTGRES_HOST=postgres
-{% endif %}
-{% if broker == "redis" or cache == "redis" %}
-      - REDIS_HOST=redis
-{% endif %}
-    restart: unless-stopped
-{% endif %}
-
-{% if has_relational_db and db == "postgresql" %}
-  postgres:
-    image: postgres:16-alpine
-    environment:
-      POSTGRES_DB: {{ slug }}_db
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U user -d {{ slug }}_db"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-{% endif %}
-
-{% if has_mongo %}
-  mongodb:
-    image: mongo:7
-    ports:
-      - "27017:27017"
-    volumes:
-      - mongo_data:/data/db
-{% endif %}
-
-{% if broker == "redis" or cache == "redis" %}
-  redis:
-    image: redis:7-alpine
-    ports:
-      - "6379:6379"
-    volumes:
-      - redis_data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 3s
-      retries: 3
-{% endif %}
-
-{% if broker == "rabbitmq" %}
-  rabbitmq:
-    image: rabbitmq:3-management-alpine
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    environment:
-      RABBITMQ_DEFAULT_USER: guest
-      RABBITMQ_DEFAULT_PASS: guest
-{% endif %}
-
-volumes:
-{% if has_relational_db and db == "postgresql" %}
-  postgres_data:
-{% endif %}
-{% if has_mongo %}
-  mongo_data:
-{% endif %}
-{% if broker == "redis" or cache == "redis" %}
-  redis_data:
-{% endif %}