Skip to content

Add searching as a tool instead of as resource #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meghanmurphy1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add searching as a tool instead of as resource #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b906cd4
searching as a tool instead
meghanmurphy1 Mar 4, 2025
879c7b4
add search docs
meghanmurphy1 Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


@mcp.resource(
"elasticsearch://indices",
uri="elasticsearch://indices",
name="Elasticsearch Indices",
description="Retrieve all Elasticsearch indices.",
)
Expand All @@ -23,7 +23,7 @@ def fetch_indices() -> list[dict]:


@mcp.resource(
"elasticsearch://indices/{index}",
uri="elasticsearch://indices/{index}",
name="Index Details",
description="Retrieve details of a specific Elasticsearch index.",
)
Expand All @@ -32,11 +32,14 @@ def fetch_index_details(index: str) -> dict[str, any]:
return es_client.get_index_details(index)


@mcp.resource(
"docs://search/{query}",
name="Elasticsearch Documentation",
description="Perform a semantic search across Elastic documentation for a given query.",
)
# ------------------- MCP Tools (Actions Users Can Trigger) -------------------


# IMO the search tools (semantic search) should be actually resources
#
# TODO: define actual tools

@mcp.tool()
def search_elastic_documentation(query: str) -> dict[str, any]:
"""
Perform a semantic search across Elastic documentation for a given query. The
Expand All @@ -45,12 +48,7 @@ def search_elastic_documentation(query: str) -> dict[str, any]:
"""
return es_client.search_crawler_resource("search-elastic-docs", query)


@mcp.resource(
"search_labs://search/{query}",
name="Elasticsearch Labs Blogs",
description="Perform a semantic search across Elastic search labs blogs for a given query.",
)
@mcp.tool()
def search_elastic_search_labs_blogs(query: str) -> dict[str, any]:
"""
Perform a semantic search across Elastic search labs blogs for a given query. The
Expand All @@ -60,12 +58,6 @@ def search_elastic_search_labs_blogs(query: str) -> dict[str, any]:
return es_client.search_crawler_resource("search-blog-search-labs", query)


# ------------------- MCP Tools (Actions Users Can Trigger) -------------------


# IMO the search tools (semantic search) should be actually resources
# TODO: define actual tools

# ------------------- MCP Prompts (Predefined Interactions with the Assistant) -------------------


Expand Down Expand Up @@ -114,17 +106,36 @@ def analyze_salesforce_data(index: str) -> list[Message]:

# ------------------- DEBUG: Print Registered Resources -------------------


def debug_registered_resources():
"""Print all registered MCP resources for debugging."""
print("\n🔍 Registered MCP Resources:")
for resource in mcp._resource_manager.list_resources():
print(f" - {resource}")
print(f" - {resource.name}")
for resource in mcp._resource_manager.list_templates():
print(f" - {resource.name}")

# ------------------- DEBUG: Print Registered Tools -------------------

def debug_registered_tools():
"""Print all registered MCP tools for debugging."""
print("\n🔍 Registered MCP Tools:")
for tool in mcp._tool_manager.list_tools():
print(f" - {tool.name}")

# ------------------- DEBUG: Print Registered Prompts -------------------

def debug_registered_prompts():
"""Print all registered MCP prompts for debugging."""
print("\n🔍 Registered MCP Prompts:")
for prompt in mcp._prompt_manager.list_prompts():
print(f" - {prompt.name}")


# ------------------- MCP Server Execution -------------------

if __name__ == "__main__":
debug_registered_resources()
print(f"MCP server '{mcp.name}' is running...")
debug_registered_prompts()
debug_registered_tools()
print(f"\n MCP server '{mcp.name}' is running...")
mcp.run()