rework to fast-api

Author: sgmdlt

Makefile

@@ -4,10 +4,10 @@ install:
 	uv sync
 
 dev:
-	uv run flask --app app.server run --debug -h 0.0.0.0 -p $(PORT)
+	uv run fastapi dev app/server.py --host 0.0.0.0 --port $(PORT)
 
 run:
-	uv run gunicorn -w 4 -b 0.0.0.0:$(PORT) app.server:app
+	uv run granian --interface asgi --workers 10 --host 0.0.0.0 --port $(PORT) app.server:app
 
 start:
 	make stop rm || true
@@ -34,6 +34,7 @@ test:
 	uv run pytest; \
 	status=$$?; \
 	if [ -f $(PID_FILE) ]; then kill `cat $(PID_FILE)` && rm $(PID_FILE); fi; \
+	sleep 1; \
 	exit $$status
 
 lint:

app/server.py

@@ -1,64 +1,79 @@
 import logging
 import os
-import traceback
+from contextlib import asynccontextmanager
 from datetime import datetime
+from typing import List
 
-import psycopg
+import asyncpg
 from dotenv import load_dotenv
-from flask import Flask, request
-from psycopg.rows import dict_row
+from fastapi import Depends, FastAPI, HTTPException, Query
 
 load_dotenv()
 
+DATABASE_URL = "postgres://student:[email protected]:5432/chartsdb"
 
-app = Flask(__name__)
-app.config['DATABASE_URL'] = os.getenv('DATABASE_URL')
+# Менеджер контекста для подключения к БД
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    # Создаем пул соединений при старте
+    app.state.pool = await asyncpg.create_pool(
+        DATABASE_URL,
+        min_size=5,
+        max_size=20
+    )
+    yield
+    # Закрываем пул при выключении
+    await app.state.pool.close()
 
+app = FastAPI(lifespan=lifespan)
 
-def get_db():
-    return psycopg.connect(app.config['DATABASE_URL'])
+# Зависимость для получения соединения с БД
+async def get_db():
+    async with app.state.pool.acquire() as conn:
+        yield conn
 
+@app.get("/")
+async def index():
+    return {"status": "It Works"}
 
-@app.route('/')
-def index():
-    return 'It Works'
-
-
-@app.get('/visits')
-def get_visits():
-    query = request.args
+@app.get("/visits")
+async def get_visits(
+    begin: datetime = Query(..., description="Start date in ISO format"),
+    end: datetime = Query(..., description="End date in ISO format"),
+    db = Depends(get_db)
+):
     try:
-        begin_date = datetime.fromisoformat(query['begin'])
-        end_date = datetime.fromisoformat(query['end'])
-    except ValueError as e:
-        logging.error(traceback.format_exc(2, chain=False))
-        return 'Invalid date. Please check your input', 400
-    query = '''
-        SELECT *
-        FROM visits
-        WHERE visits.datetime BETWEEN (%s) AND (%s);'''
-    conn = get_db()
-    with conn.cursor(row_factory=dict_row) as c:
-        c.execute(query, [begin_date, end_date])
-        res = c.fetchall()
-    return res
-
+        query = """
+            SELECT *
+            FROM visits
+            WHERE visits.datetime BETWEEN $1 AND $2;
+        """
+        records = await db.fetch(query, begin, end)
+        return records
+    except Exception as e:
+        logging.error(f"Error fetching visits: {str(e)}")
+        raise HTTPException(
+            status_code=500,
+            detail="Internal server error occurred while fetching visits"
+        )
 
-@app.get('/registrations')
-def get_registrations():
-    query = request.args
+@app.get("/registrations")
+async def get_registrations(
+    begin: datetime = Query(..., description="Start date in ISO format"),
+    end: datetime = Query(..., description="End date in ISO format"),
+    db = Depends(get_db)
+):
     try:
-        begin_date = datetime.fromisoformat(query['begin'])
-        end_date = datetime.fromisoformat(query['end'])
-    except ValueError as e:
-        logging.error(traceback.format_exc(2, chain=False))
-        return 'Invalid date. Please check your input', 400
-    query = '''
-        SELECT *
-        FROM registrations
-        WHERE registrations.datetime BETWEEN (%s) AND (%s);'''
-    conn = get_db()
-    with conn.cursor(row_factory=dict_row) as c:
-        c.execute(query, [begin_date, end_date])
-        res = c.fetchall()
-    return res
+        query = """
+            SELECT *
+            FROM registrations
+            WHERE registrations.datetime BETWEEN $1 AND $2;
+        """
+        records = await db.fetch(query, begin, end)
+        return records
+    except Exception as e:
+        logging.error(f"Error fetching registrations: {str(e)}")
+        raise HTTPException(
+            status_code=500,
+            detail="Internal server error occurred while fetching registrations"
+        )

pyproject.toml

@@ -5,7 +5,10 @@ description = "api for data charts project"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
+    "asyncpg>=0.30.0",
+    "fastapi[standard]>=0.115.4",
     "flask>=3.0.3",
+    "granian>=1.6.3",
     "gunicorn>=23.0.0",
     "psycopg>=3.2.3",
     "python-dotenv>=1.0.1",

server.pid

@@ -7,12 +7,12 @@
 def test_server():
     response = requests.get('http://localhost:4000/')
     assert response.status_code == 200
-    assert response.text == 'It Works'
+    assert response.json()['status'] == 'It Works'
 
     response = requests.get('http://localhost:4000/visits?begin=2023-03-01&end=2023-03-02')
     assert response.status_code == 200
     assert response.json()[0] == {
-        "datetime": "Wed, 01 Mar 2023 10:36:22 GMT",
+        "datetime": "2023-03-01T10:36:22",
         "platform": "web",
         "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.6",
         "visit_id": "1de9ea66-70d3-4a1f-8735-df5ef7697fb9"