Skip to content

refactor: Move Cellm.Models to shared project #111

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

Merged
kaspermarstal merged 1 commit into from
Feb 11, 2025
Merged

refactor: Move Cellm.Models to shared project #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Cellm.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cellm", "src\Cellm\Cellm.cs
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cellm.Tests", "src\Cellm.Tests\Cellm.Tests.csproj", "{A2E6E336-7F53-45B6-B03F-FE7681FFE8F2}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cellm.Models", "src\Cellm.Models\Cellm.Models.shproj", "{E78A1255-A4F5-4FD1-9546-4B5677E7ED54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -28,4 +30,8 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {44E1ACC9-691B-4A19-BAE9-2A1033F12FB0}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Cellm.Models\Cellm.Models.projitems*{ae73b93e-ab99-41b9-8367-46eefd550cb8}*SharedItemsImports = 5
src\Cellm.Models\Cellm.Models.projitems*{e78a1255-a4f5-4fd1-9546-4b5677e7ed54}*SharedItemsImports = 13
EndGlobalSection
EndGlobal
0 src/Cellm/Models/Behaviors/CacheBehavior.cs → src/Cellm.Models/Behaviors/CacheBehavior.cs
View file
Open in desktop
File renamed without changes.
0 src/Cellm/Models/Behaviors/SentryBehavior.cs → src/Cellm.Models/Behaviors/SentryBehavior.cs
View file
Open in desktop
File renamed without changes.
0 src/Cellm/Models/Behaviors/ToolBehavior.cs → src/Cellm.Models/Behaviors/ToolBehavior.cs
View file
Open in desktop
File renamed without changes.
54 changes: 54 additions & 0 deletions src/Cellm.Models/Cellm.Models.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>e78a1255-a4f5-4fd1-9546-4b5677e7ed54</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>Cellm.Models</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Behaviors\CacheBehavior.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Behaviors\SentryBehavior.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Behaviors\ToolBehavior.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Client.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Exceptions\CellmModelException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Prompts\Prompt.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Prompts\PromptBuilder.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Anthropic\AnthropicConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Anthropic\AnthropicRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Anthropic\AnthropicRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Anthropic\AnthropicResponse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Anthropic\Models.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\DeepSeek\DeepSeekConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\IModelRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\IModelRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\IModelResponse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\IProviderConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\IProviderRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\IProviderRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Llamafile\LlamafileConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Mistral\MistralConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Ollama\OllamaConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Ollama\OllamaRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Ollama\OllamaRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Ollama\OllamaResponse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAiCompatible\OpenAiCompatibleConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAiCompatible\OpenAiCompatibleRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAiCompatible\OpenAiCompatibleRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAiCompatible\OpenAiCompatibleResponse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAi\OpenAiConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAi\OpenAiRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAi\OpenAiRequestHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\OpenAi\OpenAiResponse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\Provider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Providers\ProviderConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resilience\CircuitBreakerConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resilience\RateLimiterConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resilience\ResiliencePipelineConfigurator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resilience\RetryConfiguration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Serde.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ServiceCollectionExtensions.cs" />
</ItemGroup>
</Project>
13 changes: 13 additions & 0 deletions src/Cellm.Models/Cellm.Models.shproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>e78a1255-a4f5-4fd1-9546-4b5677e7ed54</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="Cellm.Models.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>
0 src/Cellm/Models/Client.cs → src/Cellm.Models/Client.cs
View file
Open in desktop
File renamed without changes.
0 .../Models/Exceptions/CellmModelException.cs → ....Models/Exceptions/CellmModelException.cs
View file
Open in desktop
File renamed without changes.
0 src/Cellm/Models/Prompts/Prompt.cs → src/Cellm.Models/Prompts/Prompt.cs
View file
Open in desktop
File renamed without changes.
0 src/Cellm/Models/Prompts/PromptBuilder.cs → src/Cellm.Models/Prompts/PromptBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...iders/Anthropic/AnthropicConfiguration.cs → ...iders/Anthropic/AnthropicConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...s/Providers/Anthropic/AnthropicRequest.cs → ...s/Providers/Anthropic/AnthropicRequest.cs
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...ders/Anthropic/AnthropicRequestHandler.cs → ...ders/Anthropic/AnthropicRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ public AnthropicResponse Deserialize(AnthropicRequest request, string response)
.AddAssistantMessage(assistantMessage)
.Build();

return new AnthropicResponse(prompt);
var chatCompletion = new ChatCompletion(new ChatMessage(ChatRole.Assistant, assistantMessage));

return new AnthropicResponse(prompt, chatCompletion);
}
}
6 changes: 6 additions & 0 deletions src/Cellm.Models/Providers/Anthropic/AnthropicResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Cellm.Models.Prompts;
using Microsoft.Extensions.AI;

namespace Cellm.Models.Providers.Anthropic;

internal record AnthropicResponse(Prompt Prompt, ChatCompletion ChatCompletion) : IModelResponse;
0 ...ellm/Models/Providers/Anthropic/Models.cs → ...ellm.Models/Providers/Anthropic/Models.cs
View file
Open in desktop
File renamed without changes.
0 ...oviders/DeepSeek/DeepSeekConfiguration.cs → ...oviders/DeepSeek/DeepSeekConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 src/Cellm/Models/Providers/IModelRequest.cs → src/Cellm.Models/Providers/IModelRequest.cs
View file
Open in desktop
File renamed without changes.
0 .../Models/Providers/IModelRequestHandler.cs → ....Models/Providers/IModelRequestHandler.cs
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/Cellm/Models/Providers/IModelResponse.cs → src/Cellm.Models/Providers/IModelResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using Cellm.Models.Prompts;
using Microsoft.Extensions.AI;

namespace Cellm.Models;

public interface IModelResponse
{
Prompt Prompt { get; }

ChatCompletion ChatCompletion { get; }
}
0 ...odels/Providers/IProviderConfiguration.cs → ...odels/Providers/IProviderConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...ellm/Models/Providers/IProviderRequest.cs → ...ellm.Models/Providers/IProviderRequest.cs
View file
Open in desktop
File renamed without changes.
0 ...dels/Providers/IProviderRequestHandler.cs → ...dels/Providers/IProviderRequestHandler.cs
View file
Open in desktop
File renamed without changes.
0 ...iders/Llamafile/LlamafileConfiguration.cs → ...iders/Llamafile/LlamafileConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...Providers/Mistral/MistralConfiguration.cs → ...Providers/Mistral/MistralConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...s/Providers/Ollama/OllamaConfiguration.cs → ...s/Providers/Ollama/OllamaConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 .../Models/Providers/Ollama/OllamaRequest.cs → ....Models/Providers/Ollama/OllamaRequest.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../Providers/Ollama/OllamaRequestHandler.cs → .../Providers/Ollama/OllamaRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ public async Task<OllamaResponse> Handle(OllamaRequest request, CancellationToke
.AddMessage(chatCompletion.Message)
.Build();

return new OllamaResponse(prompt);
return new OllamaResponse(prompt, chatCompletion);
}
}
6 changes: 6 additions & 0 deletions src/Cellm.Models/Providers/Ollama/OllamaResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Cellm.Models.Prompts;
using Microsoft.Extensions.AI;

namespace Cellm.Models.Providers.Ollama;

internal record OllamaResponse(Prompt Prompt, ChatCompletion ChatCompletion) : IModelResponse;
0 ...s/Providers/OpenAi/OpenAiConfiguration.cs → ...s/Providers/OpenAi/OpenAiConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 .../Models/Providers/OpenAi/OpenAiRequest.cs → ....Models/Providers/OpenAi/OpenAiRequest.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../Providers/OpenAi/OpenAiRequestHandler.cs → .../Providers/OpenAi/OpenAiRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public async Task<OpenAiResponse> Handle(OpenAiRequest request, CancellationToke
.AddMessage(chatCompletion.Message)
.Build();

return new OpenAiResponse(prompt);
return new OpenAiResponse(prompt, chatCompletion);
}

public IChatClient CreateChatClient(string modelId, string apiKey)
Expand Down
6 changes: 6 additions & 0 deletions src/Cellm.Models/Providers/OpenAi/OpenAiResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Cellm.Models.Prompts;
using Microsoft.Extensions.AI;

namespace Cellm.Models.Providers.OpenAi;

internal record OpenAiResponse(Prompt Prompt, ChatCompletion ChatCompletion) : IModelResponse;
0 ...mpatible/OpenAiCompatibleConfiguration.cs → ...mpatible/OpenAiCompatibleConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...enAiCompatible/OpenAiCompatibleRequest.cs → ...enAiCompatible/OpenAiCompatibleRequest.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...patible/OpenAiCompatibleRequestHandler.cs → ...patible/OpenAiCompatibleRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task<OpenAiCompatibleResponse> Handle(OpenAiCompatibleRequest reque
.AddMessage(chatCompletion.Message)
.Build();

return new OpenAiCompatibleResponse(prompt);
return new OpenAiCompatibleResponse(prompt, chatCompletion);
}

public IChatClient CreateChatClient(Uri BaseAddress, string modelId, string apiKey)
Expand Down
6 changes: 6 additions & 0 deletions src/Cellm.Models/Providers/OpenAiCompatible/OpenAiCompatibleResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Cellm.Models.Prompts;
using Microsoft.Extensions.AI;

namespace Cellm.Models.Providers.OpenAiCompatible;

internal record OpenAiCompatibleResponse(Prompt Prompt, ChatCompletion ChatCompletion) : IModelResponse;
0 src/Cellm/Models/Providers/Provider.cs → src/Cellm.Models/Providers/Provider.cs
View file
Open in desktop
File renamed without changes.
0 ...Models/Providers/ProviderConfiguration.cs → ...Models/Providers/ProviderConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...Resilience/CircuitBreakerConfiguration.cs → ...Resilience/CircuitBreakerConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...ls/Resilience/RateLimiterConfiguration.cs → ...ls/Resilience/RateLimiterConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...ilience/ResiliencePipelineConfigurator.cs → ...ilience/ResiliencePipelineConfigurator.cs
View file
Open in desktop
File renamed without changes.
0 ...m/Models/Resilience/RetryConfiguration.cs → ...m.Models/Resilience/RetryConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 src/Cellm/Models/Serde.cs → src/Cellm.Models/Serde.cs
View file
Open in desktop
File renamed without changes.
0 ...llm/Models/ServiceCollectionExtensions.cs → ...llm.Models/ServiceCollectionExtensions.cs
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions src/Cellm/Cellm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,6 @@
</Content>
</ItemGroup>

<Import Project="..\Cellm.Models\Cellm.Models.projitems" Label="Shared" />

</Project>
5 changes: 0 additions & 5 deletions src/Cellm/Models/Providers/Anthropic/AnthropicResponse.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Cellm/Models/Providers/Ollama/OllamaResponse.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Cellm/Models/Providers/OpenAi/OpenAiResponse.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Cellm/Models/Providers/OpenAiCompatible/OpenAiCompatibleResponse.cs
View file
Open in desktop

This file was deleted.