fix: ai chat bot template (#10510)

* fix: ai chat bot template * refactor: bump sdk version
OfficeDev · Dec 12, 2023 · b364db1 · b364db1
1 parent 8740978
commit b364db1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/templates/csharp/ai-assistant-bot/{{ProjectName}}.csproj.tpl b/templates/csharp/ai-assistant-bot/{{ProjectName}}.csproj.tpl
@@ -17,6 +17,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.21.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.1" />
-    <PackageReference Include="Microsoft.Teams.AI" Version="1.0.0-preview-6" />
+    <PackageReference Include="Microsoft.Teams.AI" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/templates/csharp/ai-bot/Program.cs.tpl b/templates/csharp/ai-bot/Program.cs.tpl
@@ -31,21 +31,32 @@ builder.Services.AddSingleton<IBotFrameworkHttpAdapter>(sp => sp.GetService<Clou
 builder.Services.AddSingleton<BotAdapter>(sp => sp.GetService<CloudAdapter>());
 
 builder.Services.AddSingleton<IStorage, MemoryStorage>();
-OpenAIModel model = null;
+
 if (!string.IsNullOrWhiteSpace(config.OpenAI?.ApiKey))
 {
-    model = new(new OpenAIModelOptions(config.OpenAI.ApiKey, "gpt-3.5-turbo"));
+    builder.Services.AddSingleton<OpenAIModel>(sp => new(
+        new OpenAIModelOptions(config.OpenAI.ApiKey, "gpt-3.5-turbo")
+        {
+            LogRequests = true
+        },
+        sp.GetService<ILoggerFactory>()
+    ));
 }
 else if (!string.IsNullOrWhiteSpace(config.Azure?.OpenAIApiKey) && !string.IsNullOrWhiteSpace(config.Azure.OpenAIEndpoint))
 {
-    model = new(new AzureOpenAIModelOptions(
-        config.Azure.OpenAIApiKey,
-        "gpt-35-turbo",
-        config.Azure.OpenAIEndpoint
+    builder.Services.AddSingleton<OpenAIModel>(sp => new(
+        new AzureOpenAIModelOptions(
+            config.Azure.OpenAIApiKey,
+            "gpt-35-turbo",
+            config.Azure.OpenAIEndpoint
+        )
+        {
+            LogRequests = true
+        },
+        sp.GetService<ILoggerFactory>()
     ));
 }
-
-if (model == null)
+else
 {
     throw new Exception("Missing configuration, please configure settings for either OpenAI or Azure");
 }
@@ -65,7 +76,7 @@ builder.Services.AddTransient<IBot>(sp =>
     // Create ActionPlanner
     ActionPlanner<TurnState> planner = new(
         options: new(
-            model: model,
+            model: sp.GetService<OpenAIModel>(),
             prompts: prompts,
             defaultPrompt: async (context, state, planner) =>
             {

diff --git a/templates/csharp/ai-bot/appsettings.Development.json b/templates/csharp/ai-bot/appsettings.Development.json
@@ -3,7 +3,8 @@
     "LogLevel": {
       "Default": "Information",
       "Microsoft": "Information",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.Teams.AI": "Trace"
     }
   },
   "AllowedHosts": "*",

diff --git a/templates/csharp/ai-bot/{{ProjectName}}.csproj.tpl b/templates/csharp/ai-bot/{{ProjectName}}.csproj.tpl
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.21.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.1" />
-    <PackageReference Include="Microsoft.Teams.AI" Version="1.0.0-preview-3" />
+    <PackageReference Include="Microsoft.Teams.AI" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>