Massive isort (#242)

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

alembic/env.py

@@ -2,13 +2,13 @@
 # Standard
 from logging.config import fileConfig
 
+# Third-Party
+from sqlalchemy import engine_from_config, pool
+
 # First-Party
 from alembic import context
 from mcpgateway.config import settings
 
-# Third-Party
-from sqlalchemy import engine_from_config, pool
-
 # from mcpgateway.db import get_metadata
 # target_metadata = get_metadata()
 

alembic/versions/b77ca9d2de7e_uuid_pk_and_slug_refactor.py

@@ -10,15 +10,15 @@
 from typing import Sequence, Union
 import uuid
 
+# Third-Party
+import sqlalchemy as sa
+from sqlalchemy.orm import Session
+
 # First-Party
 from alembic import op
 from mcpgateway.config import settings
 from mcpgateway.utils.create_slug import slugify
 
-# Third-Party
-import sqlalchemy as sa
-from sqlalchemy.orm import Session
-
 # revision identifiers, used by Alembic.
 revision: str = 'b77ca9d2de7e'
 down_revision: Union[str, Sequence[str], None] = None

alembic/versions/e4fc04d1a442_add_annotations_to_tables.py

@@ -9,13 +9,13 @@
 # Standard
 from typing import Sequence, Union
 
-# First-Party
-from alembic import op
-
 # Third-Party
 import sqlalchemy as sa
 from sqlalchemy.orm import Session
 
+# First-Party
+from alembic import op
+
 # revision identifiers, used by Alembic.
 revision: str = 'e4fc04d1a442'
 down_revision: Union[str, Sequence[str], None] = 'b77ca9d2de7e'
@@ -52,9 +52,9 @@ def downgrade() -> None:
     bind = op.get_bind()
     sess = Session(bind=bind)
     inspector = sa.inspect(bind)
-    
+
     if not inspector.has_table("gateways"):
         print("Fresh database detected. Skipping migration.")
         return
-    
+
     op.drop_column('tools', 'annotations')

alembic/versions/e75490e949b1_add_improved_status_to_tables.py

@@ -1,20 +1,21 @@
+# -*- coding: utf-8 -*-
 """Add enabled and reachable columns in tools and gateways tables and migrate data (is_active ➜ enabled,reachable).
 
 Revision ID: e75490e949b1
 Revises: e4fc04d1a442
-Create Date: 2025‑07‑02 17:12:40.678256
+Create Date: 2025‑07‑02 17:12:40.678256
 """
 
 # Standard
 from typing import Sequence, Union
 
+# Third-Party
+import sqlalchemy as sa
+
 # First-Party
 # Alembic / SQLAlchemy
 from alembic import op
 
-# Third-Party
-import sqlalchemy as sa
-
 # Revision identifiers.
 revision: str = "e75490e949b1"
 down_revision: Union[str, Sequence[str], None] = "e4fc04d1a442"
@@ -24,7 +25,7 @@
 
 def upgrade():
     """
-    Renames 'is_active' to 'enabled' and adds a new 'reachable' column (default True) 
+    Renames 'is_active' to 'enabled' and adds a new 'reachable' column (default True)
     in both 'tools' and 'gateways' tables.
     """
     op.alter_column('tools', 'is_active', new_column_name='enabled')
@@ -36,11 +37,11 @@ def upgrade():
 
 def downgrade():
     """
-    Reverts the changes by renaming 'enabled' back to 'is_active' 
+    Reverts the changes by renaming 'enabled' back to 'is_active'
     and dropping the 'reachable' column in both 'tools' and 'gateways' tables.
     """
     op.alter_column('tools', 'enabled', new_column_name='is_active')
     op.drop_column('tools', 'reachable')
 
     op.alter_column('gateways', 'enabled', new_column_name='is_active')
-    op.drop_column('gateways', 'reachable')
+    op.drop_column('gateways', 'reachable')

mcpgateway/bootstrap_db.py

@@ -1,18 +1,19 @@
+# -*- coding: utf-8 -*-
 # mcpgateway/bootstrap_db.py
 # Standard
 import asyncio
 import logging
 from pathlib import Path
 
+# Third-Party
+from sqlalchemy import create_engine, inspect
+
 # First-Party
 from alembic import command
 from alembic.config import Config
 from mcpgateway.config import settings
 from mcpgateway.db import Base
 
-# Third-Party
-from sqlalchemy import create_engine, inspect
-
 logger = logging.getLogger(__name__)
 
 

mcpgateway/cache/session_registry.py

@@ -16,17 +16,17 @@
 import time
 from typing import Any, Dict, Optional
 
+# Third-Party
+from fastapi import HTTPException, status
+import httpx
+
 # First-Party
 from mcpgateway.config import settings
 from mcpgateway.db import get_db, SessionMessageRecord, SessionRecord
 from mcpgateway.services import PromptService, ResourceService, ToolService
 from mcpgateway.transports import SSETransport
 from mcpgateway.types import Implementation, InitializeResult, ServerCapabilities
 
-# Third-Party
-from fastapi import HTTPException, status
-import httpx
-
 logger = logging.getLogger(__name__)
 
 tool_service = ToolService()

mcpgateway/db.py

@@ -21,12 +21,6 @@
 from typing import Any, Dict, List, Optional
 import uuid
 
-# First-Party
-from mcpgateway.config import settings
-from mcpgateway.types import ResourceContent
-from mcpgateway.utils.create_slug import slugify
-from mcpgateway.utils.db_isready import wait_for_db_ready
-
 # Third-Party
 import jsonschema
 from sqlalchemy import (
@@ -59,6 +53,12 @@
 )
 from sqlalchemy.orm.attributes import get_history
 
+# First-Party
+from mcpgateway.config import settings
+from mcpgateway.types import ResourceContent
+from mcpgateway.utils.create_slug import slugify
+from mcpgateway.utils.db_isready import wait_for_db_ready
+
 # ---------------------------------------------------------------------------
 # 1. Parse the URL so we can inspect backend ("postgresql", "sqlite", …)
 #    and the specific driver ("psycopg2", "asyncpg", empty string = default).

mcpgateway/handlers/sampling.py

@@ -19,7 +19,6 @@
 # First-Party
 from mcpgateway.types import CreateMessageResult, ModelPreferences, Role, TextContent
 
-
 logger = logging.getLogger(__name__)
 
 

mcpgateway/main.py

@@ -32,6 +32,28 @@
 import logging
 from typing import Any, AsyncIterator, Dict, List, Optional, Union
 
+# Third-Party
+from fastapi import (
+    APIRouter,
+    Body,
+    Depends,
+    FastAPI,
+    HTTPException,
+    Request,
+    status,
+    WebSocket,
+    WebSocketDisconnect,
+)
+from fastapi.background import BackgroundTasks
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse, RedirectResponse, StreamingResponse
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+import httpx
+from sqlalchemy import text
+from sqlalchemy.orm import Session
+from starlette.middleware.base import BaseHTTPMiddleware
+
 # First-Party
 from mcpgateway import __version__
 from mcpgateway.admin import admin_router
@@ -109,28 +131,6 @@
 # Import the admin routes from the new module
 from mcpgateway.version import router as version_router
 
-# Third-Party
-from fastapi import (
-    APIRouter,
-    Body,
-    Depends,
-    FastAPI,
-    HTTPException,
-    Request,
-    status,
-    WebSocket,
-    WebSocketDisconnect,
-)
-from fastapi.background import BackgroundTasks
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import JSONResponse, RedirectResponse, StreamingResponse
-from fastapi.staticfiles import StaticFiles
-from fastapi.templating import Jinja2Templates
-import httpx
-from sqlalchemy import text
-from sqlalchemy.orm import Session
-from starlette.middleware.base import BaseHTTPMiddleware
-
 # Initialize logging service first
 logging_service = LoggingService()
 logger = logging_service.get_logger("mcpgateway")

mcpgateway/services/gateway_service.py

@@ -21,6 +21,15 @@
 from typing import Any, AsyncGenerator, Dict, List, Optional, Set
 import uuid
 
+# Third-Party
+from filelock import FileLock, Timeout
+import httpx
+from mcp import ClientSession
+from mcp.client.sse import sse_client
+from mcp.client.streamable_http import streamablehttp_client
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
 # First-Party
 from mcpgateway.config import settings
 from mcpgateway.db import Gateway as DbGateway
@@ -31,15 +40,6 @@
 from mcpgateway.utils.create_slug import slugify
 from mcpgateway.utils.services_auth import decode_auth
 
-# Third-Party
-from filelock import FileLock, Timeout
-import httpx
-from mcp import ClientSession
-from mcp.client.sse import sse_client
-from mcp.client.streamable_http import streamablehttp_client
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
 try:
     # Third-Party
     import redis