style: sort imports in api and utils modules

gns3server/api/routes/compute/__init__.py

@@ -15,43 +15,44 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from fastapi import FastAPI, Request, Depends
+import logging
+
+from fastapi import Depends, FastAPI, Request
 from fastapi.responses import JSONResponse
 from starlette.exceptions import HTTPException as StarletteHTTPException
-from gns3server.controller.gns3vm.gns3_vm_error import GNS3VMError
-from gns3server.compute.error import ImageMissingError, NodeError
-from gns3server.compute.ubridge.ubridge_error import UbridgeError
-
-from .dependencies.authentication import compute_authentication
 
 from gns3server.compute.compute_error import (
     ComputeError,
+    ComputeForbiddenError,
     ComputeNotFoundError,
     ComputeTimeoutError,
-    ComputeForbiddenError,
     ComputeUnauthorizedError,
 )
+from gns3server.compute.error import ImageMissingError, NodeError
+from gns3server.compute.ubridge.ubridge_error import UbridgeError
+from gns3server.controller.gns3vm.gns3_vm_error import GNS3VMError
 
-from . import capabilities
-from . import compute
-from . import projects
-from . import notifications
-from . import images
-from . import atm_switch_nodes
-from . import cloud_nodes
-from . import docker_nodes
-from . import dynamips_nodes
-from . import ethernet_hub_nodes
-from . import ethernet_switch_nodes
-from . import frame_relay_switch_nodes
-from . import iou_nodes
-from . import nat_nodes
-from . import qemu_nodes
-from . import virtualbox_nodes
-from . import vmware_nodes
-from . import vpcs_nodes
-
-import logging
+from . import (
+    atm_switch_nodes,
+    capabilities,
+    cloud_nodes,
+    compute,
+    docker_nodes,
+    dynamips_nodes,
+    ethernet_hub_nodes,
+    ethernet_switch_nodes,
+    frame_relay_switch_nodes,
+    images,
+    iou_nodes,
+    nat_nodes,
+    notifications,
+    projects,
+    qemu_nodes,
+    virtualbox_nodes,
+    vmware_nodes,
+    vpcs_nodes,
+)
+from .dependencies.authentication import compute_authentication
 
 log = logging.getLogger(__name__)
 

gns3server/api/routes/compute/atm_switch_nodes.py

@@ -18,13 +18,13 @@
 API routes for ATM switch nodes.
 """
 
-from typing import Any
 import os
+from typing import Any
+from uuid import UUID
 
-from fastapi import APIRouter, Depends, Body, Path, status, HTTPException
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
-from uuid import UUID
 
 from gns3server import schemas
 from gns3server.compute.dynamips import Dynamips

gns3server/api/routes/compute/capabilities.py

@@ -19,14 +19,14 @@ API routes for capabilities
 """
 
 import sys
-import psutil
 
+import psutil
 from fastapi import APIRouter, Request
 
-from gns3server.version import __version__
+from gns3server import schemas
 from gns3server.compute import MODULES
 from gns3server.utils.path import get_default_project_directory
-from gns3server import schemas
+from gns3server.version import __version__
 
 router = APIRouter()
 

gns3server/api/routes/compute/cloud_nodes.py

@@ -19,13 +19,13 @@ API routes for cloud nodes.
 """
 
 import os
-
-from fastapi import APIRouter, Depends, Path, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
 from typing import Any, Union
 from uuid import UUID
 
+from fastapi import APIRouter, Depends, HTTPException, Path, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
 from gns3server import schemas
 from gns3server.compute.builtin import Builtin
 from gns3server.compute.builtin.nodes.cloud import Cloud

gns3server/api/routes/compute/compute.py

@@ -20,26 +20,26 @@ API routes for compute.
 """
 
 import os
-import psutil
-import cpuinfo
-
 from functools import lru_cache
-from gns3server.config import Config
-from gns3server.utils.cpu_percent import CpuPercent
-from gns3server.version import __version__
-from gns3server.utils.path import get_default_project_directory, is_safe_path
+from typing import List, Optional
+from uuid import UUID
+
+import cpuinfo
+import psutil
+from fastapi import APIRouter, Body, HTTPException, Response, status
+from fastapi.encoders import jsonable_encoder
+
+from gns3server import schemas
 from gns3server.compute.port_manager import PortManager
 from gns3server.compute.project_manager import ProjectManager
-from gns3server.utils.interfaces import interfaces
 from gns3server.compute.qemu import Qemu
 from gns3server.compute.virtualbox import VirtualBox
 from gns3server.compute.vmware import VMware
-from gns3server import schemas
-
-from fastapi import APIRouter, HTTPException, Body, Response, status
-from fastapi.encoders import jsonable_encoder
-from uuid import UUID
-from typing import Optional, List
+from gns3server.config import Config
+from gns3server.utils.cpu_percent import CpuPercent
+from gns3server.utils.interfaces import interfaces
+from gns3server.utils.path import get_default_project_directory, is_safe_path
+from gns3server.version import __version__
 
 router = APIRouter()
 

gns3server/api/routes/compute/dependencies/authentication.py

@@ -14,16 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import secrets
 import base64
 import binascii
 import logging
+import secrets
+from typing import Optional, Union
 
 from fastapi import Depends, HTTPException, WebSocket, status
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
 from fastapi.security.utils import get_authorization_scheme_param
+
 from gns3server.config import Config
-from typing import Optional, Union
 
 log = logging.getLogger(__name__)
 security = HTTPBasic(auto_error=False)

gns3server/api/routes/compute/docker_nodes.py

@@ -19,16 +19,17 @@ API routes for Docker nodes.
 """
 
 import os
+from typing import Any, Union
+from uuid import UUID
 
-from fastapi import APIRouter, WebSocket, Depends, Body, status, HTTPException
+from fastapi import APIRouter, Body, Depends, HTTPException, WebSocket, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
-from uuid import UUID
-from typing import Any, Union
 
 from gns3server import schemas
 from gns3server.compute.docker import Docker
 from gns3server.compute.docker.docker_vm import DockerVM
+
 from .dependencies.authentication import compute_authentication, ws_compute_authentication
 
 responses: dict[int | str, dict[str, Any]] = {

gns3server/api/routes/compute/dynamips_nodes.py

@@ -19,16 +19,16 @@ API routes for Dynamips nodes.
 """
 
 import os
-
-from fastapi import APIRouter, WebSocket, Body, Depends, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
 from typing import Any, List, Optional, Union
 from uuid import UUID
 
+from fastapi import APIRouter, Body, Depends, HTTPException, WebSocket, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
+from gns3server import schemas
 from gns3server.compute.dynamips import Dynamips
 from gns3server.compute.dynamips.nodes.router import Router
-from gns3server import schemas
 
 from .dependencies.authentication import compute_authentication, ws_compute_authentication
 

gns3server/api/routes/compute/ethernet_hub_nodes.py

@@ -18,17 +18,17 @@
 API routes for Ethernet hub nodes.
 """
 
-from typing import Any
 import os
-
-from fastapi import APIRouter, Depends, Body, Path, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
+from typing import Any
 from uuid import UUID
 
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
+from gns3server import schemas
 from gns3server.compute.dynamips import Dynamips
 from gns3server.compute.dynamips.nodes.ethernet_hub import EthernetHub
-from gns3server import schemas
 
 responses: dict[int | str, dict[str, Any]] = {
     404: {"model": schemas.ErrorMessage, "description": "Could not find project or Ethernet hub node"}

gns3server/api/routes/compute/ethernet_switch_nodes.py

@@ -22,17 +22,17 @@ through uBridge's ``brctl`` module (see
 ``gns3server.compute.builtin.nodes.ethernet_switch``).
 """
 
-from typing import Any
 import os
-
-from fastapi import APIRouter, Depends, Body, Path, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
+from typing import Any
 from uuid import UUID
 
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
+from gns3server import schemas
 from gns3server.compute.builtin import Builtin
 from gns3server.compute.builtin.nodes.ethernet_switch import EthernetSwitch
-from gns3server import schemas
 
 responses: dict[int | str, dict[str, Any]] = {
     404: {"model": schemas.ErrorMessage, "description": "Could not find project or Ethernet switch node"}

gns3server/api/routes/compute/frame_relay_switch_nodes.py

@@ -18,13 +18,13 @@
 API routes for Frame Relay switch nodes.
 """
 
-from typing import Any
 import os
+from typing import Any
+from uuid import UUID
 
-from fastapi import APIRouter, Depends, Body, Path, status, HTTPException
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
-from uuid import UUID
 
 from gns3server import schemas
 from gns3server.compute.dynamips import Dynamips

gns3server/api/routes/compute/images.py

@@ -20,11 +20,11 @@ API routes for images.
 
 import os
 import urllib.parse
-
-from fastapi import APIRouter, Body, Request, status, Response, HTTPException
-from fastapi.responses import FileResponse
 from typing import List
 
+from fastapi import APIRouter, Body, HTTPException, Request, Response, status
+from fastapi.responses import FileResponse
+
 from gns3server.compute.docker import Docker
 from gns3server.compute.dynamips import Dynamips
 from gns3server.compute.iou import IOU

gns3server/api/routes/compute/iou_nodes.py

@@ -19,13 +19,13 @@ API routes for IOU nodes.
 """
 
 import os
-
-from fastapi import APIRouter, WebSocket, Depends, Body, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
 from typing import Any, Union
 from uuid import UUID
 
+from fastapi import APIRouter, Body, Depends, HTTPException, WebSocket, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
 from gns3server import schemas
 from gns3server.compute.iou import IOU
 from gns3server.compute.iou.iou_vm import IOUVM

gns3server/api/routes/compute/nat_nodes.py

@@ -19,13 +19,13 @@ API routes for NAT nodes.
 """
 
 import os
-
-from fastapi import APIRouter, Depends, Path, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
 from typing import Any, Union
 from uuid import UUID
 
+from fastapi import APIRouter, Depends, HTTPException, Path, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
 from gns3server import schemas
 from gns3server.compute.builtin import Builtin
 from gns3server.compute.builtin.nodes.nat import Nat

gns3server/api/routes/compute/notifications.py

@@ -18,14 +18,15 @@
 API routes for compute notifications.
 """
 
-from fastapi import APIRouter, Depends, WebSocket, WebSocketDisconnect
+import logging
 from typing import Union
+
+from fastapi import APIRouter, Depends, WebSocket, WebSocketDisconnect
 from websockets.exceptions import ConnectionClosed, WebSocketException
 
 from gns3server.compute.notification_manager import NotificationManager
-from .dependencies.authentication import ws_compute_authentication
 
-import logging
+from .dependencies.authentication import ws_compute_authentication
 
 log = logging.getLogger(__name__)
 

gns3server/api/routes/compute/projects.py

@@ -18,28 +18,27 @@
 API routes for projects.
 """
 
+import asyncio
+import inspect
+import logging
 import os
 import shutil
 import urllib.parse
-import inspect
-import asyncio
-
-import logging
 
 log = logging.getLogger()
 
-from fastapi import APIRouter, Depends, HTTPException, Request, Response, status, Query
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import FileResponse
 from typing import List
 from uuid import UUID
 
-from gns3server.compute.project_manager import ProjectManager
-from gns3server.compute.project import Project
-from gns3server.compute.base_manager import BaseManager
-from gns3server.utils.path import is_safe_path
-from gns3server import schemas
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import FileResponse
 
+from gns3server import schemas
+from gns3server.compute.base_manager import BaseManager
+from gns3server.compute.project import Project
+from gns3server.compute.project_manager import ProjectManager
+from gns3server.utils.path import is_safe_path
 
 router = APIRouter()
 

gns3server/api/routes/compute/qemu_nodes.py

@@ -18,21 +18,21 @@
 API routes for Qemu nodes.
 """
 
+import logging
 import os
-
-from fastapi import APIRouter, WebSocket, Depends, Body, Path, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
 from typing import Any, Union
 from uuid import UUID
 
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, WebSocket, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
 from gns3server import schemas
 from gns3server.compute import qemu
 from gns3server.compute.qemu import Qemu
 from gns3server.compute.qemu.qemu_vm import QemuVM
-from .dependencies.authentication import compute_authentication, ws_compute_authentication
 
-import logging
+from .dependencies.authentication import compute_authentication, ws_compute_authentication
 
 log = logging.getLogger(__name__)
 

gns3server/api/routes/compute/virtualbox_nodes.py

@@ -19,12 +19,12 @@ API routes for VirtualBox nodes.
 """
 
 import os
+from typing import Any, Union
+from uuid import UUID
 
-from fastapi import APIRouter, WebSocket, Depends, Path, status
+from fastapi import APIRouter, Depends, Path, WebSocket, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
-from uuid import UUID
-from typing import Any, Union
 
 from gns3server import schemas
 from gns3server.compute.virtualbox import VirtualBox

gns3server/api/routes/compute/vmware_nodes.py

@@ -19,12 +19,12 @@ API routes for VMware nodes.
 """
 
 import os
+from typing import Any, Union
+from uuid import UUID
 
-from fastapi import APIRouter, WebSocket, Depends, Path, status
+from fastapi import APIRouter, Depends, Path, WebSocket, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
-from uuid import UUID
-from typing import Any, Union
 
 from gns3server import schemas
 from gns3server.compute.vmware import VMware

gns3server/api/routes/compute/vpcs_nodes.py

@@ -19,16 +19,17 @@ API routes for VPCS nodes.
 """
 
 import os
-
-from fastapi import APIRouter, WebSocket, Depends, Body, Path, status, HTTPException
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import StreamingResponse
 from typing import Any, Union
 from uuid import UUID
 
+from fastapi import APIRouter, Body, Depends, HTTPException, Path, WebSocket, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import StreamingResponse
+
 from gns3server import schemas
 from gns3server.compute.vpcs import VPCS
 from gns3server.compute.vpcs.vpcs_vm import VPCSVM
+
 from .dependencies.authentication import compute_authentication, ws_compute_authentication
 
 responses: dict[int | str, dict[str, Any]] = {

gns3server/api/routes/index.py

@@ -16,12 +16,12 @@
 
 import os
 
-from fastapi import APIRouter, Request, HTTPException, status
-from fastapi.responses import RedirectResponse, HTMLResponse, FileResponse
+from fastapi import APIRouter, HTTPException, Request, status
+from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 
-from gns3server.version import __version__
 from gns3server.utils.get_resource import get_resource
+from gns3server.version import __version__
 
 router = APIRouter()
 templates = Jinja2Templates(directory=os.path.join("gns3server", "templates"))