fix refactor

Author: Agent-Hellboy

README.md

@@ -40,7 +40,7 @@ You can now configure middleware for your MCP server using a dedicated `config.p
 ### Example: config.py
 
 ```python
-from pymcp.server import MiddlewareConfig
+from pymcp.middleware import MiddlewareConfig
 
 middleware_config = MiddlewareConfig(
     cors={
@@ -65,8 +65,8 @@ middleware_config = MiddlewareConfig(
 ### Example: run_server.py
 
 ```python
-from example.config import middleware_config
-from pymcp.server import create_app
+from config import middleware_config
+from pymcp.applications import create_app
 
 app = create_app(middleware_config=middleware_config)
 ```

example/config.py

@@ -11,10 +11,8 @@
         "level": "DEBUG",
         "format": "%(asctime)s %(levelname)s %(message)s",
     },
-    compression={
-        "enabled": True
-    },
+    compression={"enabled": True},
     custom=[
         # Add custom middleware classes here if needed
-    ]
-) 
+    ],
+)

example/run_server.py

@@ -6,6 +6,7 @@
 
 logging.basicConfig(level=logging.DEBUG)
 
+
 @tool_registry.register
 def addNumbersTool(a: float, b: float) -> str:
     """Adds two numbers 'a' and 'b' and returns their sum."""
@@ -41,5 +42,6 @@ def promptEchoTool(prompt: str) -> str:
 
 if __name__ == "__main__":
     import uvicorn
+
     app = create_app(middleware_config=middleware_config)
     uvicorn.run(app, host="0.0.0.0", port=8088)

guide.md

@@ -133,7 +133,9 @@ For best practice, create a `config.py` file in your project root to define your
 ### Example: config.py
 
 ```python
-from pymcp.server import MiddlewareConfig
+
+from pymcp.applications import create_app
+from pymcp.middleware import MiddlewareConfig
 
 middleware_config = MiddlewareConfig(
     cors={

pymcp/applications.py

@@ -2,6 +2,7 @@
 App factory for the MCP framework.
 Provides the create_app function to instantiate and configure the FastAPI app.
 """
+
 from typing import Optional
 
 from fastapi import FastAPI
@@ -21,4 +22,4 @@ def create_app(middleware_config: Optional[MiddlewareConfig] = None, **kwargs):
     )
     setup_middleware(app, config)
     app.include_router(router)
-    return app 
+    return app

pymcp/middleware.py

@@ -1,7 +1,7 @@
 """
 Middleware configuration and setup for the MCP framework.
 """
-import logging
+
 from typing import Any, Dict, Optional
 
 from fastapi.middleware.cors import CORSMiddleware
@@ -12,6 +12,7 @@ class MiddlewareConfig:
     """
     Configuration class for setting up middleware in the MCP server.
     """
+
     def __init__(
         self,
         cors: Optional[Dict[str, Any]] = None,
@@ -26,7 +27,10 @@ def __init__(
             "allow_methods": ["*"],
             "allow_headers": ["*"],
         }
-        self.logging = logging or {"level": "INFO", "format": "%(asctime)s %(levelname)s %(message)s"}
+        self.logging = logging or {
+            "level": "INFO",
+            "format": "%(asctime)s %(levelname)s %(message)s",
+        }
         self.error_handling = error_handling or {}
         self.compression = compression or {"enabled": False}
         self.custom = custom or []
@@ -44,12 +48,13 @@ def setup_middleware(app, config: MiddlewareConfig):
         allow_methods=config.cors["allow_methods"],
         allow_headers=config.cors["allow_headers"],
     )
-    # Logging
-    logging.basicConfig(level=config.logging["level"], format=config.logging["format"])
+
     # Compression
     if config.compression.get("enabled", False):
         app.add_middleware(GZipMiddleware)
     # Custom middleware
     for mw in config.custom:
+        if not hasattr(mw, "__call__"):
+            raise ValueError(f"Custom middleware {mw} is not callable")
         app.add_middleware(mw)
-    # Error handling can be added here as needed 
+    # Error handling can be added here as needed

pymcp/server.py

@@ -1,6 +1,7 @@
 """
 Main server logic for the MCP framework.
 """
+
 import asyncio
 import json
 from uuid import uuid4
@@ -13,15 +14,18 @@
 
 router = APIRouter()
 
+
 def get_sessions(app):
     if not hasattr(app.state, "sessions"):
         app.state.sessions = {}
     return app.state.sessions
 
+
 @router.get("/")
 async def root():
     return {"status": "ok"}
 
+
 @router.get("/sse-cursor")
 async def sse_cursor(request: Request):
     app = request.app
@@ -46,6 +50,7 @@ async def event_stream():
 
     return StreamingResponse(event_stream(), media_type="text/event-stream")
 
+
 @router.post("/message")
 async def message(request: Request):
     app = request.app

pymcp/utils.py

@@ -1,6 +1,7 @@
 """
 Utility functions for the MCP framework.
 """
+
 import json
 import logging
 
@@ -80,4 +81,4 @@ async def handle_rpc_method(method, data, session_id, rpc_id, sessions):
             "id": rpc_id,
             "error": {"code": -32601, "message": f"Method '{method}' not recognized"},
         }
-        await queue.put(json.dumps(error)) 
+        await queue.put(json.dumps(error))