chore: fix merge conflicts

Author: cr7258

.env.example

@@ -0,0 +1,9 @@
+# Elasticsearch connection settings
+ELASTICSEARCH_HOSTS=https://localhost:9200
+ELASTICSEARCH_USERNAME=elastic
+ELASTICSEARCH_PASSWORD=test123
+
+# OpenSearch connection settings
+OPENSEARCH_HOSTS=https://localhost:9200
+OPENSEARCH_USERNAME=admin
+OPENSEARCH_PASSWORD=admin

.gitignore

@@ -1,6 +1,12 @@
+# IDE
 .idea
 .vscode
+
+# Python
 .venv
 dist
 __pycache__
 *.egg-info
+
+# Configuration and Credentials
+.env

README.md

@@ -1,10 +1,10 @@
-# Elasticsearch MCP Server
+# Elasticsearch/OpenSearch MCP Server
 
 [![smithery badge](https://smithery.ai/badge/elasticsearch-mcp-server)](https://smithery.ai/server/elasticsearch-mcp-server)
 
 ## Overview
 
-A Model Context Protocol (MCP) server implementation that provides Elasticsearch interaction. This server enables searching documents, analyzing indices, and managing cluster through a set of tools.
+A Model Context Protocol (MCP) server implementation that provides Elasticsearch and OpenSearch interaction. This server enables searching documents, analyzing indices, and managing cluster through a set of tools.
 
 <a href="https://glama.ai/mcp/servers/b3po3delex"><img width="380" height="200" src="https://glama.ai/mcp/servers/b3po3delex/badge" alt="Elasticsearch MCP Server" /></a>
 
@@ -16,30 +16,41 @@ https://github.com/user-attachments/assets/f7409e31-fac4-4321-9c94-b0ff2ea7ff15
 
 ### Index Operations
 
-- `list_indices`: List all indices in the Elasticsearch cluster.
-- `get_mapping`: Retrieve the mapping configuration for a specific index.
-- `get_settings`: Get the settings configuration for a specific index.
+- `list_indices`: List all indices.
+- `get_index`: Returns information (mappings, settings, aliases) about one or more indices.
+- `create_index`: Create a new index.
+- `delete_index`: Delete an index.
 
 ### Document Operations
 
-- `search_documents`: Search documents in an index using Elasticsearch Query DSL.
+- `search_documents`: Search for documents.
+- `index_document`: Creates or updates a document in the index.
+- `get_document`: Get a document by ID.
+- `delete_document`: Delete a document by ID.
+- `delete_by_query`: Deletes documents matching the provided query.
 
 ### Cluster Operations
 
-- `get_cluster_health`: Get health status of the cluster.
-- `get_cluster_stats`: Get statistical information about the cluster.
+- `get_cluster_health`: Returns basic information about the health of the cluster.
+- `get_cluster_stats`: Returns high-level overview of cluster statistics.
 
+### Alias Operations
+
+- `list_aliases`: List all aliases.
+- `get_alias`: Get alias information for a specific index.
+- `put_alias`: Create or update an alias for a specific index.
+- `delete_alias`: Delete an alias for a specific index.
 
 ## Start Elasticsearch/OpenSearch Cluster
 
 Start the Elasticsearch/OpenSearch cluster using Docker Compose:
 
 ```bash
 # For Elasticsearch
-docker-compose -f setup/elasticsearch-docker-compose.yml up -d
+docker-compose -f docker-compose-elasticsearch.yml up -d
 
 # For OpenSearch
-docker-compose -f setup/opensearch-docker-compose.yml up -d
+docker-compose -f docker-compose-opensearch.yml up -d
 ```
 
 The default Elasticsearch username is `elastic` and password is `test123`. The default OpenSearch username is `admin` and password is `admin`.
@@ -61,6 +72,7 @@ npx -y @smithery/cli install elasticsearch-mcp-server --client claude
 Using `uvx` will automatically install the package from PyPI, no need to clone the repository locally. Add the following configuration to Claude Desktop's config file `claude_desktop_config.json`.
 
 ```json
+// For Elasticsearch
 {
   "mcpServers": {
     "elasticsearch-mcp-server": {
@@ -76,16 +88,34 @@ Using `uvx` will automatically install the package from PyPI, no need to clone t
     }
   }
 }
+
+// For OpenSearch
+{
+  "mcpServers": {
+    "opensearch-mcp-server": {
+      "command": "uvx",
+      "args": [
+        "opensearch-mcp-server"
+      ],
+      "env": {
+        "OPENSEARCH_HOST": "https://localhost:9200",
+        "OPENSEARCH_USERNAME": "admin",
+        "OPENSEARCH_PASSWORD": "admin"
+      }
+    }
+  }
+}
 ```
 
 ### Option 3: Using uv with local development
 
 Using `uv` requires cloning the repository locally and specifying the path to the source code. Add the following configuration to Claude Desktop's config file `claude_desktop_config.json`.
 
 ```json
+// For Elasticsearch
 {
   "mcpServers": {
-    "elasticsearch": {
+    "elasticsearch-mcp-server": {
       "command": "uv",
       "args": [
         "--directory",
@@ -101,18 +131,44 @@ Using `uv` requires cloning the repository locally and specifying the path to th
     }
   }
 }
+
+// For OpenSearch
+{
+  "mcpServers": {
+    "opensearch-mcp-server": {
+      "command": "uv",
+      "args": [
+        "--directory",
+        "path/to/src/elasticsearch_mcp_server",
+        "run",
+        "opensearch-mcp-server"
+      ],
+      "env": {
+        "OPENSEARCH_HOST": "https://localhost:9200",
+        "OPENSEARCH_USERNAME": "admin",
+        "OPENSEARCH_PASSWORD": "admin"
+      }
+    }
+  }
+}
 ```
 
 - On macOS: `~/Library/Application Support/Claude/claude_desktop_config.json`
 - On Windows: `%APPDATA%/Claude/claude_desktop_config.json`
 
 Restart Claude Desktop to load the new MCP server.
 
-Now you can interact with your Elasticsearch cluster through Claude using natural language commands like:
+Now you can interact with your Elasticsearch/OpenSearch cluster through Claude using natural language commands like:
 - "List all indices in the cluster"
 - "How old is the student Bob?"
 - "Show me the cluster health status"
 
+## Usage with Anthropic MCP Client
+
+```python
+uv run mcp_client/client.py src/server.py
+```
+
 ## License
 
 This project is licensed under the Apache License Version 2.0 - see the [LICENSE](LICENSE) file for details.

cliff.toml

@@ -97,4 +97,4 @@ git_path = "git"
 # whether to use relaxed or strict semver parsing
 relaxed_semver = true
 # only show the changes for the current version
-tag_range = true
+tag_range = true

setup/elasticsearch-docker-compose.yml docker-compose-elasticsearch.yml

@@ -6,8 +6,8 @@ services:
     user: "0"
     command: >
       bash -c '
-        if [ x${ELASTIC_PASSWORD} == x ]; then
-          echo "Set the ELASTIC_PASSWORD environment variable in the .env file";
+        if [ x${ELASTICSEARCH_PASSWORD} == x ]; then
+          echo "Set the ELASTICSEARCH_PASSWORD environment variable in the .env file";
           exit 1;
         fi;
         if [ ! -f config/certs/ca.zip ]; then
@@ -48,7 +48,7 @@ services:
         echo "Waiting for Elasticsearch availability";
         until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
         echo "Setting kibana_system password";
-        until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"kibana123\"}" | grep -q "^{}"; do sleep 10; done;
+        until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTICSEARCH_PASSWORD}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"kibana123\"}" | grep -q "^{}"; do sleep 10; done;
         echo "All done!";
       '
     healthcheck:
@@ -72,7 +72,7 @@ services:
       - cluster.name=es-mcp-cluster
       - cluster.initial_master_nodes=es01,es02,es03
       - discovery.seed_hosts=es02,es03
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
+      - ELASTIC_PASSWORD=${ELASTICSEARCH_PASSWORD}
       - bootstrap.memory_lock=true
       - xpack.security.enabled=true
       - xpack.security.http.ssl.enabled=true

setup/opensearch-docker-compose.yml docker-compose-opensearch.yml

@@ -0,0 +1 @@
+.env

mcp_client/.gitignore

@@ -0,0 +1,158 @@
+"""
+Client example copied from https://modelcontextprotocol.io/quickstart/client
+"""
+
+import asyncio
+from typing import Optional
+from contextlib import AsyncExitStack
+
+from mcp import ClientSession, StdioServerParameters
+from mcp.client.stdio import stdio_client
+
+from anthropic import Anthropic
+
+from config import get_logger, read_config
+
+logger = get_logger(__name__)
+
+
+class MCPClient:
+    def __init__(self):
+        self.session: Optional[ClientSession] = None
+        self.exit_stack = AsyncExitStack()
+        self.anthropic = Anthropic()
+        self.config = read_config()
+
+    async def connect_to_server(self, server_script_path: str):
+        """Connect to an MCP server
+
+        Args:
+            server_script_path: Path to the server script (.py or .js)
+        """
+        is_python = server_script_path.endswith('.py')
+        is_js = server_script_path.endswith('.js')
+        if not (is_python or is_js):
+            raise ValueError("Server script must be a .py or .js file")
+
+        command = "python" if is_python else "node"
+        server_params = StdioServerParameters(command=command, args=[server_script_path], env=None)
+
+        stdio_transport = await self.exit_stack.enter_async_context(stdio_client(server_params))
+        self.stdio, self.write = stdio_transport
+        self.session = await self.exit_stack.enter_async_context(ClientSession(self.stdio, self.write))
+
+        if self.session is not None:
+            await self.session.initialize()
+            response = await self.session.list_tools()
+            tools = response.tools
+            logger.info(f"\nConnected to server with tools: {', '.join(tool.name for tool in tools)}")
+
+    async def process_query(self, query: str) -> str:
+        """Process a query using Claude and available tools"""
+        messages = [
+            {
+                "role": "user",
+                "content": query
+            }
+        ]
+
+        response = await self.session.list_tools()
+        available_tools = [{
+            "name": tool.name,
+            "description": tool.description,
+            "input_schema": tool.inputSchema
+        } for tool in response.tools]
+
+        # Initial Claude API call
+        response = self.anthropic.messages.create(
+            model=self.config.anthropic.model,
+            max_tokens=self.config.anthropic.max_tokens_message,
+            messages=messages,
+            tools=available_tools
+        )
+
+        # Process response and handle tool calls
+        final_text = []
+
+        assistant_message_content = []
+        for content in response.content:
+            if content.type == 'text':
+                final_text.append(content.text)
+                assistant_message_content.append(content)
+            elif content.type == 'tool_use':
+                tool_name = content.name
+                tool_args = content.input
+
+                # Execute tool call
+                result = await self.session.call_tool(tool_name, tool_args)
+                final_text.append(f"[Calling tool {tool_name} with args {tool_args}]")
+
+                assistant_message_content.append(content)
+                messages.append({
+                    "role": "assistant",
+                    "content": assistant_message_content
+                })
+                messages.append({
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": content.id,
+                            "content": result.content
+                        }
+                    ]
+                })
+
+                # Get next response from Claude
+                response = self.anthropic.messages.create(
+                    model=self.config.anthropic.model,
+                    max_tokens=self.config.anthropic.max_tokens_message,
+                    messages=messages,
+                    tools=available_tools
+                )
+
+                final_text.append(response.content[0].text)
+
+        return "\n".join(final_text)
+
+    async def chat_loop(self):
+        """Run an interactive chat loop"""
+        logger.info("\nMCP Client Started!")
+        logger.info("Type your queries or 'quit' to exit.")
+
+        while True:
+            try:
+                query = input("\nQuery: ").strip()
+
+                if query.lower() == 'quit':
+                    break
+
+                response = await self.process_query(query)
+                logger.info("\n" + response)
+
+            except Exception as e:
+                logger.error(f"\nError: {str(e)}")
+
+    async def cleanup(self):
+        """Clean up resources"""
+        await self.exit_stack.aclose()
+
+
+async def main():
+    # if len(sys.argv) < 2:
+    #     logger.exception("Usage: python client.py <path_to_server_script>")
+    #     return
+
+    client = MCPClient()
+    try:
+        await client.connect_to_server(sys.argv[1])
+        logger.info(f"Connected to the server: {sys.argv[1]}.")
+        await client.chat_loop()
+    finally:
+        await client.cleanup()
+        logger.info(f"Disconnected from the server: {sys.argv[1]}.")
+
+
+if __name__ == "__main__":
+    import sys
+    asyncio.run(main())