get_serveR_details and cmd line arg for client

Author: aarora79

servers/mcpgw/client.py

@@ -87,45 +87,48 @@ async def run(server_url, args):
                 print(f"Error calling 'get_server_details': {e}")
             # --- End Example ---
 
-            # --- Example: Call the register_service tool ---
-            print("\nCalling 'register_service' tool with hardcoded parameters")
+            # --- Example: Call the register_service tool (if enabled) ---
+            if args.test_register_service and args.test_register_service.lower() in ["true", "yes"]:
+                print("\nCalling 'register_service' tool with hardcoded parameters")
 
-            try:
-                # Pass hardcoded parameters to the register_service tool
-                result = await session.call_tool(
-                    "register_service", arguments={
-                        "server_name": "Example Service",
-                        "path": "/example-service",
-                        "proxy_pass_url": "http://localhost:9000",
-                        "description": "An example MCP service for demonstration purposes",
-                        "tags": ["example", "demo", "test"],
-                        "num_tools": 3,
-                        "num_stars": 5,
-                        "is_python": True,
-                        "license": "MIT",
-                        "username": args.username,
-                        "password": args.password
-                    }
-                )
-
-                # Display the results
-                print("=" * 50)
-                print("Result for register_service:")
-                print("=" * 50)
-                # The result content is usually a list of MessagePart objects
-                full_response_text = "".join(part.text for part in result.content if hasattr(part, 'text'))
                 try:
-                    # Attempt to parse and pretty-print if it's JSON
-                    parsed_json = json.loads(full_response_text)
-                    print(json.dumps(parsed_json, indent=2))
-                except json.JSONDecodeError:
-                    # Otherwise, just print the raw text
-                    print(full_response_text)
-                print("=" * 50)
-
-            except Exception as e:
-                print(f"Error calling 'register_service': {e}")
-            # --- End Example ---
+                    # Pass hardcoded parameters to the register_service tool
+                    result = await session.call_tool(
+                        "register_service", arguments={
+                            "server_name": "Example Service",
+                            "path": "/example-service",
+                            "proxy_pass_url": "http://localhost:9000",
+                            "description": "An example MCP service for demonstration purposes",
+                            "tags": ["example", "demo", "test"],
+                            "num_tools": 3,
+                            "num_stars": 5,
+                            "is_python": True,
+                            "license": "MIT",
+                            "username": args.username,
+                            "password": args.password
+                        }
+                    )
+
+                    # Display the results
+                    print("=" * 50)
+                    print("Result for register_service:")
+                    print("=" * 50)
+                    # The result content is usually a list of MessagePart objects
+                    full_response_text = "".join(part.text for part in result.content if hasattr(part, 'text'))
+                    try:
+                        # Attempt to parse and pretty-print if it's JSON
+                        parsed_json = json.loads(full_response_text)
+                        print(json.dumps(parsed_json, indent=2))
+                    except json.JSONDecodeError:
+                        # Otherwise, just print the raw text
+                        print(full_response_text)
+                    print("=" * 50)
+
+                except Exception as e:
+                    print(f"Error calling 'register_service': {e}")
+                # --- End Example ---
+            else:
+                print("\nSkipping 'register_service' tool example (use --test-register-service=true to enable)")
 
 
 if __name__ == "__main__":
@@ -155,6 +158,12 @@ async def run(server_url, args):
         type=str,        
         help='Password for the MCP Gateway',
     )
+    parser.add_argument(
+        "--test-register-service",
+        type=str,   
+        default="false",
+        help='Set to "true" to test the register_service tool (default: "false")',
+    )
 
     # Parse the arguments
     args = parser.parse_args()

servers/mcpgw/server.py

@@ -262,57 +262,6 @@ async def toggle_service(
     credentials = Credentials(username=username, password=password)
     return await _call_registry_api("POST", endpoint, credentials=credentials)
 
-# This implementation has been replaced by the one below
-# @mcp.tool()
-# async def register_service(
-#     server_name: str = Field(..., description="Display name for the server."),
-#     path: str = Field(..., description="Unique URL path prefix for the server (e.g., '/my-service'). Must start with '/'."),
-#     proxy_pass_url: str = Field(..., description="The internal URL where the actual MCP server is running (e.g., 'http://localhost:8001')."),
-#     description: Optional[str] = Field(None, description="Optional description of the server."),
-#     tags: Optional[List[str]] = Field(None, description="Optional list of tags for categorization."),
-#     is_python: Optional[bool] = Field(False, description="Whether the server is implemented in Python."),
-#     license: Optional[str] = Field("N/A", description="License information for the server."),
-#     username: str = Field(..., description="Username for registry authentication"),
-#     password: str = Field(..., description="Password for registry authentication")
-# ) -> Dict[str, Any]:
-#     """
-#     Registers a new MCP server with the gateway.
-#
-#     Args:
-#         server_name: Display name for the server.
-#         path: Unique URL path prefix for the server (e.g., '/my-service'). Must start with '/'.
-#         proxy_pass_url: The internal URL where the actual MCP server is running (e.g., 'http://localhost:8001').
-#         description: Optional description of the server.
-#         tags: Optional list of tags for categorization.
-#         is_python: Whether the server is implemented in Python (default: False).
-#         license: License information for the server (default: 'N/A').
-#         username: Username for registry authentication.
-#         password: Password for registry authentication.
-#
-#     Returns:
-#         Dict[str, Any]: Response from the registry API, likely including the registered server details.
-#
-#     Raises:
-#         Exception: If the API call fails.
-#     """
-#     endpoint = "/register"
-#     # Extract username and password for credentials
-#     credentials = Credentials(username=username, password=password)
-#
-#     # Create data to send to the API (excluding username and password)
-#     data_to_send = {
-#         "server_name": server_name,
-#         "path": path,
-#         "proxy_pass_url": proxy_pass_url,
-#         "description": description,
-#         "tags": tags,
-#         "is_python": is_python,
-#         "license": license
-#     }
-#     # Remove None values
-#     data_to_send = {k: v for k, v in data_to_send.items() if v is not None}
-#
-#     return await _call_registry_api("POST", endpoint, credentials=credentials, json=data_to_send)
 
 @mcp.tool()
 async def register_service(
@@ -426,6 +375,32 @@ async def refresh_service(
     return await _call_registry_api("POST", endpoint, credentials=credentials)
 
 
+@mcp.tool()
+async def get_server_details(
+    service_path: str = Field(..., description="The unique path identifier for the service (e.g., '/fininfo'). Must start with '/'. Use '/all' to get details for all registered servers."),
+    username: str = Field(..., description="Username for registry authentication"),
+    password: str = Field(..., description="Password for registry authentication")
+) -> Dict[str, Any]:
+    """
+    Retrieves detailed information about a registered MCP server.
+    
+    Args:
+        service_path: The unique path identifier for the service (e.g., '/fininfo'). Must start with '/'.
+                      Use '/all' to get details for all registered servers.
+        username: Username for registry authentication.
+        password: Password for registry authentication.
+        
+    Returns:
+        Dict[str, Any]: Detailed information about the specified server or all servers if '/all' is specified.
+        
+    Raises:
+        Exception: If the API call fails or the server is not registered.
+    """
+    endpoint = f"/api/server_details/{service_path.lstrip('/')}"
+    credentials = Credentials(username=username, password=password)
+    return await _call_registry_api("GET", endpoint, credentials=credentials)
+
+
 # --- Main Execution ---
 
 def main():