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

opensearch_mcp_server-2.0.7/.github/workflows/pypi-publish.yaml

@@ -0,0 +1,58 @@
+# This workflow will upload Python Packages using uv when a release is created
+# It builds and publishes multiple packages for different Elasticsearch versions
+
+name: PyPI Publish
+
+on:
+  workflow_run:
+    workflows: ["Release"]
+    types:
+      - completed
+
+env:
+  UV_PUBLISH_TOKEN: '${{ secrets.PYPI_API_TOKEN }}'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    strategy:
+      matrix:
+        variant:
+          - name: "elasticsearch-mcp-server-es7"
+            elasticsearch_version: "7.13.0"
+          - name: "elasticsearch-mcp-server"
+            elasticsearch_version: "8.17.2"
+          - name: "elasticsearch-mcp-server-es9"
+            elasticsearch_version: "9.0.0"
+          - name: "opensearch-mcp-server"
+            elasticsearch_version: "8.17.2"
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.10.x'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install uv
+        uv sync
+
+    - name: Modify pyproject.toml for ${{ matrix.variant.name }}
+      run: |
+        # Update package name
+        sed -i 's/^name = .*$/name = "${{ matrix.variant.name }}"/' pyproject.toml
+
+        # Update elasticsearch version
+        sed -i 's/elasticsearch==.*/elasticsearch==${{ matrix.variant.elasticsearch_version }}",/' pyproject.toml
+
+    - name: Build ${{ matrix.variant.name }} package
+      run: uv build
+
+    - name: Publish ${{ matrix.variant.name }} package
+      run: uv publish
+
+    - name: Clean dist directory
+      run: rm -rf dist/*

{opensearch_mcp_server-2.0.5 → opensearch_mcp_server-2.0.7}/.gitignore

@@ -1,6 +1,7 @@
 # IDE
 .idea
 .vscode
+.kiro
 
 # Python
 .venv

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensearch-mcp-server
-Version: 2.0.5
+Version: 2.0.7
 Summary: MCP Server for interacting with Elasticsearch and OpenSearch
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -375,22 +375,56 @@ Using `uv` requires cloning the repository locally and specifying the path to th
 
 ## SSE
 
+### Option 1: Using uvx
+
+```bash
+# export environment variables
+export ELASTICSEARCH_HOSTS="https://localhost:9200"
+export ELASTICSEARCH_USERNAME="elastic"
+export ELASTICSEARCH_PASSWORD="test123"
+
+# By default, the SSE MCP server will serve on http://127.0.0.1:8000/sse
+uvx elasticsearch-mcp-server --transport sse
+
+# The host, port, and path can be specified using the --host, --port, and --path options
+uvx elasticsearch-mcp-server --transport sse --host 0.0.0.0 --port 8000 --path /sse
+```
+
+### Option 2: Using uv
+
 ```bash
 # By default, the SSE MCP server will serve on http://127.0.0.1:8000/sse
-uv run src/server.py elasticsearch --transport sse
+uv run src/server.py elasticsearch-mcp-server --transport sse
 
 # The host, port, and path can be specified using the --host, --port, and --path options
-uv run src/server.py elasticsearch --transport sse --host 0.0.0.0 --port 8000 --path /sse
+uv run src/server.py elasticsearch-mcp-server --transport sse --host 0.0.0.0 --port 8000 --path /sse
 ```
 
 ## Streamable HTTP
 
+### Option 1: Using uvx
+
+```bash
+# export environment variables
+export ELASTICSEARCH_HOSTS="https://localhost:9200"
+export ELASTICSEARCH_USERNAME="elastic"
+export ELASTICSEARCH_PASSWORD="test123"
+
+# By default, the Streamable HTTP MCP server will serve on http://127.0.0.1:8000/mcp
+uvx elasticsearch-mcp-server --transport streamable-http
+
+# The host, port, and path can be specified using the --host, --port, and --path options
+uvx elasticsearch-mcp-server --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
+```
+
+### Option 2: Using uv
+
 ```bash
 # By default, the Streamable HTTP MCP server will serve on http://127.0.0.1:8000/mcp
-uv run src/server.py elasticsearch --transport streamable-http
+uv run src/server.py elasticsearch-mcp-server --transport streamable-http
 
 # The host, port, and path can be specified using the --host, --port, and --path options
-uv run src/server.py elasticsearch --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
+uv run src/server.py elasticsearch-mcp-server --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
 ```
 
 ## License

{opensearch_mcp_server-2.0.5 → opensearch_mcp_server-2.0.7}/README.md

@@ -158,22 +158,56 @@ Using `uv` requires cloning the repository locally and specifying the path to th
 
 ## SSE
 
+### Option 1: Using uvx
+
+```bash
+# export environment variables
+export ELASTICSEARCH_HOSTS="https://localhost:9200"
+export ELASTICSEARCH_USERNAME="elastic"
+export ELASTICSEARCH_PASSWORD="test123"
+
+# By default, the SSE MCP server will serve on http://127.0.0.1:8000/sse
+uvx elasticsearch-mcp-server --transport sse
+
+# The host, port, and path can be specified using the --host, --port, and --path options
+uvx elasticsearch-mcp-server --transport sse --host 0.0.0.0 --port 8000 --path /sse
+```
+
+### Option 2: Using uv
+
 ```bash
 # By default, the SSE MCP server will serve on http://127.0.0.1:8000/sse
-uv run src/server.py elasticsearch --transport sse
+uv run src/server.py elasticsearch-mcp-server --transport sse
 
 # The host, port, and path can be specified using the --host, --port, and --path options
-uv run src/server.py elasticsearch --transport sse --host 0.0.0.0 --port 8000 --path /sse
+uv run src/server.py elasticsearch-mcp-server --transport sse --host 0.0.0.0 --port 8000 --path /sse
 ```
 
 ## Streamable HTTP
 
+### Option 1: Using uvx
+
+```bash
+# export environment variables
+export ELASTICSEARCH_HOSTS="https://localhost:9200"
+export ELASTICSEARCH_USERNAME="elastic"
+export ELASTICSEARCH_PASSWORD="test123"
+
+# By default, the Streamable HTTP MCP server will serve on http://127.0.0.1:8000/mcp
+uvx elasticsearch-mcp-server --transport streamable-http
+
+# The host, port, and path can be specified using the --host, --port, and --path options
+uvx elasticsearch-mcp-server --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
+```
+
+### Option 2: Using uv
+
 ```bash
 # By default, the Streamable HTTP MCP server will serve on http://127.0.0.1:8000/mcp
-uv run src/server.py elasticsearch --transport streamable-http
+uv run src/server.py elasticsearch-mcp-server --transport streamable-http
 
 # The host, port, and path can be specified using the --host, --port, and --path options
-uv run src/server.py elasticsearch --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
+uv run src/server.py elasticsearch-mcp-server --transport streamable-http --host 0.0.0.0 --port 8000 --path /mcp
 ```
 
 ## License

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

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

{opensearch_mcp_server-2.0.5 → opensearch_mcp_server-2.0.7}/src/server.py

@@ -17,7 +17,7 @@ class SearchMCPServer:
     def __init__(self, engine_type):
         # Set engine type
         self.engine_type = engine_type
-        self.name = f"{self.engine_type}_mcp_server"
+        self.name = f"{self.engine_type}-mcp-server"
         self.mcp = FastMCP(self.name)
         self.logger = logging.getLogger()
         self.logger.info(f"Initializing {self.name}, Version: {VERSION}")
@@ -65,24 +65,13 @@ def run_search_server(engine_type, transport, host, port, path):
         server.logger.info(f"Starting {server.name} with {transport} transport")
         server.mcp.run(transport=transport)
 
-def elasticsearch_mcp_server():
-    """Entry point for Elasticsearch MCP server."""
-    run_search_server(engine_type="elasticsearch")
-
-def opensearch_mcp_server():
-    """Entry point for OpenSearch MCP server."""
-    run_search_server(engine_type="opensearch")
-
-if __name__ == "__main__":
-    # Parse command line arguments
-    parser = argparse.ArgumentParser(description=f"Elasticsearch/OpenSearch MCP Server v{VERSION}")
-    parser.add_argument(
-        "engine_type", 
-        nargs="?", 
-        default="elasticsearch",
-        choices=["elasticsearch", "opensearch"], 
-        help="Search engine type to use (default: elasticsearch)"
-    )
+def parse_server_args():
+    """Parse command line arguments for the MCP server.
+    
+    Returns:
+        Parsed arguments
+    """
+    parser = argparse.ArgumentParser()
     parser.add_argument(
         "--transport", "-t",
         default="stdio",
@@ -113,12 +102,57 @@ if __name__ == "__main__":
             args.path = "/sse"
         else:
             args.path = "/mcp"
+            
+    return args
+
+def elasticsearch_mcp_server():
+    """Entry point for Elasticsearch MCP server."""
+    args = parse_server_args()
     
     # Run the server with the specified options
     run_search_server(
-        engine_type=args.engine_type,
+        engine_type="elasticsearch",
         transport=args.transport,
         host=args.host,
         port=args.port,
         path=args.path
-    )
+    )
+
+def opensearch_mcp_server():
+    """Entry point for OpenSearch MCP server."""
+    args = parse_server_args()
+    
+    # Run the server with the specified options
+    run_search_server(
+        engine_type="opensearch",
+        transport=args.transport,
+        host=args.host,
+        port=args.port,
+        path=args.path
+    )
+
+if __name__ == "__main__":
+    # Require elasticsearch-mcp-server or opensearch-mcp-server as the first argument
+    if len(sys.argv) <= 1 or sys.argv[1] not in ["elasticsearch-mcp-server", "opensearch-mcp-server"]:
+        print("Error: First argument must be 'elasticsearch-mcp-server' or 'opensearch-mcp-server'")
+        sys.exit(1)
+        
+    # Determine engine type based on the first argument
+    engine_type = "elasticsearch"  # Default
+    if sys.argv[1] == "opensearch-mcp-server":
+        engine_type = "opensearch"
+        
+    # Remove the first argument so it doesn't interfere with argparse
+    sys.argv.pop(1)
+    
+    # Parse command line arguments
+    args = parse_server_args()
+    
+    # Run the server with the specified options
+    run_search_server(
+        engine_type=engine_type,
+        transport=args.transport,
+        host=args.host,
+        port=args.port,
+        path=args.path
+    )

opensearch_mcp_server-2.0.7/src/version.py

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

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

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

opensearch_mcp_server-2.0.5/.github/workflows/pypi-publish.yaml

@@ -1,51 +0,0 @@
-# This workflow will upload Python Packages using uv when a release is created
-# It builds and publishes two separate packages: elasticsearch-mcp-server and opensearch-mcp-server
-
-name: PyPI Publish
-
-on:
-  workflow_run:
-    workflows: ["Release"]
-    types:
-      - completed
-
-env:
-  UV_PUBLISH_TOKEN: '${{ secrets.PYPI_API_TOKEN }}'
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.10.x'
-
-    - name: Install dependencies
-      run: |
-        python -m pip install uv
-        uv sync
-
-    # First build and publish elasticsearch-mcp-server
-    - name: Build elasticsearch-mcp-server package
-      run: uv build
-        
-    - name: Publish elasticsearch-mcp-server package
-      run: uv publish
-      
-    # Clean up dist directory
-    - name: Clean dist directory
-      run: rm -rf dist/*
-      
-    # Then build and publish opensearch-mcp-server
-    - name: Build opensearch-mcp-server package
-      run: |
-        # Change package name to opensearch-mcp-server
-        sed -i 's/^name = .*$/name = "opensearch-mcp-server"/' pyproject.toml
-        uv build
-        
-    - name: Publish opensearch-mcp-server package
-      run: uv publish

opensearch_mcp_server-2.0.5/smithery.yaml

@@ -1,25 +0,0 @@
-# Smithery configuration file: https://smithery.ai/docs/config#smitheryyaml
-
-startCommand:
-  type: stdio
-  configSchema:
-    # JSON Schema defining the configuration options for the MCP.
-    type: object
-    required:
-      - elasticsearchHosts
-      - elasticsearchUsername
-      - elasticsearchPassword
-    properties:
-      elasticsearchHosts:
-        type: string
-        description: The host URL of the Elasticsearch cluster.
-      elasticsearchUsername:
-        type: string
-        description: The username for Elasticsearch authentication.
-      elasticsearchPassword:
-        type: string
-        description: The password for Elasticsearch authentication.
-  commandFunction:
-    # A function that produces the CLI command to start the MCP on stdio.
-    |-
-    (config) => ({ command: 'elasticsearch-mcp-server', env: { ELASTICSEARCH_HOSTS: config.elasticsearchHosts, ELASTICSEARCH_USERNAME: config.elasticsearchUsername, ELASTICSEARCH_PASSWORD: config.elasticsearchPassword } })

opensearch_mcp_server-2.0.5/src/version.py

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