Changes

api/Controllers/ContactController.cs

@@ -1,11 +1,11 @@
 using Api.Services.Contracts.Models;
-using Api.Requests;
 using Api.Services.Contracts;
-using Api.Settings;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.Extensions.Options;
+using Api.Models.Settings;
+using Api.Models.Requests;
 
 namespace Api.Controllers
 {

api/Controllers/CvMatcherController.cs

@@ -1,4 +1,4 @@
-using Api.Requests;
+using Api.Models.Requests;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using System.Net.Http.Headers;

api/Controllers/FileDownloadController.cs

@@ -1,5 +1,5 @@
+using Api.Models.Settings;
 using Api.Services.Contracts;
-using Api.Settings;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.StaticFiles;

api/Controllers/GoogleController.cs

@@ -1,4 +1,4 @@
-using Api.Settings;
+using Api.Models.Settings;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;

api/Models/Requests/ContactRequest.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Api.Requests
+namespace Api.Models.Requests
 {
     public sealed class ContactRequest
     {

api/Models/Requests/JobMatchRequest.cs

@@ -1,4 +1,4 @@
-namespace Api.Requests;
+namespace Api.Models.Requests;
 
 public sealed class JobMatchRequest
 {

api/Models/Requests/SubscribeRequest.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Api.Requests
+namespace Api.Models.Requests
 {
     public sealed class SubscribeRequest
     {

api/Models/Settings/CaptchaSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public sealed class CaptchaSettings
     {

api/Models/Settings/ContactSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public sealed class ContactSettings
     {

api/Models/Settings/FileStorageSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public sealed class FileStorageSettings
     {

api/Models/Settings/GoogleSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public sealed class GoogleSettings
     {

api/Models/Settings/KeyVaultSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public sealed class KeyVaultSettings
     {

api/Models/Settings/SmtpSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public class SmtpSettings
     {

api/Models/Settings/SubscribeSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings
+namespace Api.Models.Settings
 {
     public sealed class SubscribeSettings
     {

api/Program.cs

@@ -1,6 +1,6 @@
+using Api.Models.Settings;
 using Api.Services;
 using Api.Services.Contracts;
-using Api.Settings;
 using Azure.Identity;
 using Microsoft.AspNetCore.HttpOverrides;
 using Serilog;

api/Services/Contracts/IEmailSender.cs

@@ -1,4 +1,4 @@
-using Api.Requests;
+using Api.Models.Requests;
 
 namespace Api.Services.Contracts
 {

api/Services/RecaptchaVerifier.cs

@@ -1,7 +1,7 @@
 using Api.Services.Contracts.Models;
 using Api.Services.Contracts;
-using Api.Settings;
 using Microsoft.Extensions.Options;
+using Api.Models.Settings;
 
 namespace Api.Services
 {

api/Services/SmtpEmailSender.cs

@@ -1,10 +1,10 @@
 using Api.Services.Contracts;
-using Api.Requests;
 using Microsoft.Extensions.Options;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using MimeKit;
-using Api.Settings;
+using Api.Models.Settings;
+using Api.Models.Requests;
 
 namespace Api.Services
 {

cv-matcher-api/Models/Settings/AiSettings.cs

@@ -0,0 +1,8 @@
+namespace Api.Models.Settings;
+
+public sealed class AiSettings
+{
+    public string Provider { get; set; } = "OpenAI";
+    public OpenAiSettings OpenAI { get; set; } = new();
+    public OllamaSettings Ollama { get; set; } = new();
+}

cv-matcher-api/Models/Settings/InternalApiSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings;
+namespace Api.Models.Settings;
 
 public sealed class InternalApiSettings
 {

cv-matcher-api/Models/Settings/MatcherSettings.cs

@@ -0,0 +1,8 @@
+namespace Api.Models.Settings;
+
+public sealed class MatcherSettings
+{
+    public int TopK { get; set; } = 10;
+    public int DeepScoreTopN { get; set; } = 5;
+    public int MaxJobTextChars { get; set; } = 60000;
+}

cv-matcher-api/Models/Settings/OllamaSettings.cs

@@ -0,0 +1,8 @@
+namespace Api.Models.Settings;
+
+public sealed class OllamaSettings
+{
+    public string BaseUrl { get; set; } = "http://localhost:11434";
+    public string ChatModel { get; set; } = "llama3.1:8b";
+    public int TimeoutSeconds { get; set; } = 180;
+}

cv-matcher-api/Models/Settings/OpenAiSettings.cs

@@ -0,0 +1,8 @@
+namespace Api.Models.Settings;
+
+public sealed class OpenAiSettings
+{
+    public string ApiKey { get; set; } = string.Empty;
+    public string ChatModel { get; set; } = "gpt-4o-mini";
+    public int TimeoutSeconds { get; set; } = 90;
+}

cv-matcher-api/Models/Settings/RagApiSettings.cs

@@ -0,0 +1,7 @@
+namespace Api.Models.Settings;
+
+public sealed class RagApiSettings
+{
+    public string BaseUrl { get; set; } = "http://localhost:8081";
+    public string InternalApiKey { get; set; } = string.Empty;
+}

cv-matcher-api/Models/Settings/Settings.cs

@@ -1,52 +0,0 @@
-namespace Api.Models.Settings;
-
-public sealed class RagApiSettings
-{
-    public string BaseUrl { get; set; } = "http://localhost:8081";
-    public string InternalApiKey { get; set; } = string.Empty;
-}
-
-public sealed class InternalApiSettings
-{
-    public string ApiKey { get; set; } = string.Empty;
-    public bool RequireApiKey { get; set; } = false;
-}
-
-public sealed class AiSettings
-{
-    public string Provider { get; set; } = "OpenAI";
-    public OpenAiSettings OpenAI { get; set; } = new();
-    public OllamaSettings Ollama { get; set; } = new();
-}
-
-public sealed class OpenAiSettings
-{
-    public string ApiKey { get; set; } = string.Empty;
-    public string ChatModel { get; set; } = "gpt-4o-mini";
-    public int TimeoutSeconds { get; set; } = 90;
-}
-
-public sealed class OllamaSettings
-{
-    public string BaseUrl { get; set; } = "http://localhost:11434";
-    public string ChatModel { get; set; } = "llama3.1:8b";
-    public int TimeoutSeconds { get; set; } = 180;
-}
-
-public sealed class MatcherSettings
-{
-    public int TopK { get; set; } = 10;
-    public int DeepScoreTopN { get; set; } = 5;
-    public int MaxJobTextChars { get; set; } = 60000;
-}
-
-public sealed class SmtpSettings
-{
-    public string Host { get; set; } = string.Empty;
-    public int Port { get; set; } = 587;
-    public string Username { get; set; } = string.Empty;
-    public string Password { get; set; } = string.Empty;
-    public bool UseStartTls { get; set; } = true;
-    public string FromEmail { get; set; } = "noreply@myai.ro";
-    public string ToEmail { get; set; } = string.Empty;
-}

cv-matcher-api/Models/Settings/SmtpSettings.cs

@@ -0,0 +1,12 @@
+namespace Api.Models.Settings;
+
+public sealed class SmtpSettings
+{
+    public string Host { get; set; } = string.Empty;
+    public int Port { get; set; } = 587;
+    public string Username { get; set; } = string.Empty;
+    public string Password { get; set; } = string.Empty;
+    public bool UseStartTls { get; set; } = true;
+    public string FromEmail { get; set; } = "noreply@myai.ro";
+    public string ToEmail { get; set; } = string.Empty;
+}

rag-api/Clients/Ai/CachedAiClient.cs

@@ -1,8 +1,9 @@
 using Microsoft.Extensions.Options;
-using Api.Services.Contracts;
-using Api.Settings;
+using Api.Models.Settings;
+using Api.Data.Repositories.Contracts;
+using Api.Clients.Ai.Contracts;
 
-namespace Api.Services;
+namespace Api.Clients.Ai;
 
 public sealed class CachedAiClient : IAiClient
 {

rag-api/Clients/Ai/Contracts/IAiClient.cs

@@ -1,4 +1,4 @@
-namespace Api.Services.Contracts;
+namespace Api.Clients.Ai.Contracts;
 
 public interface IAiClient
 {

rag-api/Clients/Ai/HashHelper.cs

@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Api.Services;
+namespace Api.Clients.Ai;
 
 public static class HashHelper
 {

rag-api/Clients/Ai/RawAiClient.cs

@@ -3,10 +3,10 @@ using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Options;
-using Api.Services.Contracts;
-using Api.Settings;
+using Api.Models.Settings;
+using Api.Clients.Ai.Contracts;
 
-namespace Api.Services;
+namespace Api.Clients.Ai;
 
 public sealed class RawAiClient : IAiClient
 {

rag-api/Controllers/RagController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Api.Services.Contracts;
-using Api.Requests;
+using Api.Models.Requests;
 
 namespace Api.Controllers;
 
@@ -83,7 +83,7 @@ public sealed class RagController : ControllerBase
         try
         {
             _logger.LogInformation("Semantic search request received. TargetTypes={TargetTypes}, TopK={TopK}",
-                string.Join(',', request.TargetDocumentTypes ?? []), request.TopK);
+                string.Join(',', request.TargetDocumentTypes ?? System.Array.Empty<string>()), request.TopK);
             var result = await _ragService.SearchAsync(request, ct);
             _logger.LogInformation("Semantic search completed. ResultCount={ResultCount}", result.Results.Count);
             return Ok(result);

rag-api/Data/Repositories/Contracts/IRagRepository.cs

@@ -1,6 +1,6 @@
-using Api.Services.Contracts.Models;
+using Api.Models;
 
-namespace Api.Services.Contracts;
+namespace Api.Data.Repositories.Contracts;
 
 public interface IRagRepository
 {

rag-api/Data/Repositories/EfRagRepository.cs

@@ -1,10 +1,10 @@
 using Api.Data;
 using Api.Data.Entities;
-using Api.Services.Contracts;
-using Api.Services.Contracts.Models;
 using Microsoft.EntityFrameworkCore;
+using Api.Data.Repositories.Contracts;
+using Api.Models;
 
-namespace Api.Services;
+namespace Api.Data.Repositories;
 
 public sealed class EfRagRepository : IRagRepository
 {
@@ -94,7 +94,7 @@ public sealed class EfRagRepository : IRagRepository
             .Where(x => !string.IsNullOrWhiteSpace(x))
             .Select(x => x.Trim().ToLowerInvariant())
             .Distinct()
-            .ToArray() ?? [];
+            .ToArray() ?? System.Array.Empty<string>();
 
         var query = _db.RagChunks
             .AsNoTracking()

rag-api/Data/Repositories/VectorSerializer.cs

@@ -1,4 +1,4 @@
-namespace Api.Services;
+namespace Api.Data.Repositories;
 
 public static class VectorSerializer
 {

rag-api/Models/DocumentClassification.cs

@@ -1,10 +1,10 @@
-namespace Api.Services.Contracts.Models
+namespace Api.Models
 {
     public sealed class DocumentClassification
     {
         public required string DocumentType { get; init; }
         public double Confidence { get; init; }
         public required string Title { get; init; }
-        public Dictionary<string, string> Metadata { get; init; } = [];
+        public Dictionary<string, string> Metadata { get; init; } = new Dictionary<string, string>();
     }
 }

rag-api/Models/RagChunkRecord.cs

@@ -1,4 +1,4 @@
-namespace Api.Services.Contracts.Models
+namespace Api.Models
 {
     public sealed class RagChunkRecord
     {

rag-api/Models/RagDocumentDetails.cs

@@ -1,4 +1,4 @@
-namespace Api.Services.Contracts.Models
+namespace Api.Models
 {
     public sealed class RagDocumentDetails
     {

rag-api/Models/RagDocumentRecord.cs

@@ -1,4 +1,4 @@
-namespace Api.Services.Contracts.Models
+namespace Api.Models
 {
     public sealed class RagDocumentRecord
     {

rag-api/Models/Requests/IndexDocumentRequest.cs

@@ -1,4 +1,4 @@
-namespace Api.Requests
+namespace Api.Models.Requests
 {
     public sealed class IndexDocumentRequest
     {

rag-api/Models/Requests/SearchRequest.cs

@@ -1,4 +1,4 @@
-namespace Api.Requests
+namespace Api.Models.Requests
 {
     public sealed class SearchRequest
     {

rag-api/Models/Responses/IndexDocumentResponse.cs

@@ -1,4 +1,4 @@
-namespace Api.Responses
+namespace Api.Models.Responses
 {
     public sealed class IndexDocumentResponse
     {

rag-api/Models/Responses/SearchResponse.cs

@@ -1,8 +1,8 @@
-namespace Api.Responses
+namespace Api.Models.Responses
 {
     public sealed class SearchResponse
     {
-        public IReadOnlyList<SearchDocumentResult> Results { get; init; } = [];
+        public IReadOnlyList<SearchDocumentResult> Results { get; init; } = System.Array.Empty<SearchDocumentResult>();
     }
 
     public sealed class SearchDocumentResult
@@ -12,7 +12,7 @@
         public required string Title { get; init; }
         public string? SourceUrl { get; init; }
         public double Score { get; init; }
-        public IReadOnlyList<SearchChunkResult> MatchedChunks { get; init; } = [];
+        public IReadOnlyList<SearchChunkResult> MatchedChunks { get; init; } = System.Array.Empty<SearchChunkResult>();
     }
 
     public sealed class SearchChunkResult

rag-api/Models/SearchCandidateChunk.cs

@@ -1,4 +1,4 @@
-namespace Api.Services.Contracts.Models
+namespace Api.Models
 {
     public sealed class SearchCandidateChunk
     {

rag-api/Models/Settings/AiSettings.cs

@@ -0,0 +1,8 @@
+namespace Api.Models.Settings;
+
+public sealed class AiSettings
+{
+    public string Provider { get; set; } = "OpenAI";
+    public OpenAiProviderSettings OpenAI { get; set; } = new();
+    public OllamaProviderSettings Ollama { get; set; } = new();
+}

rag-api/Models/Settings/InternalApiSettings.cs

@@ -0,0 +1,7 @@
+namespace Api.Models.Settings;
+
+public sealed class InternalApiSettings
+{
+    public string ApiKey { get; set; } = string.Empty;
+    public bool RequireApiKey { get; set; } = false;
+}

rag-api/Models/Settings/OllamaProviderSettings.cs

@@ -0,0 +1,9 @@
+namespace Api.Models.Settings;
+
+public sealed class OllamaProviderSettings
+{
+    public string BaseUrl { get; set; } = "http://localhost:11434";
+    public string ChatModel { get; set; } = "llama3.1:8b";
+    public string EmbeddingModel { get; set; } = "nomic-embed-text";
+    public int TimeoutSeconds { get; set; } = 180;
+}

rag-api/Models/Settings/OpenAiProviderSettings.cs

@@ -0,0 +1,9 @@
+namespace Api.Models.Settings;
+
+public sealed class OpenAiProviderSettings
+{
+    public string ApiKey { get; set; } = string.Empty;
+    public string ChatModel { get; set; } = "gpt-4o-mini";
+    public string EmbeddingModel { get; set; } = "text-embedding-3-small";
+    public int TimeoutSeconds { get; set; } = 90;
+}

rag-api/Models/Settings/RagSettings.cs

@@ -1,4 +1,4 @@
-namespace Api.Settings;
+namespace Api.Models.Settings;
 
 public sealed class RagSettings
 {

rag-api/Program.cs

@@ -3,10 +3,14 @@ using Microsoft.AspNetCore.Diagnostics;
 using Api.Data;
 using Api.Services;
 using Api.Services.Contracts;
-using Api.Settings;
 using Serilog;
 using System.Reflection;
 using Microsoft.EntityFrameworkCore;
+using Api.Models.Settings;
+using Api.Data.Repositories.Contracts;
+using Api.Data.Repositories;
+using Api.Clients.Ai.Contracts;
+using Api.Clients.Ai;
 
 DotNetEnv.Env.Load();
 

rag-api/Services/Contracts/IDocumentClassifier.cs

@@ -1,4 +1,4 @@
-using Api.Services.Contracts.Models;
+using Api.Models;
 
 namespace Api.Services.Contracts;
 

rag-api/Services/Contracts/IRagService.cs

@@ -1,6 +1,6 @@
-using Api.Requests;
-using Api.Responses;
-using Api.Services.Contracts.Models;
+using Api.Models;
+using Api.Models.Requests;
+using Api.Models.Responses;
 
 namespace Api.Services.Contracts;
 

rag-api/Services/DocumentClassifier.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 using Api.Services.Contracts;
-using Api.Services.Contracts.Models;
+using Api.Models;
 
 namespace Api.Services;
 

rag-api/Services/RagService.cs

@@ -1,10 +1,13 @@
 using System.Text.Json;
 using Microsoft.Extensions.Options;
 using Api.Services.Contracts;
-using Api.Settings;
-using Api.Responses;
-using Api.Requests;
-using Api.Services.Contracts.Models;
+using Api.Models.Requests;
+using Api.Models.Responses;
+using Api.Models.Settings;
+using Api.Data.Repositories.Contracts;
+using Api.Clients.Ai.Contracts;
+using Api.Clients.Ai;
+using Api.Models;
 
 namespace Api.Services;
 

rag-api/Settings/AiSettings.cs

@@ -1,24 +0,0 @@
-namespace Api.Settings;
-
-public sealed class AiSettings
-{
-    public string Provider { get; set; } = "OpenAI";
-    public OpenAiProviderSettings OpenAI { get; set; } = new();
-    public OllamaProviderSettings Ollama { get; set; } = new();
-}
-
-public sealed class OpenAiProviderSettings
-{
-    public string ApiKey { get; set; } = string.Empty;
-    public string ChatModel { get; set; } = "gpt-4o-mini";
-    public string EmbeddingModel { get; set; } = "text-embedding-3-small";
-    public int TimeoutSeconds { get; set; } = 90;
-}
-
-public sealed class OllamaProviderSettings
-{
-    public string BaseUrl { get; set; } = "http://localhost:11434";
-    public string ChatModel { get; set; } = "llama3.1:8b";
-    public string EmbeddingModel { get; set; } = "nomic-embed-text";
-    public int TimeoutSeconds { get; set; } = 180;
-}