Merge pull request #15 from goldlabelapps/staging

This pull request refactors the API routing and endpoints to improve clarity and separation of concerns.

Author: goldlabelapps

app/api/products.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("/products")
+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"{len(products)} products"
+    }
+    return {"meta": meta, "data": products}

app/api/root.py

@@ -9,36 +9,20 @@
 
 @router.get("/")
 def root() -> dict:
-    """Return a structured welcome message for the API root, including product data."""
+    """Return 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()
+    base_url = os.getenv("BASE_URL", "http://localhost:8000")
     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"
+        "message": f"NX AI says hello",
+        "base_url": base_url
     }
-    return {"meta": meta, "data": products}
+    endpoints = [
+        {"name": "health", "url": f"{base_url}/health"},
+        {"name": "products", "url": f"{base_url}/products"}
+    ]
+    return {"meta": meta, "data": endpoints}

app/api/routes.py

@@ -1,10 +1,6 @@
 from app import __version__
-"""API route definitions for NX AI."""
+"""API routes"""
 
-import os
-import time
-
-import psycopg2
 from dotenv import load_dotenv
 
 from fastapi import APIRouter, Depends
@@ -18,9 +14,10 @@
 from app.api.health import router as health_router
 from app.api.echo import router as echo_router
 from app.api.import_csv import router as import_csv_router
+from app.api.products import router as products_router
 
 router.include_router(root_router)
 router.include_router(health_router)
 router.include_router(echo_router)
 router.include_router(import_csv_router)
-
+router.include_router(products_router)