Skip to content

Commit

Permalink
Remove regex validation for index_name (#44)
Browse files Browse the repository at this point in the history
* Remove validation for index_name

* Remove re

* Update test_vectorstore.py

* Update test_vectorstore.py
  • Loading branch information
harupy authored Dec 6, 2024
1 parent b1e56e8 commit 0aa4d60
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
8 changes: 3 additions & 5 deletions libs/databricks/langchain_databricks/vectorstores.py
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
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

0 comments on commit 0aa4d60

Please sign in to comment.