From be0b6951a4b80c6982b8e7a70e129183d1f062f7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 1 Jan 2025 10:59:40 +0000 Subject: [PATCH] Formatting and updating the changelog. --- CHANGELOG.md | 2 +- app-data/version.toml | 2 +- mcp_servers/mcp_tcp_server.py | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80697a8..027ed77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ > Features: +- [e523815] [Feature] Standalone MCP server script - [5d138d5] [Feature] Separate MCP server and client processes > Improvements: - [cc51ead] [Improvement] Handle missing default model + optimizing the config calls - [7fa1a6f] [Improvement] Handle interruption during MCP Server initialization - [abbcd08] [Improvement] Better MCP server related error handling -- [cccf3a3] [Improvement] Proper conversation handling when interrupted with tools --- diff --git a/app-data/version.toml b/app-data/version.toml index 4a63378..1debf10 100644 --- a/app-data/version.toml +++ b/app-data/version.toml @@ -1 +1 @@ -version = "6.8.3" +version = "6.9.0" diff --git a/mcp_servers/mcp_tcp_server.py b/mcp_servers/mcp_tcp_server.py index 6fe0902..96225ad 100644 --- a/mcp_servers/mcp_tcp_server.py +++ b/mcp_servers/mcp_tcp_server.py @@ -12,7 +12,6 @@ from mcp import ClientSession, StdioServerParameters, Tool from mcp.client.stdio import stdio_client - from mcp_errors import (CommandNotFoundError, ConfigError, MCPError, ServerInitError, ToolExecutionError) @@ -21,15 +20,16 @@ logger.setLevel(logging.DEBUG) # Set the base logger level to DEBUG # Create a FileHandler for DEBUG logs -file_handler = logging.FileHandler(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'mcp_tcp_server.log'), - mode='w') +file_handler = logging.FileHandler( + os.path.join(os.path.dirname(os.path.abspath(__file__)), "mcp_tcp_server.log"), mode="w" +) file_handler.setLevel(logging.DEBUG) # Log all messages (DEBUG and above) to the file -file_handler.setFormatter(logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')) +file_handler.setFormatter(logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")) # Create a StreamHandler for INFO logs stream_handler = logging.StreamHandler(sys.stdout) stream_handler.setLevel(logging.INFO) # Only log INFO and above to the console -stream_handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')) +stream_handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")) # Add both handlers to the logger logger.addHandler(file_handler) @@ -46,6 +46,7 @@ logger.error('"mcp_config.json.sample" is either missing or renamed, please update from source.') exit(1) + class MCPServer: def __init__(self, server_name, server_config): self.server_name = server_name @@ -77,6 +78,7 @@ async def cleanup(self): self.logger.error(f"Error during client cleanup: {e}") self.client = None + class MCPTCPServer: def __init__(self, host: str = "localhost", port: int = 8765): self.host = host @@ -498,6 +500,7 @@ async def start(self): await self.cleanup() raise + if __name__ == "__main__": server = MCPTCPServer() @@ -508,4 +511,4 @@ async def main(): logger.info("\nShutting down server...") await server.cleanup() - asyncio.run(main()) \ No newline at end of file + asyncio.run(main())