Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/Cellm/AddIn/CellmAddIn.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Cellm.Models.Providers.Ollama;
using Cellm.Models.Providers.OpenAi;
using Cellm.Models.Providers.OpenAiCompatible;
using Cellm.Models.Providers.OpenRouter;
using Cellm.Models.Resilience;
using Cellm.Tools;
using Cellm.Tools.FileReader;
Expand Down Expand Up @@ -83,6 +84,7 @@ private static ServiceCollection ConfigureServices(ServiceCollection services)
.Configure<OllamaConfiguration>(configuration.GetRequiredSection(nameof(OllamaConfiguration)))
.Configure<OpenAiConfiguration>(configuration.GetRequiredSection(nameof(OpenAiConfiguration)))
.Configure<OpenAiCompatibleConfiguration>(configuration.GetRequiredSection(nameof(OpenAiCompatibleConfiguration)))
.Configure<OpenRouterConfiguration>(configuration.GetRequiredSection(nameof(OpenRouterConfiguration)))
.Configure<ResilienceConfiguration>(configuration.GetRequiredSection(nameof(ResilienceConfiguration)))
.Configure<SentryConfiguration>(configuration.GetRequiredSection(nameof(SentryConfiguration)));

Expand Down Expand Up @@ -166,7 +168,8 @@ private static ServiceCollection ConfigureServices(ServiceCollection services)
.AddResilientHttpClient(resilienceConfiguration, cellmAddInConfiguration, Provider.DeepSeek)
.AddResilientHttpClient(resilienceConfiguration, cellmAddInConfiguration, Provider.Gemini)
.AddResilientHttpClient(resilienceConfiguration, cellmAddInConfiguration, Provider.Mistral)
.AddResilientHttpClient(resilienceConfiguration, cellmAddInConfiguration, Provider.OpenAiCompatible);
.AddResilientHttpClient(resilienceConfiguration, cellmAddInConfiguration, Provider.OpenAiCompatible)
.AddResilientHttpClient(resilienceConfiguration, cellmAddInConfiguration, Provider.OpenRouter);

#pragma warning disable EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates.
services
Expand All @@ -185,7 +188,8 @@ private static ServiceCollection ConfigureServices(ServiceCollection services)
.AddMistralChatClient()
.AddOllamaChatClient()
.AddOpenAiChatClient()
.AddOpenAiCompatibleChatClient();
.AddOpenAiCompatibleChatClient()
.AddOpenRouterChatClient();

// Add tools
services
Expand Down Expand Up @@ -232,7 +236,8 @@ internal static IEnumerable<IProviderConfiguration> GetProviderConfigurations()
Services.GetRequiredService<IOptionsMonitor<MistralConfiguration>>().CurrentValue,
Services.GetRequiredService<IOptionsMonitor<OllamaConfiguration>>().CurrentValue,
Services.GetRequiredService<IOptionsMonitor<OpenAiConfiguration>>().CurrentValue,
Services.GetRequiredService<IOptionsMonitor<OpenAiCompatibleConfiguration>>().CurrentValue
Services.GetRequiredService<IOptionsMonitor<OpenAiCompatibleConfiguration>>().CurrentValue,
Services.GetRequiredService<IOptionsMonitor<OpenRouterConfiguration>>().CurrentValue
];
}

Expand Down
8 changes: 8 additions & 0 deletions src/Cellm/AddIn/UserInterface/Resources/OpenRouter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/Cellm/AddIn/UserInterface/Ribbon/RibbonModelGroup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Cellm.Models.Providers.Ollama;
using Cellm.Models.Providers.OpenAi;
using Cellm.Models.Providers.OpenAiCompatible;
using Cellm.Models.Providers.OpenRouter;
using Cellm.Users;
using ExcelDna.Integration.CustomUI;
using Microsoft.Extensions.AI;
Expand Down Expand Up @@ -494,6 +495,9 @@ public void ShowProviderSettingsForm(IRibbonControl control)
case Provider.OpenAiCompatible:
currentBaseAddress = GetProviderConfiguration<OpenAiCompatibleConfiguration>()?.BaseAddress?.ToString() ?? "";
break;
case Provider.OpenRouter:
currentBaseAddress = GetProviderConfiguration<OpenRouterConfiguration>()?.BaseAddress?.ToString() ?? "";
break;
default:
break;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Cellm/Cellm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<None Remove="AddIn\UserInterface\Resources\mistral.png" />
<None Remove="AddIn\UserInterface\Resources\ollama.png" />
<None Remove="AddIn\UserInterface\Resources\openai.png" />
<None Remove="AddIn\UserInterface\Resources\OpenRouter.svg" />
<None Remove="appsettings.json" />
<None Remove="appsettings.Local.json" />
</ItemGroup>
Expand Down Expand Up @@ -90,5 +91,6 @@
<EmbeddedResource Include="AddIn\UserInterface\Resources\Mistral.png" />
<EmbeddedResource Include="AddIn\UserInterface\Resources\Ollama.png" />
<EmbeddedResource Include="AddIn\UserInterface\Resources\OpenAi.png" />
<EmbeddedResource Include="AddIn\UserInterface\Resources\OpenRouter.svg" />
</ItemGroup>
</Project>
35 changes: 35 additions & 0 deletions src/Cellm/Models/Providers/OpenRouter/OpenRouterConfiguration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using Cellm.Users;
using Microsoft.Extensions.AI;

namespace Cellm.Models.Providers.OpenRouter;

internal class OpenRouterConfiguration : IProviderConfiguration
{
public Provider Id { get => Provider.OpenRouter; }

public string Name { get => "OpenRouter"; }

public Entitlement Entitlement { get => Entitlement.EnableOpenRouterProvider; }

public string Icon { get => $"AddIn/UserInterface/Resources/{nameof(Provider.OpenRouter)}.svg"; }

public Uri BaseAddress => new("https://openrouter.ai/api/v1");

public string DefaultModel { get; init; } = string.Empty;

public string ApiKey { get; init; } = string.Empty;

public string SmallModel { get; init; } = string.Empty;

public string MediumModel { get; init; } = string.Empty;

public string LargeModel { get; init; } = string.Empty;

public AdditionalPropertiesDictionary? AdditionalProperties { get; init; } = [];

public bool SupportsJsonSchemaResponses { get; init; } = true;

public bool SupportsStructuredOutputWithTools { get; init; } = true;

public bool IsEnabled { get; init; } = false;
}
3 changes: 2 additions & 1 deletion src/Cellm/Models/Providers/Provider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ public enum Provider
Mistral,
Ollama,
OpenAi,
OpenAiCompatible
OpenAiCompatible,
OpenRouter
}
32 changes: 32 additions & 0 deletions src/Cellm/Models/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
using Cellm.Models.Providers.Ollama;
using Cellm.Models.Providers.OpenAi;
using Cellm.Models.Providers.OpenAiCompatible;
using Cellm.Models.Providers.OpenRouter;
using Cellm.Models.Resilience;
using Cellm.Users;
using Microsoft.Extensions.AI;
Expand Down Expand Up @@ -426,6 +427,37 @@ public static IServiceCollection AddOpenAiCompatibleChatClient(this IServiceColl
return services;
}

public static IServiceCollection AddOpenRouterChatClient(this IServiceCollection services)
{
services
.AddKeyedChatClient(Provider.OpenRouter, serviceProvider =>
{
var account = serviceProvider.GetRequiredService<Account>();
account.ThrowIfNotEntitled(Entitlement.EnableOpenRouterProvider);

var openRouterConfiguration = serviceProvider.GetRequiredService<IOptionsMonitor<OpenRouterConfiguration>>();
var resilientHttpClient = serviceProvider.GetResilientHttpClient(Provider.OpenRouter);

if (string.IsNullOrWhiteSpace(openRouterConfiguration.CurrentValue.ApiKey))
{
throw new CellmException($"Empty {nameof(OpenRouterConfiguration.ApiKey)} for {Provider.OpenRouter}. Please set your API key.");
}

var openAiClient = new OpenAIClient(
new ApiKeyCredential(openRouterConfiguration.CurrentValue.ApiKey),
new OpenAIClientOptions
{
Transport = new HttpClientPipelineTransport(resilientHttpClient),
Endpoint = openRouterConfiguration.CurrentValue.BaseAddress
});

return openAiClient.GetChatClient(openRouterConfiguration.CurrentValue.DefaultModel).AsIChatClient();
}, ServiceLifetime.Transient)
.UseFunctionInvocation();

return services;
}

public static IServiceCollection AddTools(this IServiceCollection services, params Delegate[] tools)
{

Expand Down
1 change: 1 addition & 0 deletions src/Cellm/Users/Entitlement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public enum Entitlement
EnableOpenAiCompatibleProvider,
EnableOpenAiCompatibleProviderLocalModels,
EnableOpenAiCompatibleProviderHostedModels,
EnableOpenRouterProvider,
EnableModelContextProtocol,
DisableTelemetry
}
3 changes: 2 additions & 1 deletion src/Cellm/Users/Models/Entitlements.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ internal class Entitlements()
Entitlement.EnableOllamaProvider,
Entitlement.EnableOpenAiProvider,
Entitlement.EnableOpenAiCompatibleProvider,
Entitlement.EnableOpenAiCompatibleProviderLocalModels
Entitlement.EnableOpenAiCompatibleProviderLocalModels,
Entitlement.EnableOpenRouterProvider
];

public IEnumerable<Entitlement> AsEnumerable()
Expand Down
8 changes: 8 additions & 0 deletions src/Cellm/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@
"ApiKey": "",
"IsEnabled": true
},
"OpenRouterConfiguration": {
"DefaultModel": "mistralai/mistral-small-3.2-24b-instruct",
"ApiKey": "",
"SmallModel": "mistralai/mistral-small-3.2-24b-instruct",
"MediumModel": "google/gemini-2.5-flash",
"LargeModel": "anthropic/claude-opus-4-5-20251101",
"IsEnabled": true
},
"ModelContextProtocolConfiguration": {
"StdioServers": [
{
Expand Down
Loading