opensearch-mcp-server 2.0.7__tar.gz → 2.0.9__tar.gz

{opensearch_mcp_server-2.0.7 → opensearch_mcp_server-2.0.9}/.github/workflows/pypi-publish.yaml

@@ -47,6 +47,11 @@ jobs:
 
         # Update elasticsearch version
         sed -i 's/elasticsearch==.*/elasticsearch==${{ matrix.variant.elasticsearch_version }}",/' pyproject.toml
+        
+        # Update script name to match package name (only for non-opensearch packages)
+        if [[ "${{ matrix.variant.name }}" != "opensearch-mcp-server" ]]; then
+          sed -i 's/^elasticsearch-mcp-server = /"${{ matrix.variant.name }}" = /' pyproject.toml
+        fi
 
     - name: Build ${{ matrix.variant.name }} package
       run: uv build

{opensearch_mcp_server-2.0.7 → opensearch_mcp_server-2.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensearch-mcp-server
-Version: 2.0.7
+Version: 2.0.9
 Summary: MCP Server for interacting with Elasticsearch and OpenSearch
 License:                                  Apache License
                                    Version 2.0, January 2004

{opensearch_mcp_server-2.0.7 → opensearch_mcp_server-2.0.9}/pyproject.toml

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

{opensearch_mcp_server-2.0.7 → opensearch_mcp_server-2.0.9}/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 = int(es_version.split('.')[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 (ImportError, ValueError, AttributeError):
+            # 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.9/src/version.py

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

{opensearch_mcp_server-2.0.7 → opensearch_mcp_server-2.0.9}/uv.lock

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

opensearch_mcp_server-2.0.7/src/version.py

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