Merge branch 'master' of github.com:innonymous/api-server

Author: sevenzing

.env.example

@@ -1,3 +1,8 @@
 API_AMQP_URL=
 API_DATABASE_URL=
 API_KEY=
+
+# Optional.
+#API_BIND_URL=0.0.0.0:8000
+#API_ROOT_PATH=.
+#API_LOGS_PATH=./logs

.gitignore

@@ -1,3 +1,6 @@
+logs
+
+env
 .env
 
 .idea

config/gunicorn.conf.py

@@ -1,6 +1,16 @@
-from os import cpu_count
+from os import cpu_count, environ
+from pathlib import Path
 
-bind = '0.0.0.0:8000'
+from dotenv import load_dotenv
+
+load_dotenv()
+
+bind = environ.get('API_BIND_URL', '0.0.0.0:8000')
 
 workers = cpu_count()
 worker_class = 'uvicorn.workers.UvicornH11Worker'
+
+_logs_path = Path(environ.get('API_LOGS_PATH', './logs'))
+_logs_path.mkdir(parents=True, exist_ok=True)
+accesslog = str(_logs_path / 'access.log')
+errorlog = str(_logs_path / 'error.log')

entrypoint.sh

@@ -7,4 +7,4 @@ set -e;
 ./env/bin/alembic --config ./config/alembic.ini upgrade head;
 
 # Start server.
-./env/bin/gunicorn --config ./config/gunicorn.conf.py innonymous.api:app;
+./env/bin/gunicorn --config ./config/gunicorn.conf.py innonymous.api:app "$*";

innonymous/api/__init__.py

@@ -14,7 +14,11 @@
 from innonymous.api.utils.auth import JWTAuthenticator
 from innonymous.database import DatabaseEngine
 
-app = FastAPI(version='0.0.1', title='InnonymousApi')
+settings = APISettings()
+
+app = FastAPI(
+    version='0.0.2', title='InnonymousApi', root_path=settings.root_path or ''
+)
 app.add_middleware(
     CORSMiddleware,
     allow_credentials=True,
@@ -23,7 +27,6 @@
     allow_headers=["*"]
 )
 
-settings = APISettings()
 captcha = Captcha(settings.key)
 mq = MessageQueue(settings.amqp_url)
 db_engine = DatabaseEngine(settings.database_url)

innonymous/api/schemas/message/info.py

@@ -1,7 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from uuid import UUID
 
-from pydantic import BaseModel
+from pydantic import BaseModel, validator
 
 from innonymous.database.models import MessageType
 
@@ -14,5 +14,9 @@ class MessageInfoSchema(BaseModel):
     type: MessageType
     data: bytes = None
 
+    @validator('time')
+    def convert_time(cls, time: datetime) -> datetime:
+        return time.replace(tzinfo=timezone.utc)
+
     class Config:
         orm_mode = True

innonymous/api/settings.py

@@ -1,4 +1,4 @@
-from typing import Type
+from typing import Type, Optional
 
 from pydantic import (
     BaseSettings,
@@ -11,6 +11,9 @@ class APISettings(BaseSettings):
     amqp_url: str
     database_url: str
 
+    # Root of the api endpoints.
+    root_path: Optional[str]
+
     @validator('key')
     def validate_key(cls: Type['APISettings'], value: str) -> str:
         if len(value) < 32:

innonymous/api/views/messages.py

@@ -40,7 +40,7 @@
 @router.get('/rooms/{uuid}/messages', response_model=MessageListSchema)
 async def get(
         uuid: UUID,
-        limit: int = Query(None, gt=0),
+        limit: int = Query(100, gt=0, le=500),
         after: datetime = Query(None),
         before: datetime = Query(None),
         session: AsyncSession = Depends(db_engine.session)
@@ -55,8 +55,8 @@ async def get(
 
     return MessageListSchema(
         messages=[
-            MessageInfoSchema.from_orm(room)
-            for room in await get_by(
+            MessageInfoSchema.from_orm(message)
+            for message in await get_by(
                 session,
                 MessageModel,
                 MessageModel.room_uuid,
@@ -91,7 +91,7 @@ async def create(
     if not room:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
-            detail=f'UserModel with uuid {uuid} not found.'
+            detail=f'Room with uuid {uuid} not found.'
         )
 
     message = MessageModel(

innonymous/api/views/rooms.py

@@ -1,3 +1,5 @@
+from uuid import UUID
+
 from fastapi import (
     APIRouter,
     Depends,
@@ -23,12 +25,12 @@
     RoomModel,
     UserModel
 )
-from innonymous.database.utils import get_all
+from innonymous.database.utils import get_all, get_by
 
 router = APIRouter(tags=['rooms'])
 
 
-@router.get('/rooms/', response_model=RoomListSchema)
+@router.get('/rooms', response_model=RoomListSchema)
 async def get(
         session: AsyncSession = Depends(db_engine.session)
 ) -> RoomListSchema:
@@ -40,6 +42,22 @@ async def get(
     )
 
 
+@router.get('/rooms/{uuid}', response_model=RoomInfoSchema)
+async def get_by_uuid(
+        uuid: UUID, session: AsyncSession = Depends(db_engine.session)
+) -> RoomInfoSchema:
+    room: RoomModel
+    room, = await get_by(session, RoomModel, RoomModel.uuid, uuid) or [None]
+
+    if not room:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f'Room with uuid {uuid} not found.'
+        )
+
+    return RoomInfoSchema.from_orm(room)
+
+
 @router.post('/rooms/new', response_model=RoomInfoSchema)
 async def create(
         room: RoomCreateSchema,

innonymous/api/views/users.py

@@ -34,15 +34,15 @@
 
 
 @router.get('/users/{uuid}', response_model=UserInfoSchema)
-async def get(
+async def get_by_uuid(
         uuid: UUID, session: AsyncSession = Depends(db_engine.session)
 ) -> UserInfoSchema:
     user = await get_by(session, UserModel, UserModel.uuid, uuid)
 
     if not user:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
-            detail=f'UserModel with uuid {uuid} not found.'
+            detail=f'User with uuid {uuid} not found.'
         )
 
     return UserInfoSchema.from_orm(user[0])