Extend meta data support for SQLDocumentStore #2199
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julian-risch
approved these changes
Feb 21, 2022
test/test_document_store.py
Outdated
| @@ -216,7 +216,7 @@ def test_get_all_documents_with_incorrect_filter_value(document_store_with_docs) | |||
| assert len(documents) == 0 | |||
|
|
|||
|
|
|||
| @pytest.mark.parametrize("document_store_with_docs", ["elasticsearch"], indirect=True) | |||
| @pytest.mark.parametrize("document_store_with_docs", ["elasticsearch", "sql"], indirect=True) | |||
There was a problem hiding this comment.
That's good. It's exactly what I meant in your other PR for the InMemoryDocumentStore. 👍
There was a problem hiding this comment.
Just make sure that there are no problems when merging this with Bogdan's changes in the same line of code.
There was a problem hiding this comment.
Ok, I have pulled master manually to take care of that.
| @@ -1,6 +1,12 @@ | |||
| from typing import Union, List, Dict | |||
| from abc import ABC, abstractmethod | |||
| from collections import defaultdict | |||
| from functools import reduce | |||
|
|
|||
| from haystack.utils.import_utils import safe_import | |||
There was a problem hiding this comment.
I can't see where safe_import is used.
There was a problem hiding this comment.
You are right, this import is unnecessary. I've removed it now.
…epset-ai/haystack into sql_extended_metadata_support
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes:
As discussed in #1958, this PR extends SQLDocumentStore to support extended meta data filtering with the format described in #2108.
When this PR and #2143 are merged, the new filter functionality can be used everywhere where filtering could be used before. However, there are still changes necessary to make sure filtering can be used in all query methods as those currently do not support filtering at all.
Status (please check what you already did):