Skip to content

Features/add role in log #300

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
merged 3 commits into from
Feb 15, 2024
Merged

Features/add role in log #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45fc4c9
add role in content log
iceljc Feb 15, 2024
8457cf8
Merge branch 'master' of https://github.com/SciSharp/BotSharp into fe…
iceljc Feb 15, 2024
7d1aa8f
fix oauth config
iceljc Feb 15, 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: 2 additions & 0 deletions src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ public class StreamingLogModel
public string ConversationId { get; set; }
[JsonPropertyName("name")]
public string? Name { get; set; }
[JsonPropertyName("role")]
public string Role { get; set; }

[JsonPropertyName("content")]
public string Content { get; set; }
Expand Down
7 changes: 6 additions & 1 deletion src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,13 @@ public PagedItems<Conversation> GetConversations(ConversationFilter filter)
var records = new List<Conversation>();
var dir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir);
var pager = filter?.Pager ?? new Pagination();
var totalDirs = Directory.GetDirectories(dir);

if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}

var totalDirs = Directory.GetDirectories(dir);
foreach (var d in totalDirs)
{
var path = Path.Combine(d, CONVERSATION_FILE);
Expand Down
37 changes: 21 additions & 16 deletions src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static IServiceCollection AddBotSharpOpenAPI(this IServiceCollection serv

// Add bearer authentication
var schema = "MIXED_SCHEME";
services.AddAuthentication(options =>
var builder = services.AddAuthentication(options =>
{
// custom scheme defined in .AddPolicyScheme() below
// inspired from https://weblog.west-wind.com/posts/2022/Mar/29/Combining-Bearer-Token-and-Cookie-Auth-in-ASPNET
Expand All @@ -59,11 +59,6 @@ public static IServiceCollection AddBotSharpOpenAPI(this IServiceCollection serv
}
}).AddCookie(options =>
{
}).AddGitHub(options =>
{
options.ClientId = config["OAuth:GitHub:ClientId"];
options.ClientSecret = config["OAuth:GitHub:ClientSecret"];
options.Scope.Add("user:email");
}).AddPolicyScheme(schema, "Mixed authentication", options =>
{
// runs on each request
Expand All @@ -85,6 +80,16 @@ public static IServiceCollection AddBotSharpOpenAPI(this IServiceCollection serv
};
});

if (!string.IsNullOrWhiteSpace(config["OAuth:GitHub:ClientId"]) && !string.IsNullOrWhiteSpace(config["OAuth:GitHub:ClientSecret"]))
{
builder = builder.AddGitHub(options =>
{
options.ClientId = config["OAuth:GitHub:ClientId"];
options.ClientSecret = config["OAuth:GitHub:ClientSecret"];
options.Scope.Add("user:email");
});
}

// Add services to the container.
services.AddControllers()
.AddJsonOptions(options =>
Expand All @@ -106,18 +111,18 @@ public static IServiceCollection AddBotSharpOpenAPI(this IServiceCollection serv
Type = SecuritySchemeType.ApiKey
});
c.AddSecurityRequirement(new OpenApiSecurityRequirement {
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme,
Id = "Bearer"
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme,
Id = "Bearer"
}
},
Array.Empty<string>()
}
},
Array.Empty<string>()
}
});
});
}
);

Expand Down
9 changes: 5 additions & 4 deletions src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public override async Task OnMessageReceived(RoleDialogModel message)
{
var conversationId = _state.GetConversationId();
var log = $"MessageId: {message.MessageId} ==>\r\n{message.Role}: {message.Content}";
await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, _user.UserName, log));
await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, _user.UserName, message.Role, log));
}

public async Task BeforeGenerating(Agent agent, List<RoleDialogModel> conversations)
Expand All @@ -64,21 +64,22 @@ public async Task AfterGenerated(RoleDialogModel message, TokenStatsModel tokenS
var conversationId = _state.GetConversationId();
var agent = await agentService.LoadAgent(message.CurrentAgentId);

await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, tokenStats.Prompt));
await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, message.Role, tokenStats.Prompt));

var log = message.Role == AgentRole.Function ?
$"[{agent?.Name}]: {message.FunctionName}({message.FunctionArgs})" :
$"[{agent?.Name}]: {message.Content}";
log += $"\r\n<== MessageId: {message.MessageId}";
await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, log));
await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, message.Role, log));
}

private string BuildLog(string conversationId, string? name, string content)
private string BuildLog(string conversationId, string? name, string role, string content)
{
var log = new StreamingLogModel
{
ConversationId = conversationId,
Name = name,
Role = role,
Content = content,
CreateTime = DateTime.UtcNow
};
Expand Down