Skip to content
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

Remove regex validation for index_name #44

Merged
merged 4 commits into from
Dec 6, 2024
Merged

Remove regex validation for index_name #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32000cb
Remove validation for index_name
harupy Dec 5, 2024
1d79d46
Remove re
harupy Dec 5, 2024
838cdb7
Update test_vectorstore.py
harupy Dec 5, 2024
cf7d1c3
Update test_vectorstore.py
harupy Dec 5, 2024
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
8 changes: 3 additions & 5 deletions libs/databricks/langchain_databricks/vectorstores.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import asyncio
import json
import logging
import re
import uuid
from enum import Enum
from functools import partial
Expand Down Expand Up @@ -37,7 +36,6 @@ class IndexType(str, Enum):
_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 @@ -217,10 +215,10 @@ def __init__(
text_column: Optional[str] = None,
columns: Optional[List[str]] = None,
):
if not (isinstance(index_name, str) and _INDEX_NAME_PATTERN.match(index_name)):
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}"
"The `index_name` parameter must be a string, "
f"but got {type(index_name).__name__}."
)

try:
Expand Down
4 changes: 1 addition & 3 deletions libs/databricks/tests/unit_tests/test_vectorstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,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
Loading