Fix test import issue

database/__init__.py

@@ -1,2 +1,2 @@
-from .db import engine, session, Base
+from .db import engine, session
 from .models import *

database/db.py

@@ -1,6 +1,5 @@
 from settings import DB_HOST, DB_NAME, DB_PASSWORD, DB_USERNAME, DB_DIALECT, DB_DRIVER
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import Session, sessionmaker
 from urllib.parse import quote_plus
 
@@ -12,5 +11,3 @@ engine = create_engine(
     f"{DB_DIALECT}{'+' if DB_DRIVER else ''}{DB_DRIVER}://{DB_USERNAME}:{_encoded_pw}@{DB_HOST}/{DB_NAME}"
 )
 session: Session = sessionmaker(bind=engine)()
-
-Base = declarative_base()

database/models.py

@@ -1,8 +1,11 @@
-from database import Base
+from sqlalchemy.orm import declarative_base
 from sqlalchemy import Column, String, Integer, BigInteger, Numeric, Date, Boolean
 from typing import Set
 
 
+Base = declarative_base()
+
+
 # TODO fill in non-nulls everywhere
 # TODO comments