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

Relax dependency version to accept astrapy 1.* #12792

Merged
merged 6 commits into from Apr 13, 2024

Conversation

hemidactylus
Copy link
Contributor

Description

The main point of this PR is to allow for astrapy 1.* (now that 1.0.0 is out).
This version is backward-compatible so no code changes are needed.

  • While I was at it, I added a simple integration test for the Astra DB reader class
  • I made the Makefile work again by using poetry commands
  • I replaced a method call (deprecated starting astrapy 0.7.1) (delete => delete_one).

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

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 (though unrelated to the very change this PR is about)

Suggested Checklist:

  • I have performed a self-review of my own code
  • 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:M This PR changes 30-99 lines, ignoring generated files. label Apr 12, 2024

@pytest.fixture(scope="module")
def source_collection_name() -> Iterable[str]:
COLLECTION_NAME = "li_readers_test"
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe at this point the COLLECTION_NAME could be a module constant and source_collection_name become an auto_use fixture ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good suggestion. Done :)



@pytest.fixture(autouse=True, scope="module")
def source_collection() -> Iterable[str]:
Copy link
Contributor

Choose a reason for hiding this comment

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

Type is a collection

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you - fix is landed along with a couple other things

@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Apr 12, 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.

Please also update the version (patch) number for the two packages in their respective pyproject.toml files. 🙏

@hemidactylus
Copy link
Contributor Author

I see dependency trouble running the tests - despite what is seen in the pyproject.toml's. Import lines such as import astrapy apparently fail in the CI test environment. Is something (pants-related?) needed by chance? I think a little guidance might be needed here.
(of course "the tests all pass on my machine", predictably)

@nerdai
Copy link
Contributor

nerdai commented Apr 12, 2024

I see dependency trouble running the tests - despite what is seen in the pyproject.toml's. Import lines such as import astrapy apparently fail in the CI test environment. Is something (pants-related?) needed by chance? I think a little guidance might be needed here. (of course "the tests all pass on my machine", predictably)

Could be a pants-related thing. Attn: @logan-markewich any thoughts here?

@logan-markewich
Copy link
Collaborator

That should fix it, just made astrapy an explicit dep of the tests

@logan-markewich logan-markewich enabled auto-merge (squash) April 13, 2024 04:36
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Apr 13, 2024
@logan-markewich logan-markewich merged commit 8d49b9a into run-llama:main Apr 13, 2024
8 checks passed
@hemidactylus hemidactylus deleted the SL-astrapy-v1 branch April 16, 2024 13:26
chrisalexiuk-nvidia pushed a commit to chrisalexiuk-nvidia/llama_index that referenced this pull request Apr 25, 2024
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:L This PR changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants