Skip to content

add exclude agent ids #630

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 1 commit into from
Sep 9, 2024
Merged

add exclude agent ids #630

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
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public interface IConversationService
Task<PagedItems<Conversation>> GetConversations(ConversationFilter filter);
Task<Conversation> UpdateConversationTitle(string id, string title);
Task<List<Conversation>> GetLastConversations();
Task<List<string>> GetIdleConversations(int batchSize, int messageLimit, int bufferHours);
Task<List<string>> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds);
Task<bool> DeleteConversations(IEnumerable<string> ids);

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/Infrastructure/BotSharp.Abstraction/Conversations/Settings/ConversationSetting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public class ConversationSetting
public bool EnableContentLog { get; set; }
public bool EnableStateLog { get; set; }
public bool EnableTranslationMemory { get; set; }
public CleanConversationSetting CleanSetting { get; set; } = new CleanConversationSetting();
public RateLimitSetting RateLimit { get; set; } = new RateLimitSetting();
public CleanConversationSetting CleanSetting { get; set; } = new();
public RateLimitSetting RateLimit { get; set; } = new();
}

public class CleanConversationSetting
Expand All @@ -22,5 +22,5 @@ public class CleanConversationSetting
public int BatchSize { get; set; }
public int MessageLimit { get; set; }
public int BufferHours { get; set; }

public IEnumerable<string> ExcludeAgentIds { get; set; } = new List<string>();
}
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public interface IBotSharpRepository
void UpdateConversationBreakpoint(string conversationId, ConversationBreakpoint breakpoint);
ConversationBreakpoint? GetConversationBreakpoint(string conversationId);
List<Conversation> GetLastConversations();
List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours);
List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds);
IEnumerable<string> TruncateConversation(string conversationId, string messageId, bool cleanLog = false);
#endregion

Expand Down
4 changes: 2 additions & 2 deletions src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ public async Task<List<Conversation>> GetLastConversations()
return db.GetLastConversations();
}

public async Task<List<string>> GetIdleConversations(int batchSize, int messageLimit, int bufferHours)
public async Task<List<string>> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
return db.GetIdleConversations(batchSize, messageLimit, bufferHours);
return db.GetIdleConversations(batchSize, messageLimit, bufferHours, excludeAgentIds ?? new List<string>());
}

public async Task<Conversation> NewConversation(Conversation sess)
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public PagedItems<Conversation> GetConversations(ConversationFilter filter)
public List<Conversation> GetLastConversations()
=> throw new NotImplementedException();

public List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours)
public List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds)
=> throw new NotImplementedException();

public List<DialogElement> GetConversationDialogs(string conversationId)
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -378,7 +378,7 @@ public List<Conversation> GetLastConversations()
.ToList();
}

public List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours)
public List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds)
{
var ids = new List<string>();
var batchLimit = 100;
Expand Down Expand Up @@ -423,7 +423,7 @@ public List<string> GetIdleConversations(int batchSize, int messageLimit, int bu
continue;
}

if (conv.UpdatedTime > utcNow.AddHours(-bufferHours))
if (excludeAgentIds.Contains(conv.AgentId) || conv.UpdatedTime > utcNow.AddHours(-bufferHours))
{
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.OpenAPI/BackgroundServices/ConversationTimeoutService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private async Task CleanIdleConversationsAsync()
if (cleanSetting == null || !cleanSetting.Enable) return;

var conversationService = scope.ServiceProvider.GetRequiredService<IConversationService>();
var conversationIds = await conversationService.GetIdleConversations(cleanSetting.BatchSize, cleanSetting.MessageLimit, cleanSetting.BufferHours);
var conversationIds = await conversationService.GetIdleConversations(cleanSetting.BatchSize, cleanSetting.MessageLimit, cleanSetting.BufferHours, cleanSetting.ExcludeAgentIds);

if (!conversationIds.IsNullOrEmpty())
{
Expand Down
4 changes: 2 additions & 2 deletions src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public List<Conversation> GetLastConversations()
}).ToList();
}

public List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours)
public List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds)
{
var page = 1;
var batchLimit = 100;
Expand All @@ -370,7 +370,7 @@ public List<string> GetIdleConversations(int batchSize, int messageLimit, int bu
{
var skip = (page - 1) * batchSize;
var candidates = _dc.Conversations.AsQueryable()
.Where(x => x.DialogCount <= messageLimit && x.UpdatedTime <= utcNow.AddHours(-bufferHours))
.Where(x => !excludeAgentIds.Contains(x.AgentId) && x.DialogCount <= messageLimit && x.UpdatedTime <= utcNow.AddHours(-bufferHours))
.Skip(skip)
.Take(batchSize)
.Select(x => x.Id)
Expand Down