fastapi-spawn 0.4.1__tar.gz → 0.4.3__tar.gz

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/.gitignore

@@ -51,3 +51,5 @@ Thumbs.db
 
 # Hatch / build backends
 .hatch/
+
+.test/

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-spawn
-Version: 0.4.1
+Version: 0.4.3
 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
@@ -110,9 +110,13 @@ my-api/
 │   ├── api/
 │   │   ├── graphql.py           # Strawberry GraphQL schema + IDE (if graphql)
 │   │   └── v1/
-│   │       ├── health.py        # GET /health  /readiness  /liveness
-│   │       ├── auth.py          # POST /auth/login  /auth/refresh
-│   │       └── ws.py            # WebSocket /ws/connect  /ws/connect/{room_id}
+│   │       ├── router.py        # Central API router aggregating sub-routers
+│   │       ├── health/
+│   │       │   └── router.py    # GET /health  /readiness  /liveness
+│   │       ├── auth/
+│   │       │   └── router.py    # POST /auth/login  /auth/refresh (if auth)
+│   │       └── ws/
+│   │           └── router.py    # WebSocket /ws/connect (if websockets)
 │   ├── core/
 │   │   ├── config.py            # Pydantic Settings v2 — individual env fields + @property URLs
 │   │   ├── logger.py            # Context-var logger — request ID, client IP, file rotation

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/README.md

@@ -69,9 +69,13 @@ my-api/
 │   ├── api/
 │   │   ├── graphql.py           # Strawberry GraphQL schema + IDE (if graphql)
 │   │   └── v1/
-│   │       ├── health.py        # GET /health  /readiness  /liveness
-│   │       ├── auth.py          # POST /auth/login  /auth/refresh
-│   │       └── ws.py            # WebSocket /ws/connect  /ws/connect/{room_id}
+│   │       ├── router.py        # Central API router aggregating sub-routers
+│   │       ├── health/
+│   │       │   └── router.py    # GET /health  /readiness  /liveness
+│   │       ├── auth/
+│   │       │   └── router.py    # POST /auth/login  /auth/refresh (if auth)
+│   │       └── ws/
+│   │           └── router.py    # WebSocket /ws/connect (if websockets)
 │   ├── core/
 │   │   ├── config.py            # Pydantic Settings v2 — individual env fields + @property URLs
 │   │   ├── logger.py            # Context-var logger — request ID, client IP, file rotation

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/__init__.py

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

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/generator.py

@@ -173,11 +173,15 @@ class ProjectGenerator:
         v1 = api / "v1"
         v1.mkdir()
         self._render_to(v1 / "__init__.py", "app/__init__.py.j2")
-        self._render_to(v1 / "health.py", "app/api/v1/health.py.j2")
+        self._render_to(v1 / "router.py", "app/api/v1/router.py.j2")
+        (v1 / "health").mkdir()
+        self._render_to(v1 / "health" / "router.py", "app/api/v1/health/router.py.j2")
         if self.config.has_auth:
-            self._render_to(v1 / "auth.py", "app/api/v1/auth.py.j2")
+            (v1 / "auth").mkdir()
+            self._render_to(v1 / "auth" / "router.py", "app/api/v1/auth/router.py.j2")
         if self.config.has_websockets:
-            self._render_to(v1 / "ws.py", "app/api/v1/ws.py.j2")
+            (v1 / "ws").mkdir()
+            self._render_to(v1 / "ws" / "router.py", "app/api/v1/ws/router.py.j2")
             self._render_to(core / "ws_manager.py", "app/core/ws_manager.py.j2")
         if self.config.has_graphql:
             self._render_to(api / "graphql.py", "app/api/graphql.py.j2")
@@ -287,9 +291,13 @@ class ProjectGenerator:
         if cfg.has_s3:         core_items += "  storage.py"
         if cfg.has_ai:         core_items += "  ai.py"
         app.add(f"[blue]core/[/blue]  {core_items}")
-        api = app.add("[blue]api/[/blue]  deps.py")
-        v1 = "health.py" + ("  auth.py" if cfg.has_auth else "")
-        api.add(f"[blue]v1/[/blue]  {v1}")
+        api = app.add("[blue]api/[/blue]  deps.py  [dim]graphql.py[/dim]?")
+        v1 = api.add("[blue]v1/[/blue]  router.py")
+        v1.add("[blue]health/[/blue]  router.py")
+        if cfg.has_auth:
+            v1.add("[blue]auth/[/blue]  router.py")
+        if cfg.has_websockets:
+            v1.add("[blue]ws/[/blue]  router.py")
         if cfg.db.value != "none":
             app.add("[blue]db/[/blue]  session.py")
         for sub in ("models/", "schemas/", "services/", "repositories/"):

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/templates/app/api/graphql.py.j2

@@ -93,6 +93,6 @@ schema = strawberry.Schema(
 # Mount with: app.include_router(graphql_router, prefix="/graphql")
 graphql_router = GraphQLRouter(
     schema,
-    graphiql=True,          # GraphiQL IDE at /graphql — disable in production
+    graphql_ide="graphiql",
     subscription_protocols=["graphql-transport-ws", "graphql-ws"],
 )

fastapi_spawn-0.4.3/fastapi_spawn/templates/app/api/v1/router.py.j2

@@ -0,0 +1,20 @@
+from fastapi import APIRouter
+
+from app.api.v1.health.router import router as health_router
+{% if has_auth %}
+from app.api.v1.auth.router import router as auth_router
+{% endif %}
+{% if has_websockets %}
+from app.api.v1.ws.router import router as ws_router
+{% endif %}
+
+
+router = APIRouter()
+
+router.include_router(health_router)
+{% if has_auth %}
+router.include_router(auth_router)
+{% endif %}
+{% if has_websockets %}
+router.include_router(ws_router)
+{% endif %}

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/templates/app/core/config.py.j2

@@ -3,9 +3,9 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import Any
+from typing import Any, Optional
 
-from pydantic import field_validator
+from pydantic import ConfigDict, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
@@ -24,7 +24,15 @@ class Settings(BaseSettings):
     ENVIRONMENT: str = "dev"
     API_V1_PREFIX: str = "/api/v1"
     SECRET_KEY: str = "change-me"
-    CORS_ORIGINS: list[str] = ["http://localhost:3000", "http://localhost:8000"]
+    CORS_ORIGINS: str | list[str] = ["http://localhost:3000", "http://localhost:8000"]
+
+    @field_validator("CORS_ORIGINS", mode="before")
+    def parse_cors(cls, v: Any) -> list[str]:
+        if isinstance(v, str) and not v.startswith("["):
+            return [i.strip() for i in v.split(",") if i.strip()]
+        if isinstance(v, list):
+            return v
+        return []
 
     @property
     def DEBUG(self) -> bool:

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/templates/app/main.py.j2

@@ -7,19 +7,17 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import ORJSONResponse
 
-from app.api.v1 import health
-{% if has_auth %}
-from app.api.v1 import auth
+from app.api.v1.router import router as api_v1_router
+{% if has_graphql %}
+from app.api.graphql import graphql_router
 {% endif %}
 from app.core.config import settings
 from app.core.exceptions import register_exception_handlers
-from app.core.logging import configure_logging
 
 
 @asynccontextmanager
 async def lifespan(application: FastAPI) -> AsyncGenerator[None, None]:
     """Manage application startup and shutdown lifecycle."""
-    configure_logging()
 {% if has_relational_db and orm == "sqlalchemy" %}
     from app.db.session import engine, Base
     async with engine.begin() as conn:
@@ -60,9 +58,12 @@ def create_application() -> FastAPI:
     register_exception_handlers(application)
 
     # Routers
-    application.include_router(health.router, prefix=settings.API_V1_PREFIX, tags=["Health"])
-{% if has_auth %}
-    application.include_router(auth.router, prefix=settings.API_V1_PREFIX, tags=["Auth"])
+    # Mount REST API v1 router
+    application.include_router(api_v1_router, prefix=settings.API_V1_PREFIX)
+
+{% if has_graphql %}
+    # Mount GraphQL endpoint
+    application.include_router(graphql_router, prefix="/graphql")
 {% endif %}
 
     return application

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/templates/app/middleware/request_logger.py.j2

@@ -7,33 +7,11 @@ from __future__ import annotations
 
 import time
 import uuid
-from contextvars import ContextVar
-from typing import Optional
-
 from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.responses import Response
 
-# ── Context variables (per-request, async-safe) ────────────────────────────
-_request_id_ctx: ContextVar[Optional[str]] = ContextVar("request_id", default=None)
-_client_ip_ctx: ContextVar[Optional[str]] = ContextVar("client_ip", default=None)
-
-
-def set_request_id(value: Optional[str]) -> None:
-    _request_id_ctx.set(value)
-
-
-def get_request_id() -> Optional[str]:
-    return _request_id_ctx.get()
-
-
-def set_client_ip(value: Optional[str]) -> None:
-    _client_ip_ctx.set(value)
-
-
-def get_client_ip() -> Optional[str]:
-    return _client_ip_ctx.get()
-
+from app.core.logger import logger, set_client_ip, set_request_id
 
 def _extract_client_ip(request: Request) -> str:
     """Respect X-Forwarded-For / X-Real-IP from reverse proxies."""
@@ -70,7 +48,6 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
 
         start = time.perf_counter()
 
-        from app.core.logger import logger
         logger.info("→ %s %s  rid=%s  ip=%s", request.method, request.url.path, request_id, client_ip)
 
         try:

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/fastapi_spawn/templates/base/pyproject.toml.j2

@@ -15,6 +15,7 @@ dependencies = [
     "pydantic-settings>=2.2.0",
     "httpx>=0.27.0",
     "slowapi>=0.1.9",             # rate limiting middleware
+    "orjson>=3.9.0",              # fast JSON responses
 
 {% if log_lib == "loguru" %}
     "loguru>=0.7.2",
@@ -175,24 +176,8 @@ dev-dependencies = [
     "pre-commit>=3.7.0",
 ]
 
-# ── uv run scripts ────────────────────────────────────────────────────────────
-# Usage: uv run <script-name>
-[tool.uv.scripts]
-dev       = "uvicorn app.main:app --reload --host 0.0.0.0 --port 8000"
-start     = "python main.py"
-test      = "pytest --cov=app --cov-report=term-missing"
-lint      = "ruff check ."
-format    = "ruff format ."
-typecheck = "mypy app/"
-{% if migration == "alembic" %}
-migrate   = "alembic upgrade head"
-rollback  = "alembic downgrade -1"
-makemig   = "alembic revision --autogenerate -m"
-{% endif %}
-{% if has_broker %}
-worker    = "celery -A tasks.celery_app worker --loglevel=info"
-beat      = "celery -A tasks.celery_app beat --loglevel=info"
-{% endif %}
+[tool.hatch.build.targets.wheel]
+packages = ["app"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

{fastapi_spawn-0.4.1 → fastapi_spawn-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi-spawn"
-version = "0.4.1"
+version = "0.4.3"
 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" }