fixed tools metadata and some other changes

Author: kevalmahajan

__init__

@@ -191,7 +191,8 @@ async def tools_metadata(tool_ids: List[str]) -> List[Dict[str, Any]]:
     data: List[Dict[str, Any]] = response.json()
     if tool_ids == ["0"]:
         return data
-    return [tool for tool in data if str(tool.get("id")) in tool_ids]
+
+    return [tool for tool in data if tool["id"] in tool_ids]
 
 
 async def get_prompts_from_mcp_server(catalog_urls: List[str]) -> List[str]:
@@ -313,7 +314,7 @@ async def handle_list_tools() -> List[types.Tool]:
         RuntimeError: If an error occurs during fetching or processing.
     """
     try:
-        tool_ids = ["0"] if not SERVER_CATALOG_URLS else await get_tools_from_mcp_server(SERVER_CATALOG_URLS)
+        tool_ids = ["0"] if SERVER_CATALOG_URLS[0]==BASE_URL else await get_tools_from_mcp_server(SERVER_CATALOG_URLS)
         metadata = await tools_metadata(tool_ids)
         tools = []
         for tool in metadata:
@@ -392,7 +393,7 @@ async def handle_list_resources() -> List[types.Resource]:
         RuntimeError: If an error occurs during fetching or processing.
     """
     try:
-        ids = ["0"] if not SERVER_CATALOG_URLS else await get_resources_from_mcp_server(SERVER_CATALOG_URLS)
+        ids = ["0"] if SERVER_CATALOG_URLS[0]==BASE_URL else await get_resources_from_mcp_server(SERVER_CATALOG_URLS)
         meta = await resources_metadata(ids)
         resources = []
         for r in meta:
@@ -455,7 +456,7 @@ async def handle_list_prompts() -> List[types.Prompt]:
         RuntimeError: If an error occurs during fetching or processing.
     """
     try:
-        ids = ["0"] if not SERVER_CATALOG_URLS else await get_prompts_from_mcp_server(SERVER_CATALOG_URLS)
+        ids = ["0"] if SERVER_CATALOG_URLS[0]==BASE_URL else await get_prompts_from_mcp_server(SERVER_CATALOG_URLS)
         meta = await prompts_metadata(ids)
         prompts = []
         for p in meta: