patch (orchestrator): [fix] preserve thread context for a session + dependency update + minors (#47)

Co-authored-by: Chad Kittel <chad.kittel@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 3 people

README.md

@@ -134,16 +134,16 @@ The AI agent definition would likely be deployed from your application's pipelin
 
  ```bash
  # Use the agent definition on disk
- curl "https://github.com/Azure-Samples/openai-end-to-end-basic/raw/refs/heads/main/agents/chat-with-bing.json"
+ wget "https://github.com/Azure-Samples/openai-end-to-end-basic/raw/refs/heads/main/agents/chat-with-bing.json"
 
  # Update to match your environment
- cat agents/chat-with-bing.json | \
+ cat chat-with-bing.json | \
  sed "s#MODEL_CONNECTION_NAME#${MODEL_CONNECTION_NAME}#g" | \
  sed "s#BING_CONNECTION_ID#${BING_CONNECTION_ID}#g" \
- > agents/chat-with-bing-output.json
+ > chat-with-bing-output.json
 
  # Deploy the agent
- az rest -u $AI_FOUNDRY_AGENT_CREATE_URL -m "post" --resource "https://ai.azure.com" -b @agents/chat-with-bing-output.json
+ az rest -u $AI_FOUNDRY_AGENT_CREATE_URL -m "post" --resource "https://ai.azure.com" -b @chat-with-bing-output.json
  ```
 
 1. Get Agent Id value

website/chatui.zip

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Options;
 using Azure;
 using Azure.AI.Agents.Persistent;
-using chatui.Models;
 using chatui.Configuration;
 
 namespace chatui.Controllers;
@@ -19,41 +18,48 @@ public class ChatController(
  private readonly IOptionsMonitor<ChatApiOptions> _options = options;
  private readonly ILogger<ChatController> _logger = logger;
 
- [HttpPost]
- public async Task<IActionResult> Completions([FromBody] string prompt)
+ // TODO: [security] Do not trust client to provide threadId. Instead map current user to their active threadid in your application's own state store.
+ // Without this security control in place, a user can inject messages into another user's thread.
+ [HttpPost("{threadId}")]
+ public async Task<IActionResult> Completions([FromRoute] string threadId, [FromBody] string prompt)
  {
  if (string.IsNullOrWhiteSpace(prompt))
  throw new ArgumentException("Prompt cannot be null, empty, or whitespace.", nameof(prompt));
 
  _logger.LogDebug("Prompt received {Prompt}", prompt);
  var _config = _options.CurrentValue;
 
- // TODO: Reuse chat context.
- PersistentAgentThread thread = await _client.Threads.CreateThreadAsync();
-
  PersistentThreadMessage message = await _client.Messages.CreateMessageAsync(
- thread.Id,
+ threadId,
  MessageRole.User,
  prompt);
 
- ThreadRun run = await _client.Runs.CreateRunAsync(thread.Id, _config.AIAgentId);
+ ThreadRun run = await _client.Runs.CreateRunAsync(threadId, _config.AIAgentId);
 
  while (run.Status == RunStatus.Queued || run.Status == RunStatus.InProgress || run.Status == RunStatus.RequiresAction)
  {
  await Task.Delay(TimeSpan.FromMilliseconds(500));
- run = (await _client.Runs.GetRunAsync(thread.Id, run.Id)).Value;
+ run = (await _client.Runs.GetRunAsync(threadId, run.Id)).Value;
  }
 
- Pageable<PersistentThreadMessage>  messages = _client.Messages.GetMessages(
- threadId: thread.Id, order: ListSortOrder.Ascending);
+ Pageable<PersistentThreadMessage> messages = _client.Messages.GetMessages(
+ threadId: threadId, order: ListSortOrder.Ascending);
 
- var fullText = string.Concat(
+ var fullText =
  messages
  .Where(m => m.Role == MessageRole.Agent)
  .SelectMany(m => m.ContentItems.OfType<MessageTextContent>())
- .Select(c => c.Text)
- );
+ .Last().Text;
+
+ return Ok(new { data = fullText });
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> Threads()
+ {
+ // TODO [performance efficiency] Delay creating a thread until the first user message arrives.
+ PersistentAgentThread thread = await _client.Threads.CreateThreadAsync();
 
- return Ok(new HttpChatResponse(true, fullText));
+ return Ok(new { id = thread.Id });
  }
 }

website/chatui/Controllers/ChatController.cs

@@ -175,11 +175,14 @@
  const BOT_NAME = "Chatbot";
  const PERSON_NAME = "";
 
- document.addEventListener("DOMContentLoaded", () => {
+ document.addEventListener("DOMContentLoaded", async () => {
  const chatForm = document.querySelector(".msger-inputarea");
  const chatContainer = document.querySelector(".msger-chat");
  const messageInput = chatForm?.elements?.message;
 
+ const { id } = await createThread();
+ const threadId = id;
+
  addChatMessage(BOT_NAME, "left", "How can I help you today?");
 
  chatForm.addEventListener("submit", async (event) => {
@@ -202,7 +205,7 @@
  });
 
  async function sendPrompt(prompt) {
- const response = await fetch("/chat/completions", {
+ const response = await fetch(`/chat/completions/${threadId}`, {
  method: "POST",
  headers: { "Content-Type": "application/json" },
  body: JSON.stringify(prompt)
@@ -216,6 +219,20 @@
  return response.json();
  }
 
+ async function createThread() {
+ const response = await fetch("/chat/threads", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" }
+ });
+
+ if (!response.ok) {
+ const errorMessage = await response.text().catch(() => response.statusText);
+ throw new Error(`Error creating session: ${errorMessage}`);
+ }
+
+ return response.json();
+ }
+
  function addChatMessage(name, side, text) {
  const timestamp = formatTime(new Date());
 

website/chatui/Models/ChatResponse.cs

@@ -9,6 +9,6 @@
  </ItemGroup>
  <ItemGroup>
  <PackageReference Include="Azure.AI.Agents.Persistent" Version="1.1.0-beta.1" />
- <PackageReference Include="Azure.Identity" Version="1.13.2" />
+ <PackageReference Include="Azure.Identity" Version="1.14.0" />
  </ItemGroup>
 </Project>