Changes

api/Controllers/RagController.cs

@@ -1,3 +1,4 @@
+using api.Services.Contracts.Rag;
 using Api.Models.Rag;
 using Api.Services.Rag;
 using Microsoft.AspNetCore.Mvc;

api/Program.cs

@@ -1,5 +1,8 @@
+using api.Services.Contracts.Rag;
 using Api.Services;
 using Api.Services.Contracts;
+using Api.Services.Contracts.Rag;
+using Api.Services.Rag;
 using Api.Settings;
 using Azure.Identity;
 using Microsoft.AspNetCore.HttpOverrides;
@@ -82,12 +85,12 @@ try
     builder.Services.AddHttpClient<ICaptchaVerifier, RecaptchaVerifier>();
     builder.Services.AddSingleton<IEmailSender, SmtpEmailSender>();
     builder.Services.AddSingleton<Microsoft.AspNetCore.StaticFiles.IContentTypeProvider, Microsoft.AspNetCore.StaticFiles.FileExtensionContentTypeProvider>();
-    builder.Services.AddSingleton<Api.Services.Rag.IPdfTextExtractor, Api.Services.Rag.PdfTextExtractor>();
+    builder.Services.AddSingleton<IPdfTextExtractor, PdfTextExtractor>();
-    builder.Services.AddSingleton<Api.Services.Rag.ITextChunker, Api.Services.Rag.TextChunker>();
+    builder.Services.AddSingleton<ITextChunker, TextChunker>();
-    builder.Services.AddSingleton<Api.Services.Rag.ICvVectorStore, Api.Services.Rag.InMemoryCvVectorStore>();
+    builder.Services.AddSingleton<ICvVectorStore, InMemoryCvVectorStore>();
-    builder.Services.AddScoped<Api.Services.Rag.ICvRagService, Api.Services.Rag.CvRagService>();
+    builder.Services.AddScoped<ICvRagService, CvRagService>();
-    builder.Services.AddHttpClient<Api.Services.Rag.IOpenAiRagClient, Api.Services.Rag.OpenAiRagClient>();
+    builder.Services.AddHttpClient<IAiRagClient, OpenAiRagClient>();
-    builder.Services.AddHttpClient<Api.Services.Rag.IJobTextExtractor, Api.Services.Rag.JobTextExtractor>();
+    builder.Services.AddHttpClient<IJobTextExtractor, JobTextExtractor>();
 
     // Swagger
     builder.Services.AddEndpointsApiExplorer();

api/Services/Contracts/Rag/IAiRagClient.cs

@@ -0,0 +1,7 @@
+namespace Api.Services.Contracts.Rag;
+
+public interface IAiRagClient
+{
+    Task<float[]> CreateEmbeddingAsync(string input, CancellationToken ct);
+    Task<string> CreateChatCompletionAsync(string systemPrompt, string userPrompt, CancellationToken ct);
+}

api/Services/Contracts/Rag/ICvRagService.cs

@@ -0,0 +1,9 @@
+using Api.Models.Rag;
+
+namespace api.Services.Contracts.Rag;
+
+public interface ICvRagService
+{
+    Task<CvIngestResponse> IngestCvAsync(IFormFile file, bool gdprConsent, CancellationToken ct);
+    Task<JobMatchResponse> MatchJobAsync(JobMatchRequest request, CancellationToken ct);
+}

api/Services/Contracts/Rag/IJobTextExtractor.cs

@@ -0,0 +1,6 @@
+namespace Api.Services.Contracts.Rag;
+
+public interface IJobTextExtractor
+{
+    Task<string> ExtractAsync(string? jobUrl, string? jobDescription, CancellationToken ct);
+}

api/Services/Contracts/Rag/IPdfTextExtractor.cs

@@ -0,0 +1,6 @@
+namespace Api.Services.Contracts.Rag;
+
+public interface IPdfTextExtractor
+{
+    string ExtractText(Stream pdfStream);
+}

api/Services/Contracts/Rag/ITextChunker.cs

@@ -0,0 +1,6 @@
+namespace Api.Services.Contracts.Rag;
+
+public interface ITextChunker
+{
+    IReadOnlyList<string> Chunk(string text, int chunkSize, int overlap);
+}

api/Services/Rag/CvRagService.cs

@@ -1,21 +1,17 @@
+using api.Services.Contracts.Rag;
 using Api.Models.Rag;
+using Api.Services.Contracts.Rag;
 using Api.Settings;
 using Microsoft.Extensions.Options;
 using System.Text.Json;
 
 namespace Api.Services.Rag;
 
-public interface ICvRagService
-{
-    Task<CvIngestResponse> IngestCvAsync(IFormFile file, bool gdprConsent, CancellationToken ct);
-    Task<JobMatchResponse> MatchJobAsync(JobMatchRequest request, CancellationToken ct);
-}
-
 public sealed class CvRagService : ICvRagService
 {
     private readonly IPdfTextExtractor _pdfTextExtractor;
     private readonly ITextChunker _textChunker;
-    private readonly IOpenAiRagClient _openAi;
+    private readonly IAiRagClient _openAi;
     private readonly ICvVectorStore _store;
     private readonly IJobTextExtractor _jobTextExtractor;
     private readonly RagSettings _settings;
@@ -24,7 +20,7 @@ public sealed class CvRagService : ICvRagService
     public CvRagService(
         IPdfTextExtractor pdfTextExtractor,
         ITextChunker textChunker,
-        IOpenAiRagClient openAi,
+        IAiRagClient openAi,
         ICvVectorStore store,
         IJobTextExtractor jobTextExtractor,
         IOptions<RagSettings> options,

api/Services/Rag/JobTextExtractor.cs

@@ -1,15 +1,10 @@
 using System.Net;
 using System.Text.RegularExpressions;
+using Api.Services.Contracts.Rag;
 using Api.Settings;
 using Microsoft.Extensions.Options;
 
 namespace Api.Services.Rag;
-
-public interface IJobTextExtractor
-{
-    Task<string> ExtractAsync(string? jobUrl, string? jobDescription, CancellationToken ct);
-}
-
 public sealed class JobTextExtractor : IJobTextExtractor
 {
     private readonly HttpClient _httpClient;

api/Services/Rag/OpenAiRagClient.cs

@@ -2,18 +2,13 @@ using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Api.Services.Contracts.Rag;
 using Api.Settings;
 using Microsoft.Extensions.Options;
 
 namespace Api.Services.Rag;
 
-public interface IOpenAiRagClient
+public sealed class OpenAiRagClient : IAiRagClient
-{
-    Task<float[]> CreateEmbeddingAsync(string input, CancellationToken ct);
-    Task<string> CreateChatCompletionAsync(string systemPrompt, string userPrompt, CancellationToken ct);
-}
-
-public sealed class OpenAiRagClient : IOpenAiRagClient
 {
     private readonly HttpClient _httpClient;
     private readonly OpenAiSettings _settings;

api/Services/Rag/PdfTextExtractor.cs

@@ -1,13 +1,9 @@
+using Api.Services.Contracts.Rag;
 using System.Text;
 using UglyToad.PdfPig;
 
 namespace Api.Services.Rag;
 
-public interface IPdfTextExtractor
-{
-    string ExtractText(Stream pdfStream);
-}
-
 public sealed class PdfTextExtractor : IPdfTextExtractor
 {
     public string ExtractText(Stream pdfStream)

api/Services/Rag/TextChunker.cs

@@ -1,9 +1,6 @@
-namespace Api.Services.Rag;
+using Api.Services.Contracts.Rag;
 
-public interface ITextChunker
+namespace Api.Services.Rag;
-{
-    IReadOnlyList<string> Chunk(string text, int chunkSize, int overlap);
-}
 
 public sealed class TextChunker : ITextChunker
 {