add glama and also did minor refactoring

Author: kenliao94

glama.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "https://glama.ai/mcp/schemas/server.json",
+    "maintainers": [
+      "kenliao94"
+    ]
+}

src/mcp_server_rabbitmq/__init__.py

@@ -13,16 +13,14 @@ def main():
     parser.add_argument("--username", type=str, help="Username for the connection")
     parser.add_argument("--password", type=str, help="Password for the connection")
     parser.add_argument("--use-tls", type=bool, help="Is the connection amqps")
-    parser.add_argument("--log-level", type=str, help="Log level, supports DEBUG|INFO|WARNING|ERROR, default to WARNING")
 
     args = parser.parse_args()
     asyncio.run(serve(
         rabbitmq_host=args.rabbitmq_host,
         port=args.port,
         username=args.username,
         password=args.password,
-        use_tls=args.use_tls,
-        log_level=args.log_level))
+        use_tls=args.use_tls))
 
 
 if __name__ == "__main__":

src/mcp_server_rabbitmq/constant.py

@@ -0,0 +1 @@
+MCP_SERVER_VERSION = "2.0.0"

src/mcp_server_rabbitmq/server.py

@@ -6,17 +6,6 @@
 )
 import ssl
 import logging
-from .models import (
-    Enqueue, 
-    Fanout, 
-    ListQueues, 
-    ListExchanges, 
-    GetQueueInfo, 
-    DeleteQueue,
-    PurgeQueue,
-    DeleteExchange,
-    GetExchangeInfo
-)
 from .connection import RabbitMQConnection, validate_rabbitmq_name
 from .handlers import (
     handle_enqueue, 
@@ -30,15 +19,14 @@
     handle_get_exchange_info
 )
 from .admin import RabbitMQAdmin
+from .tools import MCP_TOOLS
 
-
-async def serve(rabbitmq_host: str, port: int, username: str, password: str, use_tls: bool, log_level: str = "INFO", api_port: int = 15671) -> None:
+async def serve(rabbitmq_host: str, port: int, username: str, password: str, use_tls: bool, api_port: int = 15671) -> None:
     # Setup server
     server = Server("mcp-rabbitmq")
     # Setup logger
     logger = logging.getLogger("mcp-rabbitmq")
-    logger.setLevel(log_level)
-    # Configure logging with timestamp and file output
+    logger.setLevel(logging.INFO)
     logging.basicConfig(
         format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
         handlers=[
@@ -49,53 +37,7 @@ async def serve(rabbitmq_host: str, port: int, username: str, password: str, use
 
     @server.list_tools()
     async def list_tools() -> list[Tool]:
-        return [
-            Tool(
-                name="enqueue",
-                description="""Enqueue a message to a queue hosted on RabbitMQ""",
-                inputSchema=Enqueue.model_json_schema(),
-            ),
-            Tool(
-                name="fanout",
-                description="""Publish a message to an exchange with fanout type""",
-                inputSchema=Fanout.model_json_schema(),
-            ),
-            Tool(
-                name="list_queues",
-                description="""List all the queues in the broker""",
-                inputSchema=ListQueues.model_json_schema(),
-            ),
-            Tool(
-                name="list_exchanges",
-                description="""List all the exchanges in the broker""",
-                inputSchema=ListExchanges.model_json_schema(),
-            ),
-            Tool(
-                name="get_queue_info",
-                description="""Get detailed information about a specific queue""",
-                inputSchema=GetQueueInfo.model_json_schema(),
-            ),
-            Tool(
-                name="delete_queue",
-                description="""Delete a specific queue""",
-                inputSchema=DeleteQueue.model_json_schema(),
-            ),
-            Tool(
-                name="purge_queue",
-                description="""Remove all messages from a specific queue""",
-                inputSchema=PurgeQueue.model_json_schema(),
-            ),
-            Tool(
-                name="delete_exchange",
-                description="""Delete a specific exchange""",
-                inputSchema=DeleteExchange.model_json_schema(),
-            ),
-            Tool(
-                name="get_exchange_info",
-                description="""Get detailed information about a specific exchange""",
-                inputSchema=GetExchangeInfo.model_json_schema(),
-            )
-        ]
+        return MCP_TOOLS
 
     @server.call_tool()
     async def call_tool(
@@ -106,17 +48,15 @@ async def call_tool(
             logger.debug("Executing enqueue tool")
             message = arguments["message"]
             queue = arguments["queue"]
-            
             validate_rabbitmq_name(queue, "Queue name")
-
             try:
                 # Setup RabbitMQ connection
                 rabbitmq = RabbitMQConnection(rabbitmq_host, port, username, password, use_tls)
                 handle_enqueue(rabbitmq, queue, message)
                 return [TextContent(type="text", text=str("suceeded"))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "fanout":
             logger.debug("Executing fanout tool")
             message = arguments["message"]
@@ -131,24 +71,23 @@ async def call_tool(
                 return [TextContent(type="text", text=str("suceeded"))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "list_queues":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
                 result = handle_list_queues(admin)
                 return [TextContent(type="text", text=str(result))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
-            return [TextContent(type="text", text=str("succeeded"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "list_exchanges":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
                 result = handle_list_exchanges(admin)
                 return [TextContent(type="text", text=str(result))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "get_queue_info":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
@@ -159,7 +98,7 @@ async def call_tool(
                 return [TextContent(type="text", text=str(result))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "delete_queue":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
@@ -170,7 +109,7 @@ async def call_tool(
                 return [TextContent(type="text", text=str("succeeded"))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "purge_queue":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
@@ -181,7 +120,7 @@ async def call_tool(
                 return [TextContent(type="text", text=str("succeeded"))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "delete_exchange":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
@@ -192,7 +131,7 @@ async def call_tool(
                 return [TextContent(type="text", text=str("succeeded"))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         elif name == "get_exchange_info":
             try:
                 admin = RabbitMQAdmin(rabbitmq_host, api_port, username, password, use_tls)
@@ -203,7 +142,7 @@ async def call_tool(
                 return [TextContent(type="text", text=str(result))]
             except Exception as e:
                 logger.error(f"{e}")
-                return [TextContent(type="text", text=str("failed"))]
+                return [TextContent(type="text", text=str(f"failed: {e}"))]
         raise ValueError(f"Tool not found: {name}")
 
     options = server.create_initialization_options()

src/mcp_server_rabbitmq/tools.py

@@ -0,0 +1,66 @@
+from .models import (
+    Enqueue, 
+    Fanout, 
+    ListQueues, 
+    ListExchanges, 
+    GetQueueInfo, 
+    DeleteQueue,
+    PurgeQueue,
+    DeleteExchange,
+    GetExchangeInfo
+)
+from mcp.types import (
+    Tool,
+)
+
+MCP_TOOLS = [
+    Tool(
+        name="enqueue",
+        description="""Enqueue a message to a queue hosted on RabbitMQ""",
+        inputSchema=Enqueue.model_json_schema(),
+    ),
+    Tool(
+        name="fanout",
+        description="""Publish a message to an exchange with fanout type""",
+        inputSchema=Fanout.model_json_schema(),
+    ),
+    Tool(
+        name="list_queues",
+        description="""List all the queues in the broker""",
+        inputSchema=ListQueues.model_json_schema(),
+    ),
+    Tool(
+        name="list_exchanges",
+        description="""List all the exchanges in the broker""",
+        inputSchema=ListExchanges.model_json_schema(),
+    ),
+    Tool(
+        name="get_queue_info",
+        description="""Get detailed information about a specific queue""",
+        inputSchema=GetQueueInfo.model_json_schema(),
+    ),
+    Tool(
+        name="delete_queue",
+        description="""Delete a specific queue""",
+        inputSchema=DeleteQueue.model_json_schema(),
+    ),
+    Tool(
+        name="purge_queue",
+        description="""Remove all messages from a specific queue""",
+        inputSchema=PurgeQueue.model_json_schema(),
+    ),
+    Tool(
+        name="delete_exchange",
+        description="""Delete a specific exchange""",
+        inputSchema=DeleteExchange.model_json_schema(),
+    ),
+    Tool(
+        name="get_exchange_info",
+        description="""Get detailed information about a specific exchange""",
+        inputSchema=GetExchangeInfo.model_json_schema(),
+    )
+]
+
+MCP_TOOL_ROUTING = {
+    
+}