feat: DI

Author: 01Dri

src/MapperAI.Core/Clients/MapperClientFactory.cs

@@ -5,26 +5,17 @@
 
 namespace MapperAI.Core.Clients;
 
-public class MapperClientFactory : IMapperClientFactory
+public class MapperClientFactory(IMapperSerializer serializer, HttpClient httpClient) : IMapperClientFactory
 {
-    private readonly IMapperSerializer _serializer;
-    private readonly HttpClient _httpClient;
-
-    public MapperClientFactory(IMapperSerializer serializer, HttpClient httpClient)
-    {
-        _serializer = serializer;
-        _httpClient = httpClient;
-    }
-
     public IMapperClient CreateClient(MapperClientConfiguration configuration)
     {
         switch (configuration.Type)
         {
             case ModelType.Ollama:
-                return new OllamaMapperClient(configuration, _serializer, _httpClient);
+                return new OllamaMapperClient(configuration, serializer, httpClient);
 
             default:
-                return new GeminiMapperClient(configuration, _serializer, _httpClient);
+                return new GeminiMapperClient(configuration, serializer, httpClient);
         }
     }
 }

src/MapperAI.Core/Clients/Models/MapperClientConfiguration.cs

@@ -1,25 +1,18 @@
 using MapperAI.Core.Enums;
+using MapperAI.Core.Extensions.Enums;
 
 namespace MapperAI.Core.Clients.Models;
 
 public class MapperClientConfiguration
 {
-    public string Model { get; set; }
     public string? ApiKey { get; set; }
     public ModelType Type { get; set; }
-
-
-    public MapperClientConfiguration(string model, string? apiKey, ModelType type)
+    public string Model => Type.GetEnumDescriptionValue();
+    
+    public MapperClientConfiguration( string? apiKey, ModelType type)
     {
-        Model = model;
         ApiKey = apiKey;
         Type = type;
     }
 
-    public MapperClientConfiguration(string model, ModelType type)
-    {
-        Model = model;
-        Type = type;
-    }
-
 }

src/MapperAI.Core/DI/DependencyInjection.cs

@@ -12,9 +12,9 @@ namespace MapperAI.Core.DI;
 
 public static class DependencyInjection
 {
-    public static IServiceCollection AddMapperAI(this IServiceCollection services, string apiKey, string model, ModelType modelType)
+    public static IServiceCollection AddMapperAI(this IServiceCollection services, string apiKey, ModelType modelType)
     {
-        services.AddMapperClientConfiguration(apiKey, model, modelType);
+        services.AddMapperClientConfiguration(apiKey, modelType);
         services.AddHttpClient();
         services.AddSingleton<IMapperSerializer, MapperSerializer>();
         services.AddSingleton<IMapperClientFactory, MapperClientFactory>();
@@ -27,9 +27,9 @@ public static IServiceCollection AddMapperAI(this IServiceCollection services, s
         return services;
     }
 
-    private static void AddMapperClientConfiguration(this IServiceCollection services, string apiKey, string model, ModelType modelType)
+    private static void AddMapperClientConfiguration(this IServiceCollection services, string apiKey, ModelType modelType)
     {
-        MapperClientConfiguration configuration = new(apiKey, model, modelType);
+        MapperClientConfiguration configuration = new(apiKey, modelType);
         services.AddSingleton<MapperClientConfiguration>(s => configuration);
 
     }

src/MapperAI.Core/Enums/ModelType.cs

@@ -1,9 +1,11 @@
-namespace MapperAI.Core.Enums;
+using System.ComponentModel;
+
+namespace MapperAI.Core.Enums;
 
 public enum ModelType
 {
-    
-    Gemini,
+    [Description("gemini-2.0-flash")]
+    GeminiFlash2_0,
     ChatGpt,
     Ollama
 }

src/MapperAI.Core/Extensions/Enums/EnumExtension.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel;
+using System.Reflection;
+
+namespace MapperAI.Core.Extensions.Enums;
+
+public static class EnumExtension
+{
+    public static string GetEnumDescriptionValue(this Enum data)
+    {
+        FieldInfo? field = data.GetType().GetField(data.ToString());
+        var attribute = field?.GetCustomAttribute<DescriptionAttribute>();
+        return attribute?.Description ?? throw new InvalidEnumArgumentException();
+    } 
+}

…re/Initializers/DependencyInitializer.cs …ons/Initializers/InitializerExtension.cssrc/MapperAI.Core/Initializers/DependencyInitializer.cs renamed to src/MapperAI.Core/Extensions/Initializers/InitializerExtension.cs src/MapperAI.Core/Initializers/DependencyInitializer.cs renamed to src/MapperAI.Core/Extensions/Initializers/InitializerExtension.cs

@@ -1,11 +1,10 @@
-using System.Reflection;
+using System.Reflection;
 
-namespace MapperAI.Core.Initializers;
+namespace MapperAI.Core.Extensions.Initializers;
 
-public class DependencyInitializer
+public static  class InitializerExtension
 {
-    
-    public static void Initialize(object obj)
+    public static void Initialize(this object obj)
     {
         var properties = obj.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
         var genericProperties = properties.Where(x => x.PropertyType.IsGenericType);
@@ -17,6 +16,7 @@ public static void Initialize(object obj)
             }
         }
     }
+    
     private static void InitializeDependencyProperties(Type? itemType, PropertyInfo property, object obj)
     {
         if (itemType == null)
@@ -47,5 +47,4 @@ private static void InitializeDependencyProperties(Type? itemType, PropertyInfo
 
         property.SetValue(obj, listInstance);
     }
-
 }

src/MapperAI.Core/Mappers/Models/FileMapperConfiguration.cs

@@ -6,7 +6,6 @@ public class FileMapperConfiguration
     public string InputFolder { get; set; }
     public string? NameSpace { get; set; }
     public string Extension { get; set; } = "C#";
-    
     public string? LanguageVersion { get; set; }
     public string? FileName { get; set; }
     public  bool IsUniqueClass => FileName != null; 

src/MapperAI.Core/Mappers/PdfMapper.cs

@@ -2,7 +2,7 @@
 using iText.Kernel.Pdf.Canvas.Parser;
 using MapperAI.Core.Clients.Interfaces;
 using MapperAI.Core.Clients.Models;
-using MapperAI.Core.Initializers;
+using MapperAI.Core.Extensions.Initializers;
 using MapperAI.Core.Mappers.Interfaces;
 using MapperAI.Core.Serializers.Interfaces;
 
@@ -27,7 +27,7 @@ public PdfMapper(IMapperSerializer serializer, IMapperClientFactory mapperClient
         IMapperClient iai = _mapperClientFactory.CreateClient(_clientConfiguration);
         string pdfContent = ExtractPdfContent(pdfPath);
         T destinyObject = new T();
-        DependencyInitializer.Initialize(destinyObject);
+        destinyObject.Initialize();
         string prompt = CreatePrompt(pdfContent, _serializer.Serialize(destinyObject));
         MapperClientResponse result = await iai.SendAsync(prompt, cancellationToken);
         return _serializer.Deserialize<T>(result.Value);

test/MapperAI.Test/ClassMapperTests.cs

@@ -8,12 +8,12 @@ namespace MapperAI.Test;
 public class ClassMapperTests : BaseTests
 {
     private readonly IClassMapper _classMapper;
-    private readonly MapperClientConfiguration _clientConfiguration;
 
     public ClassMapperTests()
     {
-        _clientConfiguration = new MapperClientConfiguration("gemini-2.0-flash", Environment.GetEnvironmentVariable("GEMINI_KEY"),ModelType.Gemini);
-        _classMapper = new ClassMapper(Serializer, Factory, _clientConfiguration);
+        var clientConfiguration = new MapperClientConfiguration(Environment.GetEnvironmentVariable("GEMINI_KEY"),ModelType.GeminiFlash2_0);
+        _classMapper = new ClassMapper(Serializer, Factory, clientConfiguration);
+        
     }
 
 

test/MapperAI.Test/DI/DependencyInjectionTests.cs

@@ -15,7 +15,7 @@ public void AddMapperAI_ShouldRegisterServices()
         var services = new ServiceCollection();
 
         // Act
-        services.AddMapperAI("fake-key", "gemini-2.0-flash", ModelType.Gemini);
+        services.AddMapperAI("fake-key",  ModelType.GeminiFlash2_0);
         var provider = services.BuildServiceProvider();
 
         // Assert