diff --git a/.gitignore b/.gitignore index 1f5c1ad7..b529228b 100644 --- a/.gitignore +++ b/.gitignore @@ -283,6 +283,7 @@ __pycache__/ *.btm.cs *.odx.cs *.xsd.cs -conversations + /docs/_build *.bin +/src/WebStarter/data/conversations diff --git a/BotSharp.sln b/BotSharp.sln index e8de4184..258fd099 100644 --- a/BotSharp.sln +++ b/BotSharp.sln @@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.PaddleSharp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.MetaMessenger", "src\Plugins\BotSharp.Plugin.MetaMessenger\BotSharp.Plugin.MetaMessenger.csproj", "{8300F66D-9EB8-438A-BF0F-70DFBE07D9DE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.OpenAPI", "src\Infrastructure\BotSharp.OpenAPI\BotSharp.OpenAPI.csproj", "{7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -147,6 +149,14 @@ Global {8300F66D-9EB8-438A-BF0F-70DFBE07D9DE}.Release|Any CPU.Build.0 = Release|Any CPU {8300F66D-9EB8-438A-BF0F-70DFBE07D9DE}.Release|x64.ActiveCfg = Release|Any CPU {8300F66D-9EB8-438A-BF0F-70DFBE07D9DE}.Release|x64.Build.0 = Release|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Debug|x64.ActiveCfg = Debug|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Debug|x64.Build.0 = Debug|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Release|Any CPU.Build.0 = Release|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Release|x64.ActiveCfg = Release|Any CPU + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -168,6 +178,7 @@ Global {B797EC3E-B5B9-4047-A6C8-6D330B7C6763} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C} {0308FBFD-57EB-4709-9AE4-A80D516AD84D} = {B797EC3E-B5B9-4047-A6C8-6D330B7C6763} {8300F66D-9EB8-438A-BF0F-70DFBE07D9DE} = {64264688-0F5C-4AB0-8F2B-B59B717CCE00} + {7E63F5F8-4EA0-498B-ABFE-2BBE4D7DDBA7} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A9969D89-C98B-40A5-A12B-FC87E55B3A19} diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStorage.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStorage.cs index 8c01cbbc..ed5044b0 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStorage.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStorage.cs @@ -5,6 +5,6 @@ namespace BotSharp.Abstraction.Conversations; public interface IConversationStorage { void InitStorage(string conversationId); - void Append(string conversationId, Agent agent, RoleDialogModel dialog); + void Append(string conversationId, string agentId, RoleDialogModel dialog); List GetDialogs(string conversationId); } diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentHookBase.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentHookBase.cs index 88e3ec1f..0a9e2668 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentHookBase.cs +++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentHookBase.cs @@ -1,7 +1,6 @@ using BotSharp.Abstraction.Agents.Models; using BotSharp.Abstraction.Conversations.Models; using Fluid; -using Microsoft.AspNetCore.Mvc; namespace BotSharp.Core.Agents.Services; diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs index 7bf27a44..420784c3 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs +++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs @@ -40,20 +40,11 @@ public partial class AgentService { profile.Samples = File.ReadAllText(samplesFile); } - else - { - _logger.LogWarning($"Can't find samples file from {samplesFile}"); - } - var functionsFile = Path.Combine(dir, "functions.json"); if (File.Exists(functionsFile)) { profile.Functions = File.ReadAllText(functionsFile); } - else - { - _logger.LogInformation($"Can't find functions file from {functionsFile}"); - } return profile; } diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj index c3a188fd..6b4b0970 100644 --- a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj +++ b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj @@ -77,9 +77,7 @@ - - diff --git a/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs b/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs index c746438e..4607086a 100644 --- a/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs +++ b/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs @@ -1,3 +1,5 @@ +using BotSharp.Abstraction.Functions; +using BotSharp.Core.Functions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; @@ -35,6 +37,8 @@ public static class BotSharpServiceCollectionExtensions services.AddScoped(); + services.AddScoped(); + return services; } diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs index 78516b22..b5e351e6 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs +++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs @@ -1,5 +1,3 @@ -using Amazon.SecurityToken.Model.Internal.MarshallTransformations; -using BotSharp.Abstraction.Agents.Enums; using BotSharp.Abstraction.Agents.Models; using BotSharp.Abstraction.Conversations.Models; using BotSharp.Abstraction.Functions; @@ -98,8 +96,10 @@ public class ConversationService : IConversationService var router = _services.GetRequiredService(); var agent = await router.LoadCurrentAgent(); + _logger.LogInformation($"[{agent.Name}] {lastDialog.Role}: {lastDialog.Content}"); + lastDialog.CurrentAgentId = agent.Id; - _storage.Append(conversationId, agent, lastDialog); + _storage.Append(conversationId, agent.Id, lastDialog); var wholeDialogs = GetDialogHistory(conversationId); @@ -149,28 +149,29 @@ public class ConversationService : IConversationService await HandleAssistantMessage(msg, onMessageReceived); // Add to dialog history - _storage.Append(conversationId, agent, msg); + _storage.Append(conversationId, agent.Id, msg); }, async fn => { var preAgentId = agent.Id; await HandleFunctionMessage(fn, onFunctionExecuting); + fn.Content = fn.ExecutionResult; + // Agent has been transferred if (fn.CurrentAgentId != preAgentId) { + var agentSettings = _services.GetRequiredService(); var agentService = _services.GetRequiredService(); agent = await agentService.LoadAgent(fn.CurrentAgentId); // Set state to make next conversation will go to this agent directly - var state = _services.GetRequiredService(); - state.SetState("agentId", fn.CurrentAgentId); + // var state = _services.GetRequiredService(); + // state.SetState("agentId", fn.CurrentAgentId); } - fn.Content = fn.ExecutionResult; - // Add to dialog history - _storage.Append(conversationId, agent, fn); + _storage.Append(conversationId, preAgentId, fn); // After function is executed, pass the result to LLM to get a natural response wholeDialogs.Add(fn); diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs index 38097106..8e0b08dd 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs +++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs @@ -1,5 +1,4 @@ using BotSharp.Abstraction.Agents.Enums; -using BotSharp.Abstraction.Agents.Models; using BotSharp.Abstraction.Conversations.Models; using System.IO; @@ -8,12 +7,14 @@ namespace BotSharp.Core.Conversations.Services; public class ConversationStorage : IConversationStorage { private readonly MyDatabaseSettings _dbSettings; - public ConversationStorage(MyDatabaseSettings dbSettings) + private readonly IServiceProvider _services; + public ConversationStorage(MyDatabaseSettings dbSettings, IServiceProvider services) { _dbSettings = dbSettings; + _services = services; } - public void Append(string conversationId, Agent agent, RoleDialogModel dialog) + public void Append(string conversationId, string agentId, RoleDialogModel dialog) { var conversationFile = GetStorageFile(conversationId); var sb = new StringBuilder(); @@ -22,7 +23,7 @@ public class ConversationStorage : IConversationStorage { var args = dialog.FunctionArgs.Replace("\r", " ").Replace("\n", " ").Trim(); - sb.AppendLine($"{dialog.CreatedAt}|{dialog.Role}|{agent.Name}|{dialog.FunctionName}|{args}"); + sb.AppendLine($"{dialog.CreatedAt}|{dialog.Role}|{agentId}|{dialog.FunctionName}|{args}"); var content = dialog.ExecutionResult.Replace("\r", " ").Replace("\n", " ").Trim(); if (string.IsNullOrEmpty(content)) @@ -31,19 +32,12 @@ public class ConversationStorage : IConversationStorage } sb.AppendLine($" - {content}"); } - else if (dialog.Role == AgentRole.Assistant) - { - sb.AppendLine($"{dialog.CreatedAt}|{dialog.Role}|{agent.Name}||"); - var content = dialog.Content.Replace("\r", " ").Replace("\n", " ").Trim(); - if (string.IsNullOrEmpty(content)) - { - return; - } - sb.AppendLine($" - {content}"); - } else { - sb.AppendLine($"{dialog.CreatedAt}|{dialog.Role}|{agent.Name}||"); + var db = _services.GetRequiredService(); + var agent = db.Agent.First(x => x.Id == agentId); + + sb.AppendLine($"{dialog.CreatedAt}|{dialog.Role}|{agentId}|{agent.Name}|"); var content = dialog.Content.Replace("\r", " ").Replace("\n", " ").Trim(); if (string.IsNullOrEmpty(content)) { diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/ConversationCreationModel.cs b/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/ConversationCreationModel.cs deleted file mode 100644 index 300254a3..00000000 --- a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/ConversationCreationModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace BotSharp.Core.Conversations.ViewModels; - -public class ConversationCreationModel -{ - -} diff --git a/src/Infrastructure/BotSharp.Core/Functions/GoToRouterFn.cs b/src/Infrastructure/BotSharp.Core/Functions/GoToRouterFn.cs new file mode 100644 index 00000000..e7a3455a --- /dev/null +++ b/src/Infrastructure/BotSharp.Core/Functions/GoToRouterFn.cs @@ -0,0 +1,27 @@ +using BotSharp.Abstraction.Conversations.Models; +using BotSharp.Abstraction.Functions; +using BotSharp.Abstraction.Functions.Models; + +namespace BotSharp.Core.Functions; + +public class GoToRouterFn : IFunctionCallback +{ + public string Name => "go_to_router"; + private readonly IServiceProvider _services; + + public GoToRouterFn(IServiceProvider services) + { + _services = services; + } + + public async Task Execute(RoleDialogModel message) + { + var settings = _services.GetRequiredService(); + message.CurrentAgentId = settings.RouterId; + + var result = new FunctionExecutionValidationResult("true"); + message.ExecutionResult = JsonSerializer.Serialize(result); + + return true; + } +} diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj new file mode 100644 index 00000000..ef6a4193 --- /dev/null +++ b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj @@ -0,0 +1,19 @@ + + + + net6.0 + enable + enable + 0.8.0 + + + + + + + + + + + + diff --git a/src/Infrastructure/BotSharp.Core/Agents/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs similarity index 87% rename from src/Infrastructure/BotSharp.Core/Agents/AgentController.cs rename to src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs index 3e17e193..fb19ac5a 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/AgentController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs @@ -1,9 +1,7 @@ using BotSharp.Abstraction.ApiAdapters; -using BotSharp.Core.Agents.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; +using BotSharp.OpenAPI.ViewModels.Agents; -namespace BotSharp.Core.Agents; +namespace BotSharp.OpenAPI.Controllers; [Authorize] [ApiController] diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs similarity index 95% rename from src/Infrastructure/BotSharp.Core/Conversations/ConversationController.cs rename to src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs index 8a26a569..dab95e50 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/ConversationController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs @@ -1,10 +1,10 @@ using BotSharp.Abstraction.ApiAdapters; using BotSharp.Abstraction.Conversations.Models; -using BotSharp.Core.Conversations.ViewModels; +using BotSharp.OpenAPI.ViewModels.Conversations; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace BotSharp.Core.Conversations; +namespace BotSharp.OpenAPI.Controllers; [Authorize] [ApiController] diff --git a/src/Infrastructure/BotSharp.Core/Plugins/Knowledges/KnowledgeController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeController.cs similarity index 94% rename from src/Infrastructure/BotSharp.Core/Plugins/Knowledges/KnowledgeController.cs rename to src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeController.cs index d990e41d..4d63885e 100644 --- a/src/Infrastructure/BotSharp.Core/Plugins/Knowledges/KnowledgeController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeController.cs @@ -1,13 +1,10 @@ using BotSharp.Abstraction.ApiAdapters; using BotSharp.Abstraction.Knowledges.Models; -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using System.IO; using UglyToad.PdfPig.Content; using UglyToad.PdfPig; -namespace BotSharp.Core.Plugins.Knowledges; +namespace BotSharp.OpenAPI.Controllers; [Authorize] [ApiController] diff --git a/src/Infrastructure/BotSharp.Core/Users/UserController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs similarity index 88% rename from src/Infrastructure/BotSharp.Core/Users/UserController.cs rename to src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs index c03d82bc..1952c9c1 100644 --- a/src/Infrastructure/BotSharp.Core/Users/UserController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs @@ -1,10 +1,8 @@ using BotSharp.Abstraction.ApiAdapters; using BotSharp.Abstraction.Users.Models; -using BotSharp.Core.Users.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; +using BotSharp.OpenAPI.ViewModels.Users; -namespace BotSharp.Core.Users; +namespace BotSharp.OpenAPI.Controllers; [Authorize] [ApiController] diff --git a/src/Infrastructure/BotSharp.OpenAPI/Using.cs b/src/Infrastructure/BotSharp.OpenAPI/Using.cs new file mode 100644 index 00000000..75f7274b --- /dev/null +++ b/src/Infrastructure/BotSharp.OpenAPI/Using.cs @@ -0,0 +1,18 @@ +global using System; +global using System.Collections.Generic; +global using System.Text; +global using System.Threading.Tasks; +global using System.Linq; +global using System.Text.Json; +global using Microsoft.AspNetCore.Authorization; +global using Microsoft.AspNetCore.Mvc; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Logging; +global using BotSharp.Abstraction.Plugins; +global using BotSharp.Abstraction.Agents; +global using BotSharp.Abstraction.Conversations; +global using BotSharp.Abstraction.Knowledges; +global using BotSharp.Abstraction.Users; +global using BotSharp.Abstraction.Utilities; +global using BotSharp.Abstraction.Agents.Settings; +global using BotSharp.Abstraction.Conversations.Settings; \ No newline at end of file diff --git a/src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentCreationModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs similarity index 59% rename from src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentCreationModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs index 00bd7d92..f8fead86 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentCreationModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs @@ -1,6 +1,6 @@ using BotSharp.Abstraction.Agents.Models; -namespace BotSharp.Core.Agents.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Agents; public class AgentCreationModel { @@ -9,10 +9,10 @@ public class AgentCreationModel public Agent ToAgent() { - return new Agent - { - Name = Name, - Description = Description + return new Agent + { + Name = Name, + Description = Description }; } } diff --git a/src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentUpdateModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs similarity index 95% rename from src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentUpdateModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs index 5b519953..1a87a2d7 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentUpdateModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs @@ -1,6 +1,6 @@ using BotSharp.Abstraction.Agents.Models; -namespace BotSharp.Core.Agents.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Agents; public class AgentUpdateModel { diff --git a/src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs similarity index 91% rename from src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentViewModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs index 1115d582..5a2b8969 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/ViewModels/AgentViewModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs @@ -1,6 +1,6 @@ using BotSharp.Abstraction.Agents.Models; -namespace BotSharp.Core.Agents.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Agents; public class AgentViewModel { diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ConversationCreationModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ConversationCreationModel.cs new file mode 100644 index 00000000..645de634 --- /dev/null +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ConversationCreationModel.cs @@ -0,0 +1,6 @@ +namespace BotSharp.OpenAPI.ViewModels.Conversations; + +public class ConversationCreationModel +{ + +} diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/ConversationViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ConversationViewModel.cs similarity index 92% rename from src/Infrastructure/BotSharp.Core/Conversations/ViewModels/ConversationViewModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ConversationViewModel.cs index 3289a1d5..f47c5cd6 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/ConversationViewModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ConversationViewModel.cs @@ -1,6 +1,6 @@ using BotSharp.Abstraction.Conversations.Models; -namespace BotSharp.Core.Conversations.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Conversations; public class ConversationViewModel { diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/MessageResponseModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs similarity index 58% rename from src/Infrastructure/BotSharp.Core/Conversations/ViewModels/MessageResponseModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs index 68f58a5f..b6a6e1e4 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/MessageResponseModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs @@ -1,4 +1,4 @@ -namespace BotSharp.Core.Conversations.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Conversations; public class MessageResponseModel { diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/NewMessageModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/NewMessageModel.cs similarity index 57% rename from src/Infrastructure/BotSharp.Core/Conversations/ViewModels/NewMessageModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/NewMessageModel.cs index 714f3500..45716e21 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/NewMessageModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/NewMessageModel.cs @@ -1,4 +1,4 @@ -namespace BotSharp.Core.Conversations.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Conversations; public class NewMessageModel { diff --git a/src/Infrastructure/BotSharp.Core/Users/ViewModels/UserCreationModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserCreationModel.cs similarity index 91% rename from src/Infrastructure/BotSharp.Core/Users/ViewModels/UserCreationModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserCreationModel.cs index 23aa7e08..76fdb443 100644 --- a/src/Infrastructure/BotSharp.Core/Users/ViewModels/UserCreationModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserCreationModel.cs @@ -1,6 +1,6 @@ using BotSharp.Abstraction.Users.Models; -namespace BotSharp.Core.Users.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Users; public class UserCreationModel { diff --git a/src/Infrastructure/BotSharp.Core/Users/ViewModels/UserViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserViewModel.cs similarity index 91% rename from src/Infrastructure/BotSharp.Core/Users/ViewModels/UserViewModel.cs rename to src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserViewModel.cs index ecb2c16b..4e452334 100644 --- a/src/Infrastructure/BotSharp.Core/Users/ViewModels/UserViewModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserViewModel.cs @@ -1,6 +1,6 @@ using BotSharp.Abstraction.Users.Models; -namespace BotSharp.Core.Users.ViewModels; +namespace BotSharp.OpenAPI.ViewModels.Users; public class UserViewModel { diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj index 41765502..d03a2f39 100644 --- a/src/WebStarter/WebStarter.csproj +++ b/src/WebStarter/WebStarter.csproj @@ -35,6 +35,7 @@ +