opensearch-mcp-server 2.0.8__tar.gz → 2.0.10__tar.gz

{opensearch_mcp_server-2.0.8 → opensearch_mcp_server-2.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensearch-mcp-server
-Version: 2.0.8
+Version: 2.0.10
 Summary: MCP Server for interacting with Elasticsearch and OpenSearch
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -427,6 +427,21 @@ uv run src/server.py elasticsearch-mcp-server --transport streamable-http
 uv run src/server.py elasticsearch-mcp-server --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
 ```
 
+## Compatibility
+
+The MCP server is compatible with Elasticsearch 7.x, 8.x, and 9.x. By default, it uses the Elasticsearch 8.x client (without a suffix). To use the Elasticsearch 7.x client, run the `elasticsearch-mcp-server-es7` variant. For Elasticsearch 9.x, use `elasticsearch-mcp-server-es9`. For example:
+
+```bash
+uvx elasticsearch-mcp-server-es7
+```
+
+| MCP Server | Elasticsearch |
+| --- | --- |
+| elasticsearch-mcp-server-es7 | Elasticsearch 7.x |
+| elasticsearch-mcp-server | Elasticsearch 8.x |
+| elasticsearch-mcp-server-es9 | Elasticsearch 9.x |
+| opensearch-mcp-server | OpenSearch 1.x, 2.x, 3.x |
+
 ## License
 
 This project is licensed under the Apache License Version 2.0 - see the [LICENSE](LICENSE) file for details.

{opensearch_mcp_server-2.0.8 → opensearch_mcp_server-2.0.10}/README.md

@@ -210,6 +210,21 @@ uv run src/server.py elasticsearch-mcp-server --transport streamable-http
 uv run src/server.py elasticsearch-mcp-server --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
 ```
 
+## Compatibility
+
+The MCP server is compatible with Elasticsearch 7.x, 8.x, and 9.x. By default, it uses the Elasticsearch 8.x client (without a suffix). To use the Elasticsearch 7.x client, run the `elasticsearch-mcp-server-es7` variant. For Elasticsearch 9.x, use `elasticsearch-mcp-server-es9`. For example:
+
+```bash
+uvx elasticsearch-mcp-server-es7
+```
+
+| MCP Server | Elasticsearch |
+| --- | --- |
+| elasticsearch-mcp-server-es7 | Elasticsearch 7.x |
+| elasticsearch-mcp-server | Elasticsearch 8.x |
+| elasticsearch-mcp-server-es9 | Elasticsearch 9.x |
+| opensearch-mcp-server | OpenSearch 1.x, 2.x, 3.x |
+
 ## License
 
 This project is licensed under the Apache License Version 2.0 - see the [LICENSE](LICENSE) file for details.

{opensearch_mcp_server-2.0.8 → opensearch_mcp_server-2.0.10}/pyproject.toml

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

{opensearch_mcp_server-2.0.8 → opensearch_mcp_server-2.0.10}/src/clients/base.py

@@ -1,7 +1,7 @@
 from abc import ABC
 import logging
 import warnings
-from typing import Dict
+from typing import Dict, Optional
 
 from elasticsearch import Elasticsearch
 import httpx
@@ -39,10 +39,13 @@ class SearchClientBase(ABC):
         
         # Initialize client based on engine type
         if engine_type == "elasticsearch":
+            # Get auth parameters based on elasticsearch package version
+            auth_params = self._get_elasticsearch_auth_params(username, password)
+            
             self.client = Elasticsearch(
                 hosts=hosts,
-                basic_auth=(username, password) if username and password else None,
-                verify_certs=verify_certs
+                verify_certs=verify_certs,
+                **auth_params
             )
             self.logger.info(f"Elasticsearch client initialized with hosts: {hosts}")
         elif engine_type == "opensearch":
@@ -64,9 +67,38 @@ class SearchClientBase(ABC):
             verify_certs=verify_certs,
         )
 
+    def _get_elasticsearch_auth_params(self, username: Optional[str], password: Optional[str]) -> Dict:
+        """
+        Get authentication parameters for Elasticsearch client based on package version.
+        
+        Args:
+            username: Username for authentication
+            password: Password for authentication
+            
+        Returns:
+            Dictionary with appropriate auth parameters for the ES version
+        """
+        if not username or not password:
+            return {}
+            
+        # Check Elasticsearch package version to determine auth parameter name
+        try:
+            from elasticsearch import __version__ as es_version
+            major_version = es_version[0]    
+            if major_version >= 8:
+                # ES 8+ uses basic_auth
+                return {"basic_auth": (username, password)}
+            else:
+                # ES 7 and below use http_auth
+                return {"http_auth": (username, password)}
+        except Exception as e:
+            self.logger.error(f"Failed to detect Elasticsearch version: {e}")
+            # If we can't detect version, try basic_auth first (ES 8+ default)
+            return {"basic_auth": (username, password)}
+
 class GeneralRestClient:
-    def __init__(self, base_url: str, username: str, password: str, verify_certs: bool):
-        self.base_url = base_url.rstrip("/")
+    def __init__(self, base_url: Optional[str], username: Optional[str], password: Optional[str], verify_certs: bool):
+        self.base_url = base_url.rstrip("/") if base_url else ""
         self.auth = (username, password) if username and password else None
         self.verify_certs = verify_certs
 

opensearch_mcp_server-2.0.10/src/version.py

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

{opensearch_mcp_server-2.0.8 → opensearch_mcp_server-2.0.10}/uv.lock

@@ -287,7 +287,7 @@ wheels = [
 
 [[package]]
 name = "elasticsearch-mcp-server"
-version = "2.0.8"
+version = "2.0.10"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },

opensearch_mcp_server-2.0.8/src/version.py

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