Merge pull request #10 from goldlabelapps/staging

This pull request refactors and modularizes the FastAPI application, improving maintainability and clarity.

Author: goldlabelapps

app/__init__.py

@@ -1,4 +1,4 @@
 """NX AI - FastAPI"""
 
 # Version tracking
-__version__ = "1.0.2"
+__version__ = "1.0.3"

app/print_products.py app/api/db.pyapp/print_products.py renamed to app/api/db.py

@@ -1,29 +1,19 @@
 import os
-
 import psycopg2
 from dotenv import load_dotenv
 
+load_dotenv()
 
-def main() -> None:
-    load_dotenv()
-
+def get_db_connection():  # type: ignore[return]
+    """Create and yield a PostgreSQL connection for use as a FastAPI dependency."""
     conn = psycopg2.connect(
         host=os.getenv('DB_HOST'),
         port=os.getenv('DB_PORT', '5432'),
         dbname=os.getenv('DB_NAME'),
         user=os.getenv('DB_USER'),
         password=os.getenv('DB_PASSWORD'),
     )
-    cur = conn.cursor()
     try:
-        cur.execute('SELECT * FROM product;')
-        rows = cur.fetchall()
-        for row in rows:
-            print(row)
+        yield conn
     finally:
-        cur.close()
         conn.close()
-
-
-if __name__ == "__main__":
-    main()

app/api/echo.py

@@ -0,0 +1,8 @@
+from fastapi import APIRouter
+from app.api.schemas import EchoRequest, EchoResponse
+
+router = APIRouter()
+
+@router.post("/echo", response_model=EchoResponse)
+def echo(body: EchoRequest) -> EchoResponse:
+    return EchoResponse(echo=body.message)

app/api/health.py

@@ -0,0 +1,8 @@
+from fastapi import APIRouter
+
+router = APIRouter()
+
+@router.get("/health")
+def health() -> dict[str, str]:
+    """Return the health status of the application."""
+    return {"status": "ok"}

app/api/root.py

@@ -0,0 +1,44 @@
+from app import __version__
+from fastapi import APIRouter
+import os, time
+import psycopg2
+from dotenv import load_dotenv
+from app import __version__
+
+router = APIRouter()
+
+@router.get("/")
+def root() -> dict:
+    """Return a structured welcome message for the API root, including product data."""
+    load_dotenv()
+    conn = psycopg2.connect(
+        host=os.getenv('DB_HOST'),
+        port=os.getenv('DB_PORT', '5432'),
+        dbname=os.getenv('DB_NAME'),
+        user=os.getenv('DB_USER'),
+        password=os.getenv('DB_PASSWORD')
+    )
+    cur = conn.cursor()
+    cur.execute('SELECT id, name, description, price, in_stock, created_at FROM product;')
+    products = [
+        {
+            "id": row[0],
+            "name": row[1],
+            "description": row[2],
+            "price": float(row[3]),
+            "in_stock": row[4],
+            "created_at": row[5].isoformat() if row[5] else None
+        }
+        for row in cur.fetchall()
+    ]
+    cur.close()
+    conn.close()
+    epoch = int(time.time() * 1000)
+    meta = {
+        "version": __version__,
+        "time": time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()),
+        "epoch": epoch,
+        "severity": "success",
+        "message": f"NX AI says hello. Returned {len(products)} products."
+    }
+    return {"meta": meta, "data": products}

app/api/routes.py

@@ -1,45 +1,29 @@
+from app import __version__
 """API route definitions for NX AI."""
 
 import os
 import time
 
 import psycopg2
 from dotenv import load_dotenv
-from fastapi import APIRouter, Depends
-from pydantic import BaseModel
 
-from app import __version__
+from fastapi import APIRouter, Depends
 
-load_dotenv()
+from app.api.db import get_db_connection
+from app.api.schemas import EchoRequest, EchoResponse
 
 router = APIRouter()
 
+from app.api.root import router as root_router
+from app.api.health import router as health_router
+from app.api.echo import router as echo_router
 
-def get_db_connection():  # type: ignore[return]
-    """Create and yield a PostgreSQL connection for use as a FastAPI dependency."""
-    conn = psycopg2.connect(
-        host=os.getenv('DB_HOST'),
-        port=os.getenv('DB_PORT', '5432'),
-        dbname=os.getenv('DB_NAME'),
-        user=os.getenv('DB_USER'),
-        password=os.getenv('DB_PASSWORD'),
-    )
-    try:
-        yield conn
-    finally:
-        conn.close()
-
-
-class EchoRequest(BaseModel):
-    """Request body for the echo endpoint."""
-
-    message: str
+router.include_router(root_router)
+router.include_router(health_router)
+router.include_router(echo_router)
 
 
-class EchoResponse(BaseModel):
-    """Response body for the echo endpoint."""
 
-    echo: str
 
 
 @router.get("/")

app/api/schemas.py

@@ -0,0 +1,7 @@
+from pydantic import BaseModel
+
+class EchoRequest(BaseModel):
+    message: str
+
+class EchoResponse(BaseModel):
+    echo: str

app/main.py

@@ -1,3 +1,4 @@
+from app import __version__
 """NX AI - FastAPI entry point."""
 
 from fastapi import FastAPI