Merge pull request #203 from IBM/test-case-updates

Fixes for pytest warnings

Author: crivetimihai

mcpgateway/admin.py

@@ -101,7 +101,7 @@ async def admin_list_servers(
     """
     logger.debug(f"User {user} requested server list")
     servers = await server_service.list_servers(db, include_inactive=include_inactive)
-    return [server.dict(by_alias=True) for server in servers]
+    return [server.model_dump(by_alias=True) for server in servers]
 
 
 @admin_router.get("/servers/{server_id}", response_model=ServerRead)
@@ -316,7 +316,7 @@ async def admin_list_resources(
     """
     logger.debug(f"User {user} requested resource list")
     resources = await resource_service.list_resources(db, include_inactive=include_inactive)
-    return [resource.dict(by_alias=True) for resource in resources]
+    return [resource.model_dump(by_alias=True) for resource in resources]
 
 
 @admin_router.get("/prompts", response_model=List[PromptRead])
@@ -342,7 +342,7 @@ async def admin_list_prompts(
     """
     logger.debug(f"User {user} requested prompt list")
     prompts = await prompt_service.list_prompts(db, include_inactive=include_inactive)
-    return [prompt.dict(by_alias=True) for prompt in prompts]
+    return [prompt.model_dump(by_alias=True) for prompt in prompts]
 
 
 @admin_router.get("/gateways", response_model=List[GatewayRead])
@@ -368,7 +368,7 @@ async def admin_list_gateways(
     """
     logger.debug(f"User {user} requested gateway list")
     gateways = await gateway_service.list_gateways(db, include_inactive=include_inactive)
-    return [gateway.dict(by_alias=True) for gateway in gateways]
+    return [gateway.model_dump(by_alias=True) for gateway in gateways]
 
 
 @admin_router.post("/gateways/{gateway_id}/toggle")
@@ -444,6 +444,7 @@ async def admin_ui(
     roots = [root.model_dump(by_alias=True) for root in await root_service.list_roots()]
     root_path = settings.app_root_path
     response = request.app.state.templates.TemplateResponse(
+        request,
         "admin.html",
         {
             "request": request,
@@ -486,7 +487,7 @@ async def admin_list_tools(
     """
     logger.debug(f"User {user} requested tool list")
     tools = await tool_service.list_tools(db, include_inactive=include_inactive)
-    return [tool.dict(by_alias=True) for tool in tools]
+    return [tool.model_dump(by_alias=True) for tool in tools]
 
 
 @admin_router.get("/tools/{tool_id}", response_model=ToolRead)
@@ -570,7 +571,7 @@ async def admin_add_tool(
     logger.debug(f"Tool data built: {tool_data}")
     try:
         tool = ToolCreate(**tool_data)
-        logger.debug(f"Validated tool data: {tool.dict()}")
+        logger.debug(f"Validated tool data: {tool.model_dump(by_alias=True)}")
         await tool_service.register_tool(db, tool)
         return JSONResponse(
             content={"message": "Tool registered successfully!", "success": True},
@@ -733,7 +734,7 @@ async def admin_get_gateway(gateway_id: str, db: Session = Depends(get_db), user
     """
     logger.debug(f"User {user} requested details for gateway ID {gateway_id}")
     gateway = await gateway_service.get_gateway(db, gateway_id)
-    return gateway.dict(by_alias=True)
+    return gateway.model_dump(by_alias=True)
 
 
 @admin_router.post("/gateways")
@@ -868,7 +869,7 @@ async def admin_get_resource(uri: str, db: Session = Depends(get_db), user: str
     logger.debug(f"User {user} requested details for resource URI {uri}")
     resource = await resource_service.get_resource_by_uri(db, uri)
     content = await resource_service.read_resource(db, uri)
-    return {"resource": resource.dict(by_alias=True), "content": content}
+    return {"resource": resource.model_dump(by_alias=True), "content": content}
 
 
 @admin_router.post("/resources")
@@ -1023,7 +1024,7 @@ async def admin_get_prompt(name: str, db: Session = Depends(get_db), user: str =
     prompt_details = await prompt_service.get_prompt_details(db, name)
 
     prompt = PromptRead.model_validate(prompt_details)
-    return prompt.dict(by_alias=True)
+    return prompt.model_dump(by_alias=True)
 
 
 @admin_router.post("/prompts")

mcpgateway/cache/session_registry.py

@@ -94,8 +94,6 @@ def __init__(
                 raise ValueError("Redis backend requires redis_url")
 
             self._redis = Redis.from_url(redis_url)
-            self._pubsub = self._redis.pubsub()
-            self._pubsub.subscribe("mcp_session_events")
 
         elif self._backend == "database":
             if not SQLALCHEMY_AVAILABLE:
@@ -152,6 +150,10 @@ async def initialize(self) -> None:
             self._cleanup_task = asyncio.create_task(self._db_cleanup_task())
             logger.info("Database cleanup task started")
 
+        elif self._backend == "redis":
+            self._pubsub = self._redis.pubsub()
+            await self._pubsub.subscribe("mcp_session_events")
+
         elif self._backend == "none":
             # Nothing to initialize for none backend
             pass
@@ -179,8 +181,8 @@ async def shutdown(self) -> None:
         # Close Redis connections
         if self._backend == "redis":
             try:
-                self._pubsub.close()
-                self._redis.close()
+                await self._pubsub.aclose()
+                await self._redis.aclose()
             except Exception as e:
                 logger.error(f"Error closing Redis connection: {e}")
 

mcpgateway/config.py

@@ -41,28 +41,22 @@
 import jq
 from jsonpath_ng.ext import parse
 from jsonpath_ng.jsonpath import JSONPath
-from pydantic import Field, field_validator
+from pydantic import field_validator
 from pydantic_settings import BaseSettings, NoDecode, SettingsConfigDict
 
 
 class Settings(BaseSettings):
     """MCP Gateway configuration settings."""
 
     # Basic Settings
-    app_name: str = Field("MCP_Gateway", env="APP_NAME")
-    host: str = Field("127.0.0.1", env="HOST")
-    port: int = Field(4444, env="PORT")
+    app_name: str = "MCP_Gateway"
+    host: str = "127.0.0.1"
+    port: int = 4444
     database_url: str = "sqlite:///./mcp.db"
     templates_dir: Path = Path("mcpgateway/templates")
     # Absolute paths resolved at import-time (still override-able via env vars)
-    templates_dir: Path = Field(
-        default=files("mcpgateway") / "templates",
-        env="TEMPLATES_DIR",
-    )
-    static_dir: Path = Field(
-        default=files("mcpgateway") / "static",
-        env="STATIC_DIR",
-    )
+    templates_dir: Path = files("mcpgateway") / "templates"
+    static_dir: Path = files("mcpgateway") / "static"
     app_root_path: str = ""
 
     # Protocol

mcpgateway/db.py

@@ -105,6 +105,14 @@
     connect_args=connect_args,
 )
 
+
+# ---------------------------------------------------------------------------
+# 6. Function to return UTC timestamp
+# ---------------------------------------------------------------------------
+def utc_now():
+    return datetime.now(timezone.utc)
+
+
 # Session factory
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
@@ -181,7 +189,7 @@ class ToolMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     tool_id: Mapped[str] = mapped_column(String, ForeignKey("tools.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -207,7 +215,7 @@ class ResourceMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     resource_id: Mapped[int] = mapped_column(Integer, ForeignKey("resources.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -233,7 +241,7 @@ class ServerMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     server_id: Mapped[str] = mapped_column(String, ForeignKey("servers.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -259,7 +267,7 @@ class PromptMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     prompt_id: Mapped[int] = mapped_column(Integer, ForeignKey("prompts.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -312,8 +320,8 @@ class Tool(Base):
     headers: Mapped[Optional[Dict[str, str]]] = mapped_column(JSON)
     input_schema: Mapped[Dict[str, Any]] = mapped_column(JSON)
     annotations: Mapped[Optional[Dict[str, Any]]] = mapped_column(JSON, default=lambda: {})
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     jsonpath_filter: Mapped[str] = mapped_column(default="")
 
@@ -557,8 +565,8 @@ class Resource(Base):
     mime_type: Mapped[Optional[str]]
     size: Mapped[Optional[int]]
     template: Mapped[Optional[str]]  # URI template for parameterized resources
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     metrics: Mapped[List["ResourceMetric"]] = relationship("ResourceMetric", back_populates="resource", cascade="all, delete-orphan")
 
@@ -714,7 +722,7 @@ class ResourceSubscription(Base):
     id: Mapped[int] = mapped_column(primary_key=True)
     resource_id: Mapped[int] = mapped_column(ForeignKey("resources.id"))
     subscriber_id: Mapped[str]  # Client identifier
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     last_notification: Mapped[Optional[datetime]] = mapped_column(DateTime)
 
     resource: Mapped["Resource"] = relationship(back_populates="subscriptions")
@@ -745,8 +753,8 @@ class Prompt(Base):
     description: Mapped[Optional[str]]
     template: Mapped[str] = mapped_column(Text)
     argument_schema: Mapped[Dict[str, Any]] = mapped_column(JSON)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     metrics: Mapped[List["PromptMetric"]] = relationship("PromptMetric", back_populates="prompt", cascade="all, delete-orphan")
 
@@ -894,8 +902,8 @@ class Server(Base):
     name: Mapped[str] = mapped_column(unique=True)
     description: Mapped[Optional[str]]
     icon: Mapped[Optional[str]]
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     metrics: Mapped[List["ServerMetric"]] = relationship("ServerMetric", back_populates="server", cascade="all, delete-orphan")
 
@@ -1014,8 +1022,8 @@ class Gateway(Base):
     description: Mapped[Optional[str]]
     transport: Mapped[str] = mapped_column(default="SSE")
     capabilities: Mapped[Dict[str, Any]] = mapped_column(JSON)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     last_seen: Mapped[Optional[datetime]]
 
@@ -1086,8 +1094,8 @@ class SessionRecord(Base):
     __tablename__ = "mcp_sessions"
 
     session_id: Mapped[str] = mapped_column(primary_key=True)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
-    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)  # pylint: disable=not-callable
+    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)  # pylint: disable=not-callable
     data: Mapped[str] = mapped_column(String, nullable=True)
 
     messages: Mapped[List["SessionMessageRecord"]] = relationship("SessionMessageRecord", back_populates="session", cascade="all, delete-orphan")
@@ -1101,8 +1109,8 @@ class SessionMessageRecord(Base):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     session_id: Mapped[str] = mapped_column(ForeignKey("mcp_sessions.session_id"))
     message: Mapped[str] = mapped_column(String, nullable=True)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
-    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)  # pylint: disable=not-callable
+    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)  # pylint: disable=not-callable
 
     session: Mapped["SessionRecord"] = relationship("SessionRecord", back_populates="messages")
 

mcpgateway/federation/discovery.py

@@ -16,7 +16,7 @@
 # Standard
 import asyncio
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import logging
 import os
 import socket
@@ -205,7 +205,7 @@ async def add_peer(self, url: str, source: str, name: Optional[str] = None) -> b
         # Skip if already known
         if url in self._discovered_peers:
             peer = self._discovered_peers[url]
-            peer.last_seen = datetime.utcnow()
+            peer.last_seen = datetime.now(timezone.utc)
             return False
 
         try:
@@ -218,8 +218,8 @@ async def add_peer(self, url: str, source: str, name: Optional[str] = None) -> b
                 name=name,
                 protocol_version=PROTOCOL_VERSION,
                 capabilities=capabilities,
-                discovered_at=datetime.utcnow(),
-                last_seen=datetime.utcnow(),
+                discovered_at=datetime.now(timezone.utc),
+                last_seen=datetime.now(timezone.utc),
                 source=source,
             )
 
@@ -253,7 +253,7 @@ async def refresh_peer(self, url: str) -> bool:
         try:
             capabilities = await self._get_gateway_info(url)
             self._discovered_peers[url].capabilities = capabilities
-            self._discovered_peers[url].last_seen = datetime.utcnow()
+            self._discovered_peers[url].last_seen = datetime.now(timezone.utc)
             return True
         except Exception as e:
             logger.warning(f"Failed to refresh peer {url}: {e}")
@@ -303,7 +303,7 @@ async def _cleanup_loop(self) -> None:
         """Periodically clean up stale peers."""
         while True:
             try:
-                now = datetime.utcnow()
+                now = datetime.now(timezone.utc)
                 stale_urls = [url for url, peer in self._discovered_peers.items() if now - peer.last_seen > timedelta(minutes=10)]
                 for url in stale_urls:
                     await self.remove_peer(url)
@@ -363,7 +363,7 @@ async def _get_gateway_info(self, url: str) -> ServerCapabilities:
         if result.get("protocol_version") != PROTOCOL_VERSION:
             raise ValueError(f"Unsupported protocol version: {result.get('protocol_version')}")
 
-        return ServerCapabilities.parse_obj(result["capabilities"])
+        return ServerCapabilities.model_validate(result["capabilities"])
 
     async def _exchange_peers(self) -> None:
         """Exchange peer lists with known gateways."""

mcpgateway/federation/forward.py

@@ -15,7 +15,7 @@
 
 # Standard
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 from typing import Any, Dict, List, Optional, Set, Tuple, Union
 
@@ -233,7 +233,7 @@ async def _forward_to_gateway(
                     result = response.json()
 
                     # Update last seen
-                    gateway.last_seen = datetime.utcnow()
+                    gateway.last_seen = datetime.now(timezone.utc)
 
                     # Handle response
                     if "error" in result:
@@ -316,7 +316,7 @@ def _check_rate_limit(self, gateway_url: str) -> bool:
         Returns:
             True if request allowed
         """
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc)
 
         # Clean old history
         self._request_history[gateway_url] = [t for t in self._request_history.get(gateway_url, []) if (now - t).total_seconds() < 60]