Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

.Net: Add Ollama Connector #7362

Merged
merged 22 commits into from
Sep 6, 2024
Merged

.Net: Add Ollama Connector #7362

merged 22 commits into from
Sep 6, 2024

Conversation

RogerBarreto
Copy link
Member

@RogerBarreto RogerBarreto commented Jul 19, 2024 •
edited
Loading

Motivation and Context

This PR brings support for Ollama Connector, this Connector uses the OllamaSharp library client to allow usage of native Ollama Endpoints.

RogerBarreto and others added 6 commits July 2, 2024 16:55
@RogerBarreto
.Net Ollama Connector with Ollama Sharp Client Update (#7059)
065e8f6 
### Motivation and Context

<!-- Thank you for your contribution to the semantic-kernel repo!
Please help reviewers and future users, providing the following
information:
  1. Why is this change required?
  2. What problem does it solve?
  3. What scenario does it contribute to?
  4. If it fixes an open issue, please link to the issue here.
-->

### Description

<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->

### Contribution Checklist

<!-- Before submitting this PR, please make sure: -->

- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows the [SK Contribution
Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
and the [pre-submission formatting
script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts)
raises no violations
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄
@RogerBarreto @dependabot
@moonbox3 @dmytrostruk @eltociear @crickman @shuaihuadu @Krzysztof318 @markwallace-microsoft @SergeyMenshykh @nmoeller @nmoellerms @westey-m @TaoChenOSU @eavanvalkenburg @N-E-W-T-O-N @qowlsdn8007 @glahaye
Python: .Net Ollama (Merge main) (#7231)
2def240 
### Motivation and Context

<!-- Thank you for your contribution to the semantic-kernel repo!
Please help reviewers and future users, providing the following
information:
  1. Why is this change required?
  2. What problem does it solve?
  3. What scenario does it contribute to?
  4. If it fixes an open issue, please link to the issue here.
-->

### Description

<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->

### Contribution Checklist

<!-- Before submitting this PR, please make sure: -->

- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows the [SK Contribution
Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
and the [pre-submission formatting
script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts)
raises no violations
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Mattson <35585003+moonbox3@users.noreply.github.com>
Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com>
Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com>
Co-authored-by: Chris <66376200+crickman@users.noreply.github.com>
Co-authored-by: ShuaiHua Du <shuaihua.du@outlook.com>
Co-authored-by: Krzysztof Kasprowicz <60486987+Krzysztof318@users.noreply.github.com>
Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
Co-authored-by: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com>
Co-authored-by: Nico Möller <nkm-moeller@mail.de>
Co-authored-by: Nico Möller <nicomoller@microsoft.com>
Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>
Co-authored-by: Tao Chen <taochen@microsoft.com>
Co-authored-by: Eduard van Valkenburg <eavanvalkenburg@users.noreply.github.com>
Co-authored-by: NEWTON MALLICK <38786893+N-E-W-T-O-N@users.noreply.github.com>
Co-authored-by: qowlsdn8007 <33804074+qowlsdn8007@users.noreply.github.com>
Co-authored-by: Gil LaHaye <gillahaye@microsoft.com>
@RogerBarreto
Revert "Python: .Net Ollama (Merge main)" (#7232)
02c7dfa 
Reverts #7231
@RogerBarreto
.Net: Ollama Connector : Added metadata, integration tests + more adj…
5bef1a9 
…ustments (#7212)

### Motivation and Context

- Integration Tests added
- Metadata generated with new client result data
- Adjustments in parameter names, following SK convention.
@RogerBarreto
.Net: Ollama - Adding metadata to chat messages (#7249)
3e8853e 
### Motivation and Context

Using most recent update where a ChatMessage metadata can be used by
OllamaSharp Client Chat().

### Description

<!-- Describe your changes, the overall approach, the underlying design.
These notes will help understanding how your code works. Thanks! -->

### Contribution Checklist

<!-- Before submitting this PR, please make sure: -->

- [ ] The code builds clean without any errors or warnings
- [ ] The PR follows the [SK Contribution
Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md)
and the [pre-submission formatting
script](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md#development-scripts)
raises no violations
- [ ] All unit tests pass, and I have added new tests where possible
- [ ] I didn't break anyone 😄
@RogerBarreto
Merge branch 'main' into feature-connectors-ollama
3d8078f
@markwallace-microsoft markwallace-microsoft added .NET Issue or Pull requests regarding .NET code kernel Issues or pull requests impacting the core kernel labels Jul 19, 2024
@github-actions github-actions bot changed the title Draft Merge main into connectors ollama .Net: Draft Merge main into connectors ollama Jul 19, 2024
@RogerBarreto RogerBarreto changed the title .Net: Draft Merge main into connectors ollama .Net: [Draft] main -> feature-connectors-ollama Jul 19, 2024
@RogerBarreto
Merge branch 'main' of https://github.com/microsoft/semantic-kernel i…
4d46c28 
…nto upstream/feature-connectors-ollama
@RogerBarreto
Fix conflict
5244078
@RogerBarreto
.Net: Ollama Connector - Embeddings + Latest OllamaSharp update. (#8095)
071e5f9 
### Motivation and Context

- Update to the latest version of `OllamaSharp` 
    - Adapted to the new changes to Embedding API update below
    awaescher/OllamaSharp#60
@RogerBarreto
Merge branch 'main' into feature-connectors-ollama
fa4ee99
@RogerBarreto RogerBarreto changed the title .Net: [Draft] main -> feature-connectors-ollama .Net: Add support for Ollama Connector Aug 14, 2024
@RogerBarreto RogerBarreto changed the title .Net: Add support for Ollama Connector .Net: Add Ollama Connector Aug 14, 2024
@RogerBarreto
Merge branch 'main' into feature-connectors-ollama
6ee36b8
@RogerBarreto
.Net: Ollama - Adding Missing Samples (#8309)
3b1d2dd 
### Motivation and Context

Adding missing samples using the new Ollama Connector.
- Embedding generation
- Text Generation
- Chat Completion
- AIModelRouting Demo with Ollama Connector
@RogerBarreto
.Net: Ollama Concept Test Fix (#8314)
546d30f 
### Motivation and Context

Small fix identified during bugbash.
@RogerBarreto
Merge branch 'main' into feature-connectors-ollama
fb100b9
@RogerBarreto RogerBarreto marked this pull request as ready for review September 4, 2024 10:13
@RogerBarreto RogerBarreto requested a review from a team as a code owner September 4, 2024 10:13
markwallace-microsoft
markwallace-microsoft reviewed Sep 5, 2024
View reviewed changes
dotnet/src/Connectors/Connectors.Ollama.UnitTests/OllamaPromptExecutionSettingsTests.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama.UnitTests/OllamaPromptExecutionSettingsTests.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama.UnitTests/OllamaTestHelper.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama.UnitTests/OllamaTestHelper.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama.UnitTests/Services/OllamaChatCompletionTests.cs Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama/Extensions/OllamaServiceCollectionExtensions.cs Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama/OllamaMetadata.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama/OllamaMetadata.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama/OllamaPromptExecutionSettings.cs Outdated Show resolved Hide resolved
dotnet/src/Connectors/Connectors.Ollama/Services/OllamaChatCompletionService.cs Show resolved Hide resolved
@RogerBarreto RogerBarreto added this pull request to the merge queue Sep 6, 2024
Merged via the queue into main with commit f149f95 Sep 6, 2024
18 checks passed
@RogerBarreto RogerBarreto deleted the feature-connectors-ollama branch September 6, 2024 14:41
@magols
Copy link

magols commented Sep 10, 2024

Thank you. I think we are many who have been waiting for this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dluc dluc dluc left review comments

@markwallace-microsoft markwallace-microsoft markwallace-microsoft approved these changes

@SergeyMenshykh SergeyMenshykh SergeyMenshykh approved these changes

Assignees

@RogerBarreto RogerBarreto

Labels
kernel Issues or pull requests impacting the core kernel .NET Issue or Pull requests regarding .NET code
Projects
Semantic Kernel
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RogerBarreto @magols @dluc @SergeyMenshykh @markwallace-microsoft