From db265f9524adda0c6ff80d88d6b5beb3ff7b8c9e Mon Sep 17 00:00:00 2001
From: Mark Paronyan <markparonian@gmail.com>
Date: Mon, 28 Sep 2026 04:53:18 +0000
Subject: [PATCH] fix(typing): resolve mypy errors in db models

---
 gns3server/db/models/acl.py  | 2 +-
 gns3server/db/models/base.py | 5 ++---
 pyproject.toml               | 8 --------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/gns3server/db/models/acl.py b/gns3server/db/models/acl.py
index 32f7f7248..fc75eedac 100644
--- a/gns3server/db/models/acl.py
+++ b/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)
diff --git a/gns3server/db/models/base.py b/gns3server/db/models/base.py
index cf726ec79..1802c1771 100644
--- a/gns3server/db/models/base.py
+++ b/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}
diff --git a/pyproject.toml b/pyproject.toml
index 21c8a9ba6..86926fc9a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -378,13 +378,6 @@ module = [
   "gns3server.controller.compute",  # 2
   "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
@@ -394,7 +387,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