cartaid/shopping-assistant-api
1
0
Fork 0
mirror of https://github.com/Shchoholiev/shopping-assistant-api.git synced 2025-04-04 16:49:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

SA-29 open ai service fixed and developed

Browse Source
This commit is contained in:
Mykhailo Bilodid 2023-10-22 21:40:03 +03:00
parent 2b9453b09f
commit 5ddd5c9ada
7 changed files with 194 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs
View File

@ -1,4 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using ShoppingAssistantApi.Application.IServices;
using ShoppingAssistantApi.Application.Models.OpenAi;
using ShoppingAssistantApi.Domain.Enums;
namespace ShoppingAssistantApi.Api.Controllers;
[ApiController]
@ -12,8 +15,11 @@ public class WeatherForecastController : ControllerBase
private readonly ILogger<WeatherForecastController> _logger;
public WeatherForecastController(ILogger<WeatherForecastController> logger)
private readonly IOpenAiService _openAiService;
public WeatherForecastController(ILogger<WeatherForecastController> logger, IOpenAiService openAiService)
{
_openAiService = openAiService;
_logger = logger;
}
@ -28,4 +34,60 @@ public class WeatherForecastController : ControllerBase
})
.ToArray();
}
}
[HttpPost("open-ai-test-simple")]
public async Task<OpenAiMessage> OpenAiTest(string text)
{
return await _openAiService.GetChatCompletion(new ChatCompletionRequest
{
Messages = new List<OpenAiMessage>
{
new OpenAiMessage
{
Role = OpenAiRole.System.RequestConvert(),
Content = "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:\n[Question] - return question. Each question must have suggestions.\n[Options] - return semicolon separated suggestion how to answer to a question\n[Message] - return text\n[Products] - return semicolon separated product names"
},
new OpenAiMessage
{
Role = OpenAiRole.Assistant.RequestConvert(),
Content = "[Question] What are you looking for?\n[Options] Bicycle, Laptop"
},
new OpenAiMessage
{
Role = OpenAiRole.User.RequestConvert(),
Content = text
}
}
}, CancellationToken.None);
}
[HttpPost("open-ai-test-streamed")]
public IAsyncEnumerable<string> OpenAiTestStrean(string text)
{
return _openAiService.GetChatCompletionStream(new ChatCompletionRequest
{
Messages = new List<OpenAiMessage>
{
new OpenAiMessage
{
Role = OpenAiRole.System.RequestConvert(),
Content = "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:\n[Question] - return question. Each question must have suggestions.\n[Options] - return semicolon separated suggestion how to answer to a question\n[Message] - return text\n[Products] - return semicolon separated product names"
},
new OpenAiMessage
{
Role = OpenAiRole.Assistant.RequestConvert(),
Content = "[Question] What are you looking for?\n[Options] Bicycle, Laptop"
},
new OpenAiMessage
{
Role = OpenAiRole.User.RequestConvert(),
Content = text
}
}
}, CancellationToken.None);
}
}

1
ShoppingAssistantApi.Api/Program.cs
View File

@ -12,6 +12,7 @@ builder.Services.AddJWTTokenAuthentication(builder.Configuration);
builder.Services.AddMapper();
builder.Services.AddInfrastructure();
builder.Services.AddServices();
builder.Services.AddOpenAiHttpClient(builder.Configuration);
builder.Services.AddGraphQl();
builder.Services.AddControllers();

2
ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs
View File

@ -4,7 +4,7 @@ namespace ShoppingAssistantApi.Application.Models.OpenAi;
public class OpenAiMessage
{
public OpenAiRole Role { get; set; }
public string Role { get; set; }
public string Content { get; set; }
}

18
ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs
View File

@ -6,3 +6,21 @@ public enum OpenAiRole
User,
Assistant
}
public static class OpenAiRoleExtensions
{
public static string RequestConvert(this OpenAiRole role)
{
switch (role)
{
case OpenAiRole.System:
return "system";
case OpenAiRole.Assistant:
return "assistant";
case OpenAiRole.User:
return "user";
default:
return "";
}
}
}

19
ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs
View File

@ -1,8 +1,10 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using ShoppingAssistantApi.Application.IServices;
using ShoppingAssistantApi.Application.IServices.Identity;
using ShoppingAssistantApi.Infrastructure.Services;
using ShoppingAssistantApi.Infrastructure.Services.Identity;
using System.Net.Http.Headers;
namespace ShoppingAssistantApi.Infrastructure.InfrastructureExtentions;
public static class ServicesExtention
@ -15,6 +17,21 @@ public static class ServicesExtention
services.AddScoped<ITokensService, TokensService>();
services.AddScoped<IUsersService, UsersService>();
services.AddScoped<IWishlistsService, WishlistsService>();
services.AddScoped<IOpenAiService, OpenAiService>();
return services;
}
public static IServiceCollection AddOpenAiHttpClient(this IServiceCollection services, IConfiguration configuration)
{
services.AddHttpClient(
"OpenAiHttpClient",
client =>
{
client.BaseAddress = new Uri(configuration.GetValue<string>("OpenAi:OpenAiApiUri"));
client.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue("Bearer", configuration.GetValue<string>("OpenAi:OpenAiApiKey"));
});
return services;
}

52
ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs
View File

@ -1,8 +1,8 @@
using System;
using System.IO;
using System.Net.Http.Headers;
using System.Text;
using MongoDB.Bson;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using ShoppingAssistantApi.Application.IServices;
using ShoppingAssistantApi.Application.Models.OpenAi;
@ -23,21 +23,18 @@ public class OpenAiService : IOpenAiService
private readonly HttpClient _httpClient;
public OpenAiService(HttpClient client)
public OpenAiService(IHttpClientFactory httpClientFactory)
{
_httpClient = client;
_httpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue("Bearer", "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");
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
_httpClient = httpClientFactory.CreateClient("OpenAiHttpClient");
}
public async Task<OpenAiMessage> GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken)
{
chat.Stream = false;
var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings);
var body = new StringContent(jsonBody, Encoding.UTF8, /*change file appsettings.Develop.json*/"application/json");
var body = new StringContent(jsonBody, Encoding.UTF8, "application/json");
using var httpResponse = await _httpClient.PostAsync(/*api url*/"https://api.openai.com/v1/completions", body, cancellationToken);
using var httpResponse = await _httpClient.PostAsync("", body, cancellationToken);
var responseBody = await httpResponse.Content.ReadAsStringAsync(cancellationToken);
@ -52,28 +49,23 @@ public class OpenAiService : IOpenAiService
var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings);
var body = new StringContent(jsonBody, Encoding.UTF8, "application/json");
var request = new HttpRequestMessage(HttpMethod.Post, "https://api.openai.com/v1/completions")
using var httpResponse = await _httpClient.PostAsync("", body, cancellationToken);
using var responseStream = await httpResponse.Content.ReadAsStreamAsync(cancellationToken);
using var reader = new StreamReader(responseStream, Encoding.UTF8);
while (!cancellationToken.IsCancellationRequested)
{
Content = body
};
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream"));
using var httpResponse = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
var allData = string.Empty;
using var streamReader = new StreamReader(await httpResponse.Content.ReadAsStringAsync(cancellationToken));
while(!streamReader.EndOfStream)
{
var line = await streamReader.ReadLineAsync();
allData += line + "\n\n";
if (string.IsNullOrEmpty(line)) continue;
var json = line?.Substring(6, line.Length - 6);
if (json == "[DONE]") yield break;
var OpenAiResponse = JsonConvert.DeserializeObject<string>(json, _jsonSettings);
yield return OpenAiResponse;
var jsonChunk = await reader.ReadLineAsync();
if (jsonChunk.StartsWith("data: "))
{
jsonChunk = jsonChunk.Substring("data: ".Length);
if (jsonChunk == "[DONE]") break;
var data = JsonConvert.DeserializeObject<OpenAiResponse>(jsonChunk);
if (data.Choices[0].Delta.Content == "" || data.Choices[0].Delta.Content == null) continue;
yield return data.Choices[0].Delta.Content;
}
}
}
}

130
ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs
View File

@ -14,73 +14,83 @@ public class OpenAiServiceTests
private readonly Mock<HttpMessageHandler> _mockHttpMessageHandler;
private readonly HttpClient _httpClient;
private readonly Mock<IHttpClientFactory> _mockHttpClientFactory;
public OpenAiServiceTests()
{
// Mock any dependencies
_mockHttpClientFactory = new Mock<IHttpClientFactory>();
_mockHttpMessageHandler = new Mock<HttpMessageHandler>();
_httpClient = new HttpClient(_mockHttpMessageHandler.Object);
_openAiService = new OpenAiService(_httpClient);
var client = new HttpClient(_mockHttpMessageHandler.Object);
client.BaseAddress = new Uri("https://www.google.com.ua/");
_mockHttpClientFactory
.Setup(factory => factory.CreateClient(It.IsAny<string>()))
.Returns(() =>
{
return client;
});
_openAiService = new OpenAiService(_mockHttpClientFactory.Object);
}
//[Fact]
//public async Task GetChatCompletion_ValidChat_ReturnsNewMessage()
//{
// // Arrange
// _mockHttpMessageHandler
// .Protected()
// .Setup<Task<HttpResponseMessage>>(
// "SendAsync",
// ItExpr.IsAny<HttpRequestMessage>(),
// ItExpr.IsAny<CancellationToken>()
// )
// .ReturnsAsync(new HttpResponseMessage
// {
// StatusCode = HttpStatusCode.OK,
// Content = new StringContent(@"
// {
// ""id"": ""chatcmpl-89OMdgTZXOLAXv7bPUJ4SwrPpS5Md"",
// ""object"": ""chat.completion"",
// ""created"": 1697249299,
// ""model"": ""gpt-3.5-turbo-0613"",
// ""choices"": [
// {
// ""index"": 0,
// ""message"": {
// ""role"": ""assistant"",
// ""content"": ""Hello World!""
// },
// ""finish_reason"": ""stop""
// }
// ],
// ""usage"": {
// ""prompt_tokens"": 10,
// ""completion_tokens"": 3,
// ""total_tokens"": 13
// }
// }"),
// });
// var chat = new ChatCompletionRequest
// {
// Messages = new List<OpenAiMessage>
// {
// new OpenAiMessage
// {
// Role = OpenAiRole.User,
// Content = "Return Hello World!"
// }
// }
// };
[Fact]
public async Task GetChatCompletion_ValidChat_ReturnsNewMessage()
{
// Arrange
_mockHttpMessageHandler
.Protected()
.Setup<Task<HttpResponseMessage>>(
"SendAsync",
ItExpr.IsAny<HttpRequestMessage>(),
ItExpr.IsAny<CancellationToken>()
)
.ReturnsAsync(new HttpResponseMessage
{
StatusCode = HttpStatusCode.OK,
Content = new StringContent(@"
{
""id"": ""chatcmpl-89OMdgTZXOLAXv7bPUJ4SwrPpS5Md"",
""object"": ""chat.completion"",
""created"": 1697249299,
""model"": ""gpt-3.5-turbo-0613"",
""choices"": [
{
""index"": 0,
""message"": {
""role"": ""assistant"",
""content"": ""Hello, World!""
},
""finish_reason"": ""stop""
}
],
""usage"": {
""prompt_tokens"": 10,
""completion_tokens"": 3,
""total_tokens"": 13
}
}"),
});
// // Act
// var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None);
var chat = new ChatCompletionRequest
{
Messages = new List<OpenAiMessage>
{
new OpenAiMessage
{
Role = OpenAiRole.User.RequestConvert(),
Content = "Return Hello World!"
}
}
};
// // Assert
// Assert.NotNull(newMessage);
// Assert.Equal("Hello World!", newMessage.Content);
//}
// Act
var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None);
// Assert
Assert.NotNull(newMessage);
Assert.Equal("Hello, World!", newMessage.Content);
}
// TODO: Add more tests
@ -128,7 +138,7 @@ public class OpenAiServiceTests
{
new OpenAiMessage
{
Role = OpenAiRole.User,
Role = OpenAiRole.User.RequestConvert(),
Content = "Return Hello World!"
}
}