Cleanup imports in tests

crivetimihai · crivetimihai · commit 3968579ad88b · 2025-06-01T01:47:11.000+01:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -98,4 +98,4 @@ jobs:
       uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{ matrix.language }}"
-        upload: false
+        upload: false
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,7 @@ jobs:
 
         echo "🚀  Launching container…"
         docker run -d --name mcpgateway -p 4444:4444 \
-                   mcpgateway/mcpgateway:latest
+                   -e HOST=0.0.0.0 mcpgateway/mcpgateway:latest
 
         echo "⏳  Waiting for startup…"
         sleep 10
diff --git a/Makefile b/Makefile
@@ -343,10 +343,10 @@ lint:
 ## --------------------------------------------------------------------------- ##
 autoflake:                          ## 🧹  Strip unused imports / vars
 	autoflake --in-place --remove-all-unused-imports \
-	          --remove-unused-variables -r mcpgateway
+	          --remove-unused-variables -r mcpgateway mcpgateway-wrapper tests
 
 black:                              ## 🎨  Reformat code with black
-	@echo "🎨  black …" && black -l 200 mcpgateway
+	@echo "🎨  black …" && black -l 200 mcpgateway mcpgateway-wrapper tests
 
 isort:                              ## 🔀  Sort imports
 	@echo "🔀  isort …" && isort .
@@ -376,19 +376,19 @@ pre-commit:                         ## 🪄  Run pre-commit hooks
 	pre-commit run --all-files --show-diff-on-failure
 
 ruff:                               ## ⚡  Ruff lint + format
-	ruff check mcpgateway && ruff format mcpgateway
+	ruff check mcpgateway && ruff format mcpgateway mcpgateway-wrapper tests
 
 ty:                                 ## ⚡  Ty type checker
-	ty check mcpgateway
+	ty check mcpgateway mcpgateway-wrapper tests
 
 pyright:                            ## 🏷️  Pyright type-checking
-	pyright mcpgateway
+	pyright mcpgateway mcpgateway-wrapper tests
 
 radon:                              ## 📈  Complexity / MI metrics
-	radon mi -s mcpgateway && \
-	radon cc -s mcpgateway && \
-	radon hal mcpgateway && \
-	radon raw -s mcpgateway
+	radon mi -s mcpgateway mcpgateway-wrapper tests && \
+	radon cc -s mcpgateway mcpgateway-wrapper tests && \
+	radon hal mcpgateway mcpgateway-wrapper tests && \
+	radon raw -s mcpgateway mcpgateway-wrapper tests
 
 pyroma:                             ## 📦  Packaging metadata check
 	pyroma -d .
@@ -445,7 +445,7 @@ sbom:								## 🛡️  Generate SBOM & security report
 
 pytype:								## 🧠  Pytype static type analysis
 	@echo "🧠  Pytype analysis…"
-	pytype -V 3.12 -j auto mcpgateway
+	pytype -V 3.12 -j auto mcpgateway mcpgateway-wrapper tests
 
 check-manifest:						## 📦  Verify MANIFEST.in completeness
 	@echo "📦  Verifying MANIFEST.in completeness…"
diff --git a/README.md b/README.md
@@ -165,11 +165,11 @@ docker run -i --name mcpgateway-wrapper \
         "-e",
         "MCP_AUTH_TOKEN=${MCPGATEWAY_BEARER_TOKEN}",
         "--entrypoint",
-        "uv",        
+        "uv",
         "ghcr.io/ibm/mcp-context-forge:latest",
         "run",
         "--directory",
-        "mcpgateway-wrapper",        
+        "mcpgateway-wrapper",
         "mcpgateway-wrapper"
       ],
       "env": {
diff --git a/mcpgateway/version.py b/mcpgateway/version.py
@@ -25,7 +25,6 @@
 import subprocess
 import time
 from datetime import datetime
-from pathlib import Path
 from typing import Any, Dict, Optional
 from urllib.parse import urlsplit, urlunsplit
 
diff --git a/test_readme.py b/test_readme.py
@@ -14,8 +14,6 @@
 import sys
 from pathlib import Path
 
-import pytest
-
 # Add the parent directory to the path so that we can import the module
 sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,17 +6,16 @@
 Authors: Mihai Criveti
 
 """
+
 import asyncio
 import os
-from typing import AsyncGenerator, Generator
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
-from fastapi import FastAPI
 from sqlalchemy import create_engine
-from sqlalchemy.orm import Session, sessionmaker
+from sqlalchemy.orm import sessionmaker
 
-from mcpgateway.config import Settings, get_settings
+from mcpgateway.config import Settings
 from mcpgateway.db import Base
 
 
diff --git a/tests/unit/mcpgateway/services/test_completion_service.py b/tests/unit/mcpgateway/services/test_completion_service.py
@@ -6,6 +6,7 @@
 Authors: Mihai Criveti
 
 """
+
 import pytest
 
 from mcpgateway.services.completion_service import (  # :contentReference[oaicite:0]{index=0}:contentReference[oaicite:1]{index=1}
diff --git a/tests/unit/mcpgateway/services/test_gateway_service.py b/tests/unit/mcpgateway/services/test_gateway_service.py
@@ -8,16 +8,13 @@
 Tests for the Gateway Service implementation.
 """
 
-import asyncio
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
-from sqlalchemy import select
-from sqlalchemy.exc import IntegrityError
 
 from mcpgateway.db import Gateway as DbGateway
 from mcpgateway.db import Tool as DbTool
-from mcpgateway.schemas import GatewayCreate, GatewayRead, GatewayUpdate
+from mcpgateway.schemas import GatewayCreate, GatewayUpdate
 from mcpgateway.services.gateway_service import (
     GatewayConnectionError,
     GatewayError,
diff --git a/tests/unit/mcpgateway/services/test_logging_service.py b/tests/unit/mcpgateway/services/test_logging_service.py
@@ -6,6 +6,7 @@
 Authors: Mihai Criveti
 
 """
+
 import asyncio
 import logging
 from datetime import datetime
diff --git a/tests/unit/mcpgateway/services/test_prompt_service.py b/tests/unit/mcpgateway/services/test_prompt_service.py
@@ -8,11 +8,9 @@
 Tests for prompt service implementation.
 """
 
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
-from sqlalchemy import select
-from sqlalchemy.exc import IntegrityError
 
 from mcpgateway.db import Prompt as DbPrompt
 from mcpgateway.schemas import PromptArgument, PromptCreate, PromptRead, PromptUpdate
diff --git a/tests/unit/mcpgateway/services/test_resource_service.py b/tests/unit/mcpgateway/services/test_resource_service.py
@@ -6,13 +6,13 @@
 Authors: Mihai Criveti
 
 """
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
 
 from mcpgateway.schemas import ResourceCreate, ResourceRead
 from mcpgateway.services.resource_service import (
-    ResourceError,
     ResourceNotFoundError,
     ResourceService,
     ResourceURIConflictError,
diff --git a/tests/unit/mcpgateway/services/test_root_service.py b/tests/unit/mcpgateway/services/test_root_service.py
@@ -6,6 +6,7 @@
 Authors: Mihai Criveti
 
 """
+
 import asyncio
 import os
 from urllib.parse import urlparse
@@ -14,7 +15,6 @@
 
 from mcpgateway.config import settings
 from mcpgateway.services.root_service import RootService, RootServiceError
-from mcpgateway.types import Root
 
 
 @pytest.mark.asyncio
@@ -63,7 +63,7 @@ async def test_add_root_duplicate_raises():
 async def test_remove_root_and_list():
     service = RootService()
     uri = "http://example.com/to-remove"
-    root = await service.add_root(uri)
+    await service.add_root(uri)
     # Ensure it's listed
     roots = await service.list_roots()
     assert any(r.uri == uri for r in roots)
diff --git a/tests/unit/mcpgateway/services/test_server_service.py b/tests/unit/mcpgateway/services/test_server_service.py
@@ -8,11 +8,9 @@
 Tests for server service implementation.
 """
 
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
-from sqlalchemy import select
-from sqlalchemy.exc import IntegrityError
 
 from mcpgateway.db import Prompt as DbPrompt
 from mcpgateway.db import Resource as DbResource
diff --git a/tests/unit/mcpgateway/services/test_tool_service.py b/tests/unit/mcpgateway/services/test_tool_service.py
@@ -8,11 +8,9 @@
 Tests for tool service implementation.
 """
 
-import json
-from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
+from unittest.mock import ANY, AsyncMock, MagicMock, Mock
 
 import pytest
-from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 
 from mcpgateway.db import Tool as DbTool
diff --git a/tests/unit/mcpgateway/test_admin.py b/tests/unit/mcpgateway/test_admin.py
@@ -19,16 +19,6 @@
 from sqlalchemy.orm import Session
 
 from mcpgateway.admin import (
-    GatewayCreate,
-    GatewayUpdate,
-    PromptCreate,
-    PromptUpdate,
-    ResourceCreate,
-    ResourceUpdate,
-    ServerCreate,
-    ServerUpdate,
-    ToolCreate,
-    ToolUpdate,
     admin_add_gateway,
     admin_add_prompt,
     admin_add_resource,
@@ -63,15 +53,13 @@
     admin_toggle_resource,
     admin_toggle_server,
     admin_toggle_tool,
-    admin_ui,
 )
 from mcpgateway.services.gateway_service import GatewayService
 from mcpgateway.services.prompt_service import PromptService
 from mcpgateway.services.resource_service import ResourceService
 from mcpgateway.services.root_service import RootService
 from mcpgateway.services.server_service import ServerNotFoundError, ServerService
 from mcpgateway.services.tool_service import (
-    ToolError,
     ToolNameConflictError,
     ToolService,
 )
diff --git a/tests/unit/mcpgateway/test_config.py b/tests/unit/mcpgateway/test_config.py
@@ -6,9 +6,8 @@
 Authors: Mihai Criveti
 
 """
-from unittest.mock import patch
 
-import pytest
+from unittest.mock import patch
 
 from mcpgateway.config import Settings, get_settings
 
diff --git a/tests/unit/mcpgateway/test_main.py b/tests/unit/mcpgateway/test_main.py
@@ -8,15 +8,12 @@
 Tests for the main API endpoints.
 """
 
-import json
 import os
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import MagicMock, patch
 
 import pytest
-from fastapi import FastAPI
 from fastapi.testclient import TestClient
 
-from mcpgateway.config import settings
 from mcpgateway.schemas import ResourceRead, ServerRead, ToolRead
 from mcpgateway.types import InitializeResult, ResourceContent, ServerCapabilities
 
diff --git a/tests/unit/mcpgateway/test_schemas.py b/tests/unit/mcpgateway/test_schemas.py
@@ -13,14 +13,12 @@
 import json
 import os
 from datetime import datetime
-from typing import Dict, List
 
 import pytest
 from pydantic import ValidationError
 
 from mcpgateway.types import (
     ClientCapabilities,
-    ContentType,
     CreateMessageResult,
     ImageContent,
     Implementation,
diff --git a/tests/unit/mcpgateway/test_types.py b/tests/unit/mcpgateway/test_types.py
@@ -12,15 +12,12 @@
 
 import json
 import os
-from datetime import datetime
-from typing import Dict, List
 
 import pytest
 from pydantic import ValidationError
 
 from mcpgateway.types import (
     ClientCapabilities,
-    ContentType,
     CreateMessageResult,
     ImageContent,
     Implementation,
diff --git a/tests/unit/mcpgateway/transports/test_sse_transport.py b/tests/unit/mcpgateway/transports/test_sse_transport.py
@@ -10,7 +10,7 @@
 
 import asyncio
 import json
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import Mock
 
 import pytest
 from fastapi import Request
diff --git a/tests/unit/mcpgateway/transports/test_stdio_transport.py b/tests/unit/mcpgateway/transports/test_stdio_transport.py
@@ -11,10 +11,7 @@
 """
 
 import asyncio
-import json
-import sys
-from io import StringIO
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
@@ -37,7 +34,7 @@ async def test_connect(self, mock_get_loop, stdio_transport):
         mock_loop = MagicMock()
         mock_get_loop.return_value = mock_loop
 
-        mock_reader = MagicMock()
+        MagicMock()
         mock_reader_protocol = MagicMock()
 
         mock_transport = MagicMock()
diff --git a/tests/unit/mcpgateway/transports/test_websocket_transport.py b/tests/unit/mcpgateway/transports/test_websocket_transport.py
@@ -9,8 +9,7 @@
 """
 
 import asyncio
-import json
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 from fastapi import WebSocket, WebSocketDisconnect
@@ -144,7 +143,6 @@ async def test_ping_loop(self, websocket_transport, mock_websocket):
         """Test the ping loop with valid response."""
         # Mock dependencies
         with patch("mcpgateway.config.settings") as mock_settings, patch("asyncio.sleep", new_callable=AsyncMock):
-
             # Configure settings
             mock_settings.websocket_ping_interval = 0.1  # Short interval for testing
 
diff --git a/tests/unit/mcpgateway/validation/test_jsonrpc.py b/tests/unit/mcpgateway/validation/test_jsonrpc.py
@@ -6,6 +6,7 @@
 Authors: Mihai Criveti
 
 """
+
 import pytest
 
 from mcpgateway.validation.jsonrpc import (
