Fix #3 - Route Testing

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 max-line-length = 88
-exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache
+exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache,alembic/versions

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Makefile

@@ -0,0 +1,8 @@
+include .env
+
+.PHONY: up-test
+
+test:
+	(sudo docker-compose -f test.docker-compose.yml up -d && \
+	sudo docker-compose -f test.docker-compose.yml exec backend-tests pytest);\
+	sudo docker-compose -f test.docker-compose.yml down

app/crud/base.py

@@ -3,7 +3,6 @@
 from fastapi.encoders import jsonable_encoder
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
-import logging
 
 from app.database.base import Base
 

app/crud/paper.py

@@ -4,8 +4,7 @@
 
 
 class CRUDPaper(CRUDBase[Paper, PaperCreate, PaperUpdate]):
-    pass        
-
+    pass
 
 
 paper = CRUDPaper(Paper)

app/crud/paper_with_code.py

@@ -41,7 +41,10 @@ def get_multi_model_metrics_by_identifier(
                     'model_identifier': row.model_identifier,
                     'model_name': row.model_name,
                     'model_hardware_burden': row.model_hardware_burden,
-                    'model_operation_per_network_pass': row.model_gflops if row.model_gflops else row.model_multiply_adds,
+                    'model_operation_per_network_pass': (
+                        row.model_gflops
+                        if row.model_gflops else row.model_multiply_adds
+                    ),
 
                     'paper_identifier': row.paper_identifier,
                 })
@@ -83,7 +86,10 @@ def get_model_metrics_by_identifier(
                 'model_identifier': response[0].model_identifier,
                 'model_name': response[0].model_name,
                 'model_hardware_burden': response[0].model_hardware_burden,
-                'model_operation_per_network_pass': response[0].model_gflops if response[0].model_gflops else response[0].model_multiply_adds,
+                'model_operation_per_network_pass': (
+                    response[0].model_gflops
+                    if response[0].model_gflops else response[0].model_multiply_adds
+                ),
                 'paper_identifier': response[0].paper_identifier,
             }
 

app/crud/task.py

@@ -357,7 +357,10 @@ def get_models(
                     'gflops': row.model_gflops,
                     'number_of_parameters': row.model_number_of_parameters,
                     'multiply_adds': row.model_multiply_adds,
-                    'operation_per_network_pass': row.model_gflops if row.model_gflops else row.model_multiply_adds,
+                    'operation_per_network_pass': (
+                        row.model_gflops
+                        if row.model_gflops else row.model_multiply_adds
+                    ),
                     'hardware_burden': row.model_hardware_burden,
                     'paper_title': row.paper_title,
                     'paper_code_link': row.paper_code_link,
@@ -443,7 +446,10 @@ def get_models_csv(
                     row.accuracy_type: row.accuracy_value,
                     'model_gflops': row.model_gflops,
                     'model_multiply_adds': row.model_multiply_adds,
-                    'model_operation_per_network_pass': row.model_gflops if row.model_gflops else row.model_multiply_adds,
+                    'model_operation_per_network_pass': (
+                        row.model_gflops
+                        if row.model_gflops else row.model_multiply_adds
+                    ),
                     'model_extra_training_time': row.model_extra_training_time,
                     'model_number_of_cpus': row.model_number_of_cpus,
                     'model_cpu': row.model_cpu,

app/database.py

@@ -10,4 +10,4 @@
 )
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
-Base = declarative_base()
+Base = declarative_base()

main.py → app/main.py

@@ -25,4 +25,4 @@
 
 app.include_router(api_router, prefix=settings.API_V1_STR)
 
-app.mount("/image", StaticFiles(directory="image"), name="image")
+app.mount("/image", StaticFiles(directory="app/image"), name="image")

app/models/cpu.py

@@ -14,4 +14,4 @@ class Cpu(Base):
     tdp = Column(Float(precision=3))
     gflops = Column(Float(precision=3))
     die_size = Column(Integer)
-    year = Column(Integer)
+    year = Column(Integer)

app/models/gpu.py

@@ -11,4 +11,4 @@ class Gpu(Base):
     tdp = Column(Float(precision=3))
     gflops = Column(Float(precision=3))
     die_size = Column(Integer)
-    year = Column(Integer)
+    year = Column(Integer)

app/models/task_dataset.py

@@ -1,8 +1,6 @@
 from sqlalchemy import event
-import logging
-from sqlalchemy.sql.expression import bindparam, select, text
-from app.models import Dataset, Task
-from sqlalchemy.sql.functions import func
+
+from sqlalchemy.sql.expression import text
 from app.database.base import Base
 from sqlalchemy import Column, Integer, ForeignKey, String
 from sqlalchemy.orm import relationship
@@ -25,8 +23,11 @@ class TaskDataset(Base):
 
 def my_before_insert_listener(mapper, connection, target):
     target.identifier = connection.execute(
-        text("select concat(task.identifier,'-on-', dataset.identifier) from task, dataset where task.id = %d and dataset.id = %d" %
-             (target.task_id, target.dataset_id))
+        text(
+            "select concat(task.identifier,'-on-', dataset.identifier) from task, "
+            "dataset where task.id = %d and dataset.id = %d" %
+            (target.task_id, target.dataset_id)
+        )
     ).scalar()
 
 

app/routes/model.py

@@ -74,7 +74,9 @@ def get_models_csv(
                                  media_type="text/csv"
                                  )
 
-    response.headers["Content-Disposition"] = f"attachment; filename={task_id}-{dataset_id}.csv"
+    response.headers[
+        "Content-Disposition"
+    ] = f"attachment; filename={task_id}-{dataset_id}.csv"
 
     return response
 

app/schemas/msg.py

@@ -2,4 +2,4 @@
 
 
 class Msg(BaseModel):
-    msg: str
+    msg: str

app/schemas/task.py

@@ -1,8 +1,6 @@
-from app import models
 from pydantic.main import BaseModel
 from typing import List, Optional
 
-from .dataset import Dataset
 from .model import Model
 
 # Shared properties

app/test/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.1.0'

app/test/conftest.py

@@ -0,0 +1,60 @@
+import pytest
+import asyncio
+from httpx import AsyncClient
+from sqlalchemy_utils import create_database, database_exists
+from os import system, name
+from time import sleep
+
+from app.database.base import Base
+from app.settings import settings
+from app.database.init_db import init_db
+from app.main import app
+from app.deps import get_db
+from app.test.utils.overrides import override_get_db
+from app.test.utils.test_db import (
+    engine,
+    SQLALCHEMY_TEST_DATABASE_URI,
+)
+from .utils.test_db import TestSessionLocal
+
+app.dependency_overrides[get_db] = override_get_db
+
+if not database_exists(SQLALCHEMY_TEST_DATABASE_URI):
+    create_database(SQLALCHEMY_TEST_DATABASE_URI)
+
+Base.metadata.drop_all(bind=engine)
+Base.metadata.create_all(bind=engine)
+init_db(TestSessionLocal())
+
+with open('app/test/utils/initial_seed.sql') as sql_file:
+    for statement in sql_file.read().split(';'):
+        if len(statement.strip()) > 0:
+             engine.execute(statement + ';')
+
+if name == 'nt':
+  _ = system('cls')
+
+else:
+  _ = system('clear')
+
+@pytest.fixture(scope="session")
+def event_loop():
+    return asyncio.get_event_loop()
+
+
+@pytest.fixture(scope="session")
+def base_url() -> str:
+    return "http://localhost:8000/api/v1"
+
+
+@pytest.fixture(scope="session")
+async def headers(base_url) -> dict:
+    body = {
+        "username": settings.FIRST_SUPERUSER,
+        "password": settings.FIRST_SUPERUSER_PASSWORD,
+    }
+    async with AsyncClient(app=app, base_url=base_url) as ac:
+        response = await ac.post("/login/access-token", data=body)
+    json = response.json()
+    assert json == {"token_type": "bearer", **json}
+    return {"Authorization": f"{json['token_type']} {json['access_token']}"}

app/test/route_tests/conftest.py

@@ -0,0 +1,142 @@
+import pytest
+from httpx import AsyncClient, Response
+
+from app.main import app
+from app.test.utils.constants import (
+    DATASETS_KEYS,
+    DATASETS_BODY,
+    TASK_KEYS,
+    TASK,
+    PAPER_BODY,
+    PAPER_KEYS,
+    SUBMISSION_ALT_BODY,
+    MODEL_KEYS,
+    SUCCESS,
+    CPU_BODY,
+    CPU_KEYS,
+    TPU_BODY,
+    GPU_BODY,
+    GPU_KEYS,
+)
+
+
+@pytest.fixture(scope="session")
+async def cpu_created(base_url: str, headers: dict):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.post("/cpus", json=CPU_BODY)
+    yield response
+
+
+@pytest.fixture(scope="session")
+async def tpu_created(base_url: str, headers: dict):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.post("/tpus", json=TPU_BODY)
+    yield response
+    # json = response.json()
+    # tpu_id = json["id"]
+    # async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+    #     response = await ac.delete(f"/tpus/{tpu_id}")
+    # assert response.status_code == SUCCESS
+    # assert response.json().keys() == json.keys()
+
+
+@pytest.fixture(scope="session")
+async def gpu_created(base_url: str, headers: dict):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.post("/gpus", json=GPU_BODY)
+    yield response
+    # gpu_id = response.json()["id"]
+    # async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+    #     response = await ac.delete(f"/gpus/{gpu_id}")
+    # assert response.status_code == SUCCESS
+    # assert GPU_KEYS == set(response.json().keys())
+
+
+@pytest.fixture(scope="session")
+async def datasets_created(base_url: str, headers: dict):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.post("/datasets", json=DATASETS_BODY)
+    yield response
+    datasets_id = response.json()["id"]
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.delete(f"/datasets/{datasets_id}")
+    assert response.status_code == SUCCESS
+    assert DATASETS_KEYS == set(response.json().keys())
+
+
+@pytest.fixture(scope="session")
+async def task_created(base_url: str, headers: dict):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.post("/tasks", json=TASK)
+    a = response.json()
+    assert response.status_code == SUCCESS
+    assert response.json().keys() == a.keys()
+    yield response
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.delete(f"/tasks/{a['id']}")
+    assert response.status_code == SUCCESS
+    assert response.json().keys() == TASK_KEYS.keys()
+
+
+@pytest.fixture(scope="session")
+async def submission_approved_created(
+    base_url: str,
+    headers: dict,
+    tpu_created: Response,
+    cpu_created: Response,
+    gpu_created: Response,
+):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response_create = await ac.post("/submissions", json=SUBMISSION_ALT_BODY)
+        response_update_status = await ac.put(
+            f'/submissions/{response_create.json()["id"]}/status',
+            json={"status": "approved"},
+        )
+    assert response_create.status_code == SUCCESS
+    assert response_update_status.status_code == SUCCESS
+    return response_update_status.json()
+
+
+@pytest.fixture(scope="session")
+async def get_test_model(
+    headers: dict,
+    base_url: str,
+    submission_approved_created: Response,
+    cpu_created: Response,
+    tpu_created: Response,
+    gpu_created: Response,
+):
+    async with AsyncClient(app=app, base_url=base_url) as ac:
+        response = await ac.get("/models/?skip=0&limit=1", headers=headers)
+    assert response.status_code == SUCCESS
+    assert set(response.json()[0].keys()) == MODEL_KEYS
+    yield response.json()[0]
+    model_id = response.json()[0]["id"]
+    cpu_id = cpu_created.json()["id"]
+    tpu_id = tpu_created.json()["id"]
+    gpu_id = gpu_created.json()["id"]
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response_models = await ac.delete(f"/models/{model_id}")
+        response_cpu = await ac.delete(f"/cpus/{cpu_id}")
+        response_tpu = await ac.delete(f"/tpus/{tpu_id}")
+        response_gpu = await ac.delete(f"/gpus/{gpu_id}")
+    assert response_cpu.status_code == SUCCESS
+    assert CPU_KEYS == set(response_cpu.json().keys())
+    assert response_models.status_code == SUCCESS
+    assert MODEL_KEYS == set(response_models.json().keys())
+    assert response_tpu.status_code == SUCCESS
+    assert response_tpu.json().keys() == tpu_created.json().keys()
+    assert response_gpu.status_code == SUCCESS
+    assert GPU_KEYS == set(response_gpu.json().keys())
+
+
+@pytest.fixture(scope="session")
+async def paper_created(base_url: str, headers: dict):
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.post("/papers", json=PAPER_BODY)
+    yield response
+    paper_id = response.json()["id"]
+    async with AsyncClient(app=app, base_url=base_url, headers=headers) as ac:
+        response = await ac.delete(f"/papers/{paper_id}")
+    assert response.status_code == SUCCESS
+    assert PAPER_KEYS == set(response.json().keys())