e95ed36647
Phases 1-10 of the planned refactoring:
Phase 1: rename shared-models -> common
- namespace Shared.Models -> Common throughout
- remove stale AspNetCore.Http.Features 5.0 reference
Phase 2: create shared-data with abstract BaseEntity
- BaseEntity: required string Id { get; init; } + DateTime CreatedAt { get; init; }
Phase 3: rename myai-models -> myai-data
- namespace MyAi.Models -> MyAi.Data
- MigrationsAssembly("myai-data")
Phase 4: rename cv-search-models -> cv-search-data
- namespace CvSearch.Models -> CvSearch.Data
- move JobSearchSettings to cv-matcher-api-models
- JobSearch*Entity now inherits BaseEntity
Phase 5: extract rag-data from rag-api
- new project: Apis/rag-data with RagDbContext + entities + migrations
- RagDocumentEntity inherits BaseEntity; cache entities use CacheKey PK
- fix duplicate AddHttpClient<RagAiClient>/AddScoped registrations in rag-api
- MigrationsAssembly("rag-data")
Phase 6: extract cv-matcher-data from cv-matcher-api
- new project: Apis/cv-matcher-data with CvMatcherDbContext + entities + migrations
- CvMatchResultEntity inherits BaseEntity; CvMatcherChatCacheEntity uses CacheKey PK
- MigrationsAssembly("cv-matcher-data")
Phase 7: create empty cv-cleanup-job-models and cv-search-job-models
Phase 8: update all 5 Dockerfiles for renamed/new projects
Phase 9: reorganise .sln virtual folders (Apis/Jobs/Models/Data/Helpers)
- update root CLAUDE.md with new project taxonomy and migration commands
- update cv-matcher-api/CLAUDE.md and cv-search-job/CLAUDE.md
Phase 10: add Directory.Packages.props for centralised NuGet versions
- remove Version= from all PackageReference elements in active .csproj files
No database changes. No runtime behaviour changes.
All MigrationId strings in __EFMigrationsHistory are unaffected.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
98 lines
4.7 KiB
C#
98 lines
4.7 KiB
C#
using System.Net.Http.Headers;
|
|
using System.Text;
|
|
using System.Text.Json;
|
|
using System.Text.Json.Serialization;
|
|
using Api.Clients.Ai.Contracts;
|
|
using CvMatcher.Data.Repositories.Contracts;
|
|
using CommonHelpers;
|
|
using CvMatcher.Models.Settings;
|
|
using Microsoft.Extensions.Options;
|
|
|
|
namespace Api.Clients.Ai;
|
|
|
|
public sealed class MatcherAiClient : IMatcherAiClient
|
|
{
|
|
private readonly HttpClient _http;
|
|
private readonly IMatcherRepository _repository;
|
|
private readonly AiSettings _settings;
|
|
private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web)
|
|
{
|
|
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
|
|
};
|
|
|
|
public MatcherAiClient(HttpClient http, IMatcherRepository repository, IOptions<AiSettings> options)
|
|
{
|
|
_http = http;
|
|
_repository = repository;
|
|
_settings = options.Value;
|
|
}
|
|
|
|
public async Task<string> CreateChatCompletionAsync(string systemPrompt, string userPrompt, decimal temperature, CancellationToken ct)
|
|
{
|
|
var model = GetModel();
|
|
var cacheKey = HashHelper.Compute($"chat:{_settings.Provider}:{model}:{temperature:0.00}:{systemPrompt}:{userPrompt}");
|
|
var cached = await _repository.GetChatCompletionAsync(cacheKey, ct);
|
|
if (cached is not null) return cached;
|
|
|
|
var response = IsOllama()
|
|
? await CreateOllamaChatCompletionAsync(systemPrompt, userPrompt, temperature, ct)
|
|
: await CreateOpenAiChatCompletionAsync(systemPrompt, userPrompt, temperature, ct);
|
|
|
|
await _repository.SaveChatCompletionAsync(cacheKey, model, temperature, response, ct);
|
|
return response;
|
|
}
|
|
|
|
private bool IsOllama() => string.Equals(_settings.Provider, "Ollama", StringComparison.OrdinalIgnoreCase);
|
|
private string GetModel() => IsOllama() ? _settings.Ollama.ChatModel : _settings.OpenAI.ChatModel;
|
|
|
|
private async Task<string> CreateOpenAiChatCompletionAsync(string systemPrompt, string userPrompt, decimal temperature, CancellationToken ct)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(_settings.OpenAI.ApiKey)) throw new InvalidOperationException("OpenAI API key is missing.");
|
|
using var request = new HttpRequestMessage(HttpMethod.Post, "https://api.openai.com/v1/chat/completions");
|
|
request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _settings.OpenAI.ApiKey);
|
|
request.Content = ToJson(new
|
|
{
|
|
model = _settings.OpenAI.ChatModel,
|
|
temperature,
|
|
response_format = new { type = "json_object" },
|
|
messages = new[]
|
|
{
|
|
new { role = "system", content = systemPrompt },
|
|
new { role = "user", content = userPrompt }
|
|
}
|
|
});
|
|
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
|
|
cts.CancelAfter(TimeSpan.FromSeconds(Math.Max(15, _settings.OpenAI.TimeoutSeconds)));
|
|
using var response = await _http.SendAsync(request, cts.Token);
|
|
var json = await response.Content.ReadAsStringAsync(cts.Token);
|
|
if (!response.IsSuccessStatusCode) throw new InvalidOperationException($"OpenAI chat failed: {(int)response.StatusCode} {json}");
|
|
using var doc = JsonDocument.Parse(json);
|
|
return doc.RootElement.GetProperty("choices")[0].GetProperty("message").GetProperty("content").GetString() ?? "{}";
|
|
}
|
|
|
|
private async Task<string> CreateOllamaChatCompletionAsync(string systemPrompt, string userPrompt, decimal temperature, CancellationToken ct)
|
|
{
|
|
var baseUrl = _settings.Ollama.BaseUrl.TrimEnd('/');
|
|
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
|
|
cts.CancelAfter(TimeSpan.FromSeconds(Math.Max(30, _settings.Ollama.TimeoutSeconds)));
|
|
using var response = await _http.PostAsync($"{baseUrl}/api/chat", ToJson(new
|
|
{
|
|
model = _settings.Ollama.ChatModel,
|
|
stream = false,
|
|
format = "json",
|
|
messages = new[]
|
|
{
|
|
new { role = "system", content = systemPrompt },
|
|
new { role = "user", content = userPrompt }
|
|
},
|
|
options = new { temperature = (float)temperature }
|
|
}), cts.Token);
|
|
var json = await response.Content.ReadAsStringAsync(cts.Token);
|
|
if (!response.IsSuccessStatusCode) throw new InvalidOperationException($"Ollama chat failed: {(int)response.StatusCode} {json}");
|
|
using var doc = JsonDocument.Parse(json);
|
|
return doc.RootElement.GetProperty("message").GetProperty("content").GetString() ?? "{}";
|
|
}
|
|
|
|
private static StringContent ToJson<T>(T payload) => new(JsonSerializer.Serialize(payload, JsonOptions), Encoding.UTF8, "application/json");
|
|
}
|