feat(ollama): support calling the Ollama local process#2923
Merged
mdelapenya merged 42 commits intomainfrom Jan 2, 2025
Merged
feat(ollama): support calling the Ollama local process#2923mdelapenya merged 42 commits intomainfrom
mdelapenya merged 42 commits intomainfrom
Conversation
✅ Deploy Preview for testcontainers-go ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
0d0ff48 to
8619850
Compare
0146fc5 to
2f2865b
Compare
mdelapenya
previously approved these changes
Dec 20, 2024
Member
mdelapenya
left a comment
There was a problem hiding this comment.
This LGTM, waiting for you to mark is as ready. Great job with the process execution handling 🏆
modules/ollama/local.go
Outdated
|
|
||
| // Terminate implements testcontainers.Container interface for the local Ollama binary. | ||
| // It stops the local Ollama process, removing the log file. | ||
| func (c *localProcess) Terminate(ctx context.Context) error { |
Member
There was a problem hiding this comment.
todo: conflict with #2926, so depending on which one is merged first, we need to update it.
Contributor
Author
There was a problem hiding this comment.
Yer just replied to that PR, I don't think it works in its current form as it breaks the interface separation.
Member
There was a problem hiding this comment.
We merged #2926 so I think we need to update this signature to match the interface
Member
There was a problem hiding this comment.
Added it here: 9be4b71
I did not transfer the options from Terminate to the Stop call (stop duration), do you think we need to extract it from the options and override the default?
mdelapenya
reviewed
Dec 20, 2024
9927ad0 to
5e586c8
Compare
Refactor local process handling for Ollama using a container implementation avoiding the wrapping methods. This defaults to running the binary with an ephemeral port to avoid port conflicts. This behaviour can be overridden my setting OLLAMA_HOST either in the parent environment or in the values passed via WithUseLocal. Improve API compatibility with: - Multiplexed output streams - State reporting - Exec option processing - WaitingFor customisation Fix Container implementation: - Port management - Running checks - Terminate processing - Endpoint argument definition - Add missing methods - Consistent environment handling
Refactor local processing to use the new log sub match functionality.
Validate the container request to ensure the user configuration can be processed and no fields that would be ignored are present.
Remove temporary simple test.
Allow the local ollama binary name to be configured using the image name.
Detail the container request supported fields.
Update local process site docs to match recent changes.
Refactor Terminate to support testcontainers.TerminateOption.
9be4b71 to
4c3a06c
Compare
mdelapenya
reviewed
Jan 2, 2025
mdelapenya
reviewed
Jan 2, 2025
mdelapenya
approved these changes
Jan 2, 2025
Member
mdelapenya
left a comment
There was a problem hiding this comment.
LGTM, great work with the refactor of the process Start/Wait, thanks for this!
This was referenced Jan 2, 2025
mdelapenya
added a commit
to mdelapenya/testcontainers-go
that referenced
this pull request
Jan 8, 2025
* main: (103 commits) feat(postgres): ssl for postgres (testcontainers#2473) feat(ollama): support calling the Ollama local process (testcontainers#2923) chore(deps): bump jinja2 from 3.1.4 to 3.1.5 (testcontainers#2935) chore(deps): bump sonarsource/sonarcloud-github-action (testcontainers#2933) feat(termination)!: make container termination timeout configurable (testcontainers#2926) chore(deps): bump slackapi/slack-github-action from 1.26.0 to 2.0.0 (testcontainers#2934) chore(deps): bump github/codeql-action from 3.25.15 to 3.28.0 (testcontainers#2932) feat(wait): log sub match callback (testcontainers#2929) fix: Handle nil value in CleanupNetwork (testcontainers#2928) fix: avoid double lock in DockerProvider.DaemonHost() (testcontainers#2900) feat!: build log writer for container request (testcontainers#2925) feat(gcloud)!: add support to seed data when using RunBigQueryContainer (testcontainers#2523) security(deps): bump golang.org/x/crypto from 0.28.0 to 0.31.0 (testcontainers#2916) chore(ci): add Github labels based on PR title (testcontainers#2914) chore(gha): Use official setup-docker-action (testcontainers#2913) chore(ci): enforce conventional commits syntax in PR titles (testcontainers#2911) feat(nats): WithConfigFile - pass a configuration file to nats server (testcontainers#2905) chore: enable implicit default logger only in testing with -v (testcontainers#2877) fix: container binds syntax (testcontainers#2899) refactor(cockroachdb): to use request driven options (testcontainers#2883) ...
mdelapenya
added a commit
to mdelapenya/testcontainers-go
that referenced
this pull request
Feb 3, 2025
* main: (29 commits) deps(fix): include modulegen templates dir in dependabot updates (testcontainers#2956) chore(deps): bump docker/setup-docker-action from 4.0.0 to 4.1.0 (testcontainers#2959) feat: adds Pinecone module (testcontainers#2955) chore(deps): bump actions/setup-go from 5.1.0 to 5.3.0 (testcontainers#2957) chore(deps): bump actions/upload-artifact from 4.4.3 to 4.6.0 (testcontainers#2958) chore: enable unused-parameter from revive (testcontainers#2949) chore: enable use-any from revive (testcontainers#2948) bump golangci-lint to v1.63.4 (testcontainers#2950) chore: enable var-declaration from revive linter (testcontainers#2942) chore: enable context-as-argument from revive linter (testcontainers#2946) chore: enable early-return, indent-error-flow and superfluous-else from revive linter (testcontainers#2947) chore!: rename EnpointSettingsModifier to EndpointSettingsModifier fix(localstack): more reliable legacy tag detection (testcontainers#2936) chore: recover from panic in `SkipIfProviderIsNotHealthy` test helper function (testcontainers#2939) chore: fix typos (testcontainers#2940) deps(compose): bump compose (v2.32.2) and compose-go spec (v2.4.7) (testcontainers#2938) chore: prepare for next minor development cycle (0.36.0) chore: use new version (v0.35.0) in modules and examples feat(postgres): ssl for postgres (testcontainers#2473) feat(ollama): support calling the Ollama local process (testcontainers#2923) ...
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Refactor local process handling for Ollama using a container implementation avoiding the wrapping methods.
This defaults to running the binary with an ephemeral port to avoid conflict.
This behaviour can be overridden my setting OLLAMA_HOST either in the parent environment or in the values passed via WithUseLocal.
Improve API compatibility with:
Fix Container implementation: