Replace dict with model_dump for Pydantic objects

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

Author: madhav165

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")
@@ -486,7 +486,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 +570,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 +733,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 +868,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 +1023,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/federation/manager.py

@@ -157,7 +157,7 @@ async def register_gateway(self, db: Session, url: str, name: Optional[str] = No
             gateway = DbGateway(
                 name=gateway_name,
                 url=url,
-                capabilities=capabilities.dict(),
+                capabilities=capabilities,
                 last_seen=datetime.now(timezone.utc),
             )
             db.add(gateway)
@@ -350,7 +350,7 @@ async def _run_sync_loop(self, db: Session) -> None:
                     try:
                         # Update capabilities
                         capabilities = await self._initialize_gateway(gateway.url)
-                        gateway.capabilities = capabilities.dict()
+                        gateway.capabilities = capabilities
                         gateway.last_seen = datetime.now(timezone.utc)
                         gateway.is_active = True
 

mcpgateway/main.py

@@ -812,7 +812,7 @@ async def server_get_tools(
     """
     logger.debug(f"User: {user} has listed tools for the server_id: {server_id}")
     tools = await tool_service.list_server_tools(db, server_id=server_id, 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]
 
 
 @server_router.get("/{server_id}/resources", response_model=List[ResourceRead])
@@ -840,7 +840,7 @@ async def server_get_resources(
     """
     logger.debug(f"User: {user} has listed resources for the server_id: {server_id}")
     resources = await resource_service.list_server_resources(db, server_id=server_id, 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]
 
 
 @server_router.get("/{server_id}/prompts", response_model=List[PromptRead])
@@ -868,7 +868,7 @@ async def server_get_prompts(
     """
     logger.debug(f"User: {user} has listed prompts for the server_id: {server_id}")
     prompts = await prompt_service.list_server_prompts(db, server_id=server_id, 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]
 
 
 #############

tests/unit/mcpgateway/test_admin.py

@@ -136,9 +136,9 @@ async def test_admin_list_servers(self, mock_list_servers, mock_db):
         """Test listing servers through admin UI."""
         # Setup
         mock_server1 = MagicMock()
-        mock_server1.dict.return_value = {"id": 1, "name": "Server 1"}
+        mock_server1.model_dump.return_value = {"id": 1, "name": "Server 1"}
         mock_server2 = MagicMock()
-        mock_server2.dict.return_value = {"id": 2, "name": "Server 2"}
+        mock_server2.model_dump.return_value = {"id": 2, "name": "Server 2"}
         mock_list_servers.return_value = [mock_server1, mock_server2]
 
         # Execute
@@ -235,9 +235,9 @@ async def test_admin_list_tools(self, mock_list_tools, mock_db):
         """Test listing tools through admin UI."""
         # Setup
         mock_tool1 = MagicMock()
-        mock_tool1.dict.return_value = {"id": 1, "name": "Tool 1"}
+        mock_tool1.model_dump.return_value = {"id": 1, "name": "Tool 1"}
         mock_tool2 = MagicMock()
-        mock_tool2.dict.return_value = {"id": 2, "name": "Tool 2"}
+        mock_tool2.model_dump.return_value = {"id": 2, "name": "Tool 2"}
         mock_list_tools.return_value = [mock_tool1, mock_tool2]
 
         # Execute
@@ -347,9 +347,9 @@ async def test_admin_list_resources(self, mock_list_resources, mock_db):
         """Test listing resources through admin UI."""
         # Setup
         mock_resource1 = MagicMock()
-        mock_resource1.dict.return_value = {"id": 1, "name": "Resource 1"}
+        mock_resource1.model_dump.return_value = {"id": 1, "name": "Resource 1"}
         mock_resource2 = MagicMock()
-        mock_resource2.dict.return_value = {"id": 2, "name": "Resource 2"}
+        mock_resource2.model_dump.return_value = {"id": 2, "name": "Resource 2"}
         mock_list_resources.return_value = [mock_resource1, mock_resource2]
 
         # Execute
@@ -367,7 +367,7 @@ async def test_admin_get_resource(self, mock_read_resource, mock_get_resource, m
         """Test getting a single resource through admin UI."""
         # Setup
         mock_resource = MagicMock()
-        mock_resource.dict.return_value = {"id": 1, "name": "Resource 1"}
+        mock_resource.model_dump.return_value = {"id": 1, "name": "Resource 1"}
         mock_get_resource.return_value = mock_resource
         mock_read_resource.return_value = {"type": "resource", "text": "content"}
 
@@ -435,9 +435,9 @@ async def test_admin_list_prompts(self, mock_list_prompts, mock_db):
         """Test listing prompts through admin UI."""
         # Setup
         mock_prompt1 = MagicMock()
-        mock_prompt1.dict.return_value = {"id": 1, "name": "Prompt 1"}
+        mock_prompt1.model_dump.return_value = {"id": 1, "name": "Prompt 1"}
         mock_prompt2 = MagicMock()
-        mock_prompt2.dict.return_value = {"id": 2, "name": "Prompt 2"}
+        mock_prompt2.model_dump.return_value = {"id": 2, "name": "Prompt 2"}
         mock_list_prompts.return_value = [mock_prompt1, mock_prompt2]
 
         # Execute
@@ -537,9 +537,9 @@ async def test_admin_list_gateways(self, mock_list_gateways, mock_db):
         """Test listing gateways through admin UI."""
         # Setup
         mock_gateway1 = MagicMock()
-        mock_gateway1.dict.return_value = {"id": 1, "name": "Gateway 1"}
+        mock_gateway1.model_dump.return_value = {"id": 1, "name": "Gateway 1"}
         mock_gateway2 = MagicMock()
-        mock_gateway2.dict.return_value = {"id": 2, "name": "Gateway 2"}
+        mock_gateway2.model_dump.return_value = {"id": 2, "name": "Gateway 2"}
         mock_list_gateways.return_value = [mock_gateway1, mock_gateway2]
 
         # Execute
@@ -556,7 +556,7 @@ async def test_admin_get_gateway(self, mock_get_gateway, mock_db):
         """Test getting a single gateway through admin UI."""
         # Setup
         mock_gateway = MagicMock()
-        mock_gateway.dict.return_value = {"id": 1, "name": "Gateway 1"}
+        mock_gateway.model_dump.return_value = {"id": 1, "name": "Gateway 1"}
         mock_get_gateway.return_value = mock_gateway
 
         # Execute

tests/unit/mcpgateway/test_main.py

@@ -387,7 +387,7 @@ def test_delete_server_endpoint(self, mock_delete, test_client, auth_headers):
     def test_server_get_tools(self, mock_list_tools, test_client, auth_headers):
         """Test listing tools associated with a server."""
         mock_tool = MagicMock()
-        mock_tool.dict.return_value = MOCK_TOOL_READ
+        mock_tool.model_dump.return_value = MOCK_TOOL_READ
         mock_list_tools.return_value = [mock_tool]
 
         response = test_client.get("/servers/1/tools", headers=auth_headers)
@@ -400,7 +400,7 @@ def test_server_get_tools(self, mock_list_tools, test_client, auth_headers):
     def test_server_get_resources(self, mock_list_resources, test_client, auth_headers):
         """Test listing resources associated with a server."""
         mock_resource = MagicMock()
-        mock_resource.dict.return_value = MOCK_RESOURCE_READ
+        mock_resource.model_dump.return_value = MOCK_RESOURCE_READ
         mock_list_resources.return_value = [mock_resource]
 
         response = test_client.get("/servers/1/resources", headers=auth_headers)