From 63e5fdb33c6dd3750b200f4887d89d206af27016 Mon Sep 17 00:00:00 2001 From: Haiping Chen Date: Sun, 4 Feb 2024 16:57:47 -0600 Subject: [PATCH] Added DirectAgentId in AgentTask --- .../BotSharp.Abstraction/Tasks/Models/AgentTask.cs | 1 + .../BotSharp.OpenAPI/Controllers/AgentTaskController.cs | 6 +++--- .../ViewModels/Agents/AgentTaskViewModel.cs | 5 ++++- .../Drivers/PlaywrightDriver/PlaywrightInstance.cs | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs b/src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs index ebbbdf44..5aeed736 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs @@ -7,6 +7,7 @@ public class AgentTask 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; } diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs index 95ad902d..09ab468e 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs @@ -16,16 +16,16 @@ public class AgentTaskController : ControllerBase } [HttpGet("/agent/{agentId}/task/{taskId}")] - public async Task GetAgentTask([FromRoute] string agentId, [FromRoute] string taskId) + public async Task GetAgentTask([FromRoute] string agentId, [FromRoute] string taskId) { var task = await _agentTaskService.GetTask(agentId, taskId); if (task == null) return null; return AgentTaskViewModel.From(task); } - + [HttpGet("/agent/tasks")] - public async Task> GetAgents([FromQuery] AgentTaskFilter filter) + public async Task> GetAgentTasks([FromQuery] AgentTaskFilter filter) { var tasks = await _agentTaskService.GetTasks(filter); return new PagedItems diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs index 2fc06dc3..a0b9848a 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs @@ -18,6 +18,8 @@ public class AgentTaskViewModel public string AgentId { get; set; } [JsonPropertyName("agent_name")] public string AgentName { get; set; } + [JsonPropertyName("direct_agent_id")] + public string? DirectAgentId { get; set; } public static AgentTaskViewModel From(AgentTask task) { @@ -31,7 +33,8 @@ public class AgentTaskViewModel AgentId = task.AgentId, AgentName = task.Agent?.Name, CreatedDateTime = task.CreatedDateTime, - UpdatedDateTime = task.UpdatedDateTime + UpdatedDateTime = task.UpdatedDateTime, + DirectAgentId = task?.DirectAgentId }; } } diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs index f834651b..0e4ba826 100644 --- a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs +++ b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs @@ -1,4 +1,3 @@ -using Microsoft.EntityFrameworkCore; using System.IO; namespace BotSharp.Plugin.WebDriver.Drivers.PlaywrightDriver; @@ -7,7 +6,6 @@ public class PlaywrightInstance : IDisposable { IPlaywright _playwright; IBrowserContext _context; - IPage _page; public IBrowserContext Context => _context; public IPage Page => _context.Pages.LastOrDefault(); @@ -32,8 +30,6 @@ public class PlaywrightInstance : IDisposable } }); - // _page = _context.Pages.Last(); - _context.Page += async (sender, e) => { e.Close += async (sender, e) =>