mcp-proxy-adapter 6.4.45__tar.gz → 6.4.47__tar.gz

{mcp_proxy_adapter-6.4.45 → mcp_proxy_adapter-6.4.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.4.45
+Version: 6.4.47
 Summary: Powerful JSON-RPC microservices framework with built-in security, authentication, and proxy registration
 Home-page: https://github.com/maverikod/mcp-proxy-adapter
 Author: Vasiliy Zdanovskiy

{mcp_proxy_adapter-6.4.45 → mcp_proxy_adapter-6.4.47}/mcp_proxy_adapter/commands/reload_command.py

@@ -164,7 +164,7 @@ class ReloadCommand(Command):
                 logger.warning("No config_path provided, using default configuration")
 
             # Perform reload using unified initialization
-            reload_info = registry.reload_system(config_path=config_path)
+            reload_info = await registry.reload_system(config_path=config_path)
 
             # Create result
             result = ReloadResult(

{mcp_proxy_adapter-6.4.45 → mcp_proxy_adapter-6.4.47}/mcp_proxy_adapter/core/proxy_registration.py

@@ -247,6 +247,13 @@ class ProxyRegistrationManager:
             SSL context or None if SSL not needed
         """
         logger.debug("_create_ssl_context called")
+        
+        # Check if we're in HTTP mode - if so, don't create SSL context
+        server_config = self.config.get("server", {})
+        if server_config.get("protocol", "http").lower() == "http":
+            logger.debug("HTTP mode detected, skipping SSL context creation")
+            return None
+            
         if not self.client_security:
             logger.debug("SSL context creation failed: client_security is None")
             # Try best-effort default CA if available
@@ -366,7 +373,8 @@ class ProxyRegistrationManager:
 
             return None
         except Exception as e:
-            logger.error(f"Failed to create SSL context: {e}")
+            logger.warning(f"Failed to create SSL context: {e}")
+            # Don't fail the entire operation, just return None
             return None
 
     async def register_server(self) -> bool:

{mcp_proxy_adapter-6.4.45 → mcp_proxy_adapter-6.4.47}/mcp_proxy_adapter/custom_openapi.py

@@ -45,8 +45,300 @@ class CustomOpenAPIGenerator:
         Returns:
             Dict containing the base OpenAPI schema.
         """
-        with open(self.base_schema_path, "r", encoding="utf-8") as f:
-            return json.load(f)
+        try:
+            with open(self.base_schema_path, "r", encoding="utf-8") as f:
+                return json.load(f)
+        except FileNotFoundError:
+            logger.warning(f"Base schema file not found at {self.base_schema_path}, using fallback schema")
+            return self._get_fallback_schema()
+
+    def _get_fallback_schema(self) -> Dict[str, Any]:
+        """
+        Get a fallback OpenAPI schema when the base schema file is not available.
+
+        Returns:
+            Dict containing a basic OpenAPI schema.
+        """
+        return {
+            "openapi": "3.0.2",
+            "info": {
+                "title": "MCP Microservice API",
+                "description": "API для выполнения команд микросервиса",
+                "version": "1.0.0"
+            },
+            "paths": {
+                "/cmd": {
+                    "post": {
+                        "summary": "Execute Command",
+                        "description": "Executes a command via JSON-RPC protocol.",
+                        "operationId": "execute_command",
+                        "requestBody": {
+                            "content": {
+                                "application/json": {
+                                    "schema": {
+                                        "oneOf": [
+                                            { "$ref": "#/components/schemas/CommandRequest" },
+                                            { "$ref": "#/components/schemas/JsonRpcRequest" }
+                                        ]
+                                    }
+                                }
+                            },
+                            "required": True
+                        },
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {
+                                            "oneOf": [
+                                                { "$ref": "#/components/schemas/CommandResponse" },
+                                                { "$ref": "#/components/schemas/JsonRpcResponse" }
+                                            ]
+                                        }
+                                    }
+                                }
+                            },
+                            "422": {
+                                "description": "Validation Error",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {
+                                            "$ref": "#/components/schemas/HTTPValidationError"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "/health": {
+                    "get": {
+                        "summary": "Проверить работоспособность сервиса",
+                        "description": "Возвращает информацию о состоянии сервиса",
+                        "operationId": "health_check",
+                        "responses": {
+                            "200": {
+                                "description": "Информация о состоянии сервиса",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {
+                                            "$ref": "#/components/schemas/HealthResponse"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "/openapi.json": {
+                    "get": {
+                        "summary": "Get Openapi Schema",
+                        "description": "Returns OpenAPI schema.",
+                        "operationId": "get_openapi_schema_openapi_json_get",
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {}
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "/api/commands": {
+                    "get": {
+                        "summary": "Get Commands",
+                        "description": "Returns list of available commands with their descriptions.",
+                        "operationId": "get_commands_api_commands_get",
+                        "responses": {
+                            "200": {
+                                "description": "Successful Response",
+                                "content": {
+                                    "application/json": {
+                                        "schema": {}
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "components": {
+                "schemas": {
+                    "CommandRequest": {
+                        "title": "CommandRequest",
+                        "description": "Запрос на выполнение команды",
+                        "type": "object",
+                        "required": ["command"],
+                        "properties": {
+                            "command": {
+                                "title": "Command",
+                                "description": "Команда для выполнения",
+                                "type": "string"
+                            },
+                            "params": {
+                                "title": "Parameters",
+                                "description": "Параметры команды, зависят от типа команды",
+                                "type": "object",
+                                "additionalProperties": True
+                            }
+                        }
+                    },
+                    "CommandResponse": {
+                        "title": "CommandResponse",
+                        "description": "Ответ на выполнение команды",
+                        "type": "object",
+                        "required": ["result"],
+                        "properties": {
+                            "result": {
+                                "title": "Result",
+                                "description": "Результат выполнения команды"
+                            }
+                        }
+                    },
+                    "JsonRpcRequest": {
+                        "properties": {
+                            "jsonrpc": {
+                                "type": "string",
+                                "title": "Jsonrpc",
+                                "description": "JSON-RPC version",
+                                "default": "2.0"
+                            },
+                            "method": {
+                                "type": "string",
+                                "title": "Method",
+                                "description": "Method name to call"
+                            },
+                            "params": {
+                                "additionalProperties": True,
+                                "type": "object",
+                                "title": "Params",
+                                "description": "Method parameters",
+                                "default": {}
+                            },
+                            "id": {
+                                "anyOf": [
+                                    {"type": "string"},
+                                    {"type": "integer"},
+                                    {"type": "null"}
+                                ],
+                                "title": "Id",
+                                "description": "Request identifier"
+                            }
+                        },
+                        "type": "object",
+                        "required": ["method"],
+                        "title": "JsonRpcRequest",
+                        "description": "Base model for JSON-RPC requests."
+                    },
+                    "JsonRpcResponse": {
+                        "properties": {
+                            "jsonrpc": {
+                                "type": "string",
+                                "title": "Jsonrpc",
+                                "description": "JSON-RPC version",
+                                "default": "2.0"
+                            },
+                            "result": {
+                                "anyOf": [
+                                    {},
+                                    {"type": "null"}
+                                ],
+                                "title": "Result",
+                                "description": "Method execution result"
+                            },
+                            "error": {
+                                "anyOf": [
+                                    {
+                                        "additionalProperties": True,
+                                        "type": "object"
+                                    },
+                                    {"type": "null"}
+                                ],
+                                "title": "Error",
+                                "description": "Error information"
+                            },
+                            "id": {
+                                "anyOf": [
+                                    {"type": "string"},
+                                    {"type": "integer"},
+                                    {"type": "null"}
+                                ],
+                                "title": "Id",
+                                "description": "Request identifier"
+                            }
+                        },
+                        "type": "object",
+                        "title": "JsonRpcResponse",
+                        "description": "Base model for JSON-RPC responses."
+                    },
+                    "HealthResponse": {
+                        "title": "HealthResponse",
+                        "description": "Информация о состоянии сервиса",
+                        "type": "object",
+                        "required": ["status", "model", "version"],
+                        "properties": {
+                            "status": {
+                                "title": "Status",
+                                "description": "Статус сервиса (ok/error)",
+                                "type": "string"
+                            },
+                            "model": {
+                                "title": "Model",
+                                "description": "Текущая активная модель",
+                                "type": "string"
+                            },
+                            "version": {
+                                "title": "Version",
+                                "description": "Версия сервиса",
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "HTTPValidationError": {
+                        "properties": {
+                            "detail": {
+                                "items": {
+                                    "$ref": "#/components/schemas/ValidationError"
+                                },
+                                "type": "array",
+                                "title": "Detail"
+                            }
+                        },
+                        "type": "object",
+                        "title": "HTTPValidationError"
+                    },
+                    "ValidationError": {
+                        "properties": {
+                            "loc": {
+                                "items": {
+                                    "anyOf": [
+                                        {"type": "string"},
+                                        {"type": "integer"}
+                                    ]
+                                },
+                                "type": "array",
+                                "title": "Location"
+                            },
+                            "msg": {
+                                "type": "string",
+                                "title": "Message"
+                            },
+                            "type": {
+                                "type": "string",
+                                "title": "Error Type"
+                            }
+                        },
+                        "type": "object",
+                        "required": ["loc", "msg", "type"],
+                        "title": "ValidationError"
+                    }
+                }
+            }
+        }
 
     def _add_commands_to_schema(self, schema: Dict[str, Any]) -> None:
         """

mcp_proxy_adapter-6.4.47/mcp_proxy_adapter/schemas/base_schema.json

@@ -0,0 +1,114 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Base Schema",
+  "description": "Basic schema for validating commands and results",
+  "definitions": {
+    "command": {
+      "type": "object",
+      "properties": {
+        "jsonrpc": {
+          "type": "string",
+          "enum": ["2.0"],
+          "description": "JSON-RPC version"
+        },
+        "method": {
+          "type": "string",
+          "description": "Command name"
+        },
+        "params": {
+          "type": "object",
+          "description": "Command parameters"
+        },
+        "id": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "integer"},
+            {"type": "null"}
+          ],
+          "description": "Request ID"
+        }
+      },
+      "required": ["jsonrpc", "method"]
+    },
+    "success_response": {
+      "type": "object",
+      "properties": {
+        "jsonrpc": {
+          "type": "string",
+          "enum": ["2.0"],
+          "description": "JSON-RPC version"
+        },
+        "result": {
+          "type": "object",
+          "properties": {
+            "success": {
+              "type": "boolean",
+              "enum": [true],
+              "description": "Success flag"
+            },
+            "data": {
+              "type": "object",
+              "description": "Response data"
+            },
+            "message": {
+              "type": "string",
+              "description": "Response message"
+            }
+          },
+          "required": ["success"]
+        },
+        "id": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "integer"},
+            {"type": "null"}
+          ],
+          "description": "Request ID"
+        }
+      },
+      "required": ["jsonrpc", "result"]
+    },
+    "error_response": {
+      "type": "object",
+      "properties": {
+        "jsonrpc": {
+          "type": "string",
+          "enum": ["2.0"],
+          "description": "JSON-RPC version"
+        },
+        "error": {
+          "type": "object",
+          "properties": {
+            "code": {
+              "type": "integer",
+              "description": "Error code"
+            },
+            "message": {
+              "type": "string",
+              "description": "Error message"
+            },
+            "details": {
+              "type": "object",
+              "description": "Detailed error information"
+            }
+          },
+          "required": ["code", "message"]
+        },
+        "id": {
+          "oneOf": [
+            {"type": "string"},
+            {"type": "integer"},
+            {"type": "null"}
+          ],
+          "description": "Request ID"
+        }
+      },
+      "required": ["jsonrpc", "error"]
+    }
+  },
+  "oneOf": [
+    {"$ref": "#/definitions/command"},
+    {"$ref": "#/definitions/success_response"},
+    {"$ref": "#/definitions/error_response"}
+  ]
+}