Use black with -l 120 param.

gns3server/db/models/__init__.py

@@ -29,5 +29,5 @@ from .templates import (
     QemuTemplate,
     VirtualBoxTemplate,
     VMwareTemplate,
-    VPCSTemplate
+    VPCSTemplate,
 )

gns3server/db/models/base.py

@@ -26,11 +26,9 @@ from sqlalchemy.ext.declarative import as_declarative
 
 @as_declarative()
 class Base:
-
     def asdict(self):
 
-        return {c.key: getattr(self, c.key)
-                for c in inspect(self).mapper.column_attrs}
+        return {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}
 
     def asjson(self):
 
@@ -47,7 +45,7 @@ class GUID(TypeDecorator):
     impl = CHAR
 
     def load_dialect_impl(self, dialect):
-        if dialect.name == 'postgresql':
+        if dialect.name == "postgresql":
             return dialect.type_descriptor(UUID())
         else:
             return dialect.type_descriptor(CHAR(32))
@@ -55,7 +53,7 @@ class GUID(TypeDecorator):
     def process_bind_param(self, value, dialect):
         if value is None:
             return value
-        elif dialect.name == 'postgresql':
+        elif dialect.name == "postgresql":
             return str(value)
         else:
             if not isinstance(value, uuid.UUID):
@@ -78,9 +76,7 @@ class BaseTable(Base):
     __abstract__ = True
 
     created_at = Column(DateTime, default=func.current_timestamp())
-    updated_at = Column(DateTime,
-                        default=func.current_timestamp(),
-                        onupdate=func.current_timestamp())
+    updated_at = Column(DateTime, default=func.current_timestamp(), onupdate=func.current_timestamp())
 
 
 def generate_uuid():

gns3server/db/models/templates.py

@@ -52,10 +52,7 @@ class CloudTemplate(Template):
     remote_console_type = Column(String)
     remote_console_http_path = Column(String)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "cloud",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "cloud", "polymorphic_load": "selectin"}
 
 
 class DockerTemplate(Template):
@@ -79,10 +76,7 @@ class DockerTemplate(Template):
     cpus = Column(Integer)
     custom_adapters = Column(PickleType)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "docker",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "docker", "polymorphic_load": "selectin"}
 
 
 class DynamipsTemplate(Template):
@@ -125,10 +119,7 @@ class DynamipsTemplate(Template):
     wic1 = Column(String)
     wic2 = Column(String)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "dynamips",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "dynamips", "polymorphic_load": "selectin"}
 
 
 class EthernetHubTemplate(Template):
@@ -138,10 +129,7 @@ class EthernetHubTemplate(Template):
     template_id = Column(GUID, ForeignKey("templates.template_id"), primary_key=True)
     ports_mapping = Column(PickleType)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "ethernet_hub",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "ethernet_hub", "polymorphic_load": "selectin"}
 
 
 class EthernetSwitchTemplate(Template):
@@ -152,10 +140,7 @@ class EthernetSwitchTemplate(Template):
     ports_mapping = Column(PickleType)
     console_type = Column(String)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "ethernet_switch",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "ethernet_switch", "polymorphic_load": "selectin"}
 
 
 class IOUTemplate(Template):
@@ -175,10 +160,7 @@ class IOUTemplate(Template):
     console_type = Column(String)
     console_auto_start = Column(Boolean)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "iou",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "iou", "polymorphic_load": "selectin"}
 
 
 class QemuTemplate(Template):
@@ -224,10 +206,7 @@ class QemuTemplate(Template):
     options = Column(String)
     custom_adapters = Column(PickleType)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "qemu",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "qemu", "polymorphic_load": "selectin"}
 
 
 class VirtualBoxTemplate(Template):
@@ -250,10 +229,7 @@ class VirtualBoxTemplate(Template):
     console_auto_start = Column(Boolean)
     custom_adapters = Column(PickleType)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "virtualbox",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "virtualbox", "polymorphic_load": "selectin"}
 
 
 class VMwareTemplate(Template):
@@ -275,10 +251,7 @@ class VMwareTemplate(Template):
     console_auto_start = Column(Boolean)
     custom_adapters = Column(PickleType)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "vmware",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "vmware", "polymorphic_load": "selectin"}
 
 
 class VPCSTemplate(Template):
@@ -290,7 +263,4 @@ class VPCSTemplate(Template):
     console_type = Column(String)
     console_auto_start = Column(Boolean, default=False)
 
-    __mapper_args__ = {
-         "polymorphic_identity": "vpcs",
-         "polymorphic_load": "selectin"
-    }
+    __mapper_args__ = {"polymorphic_identity": "vpcs", "polymorphic_load": "selectin"}

gns3server/db/repositories/base.py

@@ -19,7 +19,6 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 
 class BaseRepository:
-
     def __init__(self, db_session: AsyncSession) -> None:
 
         self._db_session = db_session

gns3server/db/repositories/computes.py

@@ -28,7 +28,6 @@ from gns3server import schemas
 
 
 class ComputesRepository(BaseRepository):
-
     def __init__(self, db_session: AsyncSession) -> None:
 
         super().__init__(db_session)
@@ -65,7 +64,7 @@ class ComputesRepository(BaseRepository):
             host=compute_create.host,
             port=compute_create.port,
             user=compute_create.user,
-            password=password
+            password=password,
         )
         self._db_session.add(db_compute)
         await self._db_session.commit()
@@ -80,9 +79,7 @@ class ComputesRepository(BaseRepository):
         if password:
             update_values["password"] = password.get_secret_value()
 
-        query = update(models.Compute) \
-            .where(models.Compute.compute_id == compute_id) \
-            .values(update_values)
+        query = update(models.Compute).where(models.Compute.compute_id == compute_id).values(update_values)
 
         await self._db_session.execute(query)
         await self._db_session.commit()

gns3server/db/repositories/templates.py

@@ -36,12 +36,11 @@ TEMPLATE_TYPE_TO_MODEL = {
     "qemu": models.QemuTemplate,
     "virtualbox": models.VirtualBoxTemplate,
     "vmware": models.VMwareTemplate,
-    "vpcs": models.VPCSTemplate
+    "vpcs": models.VPCSTemplate,
 }
 
 
 class TemplatesRepository(BaseRepository):
-
     def __init__(self, db_session: AsyncSession) -> None:
 
         super().__init__(db_session)
@@ -67,16 +66,11 @@ class TemplatesRepository(BaseRepository):
         await self._db_session.refresh(db_template)
         return db_template
 
-    async def update_template(
-            self,
-            template_id: UUID,
-            template_update: schemas.TemplateUpdate) -> schemas.Template:
+    async def update_template(self, template_id: UUID, template_update: schemas.TemplateUpdate) -> schemas.Template:
 
         update_values = template_update.dict(exclude_unset=True)
 
-        query = update(models.Template) \
-            .where(models.Template.template_id == template_id) \
-            .values(update_values)
+        query = update(models.Template).where(models.Template.template_id == template_id).values(update_values)
 
         await self._db_session.execute(query)
         await self._db_session.commit()

gns3server/db/repositories/users.py

@@ -28,7 +28,6 @@ from gns3server.services import auth_service
 
 
 class UsersRepository(BaseRepository):
-
     def __init__(self, db_session: AsyncSession) -> None:
 
         super().__init__(db_session)
@@ -62,10 +61,7 @@ class UsersRepository(BaseRepository):
 
         hashed_password = self._auth_service.hash_password(user.password)
         db_user = models.User(
-            username=user.username,
-            email=user.email,
-            full_name=user.full_name,
-            hashed_password=hashed_password
+            username=user.username, email=user.email, full_name=user.full_name, hashed_password=hashed_password
         )
         self._db_session.add(db_user)
         await self._db_session.commit()
@@ -79,9 +75,7 @@ class UsersRepository(BaseRepository):
         if password:
             update_values["hashed_password"] = self._auth_service.hash_password(password=password)
 
-        query = update(models.User) \
-            .where(models.User.user_id == user_id) \
-            .values(update_values)
+        query = update(models.User).where(models.User.user_id == user_id).values(update_values)
 
         await self._db_session.execute(query)
         await self._db_session.commit()

gns3server/db/tasks.py

@@ -31,6 +31,7 @@ from .models import Base
 from gns3server.config import Config
 
 import logging
+
 log = logging.getLogger(__name__)
 
 
@@ -56,9 +57,8 @@ async def get_computes(app: FastAPI) -> List[dict]:
         for db_compute in db_computes:
             try:
                 compute = jsonable_encoder(
-                    schemas.Compute.from_orm(db_compute),
-                    exclude_unset=True,
-                    exclude={"created_at", "updated_at"})
+                    schemas.Compute.from_orm(db_compute), exclude_unset=True, exclude={"created_at", "updated_at"}
+                )
             except ValidationError as e:
                 log.error(f"Could not load compute '{db_compute.compute_id}' from database: {e}")
                 continue