Streamline dependencies and improve API consistency #1550
Closed
Conversation
This file contains hidden or 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
tzolov
force-pushed
the
webflux-dep-issue
branch
from
e2a0508 to
ab5308f
Compare
This was referenced Oct 16, 2024
markpollack
reviewed
Oct 16, 2024
| @@ -99,15 +103,20 @@ public ZhiPuAiApi(String baseUrl, String zhiPuAiToken, RestClient.Builder restCl | |||
| */ | |||
| public ZhiPuAiApi(String baseUrl, String zhiPuAiToken, RestClient.Builder restClientBuilder, ResponseErrorHandler responseErrorHandler) { | |||
|
|
|||
| Consumer<HttpHeaders> authHeaders = h -> { | |||
| h.setBearerAuth(zhiPuAiToken); | |||
| h.setContentType(MediaType.APPLICATION_JSON); | |||
There was a problem hiding this comment.
i'll run the IT to make sure adding content type is ok.
There was a problem hiding this comment.
unfortunately, my api key no longer works. will have to follow up on it another time.
markpollack
reviewed
Oct 16, 2024
| @@ -68,8 +70,13 @@ public ZhiPuAiImageApi(String baseUrl, String zhiPuAiToken, RestClient.Builder r | |||
| public ZhiPuAiImageApi(String baseUrl, String zhiPuAiToken, RestClient.Builder restClientBuilder, | |||
| ResponseErrorHandler responseErrorHandler) { | |||
|
|
|||
| Consumer<HttpHeaders> authHeaders = h -> { | |||
There was a problem hiding this comment.
could be inlined as there is just one usgae.
markpollack
reviewed
Oct 16, 2024
| @@ -34,6 +34,7 @@ | |||
| <version>${spring-retry.version}</version> | |||
| </dependency> | |||
|
|
|||
| <!-- --> | |||
There was a problem hiding this comment.
can remove extraneous comment.
markpollack
reviewed
Oct 16, 2024
|
|
||
| return new AnthropicApi(connectionProperties.getBaseUrl(), connectionProperties.getApiKey(), | ||
| connectionProperties.getVersion(), restClientBuilder, webClientBuilder, responseErrorHandler, | ||
| connectionProperties.getVersion(), restClientBuilderProvider.getIfAvailable(RestClient::builder), |
There was a problem hiding this comment.
if unavailable, we should create it.
There was a problem hiding this comment.
In contrary we should. This is the purpose of using the ObjectProvider
There was a problem hiding this comment.
my bad, i didn't realize that is how getIfAvailable worked!
- Remove unnecessary spring-web dependencies - Update third-party library versions - Refactor API classes to use consistent header handling - Remove ApiUtils class and inline its functionality - Adjust RestClient and WebClient builder usage in autoconfiguration - Replace direct RestClient.Builder injections with ObjectProvider<RestClient.Builder> and WebClient.Builder injections with ObjectProvider<WebClient.Builder> - Update ChromaVectorStoreAutoConfiguration to use ObjectProvider - Rename MongoDbAtlasLocalContainerConnectionDetailsFactoryTest to IT - Switch spring-ai-chroma-store dependency from spring-web to spring-webflux - Simplify ChromaApi constructor by using method reference for default headers Resolves spring-projects#1066 Resolves spring-projects#524
tzolov
force-pushed
the
webflux-dep-issue
branch
from
ab5308f to
12d3382
Compare
|
merged in 2e0a51f |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #1066, #524