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

Fix llm selection bug. #459

Merged
merged 2 commits into from
May 16, 2024
Merged

Fix llm selection bug. #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57122f7
Fix llm selection bug.
May 16, 2024
2c757ac
Merge branch 'SciSharp:master' into master
hchen2020 May 16, 2024
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
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Abstraction/MLTasks/ILlmProviderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ public interface ILlmProviderService
{
LlmModelSetting GetSetting(string provider, string model);
List<string> GetProviders();
LlmModelSetting GetProviderModel(string provider, string id, bool multiModal = false);
LlmModelSetting GetProviderModel(string provider, string id, bool? multiModal = null);
List<LlmModelSetting> GetProviderModels(string provider);
}
6 changes: 3 additions & 3 deletions src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static IChatCompletion GetChatCompletion(IServiceProvider services,
string? provider = null,
string? model = null,
string? modelId = null,
bool multiModal = false,
bool? multiModal = null,
AgentLlmConfig? agentConfig = null)
{
var completions = services.GetServices<IChatCompletion>();
Expand All @@ -59,7 +59,7 @@ private static (string, string) GetProviderAndModel(IServiceProvider services,
string? provider = null,
string? model = null,
string? modelId = null,
bool multiModal = false,
bool? multiModal = null,
AgentLlmConfig? agentConfig = null)
{
var agentSetting = services.GetRequiredService<AgentSettings>();
Expand All @@ -82,7 +82,7 @@ private static (string, string) GetProviderAndModel(IServiceProvider services,
{
var modelIdentity = state.ContainsState("model_id") ? state.GetState("model_id") : modelId;
var llmProviderService = services.GetRequiredService<ILlmProviderService>();
model = llmProviderService.GetProviderModel(provider, modelIdentity, multiModal)?.Name;
model = llmProviderService.GetProviderModel(provider, modelIdentity, multiModal: multiModal)?.Name;
}
}

Expand Down
10 changes: 7 additions & 3 deletions src/Infrastructure/BotSharp.Core/Infrastructures/LlmProviderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,15 @@ public List<LlmModelSetting> GetProviderModels(string provider)
?.Models ?? new List<LlmModelSetting>();
}

public LlmModelSetting GetProviderModel(string provider, string id, bool multiModal = false)
public LlmModelSetting GetProviderModel(string provider, string id, bool? multiModal = null)
{
var models = GetProviderModels(provider)
.Where(x => x.Id == id && x.MultiModal == multiModal)
.ToList();
.Where(x => x.Id == id);

if (multiModal.HasValue)
{
models = models.Where(x => x.MultiModal == multiModal);
}

var random = new Random();
var index = random.Next(0, models.Count());
Expand Down