Id migration wrapper (#311)

* minor change

Signed-off-by: Keval Mahajan <[email protected]>

* make ruff changes

Signed-off-by: Keval Mahajan <[email protected]>

* Updated test cases for wrapper

Signed-off-by: Keval Mahajan <[email protected]>

* Minor logging change
Signed-off-by: Madhav Kandukuri <[email protected]>

* Linting fixes
Signed-off-by: Madhav Kandukuri <[email protected]>

---------

Signed-off-by: Keval Mahajan <[email protected]>
Co-authored-by: Madhav Kandukuri <[email protected]>

Author: kevalmahajan

mcpgateway/alembic/env.py

@@ -3,10 +3,10 @@
 from logging.config import fileConfig
 
 # Third-Party
-from alembic import context
 from sqlalchemy import engine_from_config, pool
 
 # First-Party
+from alembic import context
 from mcpgateway.config import settings
 from mcpgateway.db import Base
 

mcpgateway/alembic/versions/b77ca9d2de7e_uuid_pk_and_slug_refactor.py

@@ -6,16 +6,17 @@
 Create Date: 2025-06-26 21:29:59.117140
 
 """
+
 # Standard
 from typing import Sequence, Union
 import uuid
 
 # Third-Party
-from alembic import op
 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
 

mcpgateway/alembic/versions/e4fc04d1a442_add_annotations_to_tables.py

@@ -6,13 +6,16 @@
 Create Date: 2025-06-27 21:45:35.099713
 
 """
+
 # Standard
 from typing import Sequence, Union
 
 # Third-Party
-from alembic import op
 import sqlalchemy as sa
 
+# First-Party
+from alembic import op
+
 # revision identifiers, used by Alembic.
 revision: str = "e4fc04d1a442"
 down_revision: Union[str, Sequence[str], None] = "b77ca9d2de7e"

mcpgateway/alembic/versions/e75490e949b1_add_improved_status_to_tables.py

@@ -10,9 +10,11 @@
 from typing import Sequence, Union
 
 # Third-Party
+import sqlalchemy as sa
+
+# First-Party
 # Alembic / SQLAlchemy
 from alembic import op
-import sqlalchemy as sa
 
 # Revision identifiers.
 revision: str = "e75490e949b1"

mcpgateway/bootstrap_db.py

@@ -25,11 +25,11 @@
 import logging
 
 # Third-Party
-from alembic import command
 from alembic.config import Config
 from sqlalchemy import create_engine, inspect
 
 # First-Party
+from alembic import command
 from mcpgateway.config import settings
 from mcpgateway.db import Base
 

mcpgateway/config.py

@@ -167,7 +167,7 @@ def _parse_federation_peers(cls, v):
     # Health Checks
     health_check_interval: int = 60  # seconds
     health_check_timeout: int = 10  # seconds
-    unhealthy_threshold: int = 10
+    unhealthy_threshold: int = 5  # after this many failures, mark as Offline
 
     filelock_path: str = "tmp/gateway_service_leader.lock"
 

mcpgateway/services/tool_service.py

@@ -375,7 +375,7 @@ async def toggle_tool_status(self, db: Session, tool_id: str, activate: bool, re
                     await self._notify_tool_activated(tool)
                 else:
                     await self._notify_tool_deactivated(tool)
-                logger.info(f"Tool: {tool.name} is {'enabled' if activate else 'disabled'}{' and accessible' if reachable else 'but inaccessible'}")
+                logger.info(f"Tool: {tool.name} is {'enabled' if activate else 'disabled'}{' and accessible' if reachable else ' but inaccessible'}")
 
             return self._convert_tool_to_read(tool)
         except Exception as e:

mcpgateway/wrapper.py

@@ -216,7 +216,7 @@ async def tools_metadata(tool_ids: List[str]) -> List[Dict[str, Any]]:
     if tool_ids == ["0"]:
         return data
 
-    return [tool for tool in data if tool["id"] in tool_ids]
+    return [tool for tool in data if tool["name"] in tool_ids]
 
 
 async def get_prompts_from_mcp_server(catalog_urls: List[str]) -> List[str]:

tests/unit/mcpgateway/test_wrapper.py

@@ -415,20 +415,20 @@ async def _meta(_):
 async def test_get_tools_and_metadata(monkeypatch, wrapper):
     # fake catalog → two servers with associated tools
     catalog = [
-        {"id": "1", "associatedTools": ["10", "11"]},
-        {"id": "2", "associatedTools": ["20"]},
+        {"id": "1", "associatedTools": ["tool1", "tool2"]},
+        {"id": "2", "associatedTools": ["tool3"]},
     ]
     monkeypatch.setattr(wrapper, "fetch_url", _json_fetcher(catalog))
     out = await wrapper.get_tools_from_mcp_server(["https://host.com/servers/1"])
-    assert out == ["10", "11"]
+    assert out == ["tool1", "tool2"]
 
     # now cover tools_metadata *filter* & *all* paths
     tools_payload = [
         {"id": "10", "name": "A"},
         {"id": "11", "name": "B"},
     ]
     monkeypatch.setattr(wrapper, "fetch_url", _json_fetcher(tools_payload))
-    subset = await wrapper.tools_metadata(["10"])
+    subset = await wrapper.tools_metadata(["A"])
     assert subset == [{"id": "10", "name": "A"}]
 
     everything = await wrapper.tools_metadata(["0"])