Skip to content

add direct agent id #288

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
Feb 5, 2024
Merged

add direct agent id #288

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
3 changes: 2 additions & 1 deletion src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ public enum AgentTaskField
Name,
Description,
Enabled,
Content
Content,
DirectAgentId
}
18 changes: 11 additions & 7 deletions src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
namespace BotSharp.Abstraction.Tasks.Models;

public class AgentTask
public class AgentTask : AgentTaskMetaData
{
public string Id { get; set; }
public string Name { get; set; }
public string? Description { get; set; }
public string Content { get; set; }
public bool Enabled { get; set; }
public string? DirectAgentId { get; set; }
public DateTime CreatedDateTime { get; set; }
public DateTime UpdatedDateTime { get; set; }

[JsonIgnore(Condition = JsonIgnoreCondition.Always)]
public string AgentId { get; set; }
Expand All @@ -29,3 +23,13 @@ public AgentTask(string id, string name, string? description = null)
Description = description;
}
}

public class AgentTaskMetaData
{
public string Name { get; set; }
public string? Description { get; set; }
public bool Enabled { get; set; }
public string? DirectAgentId { get; set; }
public DateTime CreatedDateTime { get; set; }
public DateTime UpdatedDateTime { get; set; }
}
34 changes: 28 additions & 6 deletions src/Infrastructure/BotSharp.Abstraction/Utilities/Pagination.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,34 @@ namespace BotSharp.Abstraction.Utilities;

public class Pagination
{
public int Page { get; set; } = 1;
/// <summary>
/// Use -1 for all records
/// </summary>
public int Size { get; set; } = 20;
public int Offset => (Page - 1) * Size;
private int _page;
private int _size;

public int Page
{
get { return _page > 0 ? _page : 1; }
set { _page = value; }
}

public int Size
{
get
{
if (_size <= 0) return 20;
if (_size > 100) return 100;

return _size;
}
set
{
_size = value;
}
}

public int Offset
{
get { return (Page - 1) * Size; }
}
}

public class PagedItems<T>
Expand Down
40 changes: 18 additions & 22 deletions src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,17 @@ public void InsertAgentTask(AgentTask task)

var fileName = $"{Guid.NewGuid()}.liquid";
var taskFile = Path.Combine(taskDir, fileName);

var model = new AgentTaskFileModel
var metaData = new AgentTaskMetaData
{
Name = task.Name,
Description = task.Description,
Enabled = task.Enabled,
DirectAgentId = task.DirectAgentId,
CreatedDateTime = DateTime.UtcNow,
UpdatedDateTime = DateTime.UtcNow
};

var fileContent = BuildAgentTaskFileContent(model, task.Content);
var fileContent = BuildAgentTaskFileContent(metaData, task.Content);
File.WriteAllText(taskFile, fileContent);
}

Expand All @@ -146,11 +146,12 @@ public void UpdateAgentTask(AgentTask task, AgentTaskField field)
var parsedTask = ParseAgentTask(taskFile);
if (parsedTask == null) return;

var model = new AgentTaskFileModel
var metaData = new AgentTaskMetaData
{
Name = parsedTask.Name,
Description = parsedTask.Description,
Enabled = parsedTask.Enabled,
DirectAgentId = parsedTask.DirectAgentId,
CreatedDateTime = parsedTask.CreatedDateTime,
UpdatedDateTime = DateTime.UtcNow
};
Expand All @@ -159,26 +160,30 @@ public void UpdateAgentTask(AgentTask task, AgentTaskField field)
switch (field)
{
case AgentTaskField.Name:
model.Name = task.Name;
metaData.Name = task.Name;
break;
case AgentTaskField.Description:
model.Description = task.Description;
metaData.Description = task.Description;
break;
case AgentTaskField.Enabled:
model.Enabled = task.Enabled;
metaData.Enabled = task.Enabled;
break;
case AgentTaskField.DirectAgentId:
metaData.DirectAgentId = task.DirectAgentId;
break;
case AgentTaskField.Content:
content = task.Content;
break;
case AgentTaskField.All:
model.Name = task.Name;
model.Description = task.Description;
model.Enabled = task.Enabled;
metaData.Name = task.Name;
metaData.Description = task.Description;
metaData.Enabled = task.Enabled;
metaData.DirectAgentId = task.DirectAgentId;
content = task.Content;
break;
}

var fileContent = BuildAgentTaskFileContent(model, content);
var fileContent = BuildAgentTaskFileContent(metaData, content);
File.WriteAllText(taskFile, fileContent);
}

Expand Down Expand Up @@ -211,18 +216,9 @@ public bool DeleteAgentTask(string agentId, string taskId)
return taskFile;
}

private string BuildAgentTaskFileContent(AgentTaskFileModel fileModel, string taskContent)
private string BuildAgentTaskFileContent(AgentTaskMetaData metaData, string taskContent)
{
return $"{AGENT_TASK_PREFIX}\n{JsonSerializer.Serialize(fileModel, _options)}\n{AGENT_TASK_SUFFIX}\n\n{taskContent}";
return $"{AGENT_TASK_PREFIX}\n{JsonSerializer.Serialize(metaData, _options)}\n{AGENT_TASK_SUFFIX}\n\n{taskContent}";
}
#endregion
}

internal class AgentTaskFileModel
{
public string Name { get; set; }
public string? Description { get; set; }
public bool Enabled { get; set; }
public DateTime CreatedDateTime { get; set; }
public DateTime UpdatedDateTime { get; set; }
}
28 changes: 28 additions & 0 deletions src/Infrastructure/BotSharp.Core/Tasks/Services/AgentTaskService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,62 @@ public AgentTaskService(IServiceProvider services)
_services = services;
}

/// <summary>
/// Get agent tasks using pagination
/// </summary>
/// <param name="filter"></param>
/// <returns></returns>
public async Task<PagedItems<AgentTask>> GetTasks(AgentTaskFilter filter)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var pagedTasks = db.GetAgentTasks(filter);
return await Task.FromResult(pagedTasks);
}

/// <summary>
/// Get an agent task
/// </summary>
/// <param name="agentId"></param>
/// <param name="taskId"></param>
/// <returns></returns>
public async Task<AgentTask?> GetTask(string agentId, string taskId)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var task = db.GetAgentTask(agentId, taskId);
return await Task.FromResult(task);
}

/// <summary>
/// Create a new agent task
/// </summary>
/// <param name="task"></param>
/// <returns></returns>
public async Task CreateTask(AgentTask task)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
db.InsertAgentTask(task);
await Task.CompletedTask;
}

/// <summary>
/// Update an agent task by a single field or all fields
/// </summary>
/// <param name="task"></param>
/// <param name="field"></param>
/// <returns></returns>
public async Task UpdateTask(AgentTask task, AgentTaskField field)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
db.UpdateAgentTask(task, field);
await Task.CompletedTask;
}

/// <summary>
/// Delete an agent task
/// </summary>
/// <param name="agentId"></param>
/// <param name="taskId"></param>
/// <returns></returns>
public async Task<bool> DeleteTask(string agentId, string taskId)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
Expand Down
38 changes: 38 additions & 0 deletions src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ public AgentTaskController(IAgentTaskService agentTaskService, IServiceProvider
_services = services;
}

/// <summary>
/// Get an agent task
/// </summary>
/// <param name="agentId"></param>
/// <param name="taskId"></param>
/// <returns></returns>
[HttpGet("/agent/{agentId}/task/{taskId}")]
public async Task<AgentTaskViewModel> GetAgentTask([FromRoute] string agentId, [FromRoute] string taskId)
{
Expand All @@ -24,6 +30,11 @@ public async Task<AgentTaskViewModel> GetAgentTask([FromRoute] string agentId, [
return AgentTaskViewModel.From(task);
}

/// <summary>
/// Get agent tasks by pagination
/// </summary>
/// <param name="filter"></param>
/// <returns></returns>
[HttpGet("/agent/tasks")]
public async Task<PagedItems<AgentTaskViewModel>> GetAgentTasks([FromQuery] AgentTaskFilter filter)
{
Expand All @@ -35,6 +46,12 @@ public async Task<PagedItems<AgentTaskViewModel>> GetAgentTasks([FromQuery] Agen
};
}

/// <summary>
/// Create a new agent task
/// </summary>
/// <param name="agentId"></param>
/// <param name="task"></param>
/// <returns></returns>
[HttpPost("/agent/{agentId}/task")]
public async Task CreateAgentTask([FromRoute] string agentId, [FromBody] AgentTaskCreateModel task)
{
Expand All @@ -43,6 +60,13 @@ public async Task CreateAgentTask([FromRoute] string agentId, [FromBody] AgentTa
await _agentTaskService.CreateTask(agentTask);
}

/// <summary>
/// Update an agent task
/// </summary>
/// <param name="agentId"></param>
/// <param name="taskId"></param>
/// <param name="task"></param>
/// <returns></returns>
[HttpPut("/agent/{agentId}/task/{taskId}")]
public async Task UpdateAgentTask([FromRoute] string agentId, [FromRoute] string taskId, [FromBody] AgentTaskUpdateModel task)
{
Expand All @@ -52,6 +76,14 @@ public async Task UpdateAgentTask([FromRoute] string agentId, [FromRoute] string
await _agentTaskService.UpdateTask(agentTask, AgentTaskField.All);
}

/// <summary>
/// Update an agent task by a single field
/// </summary>
/// <param name="agentId"></param>
/// <param name="taskId"></param>
/// <param name="field"></param>
/// <param name="task"></param>
/// <returns></returns>
[HttpPatch("/agent/{agentId}/task/{taskId}/{field}")]
public async Task PatchAgentTaskByField([FromRoute] string agentId, [FromRoute] string taskId, [FromRoute] AgentTaskField field, [FromBody] AgentTaskUpdateModel task)
{
Expand All @@ -61,6 +93,12 @@ public async Task PatchAgentTaskByField([FromRoute] string agentId, [FromRoute]
await _agentTaskService.UpdateTask(agentTask, field);
}

/// <summary>
/// Delete an agent task
/// </summary>
/// <param name="agentId"></param>
/// <param name="taskId"></param>
/// <returns></returns>
[HttpDelete("/agent/{agentId}/task/{taskId}")]
public async Task<bool> DeleteAgentTask([FromRoute] string agentId, [FromRoute] string taskId)
{
Expand Down
4 changes: 3 additions & 1 deletion src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskCreateModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class AgentTaskCreateModel
public string? Description { get; set; }
public string Content { get; set; }
public bool Enabled { get; set; }
public string? DirectAgentId { get; set; }

public AgentTask ToAgentTask()
{
Expand All @@ -16,7 +17,8 @@ public AgentTask ToAgentTask()
Name = Name,
Description = Description,
Content = Content,
Enabled = Enabled
Enabled = Enabled,
DirectAgentId = DirectAgentId
};
}
}
4 changes: 3 additions & 1 deletion src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskUpdateModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class AgentTaskUpdateModel
public string? Description { get; set; }
public string? Content { get; set; }
public bool Enabled { get; set; }
public string? DirectAgentId { get; set; }

public AgentTask ToAgentTask()
{
Expand All @@ -16,7 +17,8 @@ public AgentTask ToAgentTask()
Name = Name,
Description = Description,
Content = Content,
Enabled = Enabled
Enabled = Enabled,
DirectAgentId = DirectAgentId
};
}
}
4 changes: 2 additions & 2 deletions src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public static AgentTaskViewModel From(AgentTask task)
Enabled = task.Enabled,
AgentId = task.AgentId,
AgentName = task.Agent?.Name,
DirectAgentId = task?.DirectAgentId,
CreatedDateTime = task.CreatedDateTime,
UpdatedDateTime = task.UpdatedDateTime,
DirectAgentId = task?.DirectAgentId
UpdatedDateTime = task.UpdatedDateTime
};
}
}
1 change: 1 addition & 0 deletions src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentTaskDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public class AgentTaskDocument : MongoBase
public string Content { get; set; }
public bool Enabled { get; set; }
public string AgentId { get; set; }
public string? DirectAgentId { get; set; }
public DateTime CreatedTime { get; set; }
public DateTime UpdatedTime { get; set; }
}
Loading