From 51aca2e2707261c3c5afaab875b960cddb7a7450 Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 26 Oct 2023 12:57:52 +0300 Subject: [PATCH] made a fix for the pr --- .../Mutations/ProductMutation.cs | 12 ---- .../Queries/ProductQuery.cs | 11 ---- .../Services/ProductService.cs | 65 +++++++------------ .../TestExtentions/DbInitializer.cs | 8 +++ .../ProductTests.cs | 27 +++++++- 5 files changed, 56 insertions(+), 67 deletions(-) delete mode 100644 ShoppingAssistantApi.Api/Mutations/ProductMutation.cs delete mode 100644 ShoppingAssistantApi.Api/Queries/ProductQuery.cs diff --git a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs b/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs deleted file mode 100644 index f4598a5..0000000 --- a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Application.Models.Dtos; -using ShoppingAssistantApi.Application.Models.ProductSearch; -using ShoppingAssistantApi.Domain.Entities; -using ShoppingAssistantApi.Infrastructure.Services; - -namespace ShoppingAssistantApi.Api.Mutations; - -[ExtendObjectType(OperationTypeNames.Mutation)] -public class ProductMutation -{ -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs deleted file mode 100644 index b76586b..0000000 --- a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs +++ /dev/null @@ -1,11 +0,0 @@ -using HotChocolate.Authorization; -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Domain.Entities; - -namespace ShoppingAssistantApi.Api.Queries; - -[ExtendObjectType(OperationTypeNames.Query)] -public class ProductQuery -{ - -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index e2daa83..32fb2fc 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -29,8 +29,6 @@ public class ProductService : IProductService public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - string firstMessageForUser = "What are you looking for?"; - string promptForGpt = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + "\nYou must return data with one of the prefixes:" + @@ -39,56 +37,43 @@ public class ProductService : IProductService "\n[Message] - return text" + "\n[Products] - return semicolon separated product names"; - var isFirstMessage = await _messagesRepository.GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); + var countOfMessage = await _messagesRepository + .GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); - var chatRequest = new ChatCompletionRequest(); - - if (isFirstMessage==0) + var previousMessages = await _wishlistsService + .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken); + + var chatRequest = new ChatCompletionRequest { - chatRequest = new ChatCompletionRequest + Messages = new List { - Messages = new List + new OpenAiMessage { - new OpenAiMessage - { - Role = OpenAiRole.System.ToString().ToLower(), - Content = promptForGpt - }, - - new OpenAiMessage() - { - Role = OpenAiRole.System.ToString().ToLower(), - Content = firstMessageForUser - } - }, - Stream = true - }; - - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() - { - Text = firstMessageForUser, - }, cancellationToken); - + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.System), + Content = promptForGpt + } + } + }; + + if (countOfMessage==1) + { yield return new ServerSentEvent { Event = SearchEventType.Message, - Data = firstMessageForUser + Data = previousMessages.Items.FirstOrDefault()?.Text }; - } - if(isFirstMessage!=0) + if(countOfMessage>1) { - var previousMessages = _wishlistsService - .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 50, cancellationToken).Result.Items.ToList(); - var messagesForOpenAI = new List(); messagesForOpenAI.Add(new OpenAiMessage() { - Role = OpenAiRole.System.ToString().ToLower(), + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.System), Content = promptForGpt }); - foreach (var item in previousMessages ) + + foreach (var item in previousMessages.Items) { messagesForOpenAI.Add( new OpenAiMessage() @@ -100,15 +85,11 @@ public class ProductService : IProductService messagesForOpenAI.Add(new OpenAiMessage() { - Role = MessageRoles.User.ToString().ToLower(), + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.User), Content = message.Text }); - chatRequest = new ChatCompletionRequest - { - Messages = messagesForOpenAI, - Stream = true - }; + chatRequest.Messages.AddRange(messagesForOpenAI); var suggestionBuffer = new Suggestion(); var messageBuffer = new MessagePart(); diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index a89df14..f66a9b1 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -239,6 +239,14 @@ public class DbInitializer CreatedById = user2.Id, CreatedDateUtc = DateTime.UtcNow }, + new Message + { + Text = "What are you looking for?", + Role = "system", + WishlistId = wishlistId3, + CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow + }, }; await messagesCollection.InsertManyAsync(messages); diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index f480031..8a6fb99 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -56,11 +56,35 @@ public class ProductTests .Returns(expectedSseData.ToAsyncEnumerable()); _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) - .ReturnsAsync(0); + .ReturnsAsync(1); _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) .Verifiable(); + _wishListServiceMock + .Setup(m => m.GetMessagesPageFromPersonalWishlistAsync( + It.IsAny(), // Очікуваний параметр wishlistId + It.IsAny(), // Очікуваний параметр pageNumber + It.IsAny(), // Очікуваний параметр pageSize + It.IsAny()) // Очікуваний параметр cancellationToken + ) + .ReturnsAsync(new PagedList( + new List + { + new MessageDto + { + Text = "What are you looking for?", + Id = "3", + CreatedById = "User2", + Role = "User" + }, + + }, + 1, + 1, + 1 + )); + // Act var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); @@ -81,7 +105,6 @@ public class ProductTests // Check if the actual SSE events match the expected SSE events Assert.NotNull(actualSseEvents); Assert.Equal(expectedMessages, receivedMessages); - _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken), Times.Once); }