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.

Sign up for GitHub

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

Jump to bottom

EGW, get supported providers #1058

Merged
merged 10 commits into from
May 6, 2024
Merged

EGW, get supported providers #1058

merged 10 commits into from
May 6, 2024

Conversation

Yuqi-Du
Copy link
Contributor

@Yuqi-Du Yuqi-Du commented May 3, 2024

What this PR does:

  • Refactoring embedding provider class and interface files, for readability
  • Use EGW to get supported embedding providers when EGW enabled
  • Use default yaml file-mapped providers when EGW disabled

Some file descriptions in case it is your first time reading this embedding pakage.

  • EmbeddingConfigSourceProvider source provider allows yaml.file mapping
  • FileEmbeddingProviderConfig, mapped from yaml.file
  • EmbeddingProvidersConfigProducer produces according to EGW enabled or disabled
  • EmbeddingProvidersConfig as general interface for EGW provider info or yaml file-mapped provider info
  • EmbeddingProvidersConfigImpl implements EmbeddingProvidersConfig, so we can instantiate EmbeddingProvidersConfig

Checklist

  • Changes manually tested
  • Automated Tests added/updated
  • Documentation added/updated
  • CLA Signed: DataStax CLA

Yuqi-Du added 3 commits May 2, 2024 15:58
@Yuqi-Du
init
ff2ca93
@Yuqi-Du
Merge remote-tracking branch 'origin/main' into EG-get-supported-prov…
1ef2b41 
…iders-1

# Conflicts:
#	src/main/java/io/stargate/sgv2/jsonapi/service/embedding/configuration/PropertyBasedEmbeddingProviderConfig.java
#	src/main/java/io/stargate/sgv2/jsonapi/service/operation/model/impl/FindEmbeddingProvidersOperation.java
@Yuqi-Du
init
c8150d5
@Yuqi-Du Yuqi-Du requested a review from a team as a code owner May 3, 2024 19:20
Yuqi-Du added 4 commits May 3, 2024 14:56
@Yuqi-Du
Merge remote-tracking branch 'origin/main' into EG-get-supported-prov…
083837e 
…iders-1

# Conflicts:
#	src/main/java/io/stargate/sgv2/jsonapi/service/operation/model/impl/FindEmbeddingProvidersOperation.java
@Yuqi-Du
fix comments
82f2db5
@Yuqi-Du
fix comments
a8cf411
@Yuqi-Du
fix comments
737b787
maheshrajamani
maheshrajamani approved these changes May 6, 2024
View reviewed changes
Copy link
Contributor

@maheshrajamani maheshrajamani left a comment

Choose a reason for hiding this comment

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

LGTM.

.../stargate/sgv2/jsonapi/service/embedding/configuration/EmbeddingProvidersConfigProducer.java Outdated Show resolved Hide resolved
.../stargate/sgv2/jsonapi/service/embedding/configuration/EmbeddingProvidersConfigProducer.java Show resolved Hide resolved
src/test/java/io/stargate/sgv2/jsonapi/testresource/DseTestResource.java Show resolved Hide resolved
.../stargate/sgv2/jsonapi/service/embedding/configuration/EmbeddingProvidersConfigProducer.java Show resolved Hide resolved
.../stargate/sgv2/jsonapi/service/embedding/configuration/EmbeddingProvidersConfigProducer.java Outdated Show resolved Hide resolved
@Yuqi-Du Yuqi-Du merged commit 5351f86 into main May 6, 2024
3 checks passed
@Yuqi-Du Yuqi-Du deleted the EG-get-supported-providers-1 branch May 6, 2024 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hazel-Datastax Hazel-Datastax Hazel-Datastax left review comments

@tatu-at-datastax tatu-at-datastax tatu-at-datastax left review comments

@maheshrajamani maheshrajamani maheshrajamani approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Yuqi-Du @tatu-at-datastax @maheshrajamani @Hazel-Datastax