Update Ollama APIs and fix multimodality test #1120
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
Contributor
ThomasVitale
commented
Jul 25, 2024
ThomasVitale
commented
- Add doneReason to ChatResponse and update OllamaChatModel accordingly
- Add missing descriptions to Ollama options
- Consolidate Ollama Testcontainers image setup
- Fix multimodality Ollama test
ThomasVitale
force-pushed
the
update-ollama-apis
branch
from
98cfb16 to
1e2ab24
Compare
ThomasVitale
commented
Jul 25, 2024
| @@ -201,53 +202,43 @@ public Flux<ChatResponse> stream(Prompt prompt) { | |||
| */ | |||
| OllamaApi.ChatRequest ollamaChatRequest(Prompt prompt, boolean stream) { | |||
|
|
|||
| List<OllamaApi.Message> ollamaMessages = prompt.getInstructions() | |||
| .stream() | |||
| .filter(message -> message.getMessageType() == MessageType.USER | |||
There was a problem hiding this comment.
This diff looks really weird, but the only change I made was removing the "filter()" expression since we now accept all message types, so there's no filter needed.
There was a problem hiding this comment.
Looks like the Spring Formatter plugin made formatting changes after removing the filter() part.
ThomasVitale
commented
Jul 25, 2024
| * @param options Additional model parameters. You can use the {@link OllamaOptions} builder | ||
| * to create the options then {@link OllamaOptions#toMap()} to convert the options into a | ||
| * map. | ||
| * @param model The model to use for completion. It should be a name familiar to Ollama from the <a href="https://ollama.com/library">Library</a>. |
There was a problem hiding this comment.
Synced with Ollama GO code, including the field order to make it easier to maintain it whenever there are changes
ThomasVitale
force-pushed
the
update-ollama-apis
branch
from
1e2ab24 to
00e6c87
Compare
* Add doneReason to ChatResponse and update OllamaChatModel accordingly * Add missing descriptions to Ollama options * Consolidate Ollama Testcontainers image setup * Fix multimodality Ollama test * Add new models to enum: llama 3.1, mistral-nemo, moondream. Signed-off-by: Thomas Vitale <[email protected]>
ThomasVitale
force-pushed
the
update-ollama-apis
branch
from
00e6c87 to
81836ed
Compare
|
Thanks @ThomasVitale . Made few small adjustments and it is ready to go. |
|
Rebased and merged at 78cd3e9 |
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.