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.

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

feat(document-index): introduce is_null filter #1183

Merged
merged 5 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
- Add `create_project` bool to `StudioClient.__init__()` to enable users to automatically create their Studio projects
- Add progressbar to the `Runner` to be able to track the `Run`
- Add `StudioClient.submit_benchmark_lineages` function and include it in `StudioClient.submit_benchmark_execution`

#### DocumentIndexClient
- Add method `DocumentIndexClient.chunks()` for retrieving all text chunks of a document.
- Add metadata filter `FilterOps.IS_NULL`, that allows to filter fields based on whether their value is null.

### Fixes
- The Document Index `SearchQuery` now correctly allows searches with a negative `min_score`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class FilterOps(Enum):
BEFORE = "before"
AT_OR_BEFORE = "at_or_before"
EQUAL_TO = "equal_to"
IS_NULL = "is_null"


class FilterField(BaseModel):
Expand Down
7 changes: 7 additions & 0 deletions tests/conftest_document_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def document_contents_with_metadata() -> list[DocumentContents]:

metadata_1: JsonSerializable = {
"string-field": "example_string_1",
"option-field": None,
"integer-field": 123,
"float-field": 123.45,
"boolean-field": True,
Expand All @@ -168,6 +169,7 @@ def document_contents_with_metadata() -> list[DocumentContents]:

metadata_2: JsonSerializable = {
"string-field": "example_string_2",
"option-field": "example_string_2",
"integer-field": 456,
"float-field": 678.90,
"boolean-field": False,
Expand All @@ -178,6 +180,7 @@ def document_contents_with_metadata() -> list[DocumentContents]:

metadata_3: JsonSerializable = {
"string-field": "example_string_3",
"option-field": "example_string_3",
"integer-field": 789,
"float-field": 101112.13,
"boolean-field": True,
Expand Down Expand Up @@ -237,6 +240,10 @@ def filter_index_configs(
"field-name": "string-field",
"field-type": "string",
},
random_identifier(): {
"field-name": "option-field",
"field-type": "string",
},
random_identifier(): {
"field-name": "integer-field",
"field-type": "integer",
Expand Down
75 changes: 75 additions & 0 deletions tests/connectors/document_index/test_document_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,81 @@ def search() -> None:
search()


def test_search_with_null_filter(
document_index: DocumentIndexClient,
read_only_populated_collection: tuple[CollectionPath, IndexPath],
) -> None:
search_query = SearchQuery(
query="Pemberton",
max_results=10,
min_score=0.5,
filters=[
Filters(
filter_type="with",
fields=[
FilterField(
field_name="option-field",
field_value=True,
criteria=FilterOps.IS_NULL,
)
],
)
],
)

@retry
def search() -> None:
collection_path, index_path = read_only_populated_collection
results = document_index.search(
collection_path,
index_path.index,
search_query,
)
assert len(results) == 1
assert results[0].document_path.document_name == "document-0"

search()


def test_search_with_null_filter_without(
document_index: DocumentIndexClient,
read_only_populated_collection: tuple[CollectionPath, IndexPath],
) -> None:
search_query = SearchQuery(
query="Pemberton",
max_results=10,
min_score=0.5,
filters=[
Filters(
filter_type="without",
fields=[
FilterField(
field_name="option-field",
field_value=True,
criteria=FilterOps.IS_NULL,
)
],
)
],
)

@retry
def search() -> None:
collection_path, index_path = read_only_populated_collection
results = document_index.search(
collection_path,
index_path.index,
search_query,
)
assert len(results) == 2
assert {r.document_path.document_name for r in results} == {
"document-1",
"document-2",
}

search()


def test_search_with_integer_filter(
document_index: DocumentIndexClient,
read_only_populated_collection: tuple[CollectionPath, IndexPath],
Expand Down
Loading