[CI Refactoring] Refactor Document fixtures in tests
#2577
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
ZanSara
added
type:refactor
Closed
…-ai/haystack into refactor_test_documents_fixtures
…-ai/haystack into refactor_test_documents_fixtures
…-ai/haystack into refactor_test_documents_fixtures
…-ai/haystack into refactor_test_documents_fixtures
…-ai/haystack into refactor_test_documents_fixtures
…-ai/haystack into refactor_test_documents_fixtures
…-ai/haystack into refactor_test_documents_fixtures
bogdankostic
approved these changes
Jun 10, 2022
| @@ -942,7 +955,7 @@ def adaptive_model_qa(num_processes): | |||
| logging.error(f"Not all the subprocesses are closed! {len(children)} are still running.") | |||
|
|
|||
|
|
|||
| @pytest.fixture(scope="function") | |||
| @pytest.fixture | |||
| def bert_base_squad2(request): | |||
There was a problem hiding this comment.
This is unrelated to this PR, but not sure about the naming of this fixture, given that the model used is not bert-base but minilm... 🤔
There was a problem hiding this comment.
OMG 😄 Let's remember about this one!
test/nodes/test_label_generator.py
Outdated
| @@ -86,9 +89,9 @@ def test_pseudo_label_generator_using_question_document_pairs( | |||
| @pytest.mark.parametrize("document_store", ["memory"], indirect=True) | |||
| @pytest.mark.parametrize("retriever", ["embedding_sbert"], indirect=True) | |||
| def test_pseudo_label_generator_using_question_document_pairs_batch( | |||
| document_store: BaseDocumentStore, retriever: EmbeddingRetriever, tmp_path: Path | |||
| document_store: BaseDocumentStore, retriever: EmbeddingRetriever,docs_with_true_emb: List[Document] | |||
There was a problem hiding this comment.
Suggested change
| document_store: BaseDocumentStore, retriever: EmbeddingRetriever,docs_with_true_emb: List[Document] | |
| document_store: BaseDocumentStore, retriever: EmbeddingRetriever, docs_with_true_emb: List[Document] |
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.
Problem:
conftest.py.conftest.pyincluded the entire definition of two sentence embeddings in the code, for about 1400 lines of "code" added to the file for no reason.DOCS_WITH_EMBEDDINGSDocumentclass, while you could do the same in the original fixture.Solution:
test/samples/embeddingsDOCS_WITH_EMBEDDINGSinto the fixturedocs_with_true_emband refactor relative teststest_docs_xsinto simplydocsand ensure that all items of the returned list areDocumentobjectsdocs_all_formatsfixture for documents of legacy types (dictionaries mostly)docs_with_random_embfor tests that require documents with embeddings, but not exact embeddingsscope="function"fixture parameters (that's the default)