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 ChatbotUi models. #258

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Fix ChatbotUi models. #258

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
1 change: 1 addition & 0 deletions src/Infrastructure/BotSharp.Abstraction/MLTasks/Settings/LlmModelSetting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ namespace BotSharp.Abstraction.MLTasks.Settings;

public class LlmModelSetting
{
public string Id { get; set; }
public string Name { get; set; }
public string ApiKey { get; set; }
public string Endpoint { get; set; }
Expand Down
40 changes: 19 additions & 21 deletions src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
using BotSharp.Abstraction.Conversations.Models;
using Microsoft.AspNetCore.Authorization;
using BotSharp.Abstraction.Agents.Enums;
using BotSharp.Abstraction.MLTasks;
using BotSharp.Abstraction.MLTasks.Settings;

namespace BotSharp.Plugin.ChatbotUI.Controllers;

Expand All @@ -35,27 +37,18 @@ public ChatbotUiController(ILogger<ChatbotUiController> logger, IServiceProvider
[HttpGet("/v1/models")]
public OpenAiModels GetOpenAiModels()
{
var llm = _services.GetRequiredService<ILlmProviderService>();
var models = llm.GetProviderModels("azure-openai").Where(x => x.Type == LlmModelType.Chat)
.Select(x => new AiModel
{
Id = x.Id,
Model = x.Name,
Name = x.Name
}).ToList();

return new OpenAiModels
{
Data = new List<AiModel>
{
new AiModel
{
Id = "gpt-3.5-turbo",
Model = "gpt-3.5-turbo",
Name = "GPT-3.5 Turbo",
MaxLength = 4 * 1024,
TokenLimit = 4 * 1024
},
new AiModel
{
Id = "gpt-4",
Model = "gpt-4",
Name = "GPT-4",
MaxLength = 8 * 1024,
TokenLimit = 8 * 1024
}
}
Data = models,
};
}

Expand All @@ -73,11 +66,16 @@ public async Task SendMessage([FromBody] OpenAiMessageInput input)
.Select(x => new RoleDialogModel(x.Role, x.Content))
.Last();

var llm = _services.GetRequiredService<ILlmProviderService>();
var model = llm.GetProviderModels("azure-openai")
.First(x => x.Type == LlmModelType.Chat && x.Id == input.Model)
.Name;

var conv = _services.GetRequiredService<IConversationService>();
conv.SetConversationId(input.ConversationId, input.States);
conv.States.SetState("channel", input.Channel)
.SetState("provider", input.Provider)
.SetState("model", input.Model)
.SetState("provider", "azure-openai")
.SetState("model", model)
.SetState("temperature", input.Temperature)
.SetState("sampling_factor", input.SamplingFactor);

Expand Down