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

feat: couchbase integration #6165

Merged
merged 25 commits into from
Oct 29, 2024
Merged

Conversation

roadgoat19
Copy link
Contributor

@roadgoat19 roadgoat19 commented Jul 10, 2024

Checklist:

Important

Please review the checklist below before submitting your pull request.

  • Please open an issue before creating a PR or link to an existing issue
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

Description

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. Close issue syntax: Fixes #<issue number>, see documentation for more details.

Fixes #5178

Type of Change

  • 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, included: Dify Document
  • Improvement, including but not limited to code refactoring, performance optimization, and UI/UX improvement
  • Dependency upgrade

Testing Instructions

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

  • Tested test_vdb, docker-compose.yaml, docker-compose.middleware.yaml

@roadgoat19 roadgoat19 marked this pull request as ready for review July 16, 2024 17:50
@dosubot dosubot bot added the size:XL This PR changes 500-999 lines, ignoring generated files. label Jul 16, 2024
@roadgoat19
Copy link
Contributor Author

Hello @JohnJyong, do you have any comments? The only issue left to be fixed is disabling embedding models with a dimensionality > 2048. I'd like to ideally throw an error like this but I'm not sure how other vdb's like relyt are handling it
Screenshot 2024-07-16 at 11 49 20 AM

@crazywoola crazywoola requested a review from JohnJyong July 18, 2024 07:08
@crazywoola
Copy link
Member

@roadgoat19 Hello , sorry for the late response, we have working on some new features regarding RAG recently. Please resolve the conflicts and we can proceed with this PR. :)

@roadgoat19
Copy link
Contributor Author

@crazywoola I've fixed a lingering merge conflict, could you rerun the workflows please?

@crazywoola
Copy link
Member

crazywoola commented Aug 9, 2024

Hello the API Tests (3.10) failed and there are some lint errors in the superlinter.
You could run ./dev/reformat to resolve linting issues. @roadgoat19

@roadgoat19
Copy link
Contributor Author

@crazywoola Hello I believe I've fixed this issue causing the api tests to fail. However, I am a little unsure about how to fix the linter errors in the .env.example. When I run dev/reformat, it says that basically every single key is out of order. This issue persists even with the .env.example taken straight from the current main branch of dify. Is there a command I can run to fix this issue /or how should I proceed?

crazywoola
crazywoola previously approved these changes Aug 15, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Aug 15, 2024
@crazywoola
Copy link
Member

Hello there are some conflicts here. And still got a lint error. I think you need to upgrade ruff and sync deps by ./dev/sync-poetry.

@dosubot dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. size:XXL This PR changes 1000+ lines, ignoring generated files. labels Aug 29, 2024
@dosubot dosubot bot added size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:XXL This PR changes 1000+ lines, ignoring generated files. labels Sep 12, 2024
@ejscribner
Copy link
Contributor

Thanks @crazywoola, and sorry for the delay here. I'm picking this PR up for @roadgoat19, and have resolved all conflicts and updated the dependencies. Let me know if anything else needs adjusting!

@ejscribner ejscribner force-pushed the couchintegration branch 2 times, most recently from bdac900 to 5e74274 Compare September 17, 2024 18:00
@crazywoola
Copy link
Member

Hello @ejscribne Thanks for picking this up, please resolve those conflicts again :)

@ejscribner
Copy link
Contributor

Hey @crazywoola just fixed the conflicts, let me know if anything else needs to be done. Thanks!

@ejscribner
Copy link
Contributor

Hey @crazywoola sorry for the delay fixing this, added a healthcheck to be sure the resource is ready for the tests. It should fix the issue.

@crazywoola
Copy link
Member

Finally

@crazywoola crazywoola merged commit c8ef922 into langgenius:main Oct 29, 2024
6 checks passed
@ejscribner ejscribner deleted the couchintegration branch October 29, 2024 17:30
idonotknow pushed a commit to AceDataCloud/Dify that referenced this pull request Nov 16, 2024
Co-authored-by: crazywoola <427733928@qq.com>
Co-authored-by: Elliot Scribner <elliot.scribner@couchbase.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: Bowen Liang <bowenliang@apache.org>
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:XL This PR changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat: support Couchbase as a vector store
4 participants