Clean-up

microsoft · Oct 5, 2024 · 1b3ea75 · 1b3ea75
1 parent 06f0d27
commit 1b3ea75
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 289 deletions.
diff --git a/dotnet/samples/Concepts/Agents/ChatCompletion_StreamingTermination.cs b/dotnet/samples/Concepts/Agents/ChatCompletion_StreamingTermination.cs
diff --git a/dotnet/samples/Concepts/Agents/OpenAIAssistant_DocSample.cs b/dotnet/samples/Concepts/Agents/OpenAIAssistant_DocSample.cs
diff --git a/dotnet/src/InternalUtilities/samples/InternalUtilities/BaseTest.cs b/dotnet/src/InternalUtilities/samples/InternalUtilities/BaseTest.cs
@@ -25,19 +25,19 @@ public abstract class BaseTest : TextWriter
     /// </summary>
     public BaseTest Console => this;
 
-    protected bool UseOpenAIConfig => this.ForceOpenAI || string.IsNullOrEmpty(TestConfiguration.AzureOpenAI?.Endpoint);
+    protected bool UseOpenAIConfig => this.ForceOpenAI || string.IsNullOrEmpty(TestConfiguration.AzureOpenAI.Endpoint);
 
     protected string ApiKey =>
         this.UseOpenAIConfig ?
             TestConfiguration.OpenAI.ApiKey :
-            TestConfiguration.AzureOpenAI?.ApiKey ?? string.Empty;
+            TestConfiguration.AzureOpenAI.ApiKey;
 
-    protected string? Endpoint => UseOpenAIConfig ? null : TestConfiguration.AzureOpenAI?.Endpoint;
+    protected string? Endpoint => UseOpenAIConfig ? null : TestConfiguration.AzureOpenAI.Endpoint;
 
     protected string Model =>
         this.UseOpenAIConfig ?
             TestConfiguration.OpenAI.ChatModelId :
-            TestConfiguration.AzureOpenAI?.ChatDeploymentName ?? string.Empty;
+            TestConfiguration.AzureOpenAI.ChatDeploymentName;
 
     protected Kernel CreateKernelWithChatCompletion()
     {
@@ -52,9 +52,9 @@ protected Kernel CreateKernelWithChatCompletion()
         else
         {
             builder.AddAzureOpenAIChatCompletion(
-                TestConfiguration.AzureOpenAI?.ChatDeploymentName ?? string.Empty,
-                TestConfiguration.AzureOpenAI?.Endpoint ?? string.Empty,
-                TestConfiguration.AzureOpenAI?.ApiKey ?? string.Empty);
+                TestConfiguration.AzureOpenAI.ChatDeploymentName,
+                TestConfiguration.AzureOpenAI.Endpoint,
+                TestConfiguration.AzureOpenAI.ApiKey);
         }
 
         return builder.Build();

diff --git a/dotnet/src/InternalUtilities/samples/InternalUtilities/TestConfiguration.cs b/dotnet/src/InternalUtilities/samples/InternalUtilities/TestConfiguration.cs
@@ -19,15 +19,14 @@ public static void Initialize(IConfigurationRoot configRoot)
         s_instance = new TestConfiguration(configRoot);
     }
 
-    public static AzureOpenAIConfig? AzureOpenAI => null;
-    public static AzureOpenAIConfig? AzureOpenAIImages => null;
-    public static AzureOpenAIEmbeddingsConfig? AzureOpenAIEmbeddings => null;
-    public static AzureAISearchConfig? AzureAISearch => null;
-
     public static OllamaConfig Ollama => LoadSection<OllamaConfig>();
     public static OpenAIConfig OpenAI => LoadSection<OpenAIConfig>();
     public static OnnxConfig Onnx => LoadSection<OnnxConfig>();
+    public static AzureOpenAIConfig AzureOpenAI => LoadSection<AzureOpenAIConfig>();
     public static AzureAIInferenceConfig AzureAIInference => LoadSection<AzureAIInferenceConfig>();
+    public static AzureOpenAIConfig AzureOpenAIImages => LoadSection<AzureOpenAIConfig>();
+    public static AzureOpenAIEmbeddingsConfig AzureOpenAIEmbeddings => LoadSection<AzureOpenAIEmbeddingsConfig>();
+    public static AzureAISearchConfig AzureAISearch => LoadSection<AzureAISearchConfig>();
     public static QdrantConfig Qdrant => LoadSection<QdrantConfig>();
     public static WeaviateConfig Weaviate => LoadSection<WeaviateConfig>();
     public static KeyVaultConfig KeyVault => LoadSection<KeyVaultConfig>();