From df39a41bc733918decf000c20f04be00b2d81d15 Mon Sep 17 00:00:00 2001
From: Marco Minerva <marco.minerva@gmail.com>
Date: Wed, 24 Apr 2024 18:28:36 +0000
Subject: [PATCH] Fix KernelMemoryBuilderExtensions (#433)

## Motivation and Context (Why the change? What's the scenario?)
This PR fixes the issue described at
https://github.com/microsoft/kernel-memory/pull/424#issuecomment-2075035387.
---
 .../KernelMemoryBuilderExtensions.cs          | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/service/Abstractions/KernelMemoryBuilderExtensions.cs b/service/Abstractions/KernelMemoryBuilderExtensions.cs
index f2d9e4551..4e7184aab 100644
--- a/service/Abstractions/KernelMemoryBuilderExtensions.cs
+++ b/service/Abstractions/KernelMemoryBuilderExtensions.cs
@@ -80,9 +80,8 @@ public static IKernelMemoryBuilder WithCustomIngestionQueueClientFactory(
     }
 
     public static IKernelMemoryBuilder WithCustomIngestionQueueClientFactory<T>(
-        this IKernelMemoryBuilder builder, T service) where T : QueueClientFactory
+        this IKernelMemoryBuilder builder) where T : QueueClientFactory
     {
-        service = service ?? throw new ConfigurationException("Memory Builder: the ingestion queue client factory instance is NULL");
         builder.AddSingleton<QueueClientFactory, T>();
         return builder;
     }
@@ -96,9 +95,8 @@ public static IKernelMemoryBuilder WithCustomStorage(
     }
 
     public static IKernelMemoryBuilder WithCustomStorage<T>(
-        this IKernelMemoryBuilder builder, T service) where T : class, IContentStorage
+        this IKernelMemoryBuilder builder) where T : class, IContentStorage
     {
-        service = service ?? throw new ConfigurationException("Memory Builder: the content storage instance is NULL");
         builder.AddSingleton<IContentStorage, T>();
         return builder;
     }
@@ -112,9 +110,8 @@ public static IKernelMemoryBuilder WithCustomMimeTypeDetection(
     }
 
     public static IKernelMemoryBuilder WithCustomMimeTypeDetection<T>(
-        this IKernelMemoryBuilder builder, T service) where T : class, IMimeTypeDetection
+        this IKernelMemoryBuilder builder) where T : class, IMimeTypeDetection
     {
-        service = service ?? throw new ConfigurationException("Memory Builder: the MIME type detection instance is NULL");
         builder.AddSingleton<IMimeTypeDetection, T>();
         return builder;
     }
@@ -171,10 +168,8 @@ public static IKernelMemoryBuilder WithCustomTextGenerator(
     }
 
     public static IKernelMemoryBuilder WithCustomTextGenerator<T>(
-        this IKernelMemoryBuilder builder,
-        T service) where T : class, ITextGenerator
+        this IKernelMemoryBuilder builder) where T : class, ITextGenerator
     {
-        service = service ?? throw new ConfigurationException("Memory Builder: the text generator instance is NULL");
         builder.AddSingleton<ITextGenerator, T>();
         return builder;
     }
@@ -189,10 +184,8 @@ public static IKernelMemoryBuilder WithCustomImageOcr(
     }
 
     public static IKernelMemoryBuilder WithCustomImageOcr<T>(
-        this IKernelMemoryBuilder builder,
-        T service) where T : class, IOcrEngine
+        this IKernelMemoryBuilder builder) where T : class, IOcrEngine
     {
-        service = service ?? throw new ConfigurationException("Memory Builder: the OCR engine instance is NULL");
         builder.AddSingleton<IOcrEngine, T>();
         return builder;
     }
@@ -206,9 +199,8 @@ public static IKernelMemoryBuilder WithCustomPromptProvider(
     }
 
     public static IKernelMemoryBuilder WithCustomPromptProvider<T>(
-        this IKernelMemoryBuilder builder, T service) where T : class, IPromptProvider
+        this IKernelMemoryBuilder builder) where T : class, IPromptProvider
     {
-        service = service ?? throw new ConfigurationException("Memory Builder: the prompt provider instance is NULL");
         builder.AddSingleton<IPromptProvider, T>();
         return builder;
     }