opensearch-mcp-server 2.0.2__tar.gz → 2.0.4__tar.gz

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/Makefile

@@ -10,9 +10,10 @@ release:
 		data = tomli.load(open("pyproject.toml", "rb")); \
 		data["project"]["version"] = "$(version:v%=%)"; \
 		tomli_w.dump(data, open("pyproject.toml", "wb"))'
-	@git add pyproject.toml
-	@git commit -m "release: update version to $(version:v%=%)"
+	@python -c 'open("src/version.py", "w").write("__version__ = \"$(version:v%=%)\"\n")'
 	@uv sync
+	@git add .
+	@git commit -m "release: update version to $(version:v%=%)"
 	@git push origin main
 	@git tag $(version)
 	@git push origin $(version)

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensearch-mcp-server
-Version: 2.0.2
+Version: 2.0.4
 Summary: MCP Server for interacting with Elasticsearch and OpenSearch
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -231,6 +231,10 @@ https://github.com/user-attachments/assets/f7409e31-fac4-4321-9c94-b0ff2ea7ff15
 
 ## Features
 
+### General Operations
+
+- `general_api_request`: Perform a general HTTP API request. Use this tool for any Elasticsearch/OpenSearch API that does not have a dedicated tool.
+
 ### Index Operations
 
 - `list_indices`: List all indices.

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/README.md

@@ -14,6 +14,10 @@ https://github.com/user-attachments/assets/f7409e31-fac4-4321-9c94-b0ff2ea7ff15
 
 ## Features
 
+### General Operations
+
+- `general_api_request`: Perform a general HTTP API request. Use this tool for any Elasticsearch/OpenSearch API that does not have a dedicated tool.
+
 ### Index Operations
 
 - `list_indices`: List all indices.

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opensearch-mcp-server"
-version = "2.0.2"
+version = "2.0.4"
 description = "MCP Server for interacting with Elasticsearch and OpenSearch"
 readme = "README.md"
 requires-python = ">=3.10"

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/src/clients/base.py

@@ -3,6 +3,10 @@ import logging
 import warnings
 from typing import Dict
 
+from elasticsearch import Elasticsearch
+import httpx
+from opensearchpy import OpenSearch
+
 class SearchClientBase(ABC):
     def __init__(self, config: Dict, engine_type: str):
         """
@@ -35,7 +39,6 @@ class SearchClientBase(ABC):
         
         # Initialize client based on engine type
         if engine_type == "elasticsearch":
-            from elasticsearch import Elasticsearch
             self.client = Elasticsearch(
                 hosts=hosts,
                 basic_auth=(username, password) if username and password else None,
@@ -43,7 +46,6 @@ class SearchClientBase(ABC):
             )
             self.logger.info(f"Elasticsearch client initialized with hosts: {hosts}")
         elif engine_type == "opensearch":
-            from opensearchpy import OpenSearch
             self.client = OpenSearch(
                 hosts=hosts,
                 http_auth=(username, password) if username and password else None,
@@ -52,3 +54,34 @@ class SearchClientBase(ABC):
             self.logger.info(f"OpenSearch client initialized with hosts: {hosts}")
         else:
             raise ValueError(f"Unsupported engine type: {engine_type}")
+
+        # General REST client
+        base_url = hosts[0] if isinstance(hosts, list) else hosts
+        self.general_client = GeneralRestClient(
+            base_url=base_url,
+            username=username,
+            password=password,
+            verify_certs=verify_certs,
+        )
+
+class GeneralRestClient:
+    def __init__(self, base_url: str, username: str, password: str, verify_certs: bool):
+        self.base_url = base_url.rstrip("/")
+        self.auth = (username, password) if username and password else None
+        self.verify_certs = verify_certs
+
+    def request(self, method, path, params=None, body=None):
+        url = f"{self.base_url}/{path.lstrip('/')}"
+        with httpx.Client(verify=self.verify_certs) as client:
+            resp = client.request(
+                method=method.upper(),
+                url=url,
+                params=params,
+                json=body,
+                auth=self.auth
+            )
+            resp.raise_for_status()
+            ct = resp.headers.get("content-type", "")
+            if ct.startswith("application/json"):
+                return resp.json()
+            return resp.text

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/src/clients/common/client.py

@@ -3,9 +3,10 @@ from typing import Dict
 from src.clients.common.alias import AliasClient
 from src.clients.common.cluster import ClusterClient
 from src.clients.common.document import DocumentClient
+from src.clients.common.general import GeneralClient
 from src.clients.common.index import IndexClient
 
-class SearchClient(IndexClient, DocumentClient, ClusterClient, AliasClient):
+class SearchClient(IndexClient, DocumentClient, ClusterClient, AliasClient, GeneralClient):
     """
     Unified search client that combines all search functionality.
     

opensearch_mcp_server-2.0.4/src/clients/common/general.py

@@ -0,0 +1,10 @@
+from typing import Dict, Optional
+
+from src.clients.base import SearchClientBase
+
+class GeneralClient(SearchClientBase):
+    def general_api_request(self, method: str, path: str, params: Optional[Dict] = None, body: Optional[Dict] = None):
+        """Perform a general HTTP API request.
+           Use this tool for any Elasticsearch/OpenSearch API that does not have a dedicated tool.
+        """
+        return self.general_client.request(method, path, params, body)

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/src/server.py

@@ -7,8 +7,10 @@ from src.clients import create_search_client
 from src.tools.alias import AliasTools
 from src.tools.cluster import ClusterTools
 from src.tools.document import DocumentTools
+from src.tools.general import GeneralTools
 from src.tools.index import IndexTools
 from src.tools.register import ToolsRegister
+from src.version import __version__ as VERSION
 
 class SearchMCPServer:
     def __init__(self, engine_type):
@@ -17,7 +19,7 @@ class SearchMCPServer:
         self.name = f"{self.engine_type}_mcp_server"
         self.mcp = FastMCP(self.name)
         self.logger = logging.getLogger()
-        self.logger.info(f"Initializing {self.name}...")
+        self.logger.info(f"Initializing {self.name}, Version: {VERSION}")
         
         # Create the corresponding search client
         self.search_client = create_search_client(self.engine_type)
@@ -35,7 +37,8 @@ class SearchMCPServer:
             IndexTools,
             DocumentTools,
             ClusterTools,
-            AliasTools
+            AliasTools,
+            GeneralTools,
         ]        
         # Register all tools
         register.register_all_tools(tool_classes)

{opensearch_mcp_server-2.0.2 → opensearch_mcp_server-2.0.4}/src/tools/__init__.py

@@ -1,13 +1,15 @@
-from src.tools.index import IndexTools
-from src.tools.document import DocumentTools
-from src.tools.cluster import ClusterTools
 from src.tools.alias import AliasTools
+from src.tools.cluster import ClusterTools
+from src.tools.document import DocumentTools
+from src.tools.general import GeneralTools
+from src.tools.index import IndexTools
 from src.tools.register import ToolsRegister
 
 __all__ = [
-    'IndexTools',
-    'DocumentTools',
-    'ClusterTools',
     'AliasTools',
+    'ClusterTools',
+    'DocumentTools',
+    'GeneralTools',
+    'IndexTools',
     'ToolsRegister',
 ]

opensearch_mcp_server-2.0.4/src/tools/general.py

@@ -0,0 +1,20 @@
+from typing import Dict, Optional
+
+from fastmcp import FastMCP
+
+class GeneralTools:
+    def __init__(self, search_client):
+        self.search_client = search_client
+    def register_tools(self, mcp: FastMCP):
+        @mcp.tool()
+        def general_api_request(method: str, path: str, params: Optional[Dict] = None, body: Optional[Dict] = None):
+            """Perform a general HTTP API request.
+               Use this tool for any Elasticsearch/OpenSearch API that does not have a dedicated tool.
+            
+            Args:
+                method: HTTP method (GET, POST, PUT, DELETE, etc.)
+                path: API endpoint path
+                params: Query parameters
+                body: Request body
+            """
+            return self.search_client.general_api_request(method, path, params, body)

opensearch_mcp_server-2.0.4/src/version.py

@@ -0,0 +1 @@
+__version__ = "2.0.4"