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

Fix elasticsearch hybrid rrf window_size #12695

Merged
merged 3 commits into from Apr 11, 2024

Conversation

adrian539859
Copy link
Contributor

@adrian539859 adrian539859 commented Apr 10, 2024

Description

If similarity_top_k is larger than elastic search's default rank.rrf.window_size, it will raise exception. Added window_size depend on query.similarity_top_k instead of default value.

Fixes #8635
Fixes #12179

New Package?

Did I fill in the tool.llamahub section in the pyproject.toml and provide a detailed README.md for my new integration or package?

  • Yes
  • No

Version Bump?

Did I bump the version in the pyproject.toml file of the package I am updating? (Except for the llama-index-core package)

  • Yes
  • No

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Added new unit/integration tests
  • Added new notebook (that tests end-to-end)
  • I stared at the code and made sure it makes sense

Suggested Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added Google Colab support for the newly added notebooks.
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I ran make format; make lint to appease the lint gods

@dosubot dosubot bot added the size:XS This PR changes 0-9 lines, ignoring generated files. label Apr 10, 2024
Copy link
Contributor

@nerdai nerdai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @adrian539859 - looks good. Is it possible to whip a quick unit test for this?

@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. and removed size:XS This PR changes 0-9 lines, ignoring generated files. labels Apr 11, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Apr 11, 2024
@nerdai
Copy link
Contributor

nerdai commented Apr 11, 2024

Thanks @adrian539859! Last thing: can we update the version (patch) number in the pyproject.toml?

@nerdai nerdai enabled auto-merge (squash) April 11, 2024 03:37
@nerdai nerdai merged commit de6f22f into run-llama:main Apr 11, 2024
8 checks passed
chrisalexiuk-nvidia pushed a commit to chrisalexiuk-nvidia/llama_index that referenced this pull request Apr 25, 2024
* Fix elasticsearch hybrid rrf window_size

* add elasticsearch vector store test

* update version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
2 participants