opensearch-mcp-server 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

{opensearch_mcp_server-2.0.5.dist-info → opensearch_mcp_server-2.0.7.dist-info}/METADATA

@@ -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.dist-info → opensearch_mcp_server-2.0.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 src/__init__.py,sha256=aNKcThftSLh9IjOTA-UUpoRzIm4R0WwXKGAzykwecmU,211
-src/server.py,sha256=UTRN7Wk1njdLpF2Aa7G-dAyq04FOU3cGK1wNZGqSw3U,4154
-src/version.py,sha256=xEb7Z4b8xalXXExBg42XPAhbJKniHzcsEPjp-6S3ppg,22
+src/server.py,sha256=BfMAgXTFV9C4waCWRro8Sfl6yXEXr2vJ7YoGY7HhMPY,5072
+src/version.py,sha256=L4aOgvDE9n_eqL_mM_j5bO3bQ73q6ulNpnVuG8OmqWE,22
 src/clients/__init__.py,sha256=3UezAt9422S-7BvMiCo2Y9pmATVutorwsIQXP_g_CkA,1221
 src/clients/base.py,sha256=MBAGepXyHPtdbtHhxFB8CamZ2ApWCBuOi_6-ey-MqX8,3298
 src/clients/exceptions.py,sha256=NYF3KVw-9aAgCViin5OuBI6miMEPS5QsdHx6bcis1wc,2493
@@ -18,8 +18,8 @@ src/tools/document.py,sha256=XZTVuk4di9VEwWMZN7jyDVnzoOiXkb4FBrXF44sVXTs,2052
 src/tools/general.py,sha256=whj1spjIb8SS75h843X6c3RTsrZcSm-66KVLlY7OEh0,817
 src/tools/index.py,sha256=7KNPtElTFelkjRSvdMqPBx9nx_9Uk01OnTMeVo7YeCs,1345
 src/tools/register.py,sha256=wrG2P6-YPW77bTg1j_ELp8omWRYsJjFeOHUy_unHe6Y,1344
-opensearch_mcp_server-2.0.5.dist-info/METADATA,sha256=7XYxNvhAvMNagGh7GpYQUWb7qqLEJy0-JM200dp8S00,18747
-opensearch_mcp_server-2.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-opensearch_mcp_server-2.0.5.dist-info/entry_points.txt,sha256=ImfJnUwMpQUBmu-1MeBG_P0dwamfXKQh82mBKW7tWNY,138
-opensearch_mcp_server-2.0.5.dist-info/licenses/LICENSE,sha256=DBsjuP5FR51d9kaUdXlVBuBv3cQ_I_adq9gefYQ9FcY,11339
-opensearch_mcp_server-2.0.5.dist-info/RECORD,,
+opensearch_mcp_server-2.0.7.dist-info/METADATA,sha256=Q5XUQGbTdSnuUbE1WokgN6FPR5c8siII_EwvyLjdly8,19863
+opensearch_mcp_server-2.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+opensearch_mcp_server-2.0.7.dist-info/entry_points.txt,sha256=ImfJnUwMpQUBmu-1MeBG_P0dwamfXKQh82mBKW7tWNY,138
+opensearch_mcp_server-2.0.7.dist-info/licenses/LICENSE,sha256=DBsjuP5FR51d9kaUdXlVBuBv3cQ_I_adq9gefYQ9FcY,11339
+opensearch_mcp_server-2.0.7.dist-info/RECORD,,

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
+    )

src/version.py

@@ -1 +1 @@
-__version__ = "2.0.5"
+__version__ = "2.0.7"