fix circular dependencies

Author: joeblackwaslike

src/quart_sqlalchemy/sim/app.py

@@ -12,10 +12,10 @@
 from quart import Response
 from quart_schema import QuartSchema
 
-from .. import Base
-from .. import SQLAlchemyConfig
-from ..framework import QuartSQLAlchemy
-from .util import ObjectID
+from quart_sqlalchemy import Base
+from quart_sqlalchemy import SQLAlchemyConfig
+from quart_sqlalchemy.framework import QuartSQLAlchemy
+from quart_sqlalchemy.sim.util import ObjectID
 
 
 AUTHORIZATION_PATTERN = re.compile(r"Bearer (?P<token>.+)")

src/quart_sqlalchemy/sim/handle.py

@@ -5,14 +5,13 @@
 from sqlalchemy.orm import Session
 
 from quart_sqlalchemy import Bind
-
-from . import signals
-from .logic import LogicComponent as Logic
-from .model import AuthUser
-from .model import AuthWallet
-from .model import EntityType
-from .model import WalletType
-from .util import ObjectID
+from quart_sqlalchemy.sim import signals
+from quart_sqlalchemy.sim.logic import LogicComponent as Logic
+from quart_sqlalchemy.sim.model import AuthUser
+from quart_sqlalchemy.sim.model import AuthWallet
+from quart_sqlalchemy.sim.model import EntityType
+from quart_sqlalchemy.sim.model import WalletType
+from quart_sqlalchemy.sim.util import ObjectID
 
 
 logger = logging.getLogger(__name__)

src/quart_sqlalchemy/sim/logic.py

@@ -3,36 +3,22 @@
 from datetime import datetime
 from functools import wraps
 
-from pydantic import BaseModel
-from pydantic import Field
 from sqlalchemy import or_
-from sqlalchemy import ScalarResult
 from sqlalchemy.orm import contains_eager
-from sqlalchemy.orm import DeclarativeBase
-from sqlalchemy.orm import selectinload
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import func
-from sqlalchemy.sql.expression import label
-
-from quart_sqlalchemy.model import Base
-from quart_sqlalchemy.types import ColumnExpr
-from quart_sqlalchemy.types import EntityIdT
-from quart_sqlalchemy.types import EntityT
-from quart_sqlalchemy.types import ORMOption
-from quart_sqlalchemy.types import Selectable
-
-from . import signals
-from .model import AuthUser as auth_user_model
-from .model import AuthWallet as auth_wallet_model
-from .model import ConnectInteropStatus
-from .model import EntityType
-from .model import MagicClient as magic_client_model
-from .model import Provenance
-from .model import WalletType
-from .repo import SQLAlchemyRepository
-from .repo_adapter import RepositoryLegacyAdapter
-from .util import ObjectID
-from .util import one
+
+from quart_sqlalchemy.sim import signals
+from quart_sqlalchemy.sim.model import AuthUser as auth_user_model
+from quart_sqlalchemy.sim.model import AuthWallet as auth_wallet_model
+from quart_sqlalchemy.sim.model import ConnectInteropStatus
+from quart_sqlalchemy.sim.model import EntityType
+from quart_sqlalchemy.sim.model import MagicClient as magic_client_model
+from quart_sqlalchemy.sim.model import Provenance
+from quart_sqlalchemy.sim.model import WalletType
+from quart_sqlalchemy.sim.repo_adapter import RepositoryLegacyAdapter
+from quart_sqlalchemy.sim.util import ObjectID
+from quart_sqlalchemy.sim.util import one
 
 
 logger = logging.getLogger(__name__)

src/quart_sqlalchemy/sim/main.py

@@ -1,9 +1,9 @@
-from .app import app
-from .views import api
+from quart_sqlalchemy.sim.app import app
+from quart_sqlalchemy.sim.views import api
 
 
-app.register_blueprint(api)
+app.register_blueprint(api, url_prefix="/v1")
 
 
 if __name__ == "__main__":
-    app.run(port=8080)
+    app.run(port=8081)

src/quart_sqlalchemy/sim/model.py

@@ -81,8 +81,8 @@ class MagicClient(db.Model, SoftDeleteMixin, TimestampMixin):
     is_signing_modal_enabled: Mapped[bool] = sa.orm.mapped_column(default=False)
     global_audience_enabled: Mapped[bool] = sa.orm.mapped_column(default=False)
 
-    public_api_key: Mapped[str] = sa.orm.mapped_column(default_factory=secrets.token_hex)
-    secret_api_key: Mapped[str] = sa.orm.mapped_column(default_factory=secrets.token_hex)
+    public_api_key: Mapped[str] = sa.orm.mapped_column(default=secrets.token_hex)
+    secret_api_key: Mapped[str] = sa.orm.mapped_column(default=secrets.token_hex)
 
     auth_users: Mapped[t.List["AuthUser"]] = sa.orm.relationship(
         back_populates="magic_client",
@@ -144,7 +144,7 @@ def is_magic_connect_user(self):
 
 
 class AuthWallet(db.Model, SoftDeleteMixin, TimestampMixin):
-    __tablename__ = "auth_user"
+    __tablename__ = "auth_wallet"
 
     id: Mapped[ObjectID] = sa.orm.mapped_column(primary_key=True, autoincrement=True)
     auth_user_id: Mapped[ObjectID] = sa.orm.mapped_column(sa.ForeignKey("auth_user.id"))

src/quart_sqlalchemy/sim/repo.py

@@ -10,15 +10,14 @@
 import sqlalchemy.orm
 import sqlalchemy.sql
 
+from quart_sqlalchemy.sim.builder import StatementBuilder
 from quart_sqlalchemy.types import ColumnExpr
 from quart_sqlalchemy.types import EntityIdT
 from quart_sqlalchemy.types import EntityT
 from quart_sqlalchemy.types import ORMOption
 from quart_sqlalchemy.types import Selectable
 from quart_sqlalchemy.types import SessionT
 
-from .builder import StatementBuilder
-
 
 sa = sqlalchemy
 
@@ -56,7 +55,6 @@ def identity(self) -> t.Type[EntityIdT]:
         return self.__orig_class__.__args__[1]  # type: ignore
 
 
-
 class SQLAlchemyRepository(
     AbstractRepository[EntityT, EntityIdT],
     t.Generic[EntityT, EntityIdT],

src/quart_sqlalchemy/sim/repo_adapter.py

@@ -12,7 +12,7 @@
 from quart_sqlalchemy.types import ORMOption
 from quart_sqlalchemy.types import Selectable
 
-from .repo import SQLAlchemyRepository
+from quart_sqlalchemy.sim.repo import SQLAlchemyRepository
 
 
 class BaseModelSchema(BaseModel):

src/quart_sqlalchemy/sim/schema.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-from .util import ObjectID
+from quart_sqlalchemy.sim.util import ObjectID
 
 
 class BaseSchema(BaseModel):

src/quart_sqlalchemy/sqla.py

@@ -38,6 +38,14 @@ def initialize(self):
             class Model(self.config.model_class, sa.orm.DeclarativeBase):
                 pass
 
+        type_annotation_map = {}
+        for base_class in Model.__mro__[::-1]:
+            if base_class is Model:
+                continue
+            base_map = getattr(base_class, "type_annotation_map", {}).copy()
+            type_annotation_map.update(base_map)
+
+        Model.registry.type_annotation_map.update(type_annotation_map)
         self.Model = Model
 
         self.binds = {}