Skip to content

feat: make collection_name parameter optional in MCP tools #89

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
wggcch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: make collection_name parameter optional in MCP tools #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ It acts as a semantic memory layer on top of the Qdrant database.
- Input:
- `information` (string): Information to store
- `metadata` (JSON): Optional metadata to store
- `collection_name` (string): Name of the collection to store the information in. This field is required if there are no default collection name.
If there is a default collection name, this field is not enabled.
- `collection_name` (string, optional): Name of the collection to store the information in. If not provided, uses the default collection configured via `COLLECTION_NAME` environment variable.
- Returns: Confirmation message
2. `qdrant-find`
- Retrieve relevant information from the Qdrant database
- Input:
- `query` (string): Query to use for searching
- `collection_name` (string): Name of the collection to store the information in. This field is required if there are no default collection name.
If there is a default collection name, this field is not enabled.
- `collection_name` (string, optional): Name of the collection to search in. If not provided, uses the default collection configured via `COLLECTION_NAME` environment variable.
- Returns: Information stored in the Qdrant database as separate messages

## Environment Variables
Expand Down
55 changes: 36 additions & 19 deletions src/mcp_server_qdrant/mcp_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,11 @@ async def store(
ctx: Context,
information: Annotated[str, Field(description="Text to store")],
collection_name: Annotated[
str, Field(description="The collection to store the information in")
],
str | None,
Field(
description="Collection to store information in (uses default if not specified)"
),
] = None,
# The `metadata` parameter is defined as non-optional, but it can be None.
# If we set it to be optional, some of the MCP clients, like Cursor, cannot
# handle the optional parameter correctly.
Expand All @@ -115,21 +118,32 @@ async def store(
the default collection is used.
:return: A message indicating that the information was stored.
"""
await ctx.debug(f"Storing information {information} in Qdrant")
# Use default collection if none specified
effective_collection = (
collection_name or self.qdrant_settings.collection_name
)
await ctx.debug(
f"Storing information {information} in Qdrant collection: {effective_collection}"
)

entry = Entry(content=information, metadata=metadata)

await self.qdrant_connector.store(entry, collection_name=collection_name)
if collection_name:
return f"Remembered: {information} in collection {collection_name}"
await self.qdrant_connector.store(
entry, collection_name=effective_collection
)
if effective_collection:
return f"Remembered: {information} in collection {effective_collection}"
return f"Remembered: {information}"

async def find(
ctx: Context,
query: Annotated[str, Field(description="What to search for")],
collection_name: Annotated[
str, Field(description="The collection to search in")
],
str | None,
Field(
description="Collection to search in (uses default if not specified)"
),
] = None,
query_filter: ArbitraryFilter | None = None,
) -> list[str] | None:
"""
Expand All @@ -145,15 +159,23 @@ async def find(
# Log query_filter
await ctx.debug(f"Query filter: {query_filter}")

query_filter = models.Filter(**query_filter) if query_filter else None
# Use default collection if none specified
effective_collection = (
collection_name or self.qdrant_settings.collection_name
)

await ctx.debug(f"Finding results for query {query}")
await ctx.debug(
f"Finding results for query {query} in collection: {effective_collection}"
)

# Convert query_filter to models.Filter if provided
parsed_filter = models.Filter(**query_filter) if query_filter else None

entries = await self.qdrant_connector.search(
query,
collection_name=collection_name,
collection_name=effective_collection,
limit=self.qdrant_settings.search_limit,
query_filter=query_filter,
query_filter=parsed_filter,
)
if not entries:
return None
Expand All @@ -176,13 +198,8 @@ async def find(
elif not self.qdrant_settings.allow_arbitrary_filter:
find_foo = make_partial_function(find_foo, {"query_filter": None})

if self.qdrant_settings.collection_name:
find_foo = make_partial_function(
find_foo, {"collection_name": self.qdrant_settings.collection_name}
)
store_foo = make_partial_function(
store_foo, {"collection_name": self.qdrant_settings.collection_name}
)
# Collection parameter is now optional and handled within the functions
# No need to hide the parameter when default collection is configured

self.tool(
find_foo,
Expand Down
Loading