SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #182 from iceljc/features/fix-mongo-serialization-add-samples

Browse source 
Features/fix mongo serialization add samples
This commit is contained in:
Haiping 2023-10-19 19:45:08 -05:00 committed by GitHub
parent 4a7d20cf42 5d93a38bda
commit bdfcbd9a0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 351 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs
View file

@ -9,9 +9,10 @@ public enum AgentField
Disabled,
AllowRouting,
Profiles,
RoutingRules,
RoutingRule,
Instruction,
Function,
Template,
Response
Response,
Sample
}

9
src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
View file

@ -4,22 +4,21 @@ namespace BotSharp.Abstraction.Repositories;
public interface IBotSharpRepository
{
IQueryable<User> Users { get; }
IQueryable<Agent> Agents { get; }
IQueryable<UserAgent> UserAgents { get; }
IQueryable<Conversation> Conversations { get; }
int Transaction<TTableInterface>(Action action);
void Add<TTableInterface>(object entity);
#region User
User? GetUserByEmail(string email);
User? GetUserByExternalId(string externalId);
void CreateUser(User user);
#endregion
#region Agent
void UpdateAgent(Agent agent, AgentField field);
Agent? GetAgent(string agentId);
List<Agent> GetAgents(string? name = null, bool? disabled = null, bool? allowRouting = null,
bool? isPublic = null, List<string>? agentIds = null);
List<Agent> GetAgentsByUser(string userId);
void BulkInsertAgents(List<Agent> agents);
void BulkInsertUserAgents(List<UserAgent> userAgents);
bool DeleteAgents();

22
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
View file

@ -1,7 +1,6 @@
using BotSharp.Abstraction.Agents.Models;
using BotSharp.Abstraction.Functions.Models;
using BotSharp.Abstraction.Repositories;
using BotSharp.Abstraction.Utilities;
using System.IO;
namespace BotSharp.Core.Agents.Services;
@ -10,11 +9,7 @@ public partial class AgentService
{
public async Task<Agent> CreateAgent(Agent agent)
{
var agentRecord = (from a in _db.Agents
join ua in _db.UserAgents on a.Id equals ua.AgentId
join u in _db.Users on ua.UserId equals u.Id
where u.ExternalId == _user.Id && a.Name == agent.Name
select a).FirstOrDefault();
var agentRecord = _db.GetAgentsByUser(_user.Id).FirstOrDefault(x => x.Name.IsEqualTo(agent.Name));
if (agentRecord != null)
{
@ -47,7 +42,7 @@ public partial class AgentService
.SetResponses(foundAgent.Responses);
}
var user = _db.Users.FirstOrDefault(x => x.Id == _user.Id || x.ExternalId == _user.Id);
var user = _db.GetUserByExternalId(_user.Id);
var userAgentRecord = new UserAgent
{
Id = Guid.NewGuid().ToString(),
@ -78,10 +73,12 @@ public partial class AgentService
var instruction = FetchInstructionFromFile(dir);
var responses = FetchResponsesFromFile(dir);
var templates = FetchTemplatesFromFile(dir);
var samples = FetchSamplesFromFile(dir);
return agent.SetInstruction(instruction)
.SetTemplates(templates)
.SetFunctions(functions)
.SetResponses(responses);
.SetResponses(responses)
.SetSamples(samples);
}
}
@ -146,4 +143,13 @@ public partial class AgentService
}
return responses;
}
private List<string> FetchSamplesFromFile(string fileDir)
{
var file = Path.Combine(fileDir, "samples.txt");
if (!File.Exists(file)) return new List<string>();
var samples = File.ReadAllLines(file);
return samples?.ToList() ?? new List<string>();
}
}

8
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
View file

@ -9,12 +9,8 @@ public partial class AgentService
#endif
public async Task<List<Agent>> GetAgents()
{
var query = from a in _db.Agents
join ua in _db.UserAgents on a.Id equals ua.AgentId
join u in _db.Users on ua.UserId equals u.Id
where ua.UserId == _user.Id || u.ExternalId == _user.Id || a.IsPublic
select a;
return query.ToList();
var agents = _db.GetAgentsByUser(_user.Id);
return await Task.FromResult(agents);
}
#if !DEBUG

6
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs
View file

@ -13,7 +13,7 @@ public partial class AgentService
var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
var agentDir = Path.Combine(dbSettings.FileRepository, _agentSettings.DataDir);
var user = _db.Users.FirstOrDefault(x => x.Id == _user.Id || x.ExternalId == _user.Id);
var user = _db.GetUserByExternalId(_user.Id);
var agents = new List<Agent>();
var userAgents = new List<UserAgent>();
@ -27,10 +27,12 @@ public partial class AgentService
var instruction = FetchInstructionFromFile(dir);
var responses = FetchResponsesFromFile(dir);
var templates = FetchTemplatesFromFile(dir);
var samples = FetchSamplesFromFile(dir);
agent.SetInstruction(instruction)
.SetTemplates(templates)
.SetFunctions(functions)
.SetResponses(responses);
.SetResponses(responses)
.SetSamples(samples);
var userAgent = new UserAgent
{

23
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
View file

@ -12,7 +12,7 @@ public partial class AgentService
{
if (agent == null || string.IsNullOrEmpty(agent.Id)) return;
var record = FindAgent(agent.Id);
var record = _db.GetAgent(agent.Id);
if (record == null) return;
record.Name = agent.Name ?? string.Empty;
@ -26,25 +26,15 @@ public partial class AgentService
record.Functions = agent.Functions ?? new List<FunctionDef>();
record.Templates = agent.Templates ?? new List<AgentTemplate>();
record.Responses = agent.Responses ?? new List<AgentResponse>();
record.Samples = agent.Samples ?? new List<string>();
_db.UpdateAgent(record, updateField);
await Task.CompletedTask;
}
private Agent FindAgent(string agentId)
{
var record = (from a in _db.Agents
join ua in _db.UserAgents on a.Id equals ua.AgentId
join u in _db.Users on ua.UserId equals u.Id
where (ua.UserId == _user.Id || u.ExternalId == _user.Id) &&
a.Id == agentId
select a).FirstOrDefault();
return record;
}
public async Task UpdateAgentFromFile(string id)
{
var agent = _db.Agents?.FirstOrDefault(x => x.Id == id);
var agent = _db.GetAgent(id);
if (agent == null) return;
@ -67,7 +57,8 @@ public partial class AgentService
.SetInstruction(foundAgent.Instruction)
.SetTemplates(foundAgent.Templates)
.SetFunctions(foundAgent.Functions)
.SetResponses(foundAgent.Responses);
.SetResponses(foundAgent.Responses)
.SetSamples(foundAgent.Samples);
_db.UpdateAgent(clonedAgent, AgentField.All);
}
@ -87,10 +78,12 @@ public partial class AgentService
var instruction = FetchInstructionFromFile(dir);
var responses = FetchResponsesFromFile(dir);
var templates = FetchTemplatesFromFile(dir);
var samples = FetchSamplesFromFile(dir);
return agent.SetInstruction(instruction)
.SetTemplates(templates)
.SetFunctions(functions)
.SetResponses(responses);
.SetResponses(responses)
.SetSamples(samples);
}
}

1
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs
View file

@ -1,3 +1,4 @@
using BotSharp.Abstraction.Agents.Models;
using BotSharp.Abstraction.Repositories;
using System.IO;

4
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
View file

@ -46,7 +46,7 @@ public partial class ConversationService : IConversationService
public async Task<List<Conversation>> GetConversations()
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var user = db.Users.FirstOrDefault(x => x.ExternalId == _user.Id);
var user = db.GetUserByExternalId(_user.Id);
var conversations = db.GetConversations(user?.Id);
return conversations.OrderByDescending(x => x.CreatedTime).ToList();
}
@ -56,7 +56,7 @@ public partial class ConversationService : IConversationService
var db = _services.GetRequiredService<IBotSharpRepository>();
var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
var conversationSettings = _services.GetRequiredService<ConversationSetting>();
var user = db.Users.FirstOrDefault(x => x.ExternalId == _user.Id);
var user = db.GetUserByExternalId(_user.Id);
var foundUserId = user?.Id ?? string.Empty;
var record = sess;

2
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
View file

@ -47,7 +47,7 @@ public class ConversationStorage : IConversationStorage
else
{
var routingSetting = _services.GetRequiredService<RoutingSettings>();
var agentName = routingSetting.RouterId == agentId ? "Router" : db.Agents.First(x => x.Id == agentId).Name;
var agentName = routingSetting.RouterId == agentId ? "Router" : db.GetAgent(agentId)?.Name;
sb.AppendLine($"{dialog.CreatedAt}|{dialog.Role}|{agentId}|{agentName}|");
var content = dialog.Content.Replace("\r", " ").Replace("\n", " ").Trim();

16
src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs
View file

@ -72,6 +72,17 @@ public class BotSharpDbContext : Database, IBotSharpRepository
throw new NotImplementedException();
}
public List<Agent> GetAgents(string? name = null, bool? disabled = null, bool? allowRouting = null,
bool? isPublic = null, List<string>? agentIds = null)
{
throw new NotImplementedException();
}
public List<Agent> GetAgentsByUser(string userId)
{
throw new NotImplementedException();
}
public void UpdateAgent(Agent agent, AgentField field)
{
throw new NotImplementedException();
@ -148,6 +159,11 @@ public class BotSharpDbContext : Database, IBotSharpRepository
throw new NotImplementedException();
}
public User? GetUserByExternalId(string externalId)
{
throw new NotImplementedException();
}
public void CreateUser(User user)
{
throw new NotImplementedException();

113
src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs
View file

@ -5,6 +5,8 @@ using BotSharp.Abstraction.Users.Models;
using BotSharp.Abstraction.Agents.Models;
using MongoDB.Driver;
using BotSharp.Abstraction.Routing.Models;
using Amazon.Util;
namespace BotSharp.Core.Repository;
public class FileRepository : IBotSharpRepository
@ -32,7 +34,11 @@ public class FileRepository : IBotSharpRepository
}
private List<User> _users = new List<User>();
public IQueryable<User> Users
private List<Agent> _agents = new List<Agent>();
private List<UserAgent> _userAgents = new List<UserAgent>();
private List<Conversation> _conversations = new List<Conversation>();
private IQueryable<User> Users
{
get
{
@ -55,8 +61,7 @@ public class FileRepository : IBotSharpRepository
}
}
private List<Agent> _agents = new List<Agent>();
public IQueryable<Agent> Agents
private IQueryable<Agent> Agents
{
get
{
@ -78,7 +83,8 @@ public class FileRepository : IBotSharpRepository
agent = agent.SetInstruction(FetchInstruction(d))
.SetTemplates(FetchTemplates(d))
.SetFunctions(FetchFunctions(d))
.SetResponses(FetchResponses(d));
.SetResponses(FetchResponses(d))
.SetSamples(FetchSamples(d));
_agents.Add(agent);
}
}
@ -87,8 +93,7 @@ public class FileRepository : IBotSharpRepository
}
}
private List<UserAgent> _userAgents = new List<UserAgent>();
public IQueryable<UserAgent> UserAgents
private IQueryable<UserAgent> UserAgents
{
get
{
@ -115,34 +120,6 @@ public class FileRepository : IBotSharpRepository
}
}
private List<Conversation> _conversations = new List<Conversation>();
public IQueryable<Conversation> Conversations
{
get
{
if (!_conversations.IsNullOrEmpty())
{
return _conversations.AsQueryable();
}
var dir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir);
_conversations = new List<Conversation>();
if (Directory.Exists(dir))
{
foreach (var d in Directory.GetDirectories(dir))
{
var path = Path.Combine(d, "conversation.json");
if (File.Exists(path))
{
var json = File.ReadAllText(path);
_conversations.Add(JsonSerializer.Deserialize<Conversation>(json, _options));
}
}
}
return _conversations.AsQueryable();
}
}
public void Add<TTableInterface>(object entity)
{
if (entity is Conversation conversation)
@ -261,7 +238,7 @@ public class FileRepository : IBotSharpRepository
case AgentField.Profiles:
UpdateAgentProfiles(agent.Id, agent.Profiles);
break;
case AgentField.RoutingRules:
case AgentField.RoutingRule:
UpdateAgentRoutingRules(agent.Id, agent.RoutingRules);
break;
case AgentField.Instruction:
@ -276,6 +253,9 @@ public class FileRepository : IBotSharpRepository
case AgentField.Response:
UpdateAgentResponses(agent.Id, agent.Responses);
break;
case AgentField.Sample:
UpdateAgentSamples(agent.Id, agent.Samples);
break;
case AgentField.All:
UpdateAgentAllFields(agent);
break;
@ -456,6 +436,17 @@ public class FileRepository : IBotSharpRepository
}
}
private void UpdateAgentSamples(string agentId, List<string> samples)
{
if (samples.IsNullOrEmpty()) return;
var (agent, agentFile) = GetAgentFromFile(agentId);
if (agent == null) return;
var file = Path.Combine(_dbSettings.FileRepository, _agentSettings.DataDir, agentId, "samples.txt");
File.WriteAllLines(file, samples);
}
private void UpdateAgentAllFields(Agent inputAgent)
{
var (agent, agentFile) = GetAgentFromFile(inputAgent.Id);
@ -476,6 +467,7 @@ public class FileRepository : IBotSharpRepository
UpdateAgentResponses(inputAgent.Id, inputAgent.Responses);
UpdateAgentTemplates(inputAgent.Id, inputAgent.Templates);
UpdateAgentFunctions(inputAgent.Id, inputAgent.Functions);
UpdateAgentSamples(inputAgent.Id, inputAgent.Samples);
}
#endregion
@ -532,6 +524,50 @@ public class FileRepository : IBotSharpRepository
return null;
}
public List<Agent> GetAgents(string? name = null, bool? disabled = null, bool? allowRouting = null,
bool? isPublic = null, List<string>? agentIds = null)
{
var query = Agents;
if (!string.IsNullOrEmpty(name))
{
query = query.Where(x => x.Name.ToLower() == name.ToLower());
}
if (disabled.HasValue)
{
query = query.Where(x => x.Disabled == disabled);
}
if (allowRouting.HasValue)
{
query = query.Where(x => x.AllowRouting == allowRouting);
}
if (isPublic.HasValue)
{
query = query.Where(x => x.IsPublic == isPublic);
}
if (agentIds != null)
{
query = query.Where(x => agentIds.Contains(x.Id));
}
return query.ToList();
}
public List<Agent> GetAgentsByUser(string userId)
{
var agentIds = (from ua in UserAgents
join u in Users on ua.UserId equals u.Id
where ua.UserId == userId || u.ExternalId == userId
select ua.AgentId).ToList();
var agents = GetAgents(isPublic: true, agentIds: agentIds);
return agents;
}
public string GetAgentTemplate(string agentId, string templateName)
{
var dir = Path.Combine(_dbSettings.FileRepository, _agentSettings.DataDir, agentId, "templates");
@ -719,6 +755,11 @@ public class FileRepository : IBotSharpRepository
return Users.FirstOrDefault(x => x.Email == email);
}
public User? GetUserByExternalId(string externalId)
{
return Users.FirstOrDefault(x => x.ExternalId == externalId);
}
public void CreateUser(User user)
{
var userId = Guid.NewGuid().ToString();
@ -778,7 +819,7 @@ public class FileRepository : IBotSharpRepository
var file = Path.Combine(fileDir, "samples.txt");
if (!File.Exists(file)) return new List<string>();
return File.ReadAllLines(file).ToList();
return File.ReadAllLines(file)?.ToList() ?? new List<string>();
}
private List<AgentTemplate> FetchTemplates(string fileDir)

6
src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
View file

@ -29,7 +29,7 @@ public class RouteToAgentFn : IFunctionCallback
if (!string.IsNullOrEmpty(args.OriginalAgent) && args.OriginalAgent.Length < 32)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var originalAgent = db.Agents.FirstOrDefault(x => x.Name.ToLower() == args.OriginalAgent.ToLower());
var originalAgent = db.GetAgents(args.OriginalAgent).FirstOrDefault();
if (originalAgent != null)
{
_context.Push(originalAgent.Id);
@ -48,7 +48,7 @@ public class RouteToAgentFn : IFunctionCallback
else
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var targetAgent = db.Agents.FirstOrDefault(x => x.Name.ToLower() == args.AgentName.ToLower());
var targetAgent = db.GetAgents(args.AgentName).FirstOrDefault();
if (targetAgent == null)
{
message.ExecutionData = JsonSerializer.Deserialize<JsonElement>(message.FunctionArgs);
@ -138,7 +138,7 @@ public class RouteToAgentFn : IFunctionCallback
if (!string.IsNullOrEmpty(routingRule.RedirectTo))
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = db.Agents.First(x => x.Id == routingRule.RedirectTo);
var record = db.GetAgent(routingRule.RedirectTo);
// Add redirected agent
message.FunctionArgs = AppendPropertyToArgs(message.FunctionArgs, "redirect_to", record.Name);

2
src/Infrastructure/BotSharp.Core/Routing/Handlers/ContinueExecuteTaskRoutingHandler.cs
View file

@ -29,7 +29,7 @@ public class ContinueExecuteTaskRoutingHandler : RoutingHandlerBase, IRoutingHan
public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = db.Agents.First(x => x.Name.ToLower() == inst.AgentName.ToLower());
var record = db.GetAgents(inst.AgentName).FirstOrDefault();
var result = new RoleDialogModel(AgentRole.Function, inst.Question)
{

2
src/Infrastructure/BotSharp.Core/Routing/Handlers/RetrieveDataFromAgentRoutingHandler.cs
View file

@ -31,7 +31,7 @@ public class RetrieveDataFromAgentRoutingHandler : RoutingHandlerBase, IRoutingH
{
// Retrieve information from specific agent
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = db.Agents.First(x => x.Name.ToLower() == inst.AgentName.ToLower());
var record = db.GetAgents(inst.AgentName).FirstOrDefault();
var response = await routing.InvokeAgent(record.Id);
inst.Response = response.Content;

4
src/Infrastructure/BotSharp.Core/Routing/RouterInstance.cs
View file

@ -62,7 +62,7 @@ public class RouterInstance : IRouterInstance
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var agents = db.Agents.Where(x => !x.Disabled && x.AllowRouting).ToArray();
var agents = db.GetAgents(disabled: false, allowRouting: true);
var records = agents.SelectMany(x =>
{
x.RoutingRules.ForEach(r =>
@ -92,7 +92,7 @@ public class RouterInstance : IRouterInstance
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var agents = db.Agents.Where(x => !x.Disabled && x.AllowRouting).ToArray();
var agents = db.GetAgents(disabled: false, allowRouting: true);
return agents.Select(x => new RoutingItem
{
AgentId = x.Id,

16
src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
View file

@ -44,7 +44,7 @@ public class UserService : IUserService
var (userEmail, password) = base64.SplitAsTuple(":");
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = db.Users.FirstOrDefault(x => x.Email == userEmail);
var record = db.GetUserByEmail(userEmail);
if (record == null)
{
return default;
@ -97,19 +97,7 @@ public class UserService : IUserService
public async Task<User> GetMyProfile()
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var user = (from u in db.Users
where u.ExternalId == _user.Id
select new User
{
Id = u.Id,
Email = u.Email,
FirstName = u.FirstName,
LastName = u.LastName,
CreatedTime = u.CreatedTime,
UpdatedTime = u.UpdatedTime,
Password = u.Password,
}).FirstOrDefault();
var user = db.GetUserByExternalId(_user.Id);
return user;
}
}

10
src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
View file

@ -111,7 +111,7 @@ public class AgentController : ControllerBase, IApiAdapter
{
var model = agent.ToAgent();
model.Id = agentId;
await _agentService.UpdateAgent(model, AgentField.RoutingRules);
await _agentService.UpdateAgent(model, AgentField.RoutingRule);
}
[HttpPut("/agent/{agentId}/instruction")]
@ -145,4 +145,12 @@ public class AgentController : ControllerBase, IApiAdapter
model.Id = agentId;
await _agentService.UpdateAgent(model, AgentField.Response);
}
[HttpPut("/agent/{agentId}/samples")]
public async Task UpdateAgentSamples([FromRoute] string agentId, [FromBody] AgentUpdateModel agent)
{
var model = agent.ToAgent();
model.Id = agentId;
await _agentService.UpdateAgent(model, AgentField.Sample);
}
}

6
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs
View file

@ -17,7 +17,7 @@ public class AgentCreationModel
/// <summary>
/// LLM extensible Instructions in addition to the default Instructions
/// </summary>
public List<AgentTemplate>? Templates { get; set; }
public List<AgentTemplate> Templates { get; set; } = new List<AgentTemplate>();
/// <summary>
/// LLM callable function definition
@ -27,7 +27,8 @@ public class AgentCreationModel
/// <summary>
/// Response template
/// </summary>
public List<AgentResponse>? Responses { get; set; }
public List<AgentResponse> Responses { get; set; } = new List<AgentResponse>();
public List<string> Samples { get; set; } = new List<string>();
public bool IsPublic { get; set; }
@ -53,6 +54,7 @@ public class AgentCreationModel
Templates = Templates,
Functions = Functions,
Responses = Responses,
Samples = Samples,
IsPublic = IsPublic,
AllowRouting = AllowRouting,
Disabled = Disabled,

2
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
View file

@ -13,6 +13,7 @@ public class AgentViewModel
public List<AgentTemplate> Templates { get; set; }
public List<FunctionDef> Functions { get; set; }
public List<AgentResponse> Responses { get; set; }
public List<string> Samples { get; set; }
public bool IsPublic { get; set; }
public bool AllowRouting { get; set; }
public bool Disabled { get; set; }
@ -33,6 +34,7 @@ public class AgentViewModel
Templates = agent.Templates,
Functions = agent.Functions,
Responses = agent.Responses,
Samples = agent.Samples,
IsPublic= agent.IsPublic,
Disabled = agent.Disabled,
AllowRouting = agent.AllowRouting,

2
src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/RoutingRuleUpdateModel.cs
View file

@ -5,6 +5,7 @@ namespace BotSharp.OpenAPI.ViewModels.Agents;
public class RoutingRuleUpdateModel
{
public string Field { get; set; }
public string Description { get; set; }
public bool Required { get; set; }
public string? RedirectTo { get; set; }
@ -18,6 +19,7 @@ public class RoutingRuleUpdateModel
return new RoutingRule
{
Field = model.Field,
Description = model.Description,
Required = model.Required,
RedirectTo = model.RedirectTo
};

1
src/Plugins/BotSharp.Plugin.MongoStorage/BotSharp.Plugin.MongoStorage.csproj
View file

@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspects.Cache" Version="2.0.4" />
<PackageReference Include="MongoDB.Driver" Version="2.22.0" />
</ItemGroup>

1
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentCollection.cs
View file

@ -10,6 +10,7 @@ public class AgentCollection : MongoBase
public List<AgentTemplateMongoElement> Templates { get; set; }
public List<FunctionDefMongoElement> Functions { get; set; }
public List<AgentResponseMongoElement> Responses { get; set; }
public List<string> Samples { get; set; }
public bool IsPublic { get; set; }
public bool AllowRouting { get; set; }
public bool Disabled { get; set; }

4
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/ConversationCollection.cs
View file

@ -4,8 +4,8 @@ namespace BotSharp.Plugin.MongoStorage.Collections;
public class ConversationCollection : MongoBase
{
public Guid AgentId { get; set; }
public Guid UserId { get; set; }
public string AgentId { get; set; }
public string UserId { get; set; }
public string Title { get; set; }
public List<StateKeyValue> States { get; set; }
public DateTime CreatedTime { get; set; }

2
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/ConversationDialogCollection.cs
View file

@ -2,6 +2,6 @@ namespace BotSharp.Plugin.MongoStorage.Collections;
public class ConversationDialogCollection : MongoBase
{
public Guid ConversationId { get; set; }
public string ConversationId { get; set; }
public string Dialog { get; set; }
}

4
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserAgentCollection.cs
View file

@ -2,8 +2,8 @@ namespace BotSharp.Plugin.MongoStorage.Collections;
public class UserAgentCollection : MongoBase
{
public Guid UserId { get; set; }
public Guid AgentId { get; set; }
public string UserId { get; set; }
public string AgentId { get; set; }
public DateTime CreatedTime { get; set; }
public DateTime UpdatedTime { get; set; }

6
src/Plugins/BotSharp.Plugin.MongoStorage/Models/RoutingRuleMongoElement.cs
View file

@ -7,7 +7,7 @@ public class RoutingRuleMongoElement
public string Field { get; set; }
public string Description { get; set; }
public bool Required { get; set; }
public Guid? RedirectTo { get; set; }
public string? RedirectTo { get; set; }
public RoutingRuleMongoElement()
{
@ -21,7 +21,7 @@ public class RoutingRuleMongoElement
Field = routingRule.Field,
Description = routingRule.Description,
Required = routingRule.Required,
RedirectTo = !string.IsNullOrEmpty(routingRule.RedirectTo) ? Guid.Parse(routingRule.RedirectTo) : null
RedirectTo = routingRule.RedirectTo
};
}
@ -34,7 +34,7 @@ public class RoutingRuleMongoElement
Field = rule.Field,
Description = rule.Description,
Required = rule.Required,
RedirectTo = rule.RedirectTo?.ToString()
RedirectTo = rule.RedirectTo
};
}
}

4
src/Plugins/BotSharp.Plugin.MongoStorage/MongoBase.cs
View file

@ -6,6 +6,6 @@ namespace BotSharp.Plugin.MongoStorage;
[BsonIgnoreExtraElements(Inherited = true)]
public class MongoBase
{
[BsonId(IdGenerator = typeof(GuidGenerator))]
public Guid Id { get; set; }
[BsonId(IdGenerator = typeof(StringObjectIdGenerator))]
public string Id { get; set; }
}

1
src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs
View file

@ -1,4 +1,3 @@
using BotSharp.Abstraction.Utilities;
using BotSharp.Plugin.MongoStorage.Collections;
namespace BotSharp.Plugin.MongoStorage;

2
src/Plugins/BotSharp.Plugin.MongoStorage/MongoStoragePlugin.cs
View file

@ -1,4 +1,6 @@
using BotSharp.Plugin.MongoStorage.Repository;
using MongoDB.Bson.Serialization;
using MongoDB.Bson.Serialization.Serializers;
namespace BotSharp.Plugin.MongoStorage;

358
src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs
View file

@ -3,9 +3,9 @@ using BotSharp.Abstraction.Conversations.Models;
using BotSharp.Abstraction.Functions.Models;
using BotSharp.Abstraction.Routing.Models;
using BotSharp.Abstraction.Users.Models;
using BotSharp.Abstraction.Utilities;
using BotSharp.Plugin.MongoStorage.Collections;
using BotSharp.Plugin.MongoStorage.Models;
using Aspects.Cache;
namespace BotSharp.Plugin.MongoStorage.Repository;
@ -26,133 +26,11 @@ public class MongoRepository : IBotSharpRepository
}
private List<Agent> _agents = new List<Agent>();
public IQueryable<Agent> Agents
{
get
{
if (!_agents.IsNullOrEmpty())
{
return _agents.AsQueryable();
}
var agentDocs = _dc.Agents?.AsQueryable()?.ToList() ?? new List<AgentCollection>();
_agents = agentDocs.Select(x => new Agent
{
Id = x.Id.ToString(),
Name = x.Name,
Description = x.Description,
Instruction = x.Instruction,
Templates = x.Templates?
.Select(t => AgentTemplateMongoElement.ToDomainElement(t))?
.ToList() ?? new List<AgentTemplate>(),
Functions = x.Functions?
.Select(f => FunctionDefMongoElement.ToDomainElement(f))?
.ToList() ?? new List<FunctionDef>(),
Responses = x.Responses?
.Select(r => AgentResponseMongoElement.ToDomainElement(r))?
.ToList() ?? new List<AgentResponse>(),
IsPublic = x.IsPublic,
Disabled = x.Disabled,
AllowRouting = x.AllowRouting,
Profiles = x.Profiles,
RoutingRules = x.RoutingRules?
.Select(r => RoutingRuleMongoElement.ToDomainElement(x.Id.ToString(), x.Name, r))?
.ToList() ?? new List<RoutingRule>(),
CreatedDateTime = x.CreatedTime,
UpdatedDateTime = x.UpdatedTime
}).ToList();
return _agents.AsQueryable();
}
}
private List<User> _users = new List<User>();
public IQueryable<User> Users
{
get
{
if (!_users.IsNullOrEmpty())
{
return _users.AsQueryable();
}
var userDocs = _dc.Users?.AsQueryable()?.ToList() ?? new List<UserCollection>();
_users = userDocs.Select(x => new User
{
Id = x.Id.ToString(),
FirstName = x.FirstName,
LastName = x.LastName,
Email = x.Email,
Password = x.Password,
Salt = x.Salt,
ExternalId = x.ExternalId,
CreatedTime = x.CreatedTime,
UpdatedTime = x.UpdatedTime
}).ToList();
return _users.AsQueryable();
}
}
private List<UserAgent> _userAgents = new List<UserAgent>();
public IQueryable<UserAgent> UserAgents
{
get
{
if (!_userAgents.IsNullOrEmpty())
{
return _userAgents.AsQueryable();
}
var userDocs = _dc.UserAgents?.AsQueryable()?.ToList() ?? new List<UserAgentCollection>();
_userAgents = userDocs.Select(x => new UserAgent
{
Id = x.Id.ToString(),
AgentId = x.AgentId.ToString(),
UserId = x.UserId.ToString(),
CreatedTime = x.CreatedTime,
UpdatedTime = x.UpdatedTime
}).ToList();
return _userAgents.AsQueryable();
}
}
private List<Conversation> _conversations = new List<Conversation>();
public IQueryable<Conversation> Conversations
{
get
{
if (!_conversations.IsNullOrEmpty())
{
return _conversations.AsQueryable();
}
_conversations = new List<Conversation>();
var conversationDocs = _dc.Conversations?.AsQueryable()?.ToList() ?? new List<ConversationCollection>();
foreach (var conv in conversationDocs)
{
var convId = conv.Id.ToString();
var dialog = GetConversationDialog(convId);
_conversations.Add(new Conversation
{
Id = convId,
AgentId = conv.AgentId.ToString(),
UserId = conv.UserId.ToString(),
Title = conv.Title,
Dialog = dialog,
States = new ConversationState(conv.States),
CreatedTime = conv.CreatedTime,
UpdatedTime = conv.UpdatedTime
});
}
return _conversations.AsQueryable();
}
}
List<string> _changedTableNames = new List<string>();
public void Add<TTableInterface>(object entity)
{
if (entity is Conversation conversation)
@ -188,9 +66,9 @@ public class MongoRepository : IBotSharpRepository
{
var conversations = _conversations.Select(x => new ConversationCollection
{
Id = string.IsNullOrEmpty(x.Id) ? Guid.NewGuid() : new Guid(x.Id),
AgentId = Guid.Parse(x.AgentId),
UserId = !string.IsNullOrEmpty(x.UserId) && Guid.TryParse(x.UserId, out var _) ? Guid.Parse(x.UserId) : Guid.Empty,
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
AgentId = x.AgentId,
UserId = !string.IsNullOrEmpty(x.UserId) ? x.UserId : string.Empty,
Title = x.Title,
States = x.States?.ToKeyValueList() ?? new List<StateKeyValue>(),
CreatedTime = x.CreatedTime,
@ -214,7 +92,7 @@ public class MongoRepository : IBotSharpRepository
{
var agents = _agents.Select(x => new AgentCollection
{
Id = string.IsNullOrEmpty(x.Id) ? Guid.NewGuid() : new Guid(x.Id),
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
Name = x.Name,
Description = x.Description,
Instruction = x.Instruction,
@ -227,6 +105,7 @@ public class MongoRepository : IBotSharpRepository
Responses = x.Responses?
.Select(r => AgentResponseMongoElement.ToMongoElement(r))?
.ToList() ?? new List<AgentResponseMongoElement>(),
Samples = x.Samples ?? new List<string>(),
IsPublic = x.IsPublic,
AllowRouting = x.AllowRouting,
Disabled = x.Disabled,
@ -248,6 +127,7 @@ public class MongoRepository : IBotSharpRepository
.Set(x => x.Templates, agent.Templates)
.Set(x => x.Functions, agent.Functions)
.Set(x => x.Responses, agent.Responses)
.Set(x => x.Samples, agent.Samples)
.Set(x => x.IsPublic, agent.IsPublic)
.Set(x => x.AllowRouting, agent.AllowRouting)
.Set(x => x.Disabled, agent.Disabled)
@ -262,7 +142,7 @@ public class MongoRepository : IBotSharpRepository
{
var users = _users.Select(x => new UserCollection
{
Id = string.IsNullOrEmpty(x.Id) ? Guid.NewGuid() : new Guid(x.Id),
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
FirstName = x.FirstName,
LastName = x.LastName,
Salt = x.Salt,
@ -292,9 +172,9 @@ public class MongoRepository : IBotSharpRepository
{
var userAgents = _userAgents.Select(x => new UserAgentCollection
{
Id = string.IsNullOrEmpty(x.Id) ? Guid.NewGuid() : new Guid(x.Id),
AgentId = Guid.Parse(x.AgentId),
UserId = !string.IsNullOrEmpty(x.UserId) && Guid.TryParse(x.UserId, out var _) ? Guid.Parse(x.UserId) : Guid.Empty,
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
AgentId = x.AgentId,
UserId = !string.IsNullOrEmpty(x.UserId) ? x.UserId : string.Empty,
CreatedTime = x.CreatedTime,
UpdatedTime = x.UpdatedTime
}).ToList();
@ -340,7 +220,7 @@ public class MongoRepository : IBotSharpRepository
case AgentField.Profiles:
UpdateAgentProfiles(agent.Id, agent.Profiles);
break;
case AgentField.RoutingRules:
case AgentField.RoutingRule:
UpdateAgentRoutingRules(agent.Id, agent.RoutingRules);
break;
case AgentField.Instruction:
@ -355,6 +235,9 @@ public class MongoRepository : IBotSharpRepository
case AgentField.Response:
UpdateAgentResponses(agent.Id, agent.Responses);
break;
case AgentField.Sample:
UpdateAgentSamples(agent.Id, agent.Samples);
break;
case AgentField.All:
UpdateAgentAllFields(agent);
break;
@ -368,7 +251,7 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(name)) return;
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Name, name)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -380,7 +263,7 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(description)) return;
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Description, description)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -390,7 +273,7 @@ public class MongoRepository : IBotSharpRepository
private void UpdateAgentIsPublic(string agentId, bool isPublic)
{
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.IsPublic, isPublic)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -400,7 +283,7 @@ public class MongoRepository : IBotSharpRepository
private void UpdateAgentDisabled(string agentId, bool disabled)
{
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Disabled, disabled)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -410,7 +293,7 @@ public class MongoRepository : IBotSharpRepository
private void UpdateAgentAllowRouting(string agentId, bool allowRouting)
{
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.AllowRouting, allowRouting)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -422,7 +305,7 @@ public class MongoRepository : IBotSharpRepository
{
if (profiles.IsNullOrEmpty()) return;
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Profiles, profiles)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -435,7 +318,7 @@ public class MongoRepository : IBotSharpRepository
if (rules.IsNullOrEmpty()) return;
var ruleElements = rules.Select(x => RoutingRuleMongoElement.ToMongoElement(x)).ToList();
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.RoutingRules, ruleElements)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -447,7 +330,7 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(instruction)) return;
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Instruction, instruction)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -460,7 +343,7 @@ public class MongoRepository : IBotSharpRepository
if (functions.IsNullOrEmpty()) return;
var functionsToUpdate = functions.Select(f => FunctionDefMongoElement.ToMongoElement(f)).ToList();
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Functions, functionsToUpdate)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -473,7 +356,7 @@ public class MongoRepository : IBotSharpRepository
if (templates.IsNullOrEmpty()) return;
var templatesToUpdate = templates.Select(t => AgentTemplateMongoElement.ToMongoElement(t)).ToList();
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Templates, templatesToUpdate)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -486,7 +369,7 @@ public class MongoRepository : IBotSharpRepository
if (responses.IsNullOrEmpty()) return;
var responsesToUpdate = responses.Select(r => AgentResponseMongoElement.ToMongoElement(r)).ToList();
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agentId));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Responses, responsesToUpdate)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
@ -494,9 +377,21 @@ public class MongoRepository : IBotSharpRepository
_dc.Agents.UpdateOne(filter, update);
}
private void UpdateAgentSamples(string agentId, List<string> samples)
{
if (samples.IsNullOrEmpty()) return;
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agentId);
var update = Builders<AgentCollection>.Update
.Set(x => x.Samples, samples)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
_dc.Agents.UpdateOne(filter, update);
}
private void UpdateAgentAllFields(Agent agent)
{
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, Guid.Parse(agent.Id));
var filter = Builders<AgentCollection>.Filter.Eq(x => x.Id, agent.Id);
var update = Builders<AgentCollection>.Update
.Set(x => x.Name, agent.Name)
.Set(x => x.Description, agent.Description)
@ -508,26 +403,119 @@ public class MongoRepository : IBotSharpRepository
.Set(x => x.Templates, agent.Templates.Select(t => AgentTemplateMongoElement.ToMongoElement(t)).ToList())
.Set(x => x.Functions, agent.Functions.Select(f => FunctionDefMongoElement.ToMongoElement(f)).ToList())
.Set(x => x.Responses, agent.Responses.Select(r => AgentResponseMongoElement.ToMongoElement(r)).ToList())
.Set(x => x.Samples, agent.Samples)
.Set(x => x.IsPublic, agent.IsPublic)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
_dc.Agents.UpdateOne(filter, update);
var res = _dc.Agents.UpdateOne(filter, update);
Console.WriteLine();
}
#endregion
public Agent? GetAgent(string agentId)
{
var foundAgent = Agents.FirstOrDefault(x => x.Id == agentId);
return foundAgent;
var agent = _dc.Agents.AsQueryable().FirstOrDefault(x => x.Id == agentId);
if (agent == null) return null;
return new Agent
{
Id = agent.Id,
Name = agent.Name,
Description = agent.Description,
Instruction = agent.Instruction,
Templates = !agent.Templates.IsNullOrEmpty() ? agent.Templates
.Select(t => AgentTemplateMongoElement.ToDomainElement(t))
.ToList() : new List<AgentTemplate>(),
Functions = !agent.Functions.IsNullOrEmpty() ? agent.Functions
.Select(f => FunctionDefMongoElement.ToDomainElement(f))
.ToList() : new List<FunctionDef>(),
Responses = !agent.Responses.IsNullOrEmpty() ? agent.Responses
.Select(r => AgentResponseMongoElement.ToDomainElement(r))
.ToList() : new List<AgentResponse>(),
Samples = agent.Samples ?? new List<string>(),
IsPublic = agent.IsPublic,
Disabled = agent.Disabled,
AllowRouting = agent.AllowRouting,
Profiles = agent.Profiles,
RoutingRules = !agent.RoutingRules.IsNullOrEmpty() ? agent.RoutingRules
.Select(r => RoutingRuleMongoElement.ToDomainElement(agent.Id, agent.Name, r))
.ToList() : new List<RoutingRule>()
};
}
public List<Agent> GetAgents(string? name = null, bool? disabled = null, bool? allowRouting = null,
bool? isPublic = null, List<string>? agentIds = null)
{
var agents = new List<Agent>();
IQueryable<AgentCollection> query = _dc.Agents.AsQueryable();
if (!string.IsNullOrEmpty(name))
{
query = query.Where(x => x.Name.ToLower() == name.ToLower());
}
if (disabled.HasValue)
{
query = query.Where(x => x.Disabled == disabled);
}
if (allowRouting.HasValue)
{
query = query.Where(x => x.AllowRouting == allowRouting);
}
if (isPublic.HasValue)
{
query = query.Where(x => x.IsPublic == isPublic);
}
if (agentIds != null)
{
query = query.Where(x => agentIds.Contains(x.Id));
}
return query.ToList().Select(x => new Agent
{
Id = x.Id,
Name = x.Name,
Description = x.Description,
Instruction = x.Instruction,
Templates = !x.Templates.IsNullOrEmpty() ? x.Templates
.Select(t => AgentTemplateMongoElement.ToDomainElement(t))
.ToList() : new List<AgentTemplate>(),
Functions = !x.Functions.IsNullOrEmpty() ? x.Functions
.Select(f => FunctionDefMongoElement.ToDomainElement(f))
.ToList() : new List<FunctionDef>(),
Responses = !x.Responses.IsNullOrEmpty() ? x.Responses
.Select(r => AgentResponseMongoElement.ToDomainElement(r))
.ToList() : new List<AgentResponse>(),
Samples = x.Samples ?? new List<string>(),
IsPublic = x.IsPublic,
Disabled = x.Disabled,
AllowRouting = x.AllowRouting,
Profiles = x.Profiles,
RoutingRules = !x.RoutingRules.IsNullOrEmpty() ? x.RoutingRules
.Select(r => RoutingRuleMongoElement.ToDomainElement(x.Id, x.Name, r))
.ToList() : new List<RoutingRule>()
}).ToList();
}
public List<Agent> GetAgentsByUser(string userId)
{
var agentIds = (from ua in _dc.UserAgents.AsQueryable()
join u in _dc.Users.AsQueryable() on ua.UserId equals u.Id
where ua.UserId == userId || u.ExternalId == userId
select ua.AgentId).ToList();
var agents = GetAgents(isPublic: true, agentIds: agentIds);
return agents;
}
public List<string> GetAgentResponses(string agentId, string prefix, string intent)
{
var responses = new List<string>();
var agent = Agents.FirstOrDefault(x => x.Id == agentId);
var agent = _dc.Agents.AsQueryable().FirstOrDefault(x => x.Id == agentId);
if (agent == null) return responses;
return agent.Responses.Where(x => x.Prefix == prefix && x.Intent == intent).Select(x => x.Content).ToList();
@ -535,7 +523,7 @@ public class MongoRepository : IBotSharpRepository
public string GetAgentTemplate(string agentId, string templateName)
{
var agent = Agents.FirstOrDefault(x => x.Id == agentId);
var agent = _dc.Agents.AsQueryable().FirstOrDefault(x => x.Id == agentId);
if (agent == null) return string.Empty;
return agent.Templates?.FirstOrDefault(x => x.Name == templateName.ToLower())?.Content ?? string.Empty;
@ -547,7 +535,7 @@ public class MongoRepository : IBotSharpRepository
var agentDocs = agents.Select(x => new AgentCollection
{
Id = string.IsNullOrEmpty(x.Id) ? Guid.NewGuid() : new Guid(x.Id),
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
Name = x.Name,
Description = x.Description,
Instruction = x.Instruction,
@ -560,6 +548,7 @@ public class MongoRepository : IBotSharpRepository
Responses = x.Responses?
.Select(r => AgentResponseMongoElement.ToMongoElement(r))?
.ToList() ?? new List<AgentResponseMongoElement>(),
Samples = x.Samples ?? new List<string>(),
IsPublic = x.IsPublic,
AllowRouting = x.AllowRouting,
Disabled = x.Disabled,
@ -580,9 +569,9 @@ public class MongoRepository : IBotSharpRepository
var userAgentDocs = userAgents.Select(x => new UserAgentCollection
{
Id = string.IsNullOrEmpty(x.Id) ? Guid.NewGuid() : new Guid(x.Id),
AgentId = Guid.Parse(x.AgentId),
UserId = !string.IsNullOrEmpty(x.UserId) && Guid.TryParse(x.UserId, out var _) ? Guid.Parse(x.UserId) : Guid.Empty,
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
AgentId = x.AgentId,
UserId = !string.IsNullOrEmpty(x.UserId) ? x.UserId : string.Empty,
CreatedTime = x.CreatedTime,
UpdatedTime = x.UpdatedTime
}).ToList();
@ -594,10 +583,8 @@ public class MongoRepository : IBotSharpRepository
{
try
{
var userAgentFilter = Builders<UserAgentCollection>.Filter.Empty;
var agentfilter = Builders<AgentCollection>.Filter.Empty;
_dc.UserAgents.DeleteMany(userAgentFilter);
_dc.Agents.DeleteMany(agentfilter);
_dc.UserAgents.DeleteMany(Builders<UserAgentCollection>.Filter.Empty);
_dc.Agents.DeleteMany(Builders<AgentCollection>.Filter.Empty);
return true;
}
catch
@ -615,9 +602,9 @@ public class MongoRepository : IBotSharpRepository
var conv = new ConversationCollection
{
Id = !string.IsNullOrEmpty(conversation.Id) ? Guid.Parse(conversation.Id) : Guid.NewGuid(),
AgentId = Guid.Parse(conversation.AgentId),
UserId = !string.IsNullOrEmpty(conversation.UserId) && Guid.TryParse(conversation.UserId, out var _) ? Guid.Parse(conversation.UserId) : Guid.Empty,
Id = !string.IsNullOrEmpty(conversation.Id) ? conversation.Id : Guid.NewGuid().ToString(),
AgentId = conversation.AgentId,
UserId = !string.IsNullOrEmpty(conversation.UserId) ? conversation.UserId : string.Empty,
Title = conversation.Title,
States = conversation.States?.ToKeyValueList() ?? new List<StateKeyValue>(),
CreatedTime = DateTime.UtcNow,
@ -626,7 +613,7 @@ public class MongoRepository : IBotSharpRepository
var dialog = new ConversationDialogCollection
{
Id = Guid.NewGuid(),
Id = Guid.NewGuid().ToString(),
ConversationId = conv.Id,
Dialog = string.Empty
};
@ -639,7 +626,7 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(conversationId)) return string.Empty;
var filter = Builders<ConversationDialogCollection>.Filter.Eq(x => x.ConversationId, Guid.Parse(conversationId));
var filter = Builders<ConversationDialogCollection>.Filter.Eq(x => x.ConversationId, conversationId);
var foundDialog = _dc.ConversationDialogs.Find(filter).FirstOrDefault();
if (foundDialog == null) return string.Empty;
@ -650,11 +637,11 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(conversationId)) return;
var filterConv = Builders<ConversationCollection>.Filter.Eq(x => x.Id, Guid.Parse(conversationId));
var filterConv = Builders<ConversationCollection>.Filter.Eq(x => x.Id, conversationId);
var foundConv = _dc.Conversations.Find(filterConv).FirstOrDefault();
if (foundConv == null) return;
var filterDialog = Builders<ConversationDialogCollection>.Filter.Eq(x => x.ConversationId, Guid.Parse(conversationId));
var filterDialog = Builders<ConversationDialogCollection>.Filter.Eq(x => x.ConversationId, conversationId);
var foundDialog = _dc.ConversationDialogs.Find(filterDialog).FirstOrDefault();
if (foundDialog == null) return;
@ -670,7 +657,7 @@ public class MongoRepository : IBotSharpRepository
var states = new List<StateKeyValue>();
if (string.IsNullOrEmpty(conversationId)) return states;
var filter = Builders<ConversationCollection>.Filter.Eq(x => x.Id, Guid.Parse(conversationId));
var filter = Builders<ConversationCollection>.Filter.Eq(x => x.Id, conversationId);
var foundConversation = _dc.Conversations.Find(filter).FirstOrDefault();
var savedStates = foundConversation?.States ?? new List<StateKeyValue>();
return savedStates;
@ -680,7 +667,7 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(conversationId)) return;
var filter = Builders<ConversationCollection>.Filter.Eq(x => x.Id, Guid.Parse(conversationId));
var filter = Builders<ConversationCollection>.Filter.Eq(x => x.Id, conversationId);
var foundConv = _dc.Conversations.Find(filter).FirstOrDefault();
if (foundConv == null) return;
@ -695,8 +682,8 @@ public class MongoRepository : IBotSharpRepository
{
if (string.IsNullOrEmpty(conversationId)) return null;
var filterConv = Builders<ConversationCollection>.Filter.Eq(x => x.Id, Guid.Parse(conversationId));
var filterDialog = Builders<ConversationDialogCollection>.Filter.Eq(x => x.ConversationId, Guid.Parse(conversationId));
var filterConv = Builders<ConversationCollection>.Filter.Eq(x => x.Id, conversationId);
var filterDialog = Builders<ConversationDialogCollection>.Filter.Eq(x => x.ConversationId, conversationId);
var conv = _dc.Conversations.Find(filterConv).FirstOrDefault();
var dialog = _dc.ConversationDialogs.Find(filterDialog).FirstOrDefault();
@ -719,9 +706,9 @@ public class MongoRepository : IBotSharpRepository
public List<Conversation> GetConversations(string userId)
{
var records = new List<Conversation>();
if (string.IsNullOrEmpty(userId) || !Guid.TryParse(userId, out var _)) return records;
if (string.IsNullOrEmpty(userId)) return records;
var filterByUserId = Builders<ConversationCollection>.Filter.Eq(x => x.UserId, Guid.Parse(userId));
var filterByUserId = Builders<ConversationCollection>.Filter.Eq(x => x.UserId, userId);
var conversations = _dc.Conversations.Find(filterByUserId).ToList();
foreach (var conv in conversations)
@ -745,18 +732,31 @@ public class MongoRepository : IBotSharpRepository
#region User
public User? GetUserByEmail(string email)
{
var user = Users.FirstOrDefault(x => x.Email == email);
var user = _dc.Users.AsQueryable().FirstOrDefault(x => x.Email == email);
return user != null ? new User
{
Id = user.Id.ToString(),
Id = user.Id,
FirstName = user.FirstName,
LastName = user.LastName,
Email = user.Email,
Password = user.Password,
Salt = user.Salt,
ExternalId = user.ExternalId,
CreatedTime = user.CreatedTime,
UpdatedTime = user.UpdatedTime
ExternalId = user.ExternalId
} : null;
}
public User? GetUserByExternalId(string externalId)
{
var user = _dc.Users.AsQueryable().FirstOrDefault(x => x.ExternalId == externalId);
return user != null ? new User
{
Id = user.Id,
FirstName = user.FirstName,
LastName = user.LastName,
Email = user.Email,
Password = user.Password,
Salt = user.Salt,
ExternalId = user.ExternalId
} : null;
}
@ -766,7 +766,7 @@ public class MongoRepository : IBotSharpRepository
var userCollection = new UserCollection
{
Id = Guid.NewGuid(),
Id = Guid.NewGuid().ToString(),
FirstName = user.FirstName,
LastName = user.LastName,
Salt = user.Salt,