Skip to content

Remove regex validation for index_name #95

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

Merged
merged 2 commits into from
Apr 8, 2025
Merged

Remove regex validation for index_name #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2214a8
Remove regex validation for index_name
harupy Apr 5, 2025
9695c6d
Remove re
harupy Apr 5, 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
7 changes: 2 additions & 5 deletions integrations/langchain/src/databricks_langchain/vectorstores.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import asyncio
import logging
import re
import uuid
from functools import partial
from typing import (
Expand Down Expand Up @@ -35,7 +34,6 @@

_DIRECT_ACCESS_ONLY_MSG = "`%s` is only supported for direct-access index."
_NON_MANAGED_EMB_ONLY_MSG = "`%s` is not supported for index with Databricks-managed embeddings."
_INDEX_NAME_PATTERN = re.compile(r"^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+$")


class DatabricksVectorSearch(VectorStore):
Expand Down Expand Up @@ -227,10 +225,9 @@ def __init__(
workspace_client: Optional[WorkspaceClient] = None,
client_args: Optional[Dict[str, Any]] = None,
):
if not (isinstance(index_name, str) and _INDEX_NAME_PATTERN.match(index_name)):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the long run, can we check something like this to replace this regex:
if len(model_name.split(".")) != 3:
but I get this is solving the problem of allowing special chars. So we can merge this one

if not isinstance(index_name, str):
raise ValueError(
"The `index_name` parameter must be a string in the format "
f"'catalog.schema.index'. Received: {index_name}"
f"The `index_name` parameter must be a string, but got {type(index_name).__name__}."
)

try:
Expand Down
2 changes: 1 addition & 1 deletion integrations/langchain/tests/unit_tests/test_vectorstores.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def test_init_with_endpoint_name() -> None:
assert vectorsearch.index.describe() == INDEX_DETAILS[DELTA_SYNC_INDEX]


@pytest.mark.parametrize("index_name", [None, "invalid", 123, MagicMock(spec=VectorSearchIndex)])
@pytest.mark.parametrize("index_name", [None, 123, MagicMock(spec=VectorSearchIndex)])
def test_init_fail_invalid_index_name(index_name) -> None:
with pytest.raises(ValueError, match="The `index_name` parameter must be"):
DatabricksVectorSearch(index_name=index_name)
Expand Down