Fix ollama auto-configuration #4495
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
Kehrlann
force-pushed
the
dgarnier/fix-ollama-imports
branch
from
4da6aea to
570dea6
Compare
- Related to spring-projects#4494 Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
Kehrlann
force-pushed
the
dgarnier/fix-ollama-imports
branch
from
570dea6 to
aef3964
Compare
27 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Related to #4494
This PR removes the
@ImportAutoConfigurationfrom Ollama's auto-configuration classes.It also reworks the "autoconfigure after" declarations, so that they are closest to the actual auto-config that uses them. For example, the
RestClientAutoConfigurationis used by theOllamaApiAutoconfigurationthrough theRestClient.Builderinjection ; so the dependency is expressed inOllamaApiAutoConfiguration.We also introduce a testing pattern where all the auto-configs that would be present in a Boot app are injected by default in the test contexts of integration tests.