refactor: Removed nginx and refactors imports

.github/labeler.yml

@@ -13,44 +13,50 @@
 'module: database':
 - src/app/db/*
 
+'module: schemas':
+- src/app/schemas/*
+
+'module: models':
+- src/app/models/*
+
 'module: services':
 - src/app/services/*
 
 'route: accesses':
-- src/app/api/routes/accesses.py
+- src/app/api/endpoints/accesses.py
 - src/app/api/crud/accesses.py
 
 'route: alerts':
-- src/app/api/routes/alerts.py
+- src/app/api/endpoints/alerts.py
 - src/app/api/crud/alerts.py
 
 'route: devices':
-- src/app/api/routes/devices.py
+- src/app/api/endpoints/devices.py
 
 'route: events':
-- src/app/api/routes/events.py
+- src/app/api/endpoints/events.py
 
 'route: groups':
-- src/app/api/routes/groups.py
+- src/app/api/endpoints/groups.py
 - src/app/api/crud/groups.py
 
 'route: installations':
-- src/app/api/routes/installations.py
+- src/app/api/endpoints/installations.py
 
 'route: login':
-- src/app/api/routes/login.py
+- src/app/api/endpoints/login.py
 
 'route: media':
-- src/app/api/routes/media.py
+- src/app/api/endpoints/media.py
 
 'route: sites':
-- src/app/api/routes/sites.py
+- src/app/api/endpoints/sites.py
 
 'route: users':
-- src/app/api/routes/users.py
+- src/app/api/endpoints/users.py
 
 'route: webhooks':
-- src/app/api/routes/webhooks.py
+- src/app/api/endpoints/webhooks.py
 - src/app/api/crud/webhooks.py
 
 'topic: build':

README.md

@@ -2,10 +2,10 @@
 
 <p align="center">
   <a href="https://github.com/pyronear/pyro-api/actions?query=workflow%3Abuilds">
-    <img alt="CI Status" src="https://img.shields.io/github/workflow/status/pyronear/pyro-api/builds?label=CI&logo=github&style=flat-square">
+    <img alt="CI Status" src="https://img.shields.io/github/actions/workflow/status/pyronear/pyro-api/builds.yml?branch=main&label=CI&logo=github&style=flat-square">
   </a>
   <a href="http://pyronear-api.herokuapp.com/redoc">
-    <img src="https://img.shields.io/github/workflow/status/pyronear/pyro-api/builds?label=docs&logo=read-the-docs&style=flat-square" alt="Documentation Status">
+    <img src="https://img.shields.io/github/actions/workflow/status/pyronear/pyro-api/builds.yml?brain=main&label=docs&logo=read-the-docs&style=flat-square" alt="Documentation Status">
   </a>
   <a href="https://codecov.io/gh/pyronear/pyro-api">
     <img src="https://img.shields.io/codecov/c/github/pyronear/pyro-api.svg?logo=codecov&style=flat-square" alt="Test coverage percentage">

docker-compose-dev.yml

@@ -27,13 +27,6 @@ services:
       - S3_REGION=${S3_REGION}
     depends_on:
       - db
-  proxy:
-    build: nginx
-    ports:
-      - 80:80
-      - 443:443
-    depends_on:
-      - backend
   db:
     image: postgres:12.1-alpine
     volumes:

docker-compose.yml

@@ -36,13 +36,6 @@ services:
       - POSTGRES_USER=dummy_pg_user
       - POSTGRES_PASSWORD=dummy_pg_pwd
       - POSTGRES_DB=dummy_pg_db
-  proxy:
-    build: nginx
-    ports:
-      - 80:80
-      - 443:443
-    depends_on:
-      - backend
 
 volumes:
   postgres_data:

src/app/api/crud/accesses.py

@@ -10,7 +10,7 @@
 
 from app.api import security
 from app.api.crud import base
-from app.api.schemas import (
+from app.schemas import (
     AccessCreation,
     AccessRead,
     Cred,

src/app/api/crud/alerts.py

@@ -10,9 +10,9 @@
 
 import app.config as cfg
 from app.api import crud
-from app.api.routes.events import create_event
-from app.api.schemas import AlertIn, AlertOut, EventIn
+from app.api.endpoints.events import create_event
 from app.db import alerts
+from app.schemas import AlertIn, AlertOut, EventIn
 
 
 async def resolve_previous_alert(device_id: int) -> Optional[AlertOut]:

src/app/api/crud/authorizations.py

@@ -8,7 +8,7 @@
 
 from app.api import crud
 from app.db import accesses
-from app.db.models import AccessType
+from app.models import AccessType
 
 
 async def is_in_same_group(table: Table, entry_id: int, group_id: int) -> bool:

src/app/api/deps.py

@@ -10,9 +10,10 @@
 
 import app.config as cfg
 from app.api import crud
-from app.api.schemas import AccessRead, DeviceOut, TokenPayload, UserRead
 from app.db import accesses, devices, users
-from app.db.models import AccessType
+from app.db.session import SessionLocal
+from app.models import AccessType
+from app.schemas import AccessRead, DeviceOut, TokenPayload, UserRead
 
 # Scope definition
 oauth2_scheme = OAuth2PasswordBearer(
@@ -25,6 +26,14 @@
 )
 
 
+def get_db():
+    db = SessionLocal()  # noqa: F405
+    try:
+        yield db
+    finally:
+        db.close()
+
+
 async def get_current_access(security_scopes: SecurityScopes, token: str = Depends(oauth2_scheme)) -> AccessRead:
     """Dependency to use as fastapi.security.Security with scopes.
 

src/app/api/routes/accesses.py → src/app/api/endpoints/accesses.py

@@ -9,9 +9,9 @@
 
 from app.api import crud
 from app.api.deps import get_current_access
-from app.api.schemas.accesses import AccessRead
 from app.db import accesses
-from app.db.models import AccessType
+from app.models import AccessType
+from app.schemas.accesses import AccessRead
 
 router = APIRouter()
 

src/app/api/routes/alerts.py → src/app/api/endpoints/alerts.py

@@ -12,11 +12,11 @@
 from app.api import crud
 from app.api.crud.authorizations import check_group_read, is_admin_access
 from app.api.crud.groups import get_entity_group_id
-from app.api.deps import get_current_access, get_current_device
+from app.api.deps import get_current_access, get_current_device, get_db
 from app.api.external import post_request
-from app.api.schemas import AlertBase, AlertIn, AlertOut, DeviceOut
-from app.db import alerts, events, get_session, media, models
-from app.db.models import AccessType
+from app.db import alerts, events, media
+from app.models import Access, AccessType, Alert, Device, Event
+from app.schemas import AlertBase, AlertIn, AlertOut, DeviceOut
 
 router = APIRouter()
 
@@ -95,7 +95,7 @@ async def get_alert(
 
 @router.get("/", response_model=List[AlertOut], summary="Get the list of all alerts")
 async def fetch_alerts(
-    requester=Security(get_current_access, scopes=[AccessType.admin, AccessType.user]), session=Depends(get_session)
+    requester=Security(get_current_access, scopes=[AccessType.admin, AccessType.user]), session=Depends(get_db)
 ):
     """
     Retrieves the list of all alerts and their information
@@ -104,11 +104,7 @@ async def fetch_alerts(
         return await crud.fetch_all(alerts)
     else:
         retrieved_alerts = (
-            session.query(models.Alerts)
-            .join(models.Devices)
-            .join(models.Accesses)
-            .filter(models.Accesses.group_id == requester.group_id)
-            .all()
+            session.query(Alert).join(Device).join(Access).filter(Access.group_id == requester.group_id).all()
         )
         retrieved_alerts = [x.__dict__ for x in retrieved_alerts]
         return retrieved_alerts
@@ -124,7 +120,7 @@ async def delete_alert(alert_id: int = Path(..., gt=0), _=Security(get_current_a
 
 @router.get("/ongoing", response_model=List[AlertOut], summary="Get the list of ongoing alerts")
 async def fetch_ongoing_alerts(
-    requester=Security(get_current_access, scopes=[AccessType.admin, AccessType.user]), session=Depends(get_session)
+    requester=Security(get_current_access, scopes=[AccessType.admin, AccessType.user]), session=Depends(get_db)
 ):
     """
     Retrieves the list of ongoing alerts and their information
@@ -138,12 +134,12 @@ async def fetch_ongoing_alerts(
         return (await crud.base.database.fetch_all(query=query.limit(50)))[::-1]
     else:
         retrieved_alerts = (
-            session.query(models.Alerts)
-            .join(models.Events)
-            .filter(models.Events.end_ts.is_(None))
-            .join(models.Devices)
-            .join(models.Accesses)
-            .filter(models.Accesses.group_id == requester.group_id)
+            session.query(Alert)
+            .join(Event)
+            .filter(Event.end_ts.is_(None))
+            .join(Device)
+            .join(Access)
+            .filter(Access.group_id == requester.group_id)
         )
         retrieved_alerts = [x.__dict__ for x in retrieved_alerts.all()]
         return retrieved_alerts

src/app/api/routes/devices.py → src/app/api/endpoints/devices.py

@@ -11,8 +11,10 @@
 from app.api import crud
 from app.api.crud.authorizations import is_admin_access
 from app.api.crud.groups import get_entity_group_id
-from app.api.deps import get_current_access, get_current_device, get_current_user
-from app.api.schemas import (
+from app.api.deps import get_current_access, get_current_device, get_current_user, get_db
+from app.db import accesses, devices, users
+from app.models import Access, AccessType, Device
+from app.schemas import (
     AdminDeviceAuth,
     Cred,
     DeviceAuth,
@@ -24,8 +26,6 @@
     SoftwareHash,
     UserRead,
 )
-from app.db import accesses, devices, get_session, models, users
-from app.db.models import AccessType
 
 router = APIRouter()
 
@@ -77,20 +77,15 @@ async def get_my_device(me: DeviceOut = Security(get_current_device, scopes=["de
 
 @router.get("/", response_model=List[DeviceOut], summary="Get the list of all devices")
 async def fetch_devices(
-    requester=Security(get_current_access, scopes=[AccessType.admin, AccessType.user]), session=Depends(get_session)
+    requester=Security(get_current_access, scopes=[AccessType.admin, AccessType.user]), session=Depends(get_db)
 ):
     """
     Retrieves the list of all devices and their information
     """
     if await is_admin_access(requester.id):
         return await crud.fetch_all(devices)
     else:
-        retrieved_devices = (
-            session.query(models.Devices)
-            .join(models.Accesses)
-            .filter(models.Accesses.group_id == requester.group_id)
-            .all()
-        )
+        retrieved_devices = session.query(Device).join(Access).filter(Access.group_id == requester.group_id).all()
         retrieved_devices = [x.__dict__ for x in retrieved_devices]
 
         return retrieved_devices