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

Merge branch 'SciSharp:master' into master

Browse source
This commit is contained in:
sylviachency 2024-04-11 16:00:40 -05:00 committed by GitHub
parent d7524162d8 a043b84f26
commit a7cfa002ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,10 +51,12 @@ public partial class AgentService
var isAgentDeleted = _db.DeleteAgent(agent.Id);
if (isAgentDeleted)
{
await Task.Delay(100);
_db.BulkInsertAgents(new List<Agent> { agent });
_db.BulkInsertUserAgents(new List<UserAgent> { userAgent });
_db.BulkInsertAgentTasks(tasks);
refreshedAgents.Add(agent.Name);
_logger.LogInformation($"Agent {agent.Name} has been migrated.");
}
}
catch (Exception ex)
@ -66,7 +68,7 @@ public partial class AgentService
if (!refreshedAgents.IsNullOrEmpty())
{
Utilities.ClearCache();
refreshResult = $"Agents are migrated! {string.Join("\r\n", refreshedAgents)}";
refreshResult = $"Agents are migrated!\r\n{string.Join("\r\n", refreshedAgents)}";
}
else
{

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

@ -41,10 +41,13 @@ public partial class AgentService
public async Task<string> UpdateAgentFromFile(string id)
{
string updateResult;
var agent = _db.GetAgent(id);
if (agent == null)
{
return $"Cannot find agent ${id}";
updateResult = $"Cannot find agent ${id}";
_logger.LogError(updateResult);
return updateResult;
}
var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
@ -57,7 +60,9 @@ public partial class AgentService
var foundAgent = FetchAgentFileById(agent.Id, filePath);
if (foundAgent == null)
{
return $"Cannot find agent {agent.Name} in file directory: {filePath}";
updateResult = $"Cannot find agent {agent.Name} in file directory: {filePath}";
_logger.LogError(updateResult);
return updateResult;
}
try
@ -79,11 +84,16 @@ public partial class AgentService
_db.UpdateAgent(clonedAgent, AgentField.All);
Utilities.ClearCache();
return $"Agent {agent.Name} has been migrated!";
updateResult = $"Agent {agent.Name} has been migrated!";
_logger.LogInformation(updateResult);
return updateResult;
}
catch (Exception ex)
{
return $"Failed to migrate agent {agent.Name} in file directory {filePath}.\r\nError: {ex.Message}";
updateResult = $"Failed to migrate agent {agent.Name} in file directory {filePath}.\r\nError: {ex.Message}";
_logger.LogError(updateResult);
return updateResult;
}
}