wip

getcellm · Dec 11, 2024 · 47c517e · 47c517e
1 parent 776854f
commit 47c517e
Show file tree

Hide file tree

Showing 63 changed files with 284 additions and 404 deletions.
diff --git a/Cellm.sln b/Cellm.sln
@@ -7,8 +7,6 @@ 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", "{5E1720F7-E91F-4D99-A580-4BF4768FD32E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,8 +28,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {44E1ACC9-691B-4A19-BAE9-2A1033F12FB0}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Cellm.Models\Cellm.Models.projitems*{5e1720f7-e91f-4d99-a580-4bf4768fd32e}*SharedItemsImports = 13
-		src\Cellm.Models\Cellm.Models.projitems*{ae73b93e-ab99-41b9-8367-46eefd550cb8}*SharedItemsImports = 5
-	EndGlobalSection
 EndGlobal
diff --git a/src/Cellm.Models/Behaviors/BehaviorsServiceCollectionExtensions.cs b/src/Cellm.Models/Behaviors/BehaviorsServiceCollectionExtensions.cs
diff --git a/src/Cellm.Models/Cellm.Models.projitems b/src/Cellm.Models/Cellm.Models.projitems
diff --git a/src/Cellm.Models/Cellm.Models.shproj b/src/Cellm.Models/Cellm.Models.shproj
diff --git a/src/Cellm.Models/Providers/Anthropic/AnthropicServiceCollectionExtensions.cs b/src/Cellm.Models/Providers/Anthropic/AnthropicServiceCollectionExtensions.cs
diff --git a/src/Cellm.Models/Providers/IProviderConfiguration.cs b/src/Cellm.Models/Providers/IProviderConfiguration.cs
diff --git a/src/Cellm.Models/Providers/Llamafile/LlamafileServiceCollectionExtensions.cs b/src/Cellm.Models/Providers/Llamafile/LlamafileServiceCollectionExtensions.cs
diff --git a/src/Cellm.Models/Providers/Ollama/OllamaServiceCollectionExtensions.cs b/src/Cellm.Models/Providers/Ollama/OllamaServiceCollectionExtensions.cs
diff --git a/src/Cellm.Models/Providers/OpenAi/OpenAiServiceCollectionExtensions.cs b/src/Cellm.Models/Providers/OpenAi/OpenAiServiceCollectionExtensions.cs
diff --git a/src/Cellm.Models/Providers/OpenAiCompatible/OpenAiCompatibleRequest.cs b/src/Cellm.Models/Providers/OpenAiCompatible/OpenAiCompatibleRequest.cs
diff --git a/src/Cellm.Models/Providers/OpenAiCompatible/OpenAiCompatibleServiceCollectionExtensions.cs b/src/Cellm.Models/Providers/OpenAiCompatible/OpenAiCompatibleServiceCollectionExtensions.cs
diff --git a/src/Cellm/AddIn/ArgumentParser.cs b/src/Cellm/AddIn/ArgumentParser.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using Cellm.AddIn.Exceptions;
-using Cellm.Models;
+using Cellm.Models.Providers;
 using ExcelDna.Integration;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Office.Interop.Excel;

diff --git a/src/Cellm/AddIn/ExcelFunctions.cs b/src/Cellm/AddIn/ExcelFunctions.cs
@@ -3,6 +3,7 @@
 using Cellm.AddIn.Exceptions;
 using Cellm.Models;
 using Cellm.Models.Prompts;
+using Cellm.Models.Providers;
 using Cellm.Services;
 using Cellm.Services.Configuration;
 using ExcelDna.Integration;

diff --git a/src/Cellm/Cellm.csproj b/src/Cellm/Cellm.csproj
@@ -27,6 +27,7 @@
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.1-preview.1.24570.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
@@ -52,6 +53,4 @@
     </Content>
   </ItemGroup>
 
-  <Import Project="..\Cellm.Models\Cellm.Models.projitems" Label="Shared" />
-
 </Project>
diff --git a/src/Cellm.Models/Behaviors/CacheBehavior.cs → src/Cellm/Models/Behaviors/CacheBehavior.cs b/src/Cellm.Models/Behaviors/CacheBehavior.cs → src/Cellm/Models/Behaviors/CacheBehavior.cs
@@ -1,4 +1,5 @@
 using System.Text.Json;
+using Cellm.Models.Providers;
 using MediatR;
 using Microsoft.Extensions.Caching.Hybrid;
 using Microsoft.Extensions.Options;

diff --git a/src/Cellm.Models/Behaviors/SentryBehavior.cs → src/Cellm/Models/Behaviors/SentryBehavior.cs b/src/Cellm.Models/Behaviors/SentryBehavior.cs → src/Cellm/Models/Behaviors/SentryBehavior.cs
diff --git a/src/Cellm.Models/Behaviors/ToolBehavior.cs → src/Cellm/Models/Behaviors/ToolBehavior.cs b/src/Cellm.Models/Behaviors/ToolBehavior.cs → src/Cellm/Models/Behaviors/ToolBehavior.cs
@@ -1,4 +1,5 @@
 using Cellm.Models.Behaviors;
+using Cellm.Models.Providers;
 using MediatR;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Options;