Rebase, lint and fix pylint issues

crivetimihai · crivetimihai · commit 4cbbe66ec91a · 2025-08-10T15:36:27.000+01:00
Signed-off-by: Mihai Criveti &lt;crivetimihai@gmail.com&gt;
diff --git a/async_testing/profiler.py b/async_testing/profiler.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
 Comprehensive async performance profiler for mcpgateway.
diff --git a/mcpgateway/admin.py b/mcpgateway/admin.py
@@ -17,27 +17,25 @@
 underlying data.
 """
 
-import json
-import time
-
 # Standard
 from collections import defaultdict
 from functools import wraps
+import json
+import time
 from typing import Any, Dict, List, Optional, Union
 
-import httpx
-
 # Third-Party
 from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
+import httpx
 from pydantic import ValidationError
 from pydantic_core import ValidationError as CoreValidationError
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
 # First-Party
 from mcpgateway.config import settings
-from mcpgateway.db import GlobalConfig, get_db
+from mcpgateway.db import get_db, GlobalConfig
 from mcpgateway.schemas import (
     GatewayCreate,
     GatewayRead,
diff --git a/mcpgateway/alembic/env.py b/mcpgateway/alembic/env.py
@@ -118,7 +118,6 @@ def _inside_alembic() -> bool:
         disable_existing_loggers=False,
     )
 
-# First-Party
 # add your model's MetaData object here
 # for 'autogenerate' support
 # from myapp import mymodel
diff --git a/mcpgateway/alembic/versions/3b17fdc40a8d_add_passthrough_headers_to_gateways_and_.py b/mcpgateway/alembic/versions/3b17fdc40a8d_add_passthrough_headers_to_gateways_and_.py
@@ -10,10 +10,9 @@
 # Standard
 from typing import Sequence, Union
 
-import sqlalchemy as sa
-
 # Third-Party
 from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "3b17fdc40a8d"
diff --git a/mcpgateway/alembic/versions/b77ca9d2de7e_uuid_pk_and_slug_refactor.py b/mcpgateway/alembic/versions/b77ca9d2de7e_uuid_pk_and_slug_refactor.py
@@ -7,15 +7,13 @@
 
 """
 
-import uuid
-
 # Standard
 from typing import Sequence, Union
-
-import sqlalchemy as sa
+import uuid
 
 # Third-Party
 from alembic import op
+import sqlalchemy as sa
 from sqlalchemy.orm import Session
 
 # First-Party
diff --git a/mcpgateway/alembic/versions/cc7b95fec5d9_add_tags_support_to_all_entities.py b/mcpgateway/alembic/versions/cc7b95fec5d9_add_tags_support_to_all_entities.py
@@ -10,10 +10,9 @@
 # Standard
 from typing import Sequence, Union
 
-import sqlalchemy as sa
-
 # Third-Party
 from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "cc7b95fec5d9"
diff --git a/mcpgateway/alembic/versions/e4fc04d1a442_add_annotations_to_tables.py b/mcpgateway/alembic/versions/e4fc04d1a442_add_annotations_to_tables.py
@@ -10,10 +10,9 @@
 # Standard
 from typing import Sequence, Union
 
-import sqlalchemy as sa
-
 # Third-Party
 from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "e4fc04d1a442"
diff --git a/mcpgateway/alembic/versions/e75490e949b1_add_improved_status_to_tables.py b/mcpgateway/alembic/versions/e75490e949b1_add_improved_status_to_tables.py
@@ -9,10 +9,9 @@
 # Standard
 from typing import Sequence, Union
 
-import sqlalchemy as sa
-
 # Third-Party
 from alembic import op
+import sqlalchemy as sa
 
 # Revision identifiers.
 revision: str = "e75490e949b1"
diff --git a/mcpgateway/bootstrap_db.py b/mcpgateway/bootstrap_db.py
@@ -23,10 +23,9 @@
 import asyncio
 from importlib.resources import files
 
+# Third-Party
 from alembic import command
 from alembic.config import Config
-
-# Third-Party
 from sqlalchemy import create_engine, inspect
 
 # First-Party
diff --git a/mcpgateway/cache/resource_cache.py b/mcpgateway/cache/resource_cache.py
@@ -36,8 +36,8 @@
 
 # Standard
 import asyncio
-import time
 from dataclasses import dataclass
+import time
 from typing import Any, Dict, Optional
 
 # First-Party
diff --git a/mcpgateway/cache/session_registry.py b/mcpgateway/cache/session_registry.py
@@ -61,7 +61,7 @@
 # First-Party
 from mcpgateway import __version__
 from mcpgateway.config import settings
-from mcpgateway.db import SessionMessageRecord, SessionRecord, get_db
+from mcpgateway.db import get_db, SessionMessageRecord, SessionRecord
 from mcpgateway.models import Implementation, InitializeResult, ServerCapabilities
 from mcpgateway.services import PromptService, ResourceService, ToolService
 from mcpgateway.services.logging_service import LoggingService
diff --git a/mcpgateway/config.py b/mcpgateway/config.py
@@ -47,21 +47,19 @@
     True
 """
 
-import json
-import logging
-import os
-import re
-
 # Standard
 from functools import lru_cache
 from importlib.resources import files
+import json
+import logging
+import os
 from pathlib import Path
+import re
 from typing import Annotated, Any, ClassVar, Dict, List, Optional, Set, Union
 
-import jq
-
 # Third-Party
 from fastapi import HTTPException
+import jq
 from jsonpath_ng.ext import parse
 from jsonpath_ng.jsonpath import JSONPath
 from pydantic import Field, field_validator
diff --git a/mcpgateway/db.py b/mcpgateway/db.py
@@ -21,15 +21,14 @@
     True
 """
 
-import uuid
-
 # Standard
 from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
+import uuid
 
 # Third-Party
 import jsonschema
-from sqlalchemy import JSON, Boolean, Column, DateTime, Float, ForeignKey, Integer, String, Table, Text, UniqueConstraint, create_engine, event, func, make_url, select
+from sqlalchemy import Boolean, Column, create_engine, DateTime, event, Float, ForeignKey, func, Integer, JSON, make_url, select, String, Table, Text, UniqueConstraint
 from sqlalchemy.event import listen
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.hybrid import hybrid_property
diff --git a/mcpgateway/federation/discovery.py b/mcpgateway/federation/discovery.py
@@ -63,10 +63,10 @@
 
 # Standard
 import asyncio
-import os
-import socket
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
+import os
+import socket
 from typing import Dict, List, Optional
 from urllib.parse import urlparse
 
diff --git a/mcpgateway/handlers/sampling.py b/mcpgateway/handlers/sampling.py
@@ -218,7 +218,7 @@ async def create_message(self, db: Session, request: Dict[str, Any]) -> CreateMe
                 if not self._validate_message(msg):
                     raise SamplingError(f"Invalid message format: {msg}")
 
-            # FIXME: Implement actual model sampling - currently returns mock response
+            # TODO: Implement actual model sampling - currently returns mock response  # pylint: disable=fixme
             # For now return mock response
             response = self._mock_sample(messages=messages)
 
@@ -357,7 +357,7 @@ async def _add_context(self, _db: Session, messages: List[Dict[str, Any]], _cont
             >>> len(result)
             2
         """
-        # FIXME: Implement context gathering based on type - currently no-op
+        # TODO: Implement context gathering based on type - currently no-op  # pylint: disable=fixme
         # For now return original messages
         return messages
 
diff --git a/mcpgateway/main.py b/mcpgateway/main.py
@@ -27,14 +27,14 @@
 
 # Standard
 import asyncio
+from contextlib import asynccontextmanager
 import json
 import time
-from contextlib import asynccontextmanager
 from typing import Any, AsyncIterator, Dict, List, Optional, Union
 from urllib.parse import urlparse, urlunparse
 
 # Third-Party
-from fastapi import APIRouter, Body, Depends, FastAPI, HTTPException, Request, WebSocket, WebSocketDisconnect, status
+from fastapi import APIRouter, Body, Depends, FastAPI, HTTPException, Request, status, WebSocket, WebSocketDisconnect
 from fastapi.background import BackgroundTasks
 from fastapi.exception_handlers import request_validation_exception_handler as fastapi_default_validation_handler
 from fastapi.exceptions import RequestValidationError
@@ -56,7 +56,7 @@
 from mcpgateway.cache import ResourceCache, SessionRegistry
 from mcpgateway.config import jsonpath_modifier, settings
 from mcpgateway.db import Prompt as DbPrompt
-from mcpgateway.db import PromptMetric, SessionLocal, refresh_slugs_on_startup
+from mcpgateway.db import PromptMetric, refresh_slugs_on_startup, SessionLocal
 from mcpgateway.handlers.sampling import SamplingHandler
 from mcpgateway.models import InitializeRequest, InitializeResult, ListResourceTemplatesResult, LogLevel, ResourceContent, Root
 from mcpgateway.plugins import PluginManager, PluginViolationError
diff --git a/mcpgateway/plugins/framework/loader/plugin.py b/mcpgateway/plugins/framework/loader/plugin.py
@@ -10,7 +10,7 @@
 
 # Standard
 import logging
-from typing import Type, cast
+from typing import cast, Type
 
 # First-Party
 from mcpgateway.plugins.framework.base import Plugin
diff --git a/mcpgateway/plugins/framework/registry.py b/mcpgateway/plugins/framework/registry.py
@@ -8,10 +8,9 @@
 Module that stores plugin instances and manages hook points.
 """
 
-import logging
-
 # Standard
 from collections import defaultdict
+import logging
 from typing import Optional
 
 # First-Party
diff --git a/mcpgateway/plugins/framework/utils.py b/mcpgateway/plugins/framework/utils.py
@@ -9,10 +9,9 @@
 plugins.
 """
 
-import importlib
-
 # Standard
 from functools import cache
+import importlib
 from types import ModuleType
 
 # First-Party
diff --git a/mcpgateway/schemas.py b/mcpgateway/schemas.py
@@ -21,15 +21,15 @@
 
 # Standard
 import base64
+from datetime import datetime, timezone
+from enum import Enum
 import json
 import logging
 import re
-from datetime import datetime, timezone
-from enum import Enum
 from typing import Any, Dict, List, Literal, Optional, Self, Union
 
 # Third-Party
-from pydantic import AnyHttpUrl, BaseModel, ConfigDict, Field, ValidationInfo, field_serializer, field_validator, model_validator
+from pydantic import AnyHttpUrl, BaseModel, ConfigDict, Field, field_serializer, field_validator, model_validator, ValidationInfo
 
 # First-Party
 from mcpgateway.config import settings
diff --git a/mcpgateway/services/__init__.py b/mcpgateway/services/__init__.py
@@ -12,7 +12,6 @@
 - Gateway coordination
 """
 
-# First-Party
 from mcpgateway.services.gateway_service import GatewayError, GatewayService
 from mcpgateway.services.prompt_service import PromptError, PromptService
 from mcpgateway.services.resource_service import ResourceError, ResourceService
diff --git a/mcpgateway/services/gateway_service.py b/mcpgateway/services/gateway_service.py
@@ -39,17 +39,16 @@
 
 # Standard
 import asyncio
+from datetime import datetime, timezone
 import logging
 import os
 import tempfile
+from typing import Any, AsyncGenerator, Dict, List, Optional, Set, TYPE_CHECKING
 import uuid
-from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, AsyncGenerator, Dict, List, Optional, Set
-
-import httpx
 
 # 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
diff --git a/mcpgateway/services/logging_service.py b/mcpgateway/services/logging_service.py
@@ -11,10 +11,10 @@
 
 # Standard
 import asyncio
-import logging
-import os
 from datetime import datetime, timezone
+import logging
 from logging.handlers import RotatingFileHandler
+import os
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
 # Third-Party
diff --git a/mcpgateway/services/prompt_service.py b/mcpgateway/services/prompt_service.py
@@ -16,14 +16,14 @@
 
 # Standard
 import asyncio
-import uuid
 from datetime import datetime, timezone
 from string import Formatter
 from typing import Any, AsyncGenerator, Dict, List, Optional, Set
+import uuid
 
 # Third-Party
 from jinja2 import Environment, meta, select_autoescape
-from sqlalchemy import Float, case, delete, desc, func, not_, select
+from sqlalchemy import case, delete, desc, Float, func, not_, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
diff --git a/mcpgateway/services/resource_service.py b/mcpgateway/services/resource_service.py
@@ -26,14 +26,14 @@
 
 # Standard
 import asyncio
+from datetime import datetime, timezone
 import mimetypes
 import re
-from datetime import datetime, timezone
 from typing import Any, AsyncGenerator, Dict, List, Optional, Union
 
 # Third-Party
 import parse
-from sqlalchemy import Float, case, delete, desc, func, not_, select
+from sqlalchemy import case, delete, desc, Float, func, not_, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
diff --git a/mcpgateway/services/server_service.py b/mcpgateway/services/server_service.py
@@ -19,7 +19,7 @@
 
 # Third-Party
 import httpx
-from sqlalchemy import Float, case, delete, desc, func, select
+from sqlalchemy import case, delete, desc, Float, func, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
diff --git a/mcpgateway/services/tool_service.py b/mcpgateway/services/tool_service.py
diff --git a/mcpgateway/translate.py b/mcpgateway/translate.py
diff --git a/mcpgateway/transports/sse_transport.py b/mcpgateway/transports/sse_transport.py
diff --git a/mcpgateway/transports/streamablehttp_transport.py b/mcpgateway/transports/streamablehttp_transport.py
diff --git a/mcpgateway/utils/db_isready.py b/mcpgateway/utils/db_isready.py
diff --git a/mcpgateway/utils/verify_credentials.py b/mcpgateway/utils/verify_credentials.py
diff --git a/mcpgateway/version.py b/mcpgateway/version.py
diff --git a/mcpgateway/wrapper.py b/mcpgateway/wrapper.py
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#!/usr/bin/env python3`
`2`	`1`	`# -- coding: utf-8 --`
`3`	`2`	`"""`
`4`	`3`	`Comprehensive async performance profiler for mcpgateway.`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ def _inside_alembic() -> bool:`
`118`	`118`	`disable_existing_loggers=False,`
`119`	`119`	`)`
`120`	`120`
`121`		`-# First-Party`
`122`	`121`	`# add your model's MetaData object here`
`123`	`122`	`# for 'autogenerate' support`
`124`	`123`	`# from myapp import mymodel`