Skip to content

Ollama#26

Merged
aaronpowell merged 33 commits into
mainfrom
ollama
Sep 24, 2024
Merged

Ollama#26
aaronpowell merged 33 commits into
mainfrom
ollama

Conversation

@aaronpowell
Copy link
Copy Markdown
Member

@aaronpowell aaronpowell commented Sep 18, 2024 •
edited
Loading

Closes #23

The folks from Raygun have donated their Ollama package, which has served as the starting point for what is in this PR.

PR Checklist

  • Created a feature/dev branch in your fork (vs. submitting directly from a commit on main)
  • Based off latest main branch of toolkit
  • PR doesn't include merge commits (always rebase on top of our main, if needed)
  • New integration
    • Docs are written
    • Added description of major feature to project description for NuGet package (4000 total character limit, so don't push entire description over that)
  • Tests for the changes have been added (for bug fixes / features) (if applicable)
  • Contains NO breaking changes
  • Every new API (including internal ones) has full XML docs
  • Code follows all style conventions

Other information

Thanks to @QuantumNightmare for the initial work!

QuantumNightmare and others added 17 commits June 5, 2024 14:19
@QuantumNightmare
Initial commit
4000be1
@QuantumNightmare
initial project creation
45791ad
@QuantumNightmare
Ollama resource with model downloader
27ec070
@QuantumNightmare
Packagerize
d689033
@QuantumNightmare
A couple of fixes
65eb487
@QuantumNightmare
documentation and minor tweaks
20df3bb
@QuantumNightmare
release as version 1 and added change log
0ab743f
@QuantumNightmare
Well that's embarrassing - I hope nobody saw that
28bde7a
@QuantumNightmare
Merge pull request #1 from MindscapeHQ/initial-development
80c22dc 
Initial development
@aaronpowell
Making the ModelName property public for read-only access.
94bf83c 
Fixes #3
@QuantumNightmare
Merge pull request #4 from aaronpowell/aaronpowell/issue-3
1922dd4 
Making the `ModelName` property public for read-only access.
@QuantumNightmare
Version bump
4fb1e48
@QuantumNightmare
Changelog entry
21b32b6
@QuantumNightmare
Merge pull request #5 from MindscapeHQ/v1.1.0
7891337 
V1.1.0
@aaronpowell
Merge remote-tracking branch 'raygun/main' into ollama
ad3be06
@aaronpowell
Merge branch 'main' into ollama
01b6aba
@aaronpowell
Adding readme to csproj
fa36e44
@aaronpowell aaronpowell self-assigned this Sep 18, 2024
@aaronpowell aaronpowell added the integration A new .NET Aspire integration label Sep 18, 2024
davidfowl
davidfowl reviewed Sep 18, 2024
View reviewed changes
Comment thread src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.cs Outdated
davidfowl
davidfowl reviewed Sep 18, 2024
View reviewed changes
Comment thread src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.cs Outdated
davidfowl
davidfowl reviewed Sep 18, 2024
View reviewed changes
Comment thread src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.cs Outdated
davidfowl
davidfowl reviewed Sep 18, 2024
View reviewed changes
Comment thread src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.cs Outdated
@aaronpowell
Adding initial integration test
1903ea4
@aaronpowell
Adding a WaitFor and timeout in tests
5ec43cf
@aaronpowell
Making volume optional
23ed05a
@aaronpowell
Wait for resource before resolving it?
a5028b3
@aaronpowell
Adding some retry logic to the lifecycle hook
19f442e 
The hook is run before the container image is downloaded (and ollama started) when you run from a completely clean session (like GitHub Actions), and this poses a problem because it would timeout trying to check if the model exists. Added a really simple bit of retry logic in to counter that
@aaronpowell
Have to set the name of the endpoint, otherwise it will use 'http', w…
20307d5 
…hich isn't the name and thus returns null and fails
@aaronpowell aaronpowell marked this pull request as ready for review September 19, 2024 06:43
aaronpowell
aaronpowell commented Sep 24, 2024
View reviewed changes
Comment thread docs/integrations/hosting-ollama.md Outdated
@aaronpowell aaronpowell merged commit 91da0ec into main Sep 24, 2024
@aaronpowell aaronpowell deleted the ollama branch September 24, 2024 01:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidfowl davidfowl Awaiting requested review from davidfowl

Assignees

@aaronpowell aaronpowell

Labels

integration A new .NET Aspire integration

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Ollama

3 participants

@aaronpowell @davidfowl @QuantumNightmare