Merge pull request #2899 from markparonyan/mypy-db-models-base

fix(typing): resolve mypy errors in db models

gns3server/db/models/acl.py

@@ -29,7 +29,7 @@ class ACE(BaseTable):
     __tablename__ = "acl"
 
     ace_id = Column(GUID, primary_key=True, default=generate_uuid)
-    ace_type: str = Column(String)
+    ace_type = Column(String)
     path = Column(String)
     propagate = Column(Boolean, default=True)
     allowed = Column(Boolean, default=True)

gns3server/db/models/base.py

@@ -21,11 +21,10 @@ from fastapi.encoders import jsonable_encoder
 from sqlalchemy import Column, DateTime, func, inspect
 from sqlalchemy.types import TypeDecorator, CHAR, VARCHAR
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import as_declarative
+from sqlalchemy.orm import DeclarativeBase
 
 
-@as_declarative()
-class Base:
+class Base(DeclarativeBase):
     def asdict(self):
 
         return {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}

pyproject.toml

@@ -369,13 +369,6 @@ module = [
   "gns3server.controller.appliance_manager",  # 5
   "gns3server.controller.project",  # 2
   "gns3server.controller.topology",  # 1
-  "gns3server.db.models.acl",  # 1
-  "gns3server.db.models.images",  # 1
-  "gns3server.db.models.pools",  # 1
-  "gns3server.db.models.privileges",  # 2
-  "gns3server.db.models.roles",  # 1
-  "gns3server.db.models.templates",  # 22
-  "gns3server.db.models.users",  # 3
   "gns3server.db.repositories.api_keys",  # 8
   "gns3server.db.repositories.computes",  # 10
   "gns3server.db.repositories.images",  # 14
@@ -385,7 +378,6 @@ module = [
   "gns3server.db.repositories.templates",  # 6
   "gns3server.db.repositories.users",  # 12
   "gns3server.db.tasks",  # 12
-  "gns3server.db_migrations.env",  # 1
   "gns3server.schemas.compute.atm_switch_nodes",  # 5
   "gns3server.schemas.compute.cloud_nodes",  # 1
   "gns3server.schemas.compute.docker_nodes",  # 2