mcp-proxy-adapter 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl

examples/complete_example/server.py

@@ -8,14 +8,12 @@ environment-specific configuration, and multiple commands.
 import os
 import sys
 import argparse
-from typing import Dict, Any
 from pathlib import Path
-
-import mcp_proxy_adapter as mcp
-from mcp_proxy_adapter import MicroService
+import uvicorn
+from mcp_proxy_adapter.api.app import create_app
 from mcp_proxy_adapter.commands.command_registry import registry
-from mcp_proxy_adapter.core.logging import logger
 from mcp_proxy_adapter.config import config
+from mcp_proxy_adapter.core.logging import logger, setup_logging
 
 # Add commands directory to path for local imports
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
@@ -28,32 +26,22 @@ def parse_args():
     Returns:
         Parsed arguments
     """
-    parser = argparse.ArgumentParser(description="MCP Microservice Example")
+    parser = argparse.ArgumentParser(description="MCP Complete Example")
     parser.add_argument(
-        "--config", 
+        "--config",
         default="configs/config.dev.yaml",
         help="Path to configuration file"
     )
     return parser.parse_args()
 
 
-def ensure_directories(config_path: str):
+def ensure_directories():
     """
     Create necessary directories based on configuration.
-    
-    Args:
-        config_path: Path to configuration file
     """
-    # Extract base directory
     base_dir = os.path.dirname(os.path.abspath(__file__))
-    
-    # Create logs directory
     os.makedirs(os.path.join(base_dir, "logs"), exist_ok=True)
-    
-    # Create cache directory
     os.makedirs(os.path.join(base_dir, "cache"), exist_ok=True)
-    
-    # Create data directory
     os.makedirs(os.path.join(base_dir, "data"), exist_ok=True)
 
 
@@ -65,74 +53,60 @@ def setup_application(config_file=None):
         config_file: Path to configuration file (optional)
         
     Returns:
-        Configured microservice object
+        Configured FastAPI application
     """
-    # Parse command line arguments if config_file not provided
     if config_file is None:
         args = parse_args()
         config_file = args.config
-    
-    # Get absolute path to config file
     current_dir = Path(__file__).parent.absolute()
     config_path = current_dir / config_file
-    
-    # Fall back to config.json if specified file doesn't exist
     if not config_path.exists():
         config_path = current_dir / "config.json"
-    
-    # Create necessary directories
-    ensure_directories(str(config_path))
-    
-    # Load configuration if exists
+    ensure_directories()
     if config_path.exists():
         config.load_from_file(str(config_path))
         logger.info(f"Loaded configuration from {config_path}")
     else:
         logger.warning(f"Configuration file {config_path} not found, using defaults")
-    
-    # Create microservice
-    service = MicroService(
-        title="Complete MCP Microservice Example",
-        description="Full-featured microservice with Docker support",
-        version="1.0.0",
-        config_path=str(config_path) if config_path.exists() else None
-    )
-    
-    # Safely register commands from package
+    app = create_app()
+    app.title = "Complete MCP Microservice Example"
+    app.description = "Full-featured microservice with Docker support"
+    app.version = "1.0.0"
+    # Discover and register commands from the commands directory
+    package_path = "commands"
     try:
-        # Clear any existing registrations to prevent conflicts
-        package_path = "commands"
-        
-        # Get currently registered commands
-        commands = registry.get_all_commands()
-        for cmd_name in list(commands.keys()):
+        registered_commands = registry.get_all_commands()
+        for cmd_name in list(registered_commands.keys()):
             try:
                 registry.unregister(cmd_name)
             except Exception as e:
                 logger.debug(f"Error unregistering command {cmd_name}: {e}")
-        
-        # Discover and register commands
-        service.discover_commands(package_path)
-        logger.info(f"Discovered and registered commands from package: {package_path}")
+        registry.discover_commands(package_path)
+        logger.info(f"Discovered commands from package: {package_path}")
     except Exception as e:
         logger.error(f"Error discovering commands: {e}")
-    
-    return service
+    return app
 
 
 def main():
     """Run microservice with command discovery."""
-    # Setup application
-    service = setup_application()
-    
-    # Check if port is overridden by environment variable (for testing)
+    log_level = config.get("logging.level", "INFO")
+    setup_logging(log_level)
+    app = setup_application()
+    host = config.get("server.host", "0.0.0.0")
+    port = config.get("server.port", 8000)
     if "TEST_SERVER_PORT" in os.environ:
         port = int(os.environ["TEST_SERVER_PORT"])
-        service.port = port
         logger.info(f"Using test port from environment: {port}")
-    
-    # Run server with parameters from configuration
-    service.run()
+    logger.info(f"Starting server on {host}:{port}")
+    debug = config.get("server.debug", False)
+    uvicorn.run(
+        app,
+        host=host,
+        port=port,
+        reload=debug,
+        log_level=log_level.lower()
+    )
 
 
 if __name__ == "__main__":

mcp_proxy_adapter/api/tool_integration.py

@@ -90,7 +90,8 @@ class ToolIntegration:
             # использоваться библиотека для конвертации markdown в HTML)
             markdown = APIToolDescription.generate_tool_description_text(tool_name, registry)
             # Простая конвертация для примера
-            html = f"<html><body>{markdown.replace('#', '<h1>').replace('\n\n', '</p><p>')}</body></html>"
+            body = markdown.replace('#', '<h1>').replace('\n\n', '</p><p>')
+            html = f"<html><body>{body}</body></html>"
             return html
         else:
             # По умолчанию возвращаем markdown

mcp_proxy_adapter/custom_openapi.py

@@ -18,8 +18,16 @@ class CustomOpenAPIGenerator:
     """
     Custom OpenAPI schema generator for compatibility with MCP-Proxy.
     
+    EN:
     This generator creates an OpenAPI schema that matches the format expected by MCP-Proxy,
     enabling dynamic command loading and proper tool representation in AI models.
+    Allows overriding title, description, and version for schema customization.
+
+    RU:
+    Кастомный генератор схемы OpenAPI для совместимости с MCP-Proxy.
+    Позволяет создавать схему OpenAPI в формате, ожидаемом MCP-Proxy,
+    с возможностью динамической подгрузки команд и корректного отображения инструментов для AI-моделей.
+    Поддерживает переопределение title, description и version для кастомизации схемы.
     """
     
     def __init__(self):
@@ -88,38 +96,67 @@ class CustomOpenAPIGenerator:
         
         return cmd_schema
         
-    def generate(self) -> Dict[str, Any]:
+    def generate(self, title: Optional[str] = None, description: Optional[str] = None, version: Optional[str] = None) -> Dict[str, Any]:
         """
+        EN:
         Generate the complete OpenAPI schema compatible with MCP-Proxy.
+        Optionally override title, description, and version.
+
+        RU:
+        Генерирует полную схему OpenAPI, совместимую с MCP-Proxy.
+        Позволяет опционально переопределить title, description и version.
+        
+        Args:
+            title: Custom title for the schema / Кастомный заголовок схемы
+            description: Custom description for the schema / Кастомное описание схемы
+            version: Custom version for the schema / Кастомная версия схемы
         
         Returns:
-            Dict containing the complete OpenAPI schema.
+            Dict containing the complete OpenAPI schema / Словарь с полной схемой OpenAPI
         """
         # Deep copy the base schema to avoid modifying it
         schema = deepcopy(self.base_schema)
-        
+
+        # Optionally override info fields
+        if title:
+            schema["info"]["title"] = title
+        if description:
+            schema["info"]["description"] = description
+        if version:
+            schema["info"]["version"] = version
+
         # Add commands to schema
         self._add_commands_to_schema(schema)
-        
+
         logger.info(f"Generated OpenAPI schema with {len(registry.get_all_commands())} commands")
-        
+
         return schema
 
 
 def custom_openapi(app: FastAPI) -> Dict[str, Any]:
     """
+    EN:
     Create a custom OpenAPI schema for the FastAPI application.
+    Passes app's title, description, and version to the generator.
+
+    RU:
+    Создаёт кастомную OpenAPI-схему для FastAPI-приложения.
+    Передаёт параметры title, description и version из приложения в генератор схемы.
     
     Args:
-        app: The FastAPI application.
+        app: The FastAPI application / FastAPI-приложение
         
     Returns:
-        Dict containing the custom OpenAPI schema.
+        Dict containing the custom OpenAPI schema / Словарь с кастомной OpenAPI-схемой
     """
     generator = CustomOpenAPIGenerator()
-    openapi_schema = generator.generate()
-    
+    openapi_schema = generator.generate(
+        title=getattr(app, 'title', None),
+        description=getattr(app, 'description', None),
+        version=getattr(app, 'version', None)
+    )
+
     # Cache the schema
     app.openapi_schema = openapi_schema
-    
+
     return openapi_schema 

mcp_proxy_adapter/tests/functional/test_api.py

@@ -232,4 +232,22 @@ def test_batch_requests(test_client: TestClient, json_rpc_request: Dict[str, Any
     assert data[0]["id"] == "1"
     
     assert data[1]["result"]["params"] == {"request_id": "2"}
-    assert data[1]["id"] == "2" 
+    assert data[1]["id"] == "2"
+
+
+def test_custom_openapi_schema_fields():
+    """
+    Test that custom title, description, and version are set in the OpenAPI schema.
+    """
+    from fastapi import FastAPI
+    from mcp_proxy_adapter.custom_openapi import custom_openapi
+
+    app = FastAPI(
+        title="Custom Title",
+        description="Custom Description",
+        version="9.9.9"
+    )
+    schema = custom_openapi(app)
+    assert schema["info"]["title"] == "Custom Title"
+    assert schema["info"]["description"] == "Custom Description"
+    assert schema["info"]["version"] == "9.9.9" 

mcp_proxy_adapter/version.py

@@ -1,3 +1,3 @@
 """Version information for MCP Microservice."""
 
-__version__ = "3.0.1" 
+__version__ = "3.0.3" 

{mcp_proxy_adapter-3.0.1.dist-info → mcp_proxy_adapter-3.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
-Name: mcp_proxy_adapter
-Version: 3.0.1
+Name: mcp-proxy-adapter
+Version: 3.0.3
 Summary: Reliable microservice with unified JSON-RPC endpoint
 Home-page: https://github.com/yourusername/mcp-proxy-adapter
 Author: MCP Team

{mcp_proxy_adapter-3.0.1.dist-info → mcp_proxy_adapter-3.0.3.dist-info}/RECORD

@@ -29,7 +29,7 @@ examples/complete_example/__init__.py,sha256=JQDNMNOrQAvbQyEV7tV3XrVKBxZRYy3ODMC
 examples/complete_example/config.json,sha256=KbfZnu4SMYH6B7ENQaZ_sZXrWdkmCdMcWgy47nAHh_Q,814
 examples/complete_example/docker-compose.yml,sha256=kBXjXFeswZCZ4-UhI0vC0OMR_nMRRoDt3PltCi-RGb8,924
 examples/complete_example/requirements.txt,sha256=QHeMbXMHgkISmFoXfO09kiaXAMkg0nNBdCfwThKiHDc,403
-examples/complete_example/server.py,sha256=JzJPIHI6EJFMRqYw-ZhxIRkYGH-Mdm2UdGiizt04Q0M,4146
+examples/complete_example/server.py,sha256=t-GTqSP0yatjs67O1OFHzf-Yg7tU0aCw6r2eUdYtjpM,3565
 examples/complete_example/commands/__init__.py,sha256=cZDiwz3nLaeSCwR4oK7xlGgVsXt2WyAlIEMWCxSJPAE,121
 examples/complete_example/commands/system_command.py,sha256=CwcBRWMODG7Ynr9Syaildu3APuuUdJ_yvQOggAAidg8,10717
 examples/complete_example/configs/config.dev.yaml,sha256=ASIwU8xzB-kinAsLGghv8-LCER1SUC1ed6K8BktOYPQ,1282
@@ -44,15 +44,15 @@ examples/minimal_example/tests/test_hello_command.py,sha256=C48o7Hh_gy2NlLqb2KKm
 examples/minimal_example/tests/test_integration.py,sha256=mW9LEXX5yOCxP3uIpGMiTEMci7DE8PDDCiE8rKJn4ds,6213
 mcp_proxy_adapter/__init__.py,sha256=B7m1YWyv_Wb87-Q-JqVpHQgwajnfIgDyZ_iIxzdTbBY,1021
 mcp_proxy_adapter/config.py,sha256=MjgZAld6TiD0F5oCyEaJhYhfEXVZxc5G5ke2SLKCV9A,5748
-mcp_proxy_adapter/custom_openapi.py,sha256=EFEjeQ3DudgTfb4870PWkF1upWM5RaY1PY9jxTSOwU8,4142
+mcp_proxy_adapter/custom_openapi.py,sha256=a8DidORiO2sxMnRHlgSD0C6_6lZi3K56-PzF2p_t4NE,6316
 mcp_proxy_adapter/openapi.py,sha256=jyl5EPXcFhzFKEEMXxHeqF1U-SsYvtdlaKGU2QrekpU,13889
 mcp_proxy_adapter/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_proxy_adapter/version.py,sha256=dJk-xMDB6JeaL5chSa3I4Y6cpYWyK2dbuJHiHLtX4Og,71
+mcp_proxy_adapter/version.py,sha256=n1SIxB1BUfUjywGxxK6RFEDs6vMuHouqenqqD9oFKfg,71
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=q3yYsNEBFXYr2TOJFxfh6bbF53NkmmgfzSFOtVq7xdc,14353
 mcp_proxy_adapter/api/handlers.py,sha256=4oAkc-szU3tggkLehqvTW2P5c3HTLIiqXQMwCY0ua2Q,7043
 mcp_proxy_adapter/api/schemas.py,sha256=xOmiSwHaapY6myEFnLu7o-LWVPM7vwmLYZXFo2c6NfE,12381
-mcp_proxy_adapter/api/tool_integration.py,sha256=4nnE9I4XIHrsE5vN-I4e5xYJhHrHBDM-vMHT5lD9HWo,10137
+mcp_proxy_adapter/api/tool_integration.py,sha256=mQNFiCkd4plY_A3fkG6auaM8D_1XiC9Jxp4Zrm1ngYE,10161
 mcp_proxy_adapter/api/tools.py,sha256=nSDXD4rGlFV_NlB91Y0x3N8WeWvWZ76B32-s-VAFARw,8084
 mcp_proxy_adapter/api/middleware/__init__.py,sha256=RpaA5hbZ7XIjKaQK0PJpZNqc9tFISe5w7ZmqNgwC6FE,1556
 mcp_proxy_adapter/api/middleware/auth.py,sha256=bic-ez4o4xh74ZczLXSNafrk_m2qk82GF9MHmfDpf9w,4891
@@ -91,7 +91,7 @@ mcp_proxy_adapter/tests/commands/test_config_command.py,sha256=ud0Y57xUhFiyrUKDy
 mcp_proxy_adapter/tests/commands/test_echo_command.py,sha256=c2dmqfx3ZfvDedy5vuxArFv7iHsReepMmD2Lchg4l3E,3437
 mcp_proxy_adapter/tests/commands/test_help_command.py,sha256=OJCZMS0BqUUNNSecipd3dOFokUATiET3gpCoVAxPXPA,4116
 mcp_proxy_adapter/tests/functional/__init__.py,sha256=muVNR6LD5o7DsDaLrbLTFsavUNcnyM608-mr-dqzgDU,59
-mcp_proxy_adapter/tests/functional/test_api.py,sha256=Vsn4IsZ5uEa7g4G5IIyyhvdx6Xa0FuWSPd7XVxVMTP8,6554
+mcp_proxy_adapter/tests/functional/test_api.py,sha256=OaGB-WAWVyX4b0b-mCdXBNhwwYABYeBPO3IDnA3I00c,7114
 mcp_proxy_adapter/tests/integration/__init__.py,sha256=JZpeNG1PBRZ3k5zfq6NH3GyzDc1Yx1ZUgwi6eLBxs1o,60
 mcp_proxy_adapter/tests/integration/test_cmd_integration.py,sha256=OqBxh52WPijKaRrIHA54QDJQLBz_nwlCywF9k5jxa_Y,3430
 mcp_proxy_adapter/tests/integration/test_integration.py,sha256=Rf8GTxdZOvZzrtgqWN2fp-36qUU5rpHdV9zhN1JxNw8,6619
@@ -102,8 +102,8 @@ mcp_proxy_adapter/tests/stubs/echo_command.py,sha256=Y7SA4IB5Lo_ncn78SDm9iRZvJSK
 mcp_proxy_adapter/tests/unit/__init__.py,sha256=RS-5UoSCcLKtr2jrAaZw_NG9MquA6BZmxq-P6cTw9ok,53
 mcp_proxy_adapter/tests/unit/test_base_command.py,sha256=ldDXQYk2eijbTgZioSBAhHzSAa_SuBKYqCutCEzUYTE,3924
 mcp_proxy_adapter/tests/unit/test_config.py,sha256=SZ62LXFOv_fsV0fmSIBdHWvapEyexKrioFRQo0I4pkg,5900
-mcp_proxy_adapter-3.0.1.dist-info/licenses/LICENSE,sha256=OkApFEwdgMCt_mbvUI-eIwKMSTe38K3XnU2DT5ub-wI,1072
-mcp_proxy_adapter-3.0.1.dist-info/METADATA,sha256=IQfUDUcgTOvLRjUNzcEwp6knWzfaJxYxhS9DEYblork,7537
-mcp_proxy_adapter-3.0.1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-mcp_proxy_adapter-3.0.1.dist-info/top_level.txt,sha256=kxq3OC7vBtsFdy9dDVse4cOl-SV_QlvcTeSkuw_jw3I,27
-mcp_proxy_adapter-3.0.1.dist-info/RECORD,,
+mcp_proxy_adapter-3.0.3.dist-info/licenses/LICENSE,sha256=OkApFEwdgMCt_mbvUI-eIwKMSTe38K3XnU2DT5ub-wI,1072
+mcp_proxy_adapter-3.0.3.dist-info/METADATA,sha256=kyCCy5J9i92A38ew7UbqT4Tsy0KAKwPkLu0v00CnfFI,7537
+mcp_proxy_adapter-3.0.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+mcp_proxy_adapter-3.0.3.dist-info/top_level.txt,sha256=kxq3OC7vBtsFdy9dDVse4cOl-SV_QlvcTeSkuw_jw3I,27
+mcp_proxy_adapter-3.0.3.dist-info/RECORD,,

{mcp_proxy_adapter-3.0.1.dist-info → mcp_proxy_adapter-3.0.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any