[.Net] update oai tests by using new OpenAI resources (#2939)

LittleLittleCloud · victordibia · commit 55960125bc73 · 2024-07-29T17:02:04.000-07:00
* update oai tests

* Update MetaInfo.props
diff --git a/dotnet/eng/MetaInfo.props b/dotnet/eng/MetaInfo.props
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>0.0.14</VersionPrefix>
+        <VersionPrefix>0.0.15</VersionPrefix>
         <Authors>AutoGen</Authors>
         <PackageProjectUrl>https://microsoft.github.io/autogen-for-net/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/microsoft/autogen</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     </PropertyGroup>
-</Project>
+</Project>
diff --git a/dotnet/sample/AutoGen.BasicSamples/Example13_OpenAIAgent_JsonMode.cs b/dotnet/sample/AutoGen.BasicSamples/Example13_OpenAIAgent_JsonMode.cs
@@ -16,7 +16,7 @@ public class Example13_OpenAIAgent_JsonMode
     public static async Task RunAsync()
     {
         #region create_agent
-        var config = LLMConfiguration.GetAzureOpenAIGPT3_5_Turbo(deployName: "gpt-35-turbo-0125"); // json mode only works with 0125 and later model.
+        var config = LLMConfiguration.GetAzureOpenAIGPT3_5_Turbo(deployName: "gpt-35-turbo"); // json mode only works with 0125 and later model.
         var apiKey = config.ApiKey;
         var endPoint = new Uri(config.Endpoint);
 
diff --git a/dotnet/sample/AutoGen.BasicSamples/LLMConfiguration.cs b/dotnet/sample/AutoGen.BasicSamples/LLMConfiguration.cs
@@ -22,11 +22,11 @@ public static OpenAIConfig GetOpenAIGPT4()
         return new OpenAIConfig(openAIKey, modelId);
     }
 
-    public static AzureOpenAIConfig GetAzureOpenAIGPT3_5_Turbo(string deployName = "gpt-35-turbo-16k")
+    public static AzureOpenAIConfig GetAzureOpenAIGPT3_5_Turbo(string? deployName = null)
     {
         var azureOpenAIKey = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
-
+        deployName = deployName ?? Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         return new AzureOpenAIConfig(endpoint, deployName, azureOpenAIKey);
     }
 
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs
@@ -96,16 +96,15 @@ the number of resolved question is {correctAnswerCount}
         }
 
 
-        [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+        [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
         public async Task OpenAIAgentMathChatTestAsync()
         {
             var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new ArgumentException("AZURE_OPENAI_API_KEY is not set");
             var endPoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new ArgumentException("AZURE_OPENAI_ENDPOINT is not set");
-
+            var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new ArgumentException("AZURE_OPENAI_DEPLOY_NAME is not set");
             var openaiClient = new OpenAIClient(new Uri(endPoint), new Azure.AzureKeyCredential(key));
-            var model = "gpt-35-turbo-16k";
-            var teacher = await CreateTeacherAgentAsync(openaiClient, model);
-            var student = await CreateStudentAssistantAgentAsync(openaiClient, model);
+            var teacher = await CreateTeacherAgentAsync(openaiClient, deployName);
+            var student = await CreateStudentAssistantAgentAsync(openaiClient, deployName);
 
             var adminFunctionMiddleware = new FunctionCallMiddleware(
                 functions: [this.UpdateProgressFunctionContract],
@@ -115,7 +114,7 @@ public async Task OpenAIAgentMathChatTestAsync()
                 });
             var admin = new OpenAIChatAgent(
                 openAIClient: openaiClient,
-                modelName: model,
+                modelName: deployName,
                 name: "Admin",
                 systemMessage: $@"You are admin. You update progress after each question is answered.")
                 .RegisterMessageConnector()
@@ -124,7 +123,7 @@ public async Task OpenAIAgentMathChatTestAsync()
 
             var groupAdmin = new OpenAIChatAgent(
                 openAIClient: openaiClient,
-                modelName: model,
+                modelName: deployName,
                 name: "GroupAdmin",
                 systemMessage: "You are group admin. You manage the group chat.")
                 .RegisterMessageConnector()
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs
@@ -25,16 +25,17 @@ public async Task<string> GetWeatherAsync(string location)
         return $"The weather in {location} is sunny.";
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task BasicConversationTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var openaiClient = new OpenAIClient(new Uri(endpoint), new Azure.AzureKeyCredential(key));
         var openAIChatAgent = new OpenAIChatAgent(
             openAIClient: openaiClient,
             name: "assistant",
-            modelName: "gpt-35-turbo-16k");
+            modelName: deployName);
 
         // By default, OpenAIChatClient supports the following message types
         // - IMessage<ChatRequestMessage>
@@ -56,16 +57,17 @@ public async Task BasicConversationTestAsync()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task OpenAIChatMessageContentConnectorTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var openaiClient = new OpenAIClient(new Uri(endpoint), new Azure.AzureKeyCredential(key));
         var openAIChatAgent = new OpenAIChatAgent(
             openAIClient: openaiClient,
             name: "assistant",
-            modelName: "gpt-35-turbo-16k");
+            modelName: deployName);
 
         MiddlewareStreamingAgent<OpenAIChatAgent> assistant = openAIChatAgent
             .RegisterMessageConnector();
@@ -102,16 +104,17 @@ public async Task OpenAIChatMessageContentConnectorTestAsync()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task OpenAIChatAgentToolCallTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var openaiClient = new OpenAIClient(new Uri(endpoint), new Azure.AzureKeyCredential(key));
         var openAIChatAgent = new OpenAIChatAgent(
             openAIClient: openaiClient,
             name: "assistant",
-            modelName: "gpt-35-turbo-16k");
+            modelName: deployName);
 
         var functionCallMiddleware = new FunctionCallMiddleware(
             functions: [this.GetWeatherAsyncFunctionContract]);
@@ -170,16 +173,17 @@ public async Task OpenAIChatAgentToolCallTestAsync()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task OpenAIChatAgentToolCallInvokingTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var openaiClient = new OpenAIClient(new Uri(endpoint), new Azure.AzureKeyCredential(key));
         var openAIChatAgent = new OpenAIChatAgent(
             openAIClient: openaiClient,
             name: "assistant",
-            modelName: "gpt-35-turbo-16k");
+            modelName: deployName);
 
         var functionCallMiddleware = new FunctionCallMiddleware(
             functions: [this.GetWeatherAsyncFunctionContract],
diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs
@@ -13,18 +13,19 @@ namespace AutoGen.SemanticKernel.Tests;
 
 public class KernelFunctionMiddlewareTests
 {
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task ItRegisterKernelFunctionMiddlewareFromTestPluginTests()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var openaiClient = new OpenAIClient(new Uri(endpoint), new Azure.AzureKeyCredential(key));
 
         var kernel = new Kernel();
         var plugin = kernel.ImportPluginFromType<TestPlugin>();
         var kernelFunctionMiddleware = new KernelPluginMiddleware(kernel, plugin);
 
-        var agent = new OpenAIChatAgent(openaiClient, "assistant", modelName: "gpt-35-turbo-16k")
+        var agent = new OpenAIChatAgent(openaiClient, "assistant", modelName: deployName)
             .RegisterMessageConnector()
             .RegisterMiddleware(kernelFunctionMiddleware);
 
@@ -56,11 +57,12 @@ public async Task ItRegisterKernelFunctionMiddlewareFromTestPluginTests()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task ItRegisterKernelFunctionMiddlewareFromMethodTests()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deployName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var openaiClient = new OpenAIClient(new Uri(endpoint), new Azure.AzureKeyCredential(key));
 
         var kernel = new Kernel();
@@ -69,7 +71,7 @@ public async Task ItRegisterKernelFunctionMiddlewareFromMethodTests()
         var plugin = kernel.ImportPluginFromFunctions("plugin", [getWeatherMethod, createPersonObjectMethod]);
         var kernelFunctionMiddleware = new KernelPluginMiddleware(kernel, plugin);
 
-        var agent = new OpenAIChatAgent(openaiClient, "assistant", modelName: "gpt-35-turbo-16k")
+        var agent = new OpenAIChatAgent(openaiClient, "assistant", modelName: deployName)
             .RegisterMessageConnector()
             .RegisterMiddleware(kernelFunctionMiddleware);
 
diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs
@@ -25,13 +25,14 @@ public async Task<string> GetWeatherAsync(string location)
         return $"The weather in {location} is sunny.";
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task BasicConversationTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var builder = Kernel.CreateBuilder()
-            .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);
+            .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);
 
         var kernel = builder.Build();
 
@@ -53,13 +54,14 @@ public async Task BasicConversationTestAsync()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task SemanticKernelChatMessageContentConnectorTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var builder = Kernel.CreateBuilder()
-            .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);
+            .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);
 
         var kernel = builder.Build();
 
@@ -97,13 +99,14 @@ public async Task SemanticKernelChatMessageContentConnectorTestAsync()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task SemanticKernelPluginTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var builder = Kernel.CreateBuilder()
-            .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);
+            .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);
 
         var parameters = this.GetWeatherAsyncFunctionContract.Parameters!.Select(p => new KernelParameterMetadata(p.Name!)
         {
@@ -129,13 +132,14 @@ public async Task SemanticKernelPluginTestAsync()
     }
 
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task BasicSkChatCompletionAgentConversationTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var builder = Kernel.CreateBuilder()
-            .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);
+            .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);
 
         var kernel = builder.Build();
         var agent = new ChatCompletionAgent()
@@ -154,13 +158,14 @@ public async Task BasicSkChatCompletionAgentConversationTestAsync()
         reply.As<MessageEnvelope<ChatMessageContent>>().From.Should().Be("assistant");
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task SkChatCompletionAgentChatMessageContentConnectorTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var builder = Kernel.CreateBuilder()
-            .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);
+            .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);
 
         var kernel = builder.Build();
 
@@ -193,13 +198,14 @@ public async Task SkChatCompletionAgentChatMessageContentConnectorTestAsync()
         }
     }
 
-    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]
+    [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
     public async Task SkChatCompletionAgentPluginTestAsync()
     {
         var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");
         var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");
+        var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");
         var builder = Kernel.CreateBuilder()
-            .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);
+            .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);
 
         var parameters = this.GetWeatherAsyncFunctionContract.Parameters!.Select(p => new KernelParameterMetadata(p.Name!)
         {
diff --git a/dotnet/test/AutoGen.Tests/BasicSampleTest.cs b/dotnet/test/AutoGen.Tests/BasicSampleTest.cs
diff --git a/dotnet/test/AutoGen.Tests/SingleAgentTest.cs b/dotnet/test/AutoGen.Tests/SingleAgentTest.cs
diff --git a/dotnet/test/AutoGen.Tests/TwoAgentTest.cs b/dotnet/test/AutoGen.Tests/TwoAgentTest.cs

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class Example13_OpenAIAgent_JsonMode`
`16`	`16`	`public static async Task RunAsync()`
`17`	`17`	`{`
`18`	`18`	`#region create_agent`
`19`		`- var config = LLMConfiguration.GetAzureOpenAIGPT3_5_Turbo(deployName: "gpt-35-turbo-0125"); // json mode only works with 0125 and later model.`
	`19`	`+ var config = LLMConfiguration.GetAzureOpenAIGPT3_5_Turbo(deployName: "gpt-35-turbo"); // json mode only works with 0125 and later model.`
`20`	`20`	`var apiKey = config.ApiKey;`
`21`	`21`	`var endPoint = new Uri(config.Endpoint);`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ public static OpenAIConfig GetOpenAIGPT4()`
`22`	`22`	`return new OpenAIConfig(openAIKey, modelId);`
`23`	`23`	`}`
`24`	`24`
`25`		`- public static AzureOpenAIConfig GetAzureOpenAIGPT3_5_Turbo(string deployName = "gpt-35-turbo-16k")`
	`25`	`+ public static AzureOpenAIConfig GetAzureOpenAIGPT3_5_Turbo(string? deployName = null)`
`26`	`26`	`{`
`27`	`27`	`var azureOpenAIKey = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
`28`	`28`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`29`		`-`
	`29`	`+ deployName = deployName ?? Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`30`	`30`	`return new AzureOpenAIConfig(endpoint, deployName, azureOpenAIKey);`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,14 @@ public async Task<string> GetWeatherAsync(string location)`
`25`	`25`	`return $"The weather in {location} is sunny.";`
`26`	`26`	`}`
`27`	`27`
`28`		`- [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]`
	`28`	`+ [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]`
`29`	`29`	`public async Task BasicConversationTestAsync()`
`30`	`30`	`{`
`31`	`31`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`32`	`32`	`var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
	`33`	`+ var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`33`	`34`	`var builder = Kernel.CreateBuilder()`
`34`		`- .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);`
	`35`	`+ .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);`
`35`	`36`
`36`	`37`	`var kernel = builder.Build();`
`37`	`38`
`@@ -53,13 +54,14 @@ public async Task BasicConversationTestAsync()`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`
`56`		`- [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]`
	`57`	`+ [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]`
`57`	`58`	`public async Task SemanticKernelChatMessageContentConnectorTestAsync()`
`58`	`59`	`{`
`59`	`60`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`60`	`61`	`var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
	`62`	`+ var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`61`	`63`	`var builder = Kernel.CreateBuilder()`
`62`		`- .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);`
	`64`	`+ .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);`
`63`	`65`
`64`	`66`	`var kernel = builder.Build();`
`65`	`67`
`@@ -97,13 +99,14 @@ public async Task SemanticKernelChatMessageContentConnectorTestAsync()`
`97`	`99`	`}`
`98`	`100`	`}`
`99`	`101`
`100`		`- [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]`
	`102`	`+ [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]`
`101`	`103`	`public async Task SemanticKernelPluginTestAsync()`
`102`	`104`	`{`
`103`	`105`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`104`	`106`	`var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
	`107`	`+ var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`105`	`108`	`var builder = Kernel.CreateBuilder()`
`106`		`- .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);`
	`109`	`+ .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);`
`107`	`110`
`108`	`111`	`var parameters = this.GetWeatherAsyncFunctionContract.Parameters!.Select(p => new KernelParameterMetadata(p.Name!)`
`109`	`112`	`{`
`@@ -129,13 +132,14 @@ public async Task SemanticKernelPluginTestAsync()`
`129`	`132`	`}`
`130`	`133`
`131`	`134`
`132`		`- [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]`
	`135`	`+ [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]`
`133`	`136`	`public async Task BasicSkChatCompletionAgentConversationTestAsync()`
`134`	`137`	`{`
`135`	`138`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`136`	`139`	`var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
	`140`	`+ var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`137`	`141`	`var builder = Kernel.CreateBuilder()`
`138`		`- .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);`
	`142`	`+ .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);`
`139`	`143`
`140`	`144`	`var kernel = builder.Build();`
`141`	`145`	`var agent = new ChatCompletionAgent()`
`@@ -154,13 +158,14 @@ public async Task BasicSkChatCompletionAgentConversationTestAsync()`
`154`	`158`	`reply.As<MessageEnvelope<ChatMessageContent>>().From.Should().Be("assistant");`
`155`	`159`	`}`
`156`	`160`
`157`		`- [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]`
	`161`	`+ [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]`
`158`	`162`	`public async Task SkChatCompletionAgentChatMessageContentConnectorTestAsync()`
`159`	`163`	`{`
`160`	`164`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`161`	`165`	`var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
	`166`	`+ var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`162`	`167`	`var builder = Kernel.CreateBuilder()`
`163`		`- .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);`
	`168`	`+ .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);`
`164`	`169`
`165`	`170`	`var kernel = builder.Build();`
`166`	`171`
`@@ -193,13 +198,14 @@ public async Task SkChatCompletionAgentChatMessageContentConnectorTestAsync()`
`193`	`198`	`}`
`194`	`199`	`}`
`195`	`200`
`196`		`- [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT")]`
	`201`	`+ [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]`
`197`	`202`	`public async Task SkChatCompletionAgentPluginTestAsync()`
`198`	`203`	`{`
`199`	`204`	`var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new Exception("Please set AZURE_OPENAI_ENDPOINT environment variable.");`
`200`	`205`	`var key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new Exception("Please set AZURE_OPENAI_API_KEY environment variable.");`
	`206`	`+ var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOY_NAME") ?? throw new Exception("Please set AZURE_OPENAI_DEPLOY_NAME environment variable.");`
`201`	`207`	`var builder = Kernel.CreateBuilder()`
`202`		`- .AddAzureOpenAIChatCompletion("gpt-35-turbo-16k", endpoint, key);`
	`208`	`+ .AddAzureOpenAIChatCompletion(deploymentName, endpoint, key);`
`203`	`209`
`204`	`210`	`var parameters = this.GetWeatherAsyncFunctionContract.Parameters!.Select(p => new KernelParameterMetadata(p.Name!)`
`205`	`211`	`{`