Support Ollama APIs for model management #1532
Conversation
ThomasVitale
force-pushed
the
ollama-new-features
branch
from
da8ffe3 to
42e739a
Compare
|
Once this PR is merged, we should be able to remove the disabling logic from the Ollama integration tests since they are now all sharing the same Ollama container instance and re-using the same 3 (small) models across all tests (the only exception is the test in the Spring Boot Testcontainers module). It means the execution will be relatively fast, even on the GitHub Actions Runners. |
* Extend the OllamaApi to support listing, copying, deleting, and pulling models programmatically. * Improve setup for integration testing with Ollama and Testcontainers. Enables spring-projectsgh-526 Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
ThomasVitale
force-pushed
the
ollama-new-features
branch
from
42e739a to
8e603e6
Compare
| var promptWithMessageHistory = new Prompt(List.of(new UserMessage("Dummy"), response.getResult().getOutput(), | ||
| new UserMessage("Repeat the last assistant message."))); | ||
| var promptWithMessageHistory = new Prompt(List.of(new UserMessage("Hello"), response.getResult().getOutput(), | ||
| new UserMessage("Tell me just the names of those pirates."))); |
| public static OllamaApi buildOllamaApiWithModel(String model) { | ||
| var baseUrl = "http://localhost:11434"; | ||
| if (useTestcontainers) { | ||
| baseUrl = "http://" + ollamaContainer.getHost() + ":" + ollamaContainer.getMappedPort(11434); |
There was a problem hiding this comment.
| baseUrl = "http://" + ollamaContainer.getHost() + ":" + ollamaContainer.getMappedPort(11434); | |
| baseUrl = ollamaContainer.getEndpoint(); |
| public static String buildConnectionWithModel(String model) throws IOException, InterruptedException { | ||
| var baseUrl = "http://localhost:11434"; | ||
| if (useTestcontainers) { | ||
| baseUrl = "http://" + ollamaContainer.getHost() + ":" + ollamaContainer.getMappedPort(11434); |
There was a problem hiding this comment.
| baseUrl = "http://" + ollamaContainer.getHost() + ":" + ollamaContainer.getMappedPort(11434); | |
| baseUrl = ollamaContainer.getEndpoint(); |
There was a problem hiding this comment.
Thanks, I had missed that! I opened a new PR with that improvement: #1538
|
alot of great cleanup, took 4 min to run on my machine. thanks. |
|
@markpollack thank you! I opened a followup PR to include the improvement suggested by @eddumelendez and because I forgot the test switch on, so the PR disables the integration tests again: #1538 Sorry about that! |
Enables gh-526