-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Make Milvus2DocumentStore compatible with pymilvus>=2.0.0 #2126
Merged
+517
−245
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit
Hold shift + click to select a range
5ea553e
update remaining occurences of get_connection
MichelBartels 29aa16e
fix milvus2 import and fix wrong extra references
MichelBartels 9c569fe
Apply Black
github-actions[bot] df62d25
Retrigger tests
MichelBartels f80544d
Merge branch 'fix-milvus2' of https://github.com/deepset-ai/haystack …
MichelBartels ae47bc0
Update documentation
github-actions[bot] ccc8370
Merge branch 'master' into fix-milvus2
ZanSara f3cb065
change MilvusDocumentStore to Milvus1DocumentStore
MichelBartels 478fd08
Merge branch 'fix-milvus2' of https://github.com/deepset-ai/haystack …
MichelBartels 31f7819
update milvus docstrings to reflect updated dependency management
MichelBartels 171a69c
Update Documentation & Code Style
github-actions[bot] b86449a
enable milvus 2 tests
MichelBartels 8449aef
Merge branch 'fix-milvus2' of https://github.com/deepset-ai/haystack …
MichelBartels ad343ec
fix milvus2 env variable processing
MichelBartels f9c4a13
fix dropping collections for each milvus 2 test
MichelBartels c6d57d3
fix typo
MichelBartels 766d78c
fix another typo
MichelBartels e4df42c
make Milvus 2 doc store tests work
c897ca8
allow user to specify consistency level
fed7198
Update Documentation & Code Style
github-actions[bot] 0fabd18
fix type hint
9af14ae
Merge branch 'fix-milvus2' of https://github.com/deepset-ai/haystack …
07469e6
fix type hint
879ba17
fix type hint
6122902
fix retriever test
47a5f46
Update Documentation & Code Style
github-actions[bot] a628ccc
fix type hint
6514d0c
Merge branch 'fix-milvus2' of https://github.com/deepset-ai/haystack …
93d2fc7
Update Documentation & Code Style
github-actions[bot] 2517bd1
Merge branch 'master' into fix-milvus2
ZanSara 4fa8434
Fist attempt at running Milvus2 in the CI
ZanSara dbcc2ca
Update Documentation & Code Style
github-actions[bot] 64a61aa
Fix typo in code-and-docs-check
ZanSara e5af6a9
Typo in env var
ZanSara 221bc9c
Merge branch 'fix-milvus2' of github.com:deepset-ai/haystack into fix…
ZanSara 4415c45
Install the correct pymilvus
ZanSara b79ca80
Remove warning
ZanSara 246f236
delete debugging statements
MichelBartels a9c3aa3
Forgot a '2' in linux ci
ZanSara e612b26
add batch deletion for milvus2
a137e13
Update Documentation & Code Style
github-actions[bot] 0d3ccda
change default from milvus 1 to milvus 2
253ac5b
update launch milvus script for milvus 2
2011f34
Update Documentation & Code Style
github-actions[bot] a1da6f8
make milvus2 the default in the docstores extra
ZanSara fa6ae18
Switch milvus1 and milvus2 in base test run on CI
ZanSara d4836c1
Merge branch 'fix-milvus2' of github.com:deepset-ai/haystack into fix…
ZanSara 88ed855
Rename docstore flags for pytest: 'milvus'->'milvus1', 'milvus2'->'mi…
ZanSara 6bce535
Fix detail in conftest.py
ZanSara 4d49822
Merge branch 'master' into fix-milvus2
ZanSara 54cb14e
Rename milvus.py->milvus1.py and milvus2x.py->milvus2.py
ZanSara 3a9a063
Merge branch 'fix-milvus2' of github.com:deepset-ai/haystack into fix…
ZanSara 5fdd83b
Enable autogenerated docs for Milvus1 and 2 separately
ZanSara 838d715
Update Documentation & Code Style
github-actions[bot] 7732186
Partial fix to docstring of Milvus2DocumentStore
ZanSara fa93ba4
Update Documentation & Code Style
github-actions[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix milvus2 env variable processing
commit ad343ecaad20ab0cfc119e9fc061fcabfa3879df
There are no files selected for viewing
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't we are making Milvus2 as default? If so then how about making it MILVUS1_ENABLED :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is also what @ZanSara was referring to. I have now updated those environment variables.