Update File Search sample & other updates

doc-samples/agents/c#/azure-ai-agent-sdk/README.md

@@ -16,8 +16,8 @@ This table tracks the current status of code samples for each supported tool in
 | Tool               | Sample Description                     | Status          | Notes / Known Issues                          |
 |--------------------|-----------------------------------------|-----------------|-----------------------------------------------|
 | **Basic Agent**    | Using agent with no tools              | ❌ Doesn't exist|                                               |
-| **Bing**           | Using Bing in an agent                 | ❌ Doesn't exist|                                               |
-| **File Search**    | Uploading files                        | ❌ Doesn't exist|                                               |
+| **Bing**           | Using Bing in an agent                 | ⚠️ Exists| Sample updated - works with project connection string, but not with project endpoint |
+| **File Search**    | Uploading files                        | ⚠️ Exists| Sample updated - works with project connection string, but not with project endpoint |
 |                    | Using blob storage (project data assets)| ❌ Doesn't exist|                                               |
 |                    | Managing files                         | ❌ Doesn't exist|                                               |
 | **Azure AI Search**| Using a knowledge store                | ❌ Doesn't exist|                                               |

doc-samples/agents/c#/azure-ai-agent-sdk/Sample4_PersistentAgents_Bing_Grounding.md

@@ -15,7 +15,7 @@ var connectionId = System.Environment.GetEnvironmentVariable("AZURE_BING_CONECTI
 PersistentAgentsClient agentClient = new(projectEndpoint, new DefaultAzureCredential());
 ```
 
-2. We will use the Bing connection ID to initialize the `BingGroundingToolDefinition`.
+2. We will use the Bing connection Id to initialize the `BingGroundingToolDefinition`.
 
 ```C# Snippet:AgentsBingGrounding_GetConnection
 ToolConnectionList connectionList = new()
@@ -47,7 +47,7 @@ PersistentAgent agent = await agentClient.CreateAgentAsync(
    tools: [ bingGroundingTool ]);
 ```
 
-4. Now we will create the thread, add the message , containing a question for agent and start the run.
+4. Now we will create the thread, add the message containing a question for agent and start the run.
 
 Synchronous sample:
 ```C# Snippet:AgentsBingGrounding_CreateThreadMessage
@@ -105,15 +105,17 @@ if (run.Status != RunStatus.Completed)
 
 ```
 
-5. Print the agent messages to console in chronological order.
+5. Print the agent messages to console in chronological order (including formatting URL citations).
 
 Synchronous sample:
 ```C# Snippet:AgentsBingGrounding_Print
+// Retrieve all messages from the agent client
 PageableList<ThreadMessage> messages = agentClient.GetMessages(
     threadId: thread.Id,
     order: ListSortOrder.Ascending
 );
 
+// Process messages in order
 foreach (ThreadMessage threadMessage in messages)
 {
     Console.Write($"{threadMessage.CreatedAt:yyyy-MM-dd HH:mm:ss} - {threadMessage.Role,10}: ");
@@ -122,6 +124,8 @@ foreach (ThreadMessage threadMessage in messages)
         if (contentItem is MessageTextContent textItem)
         {
             string response = textItem.Text;
+
+            // If we have Text URL citation annotations, reformat the response to show title & URL for citations
             if (textItem.Annotations != null)
             {
                 foreach (MessageTextAnnotation annotation in textItem.Annotations)
@@ -185,14 +189,14 @@ foreach (ThreadMessage threadMessage in messages)
 6. Clean up resources by deleting thread and agent.
 
 Synchronous sample:
-```C# Snippet:AgentsBingGroundingCleanup
+```C# Snippet:AgentsBingGrounding_Cleanup
 // Delete thread and agent
 agentClient.DeleteThread(threadId: thread.Id);
 agentClient.DeleteAgent(agentId: agent.Id);
 ```
 
 Asynchronous sample:
-```C# Snippet:AgentsBingGroundingCleanupAsync
+```C# Snippet:AgentsBingGroundingAsync_Cleanup
 // Delete thread and agent
 await agentClient.DeleteThreadAsync(threadId: thread.Id);
 await agentClient.DeleteAgentAsync(agentId: agent.Id);

doc-samples/agents/c#/azure-ai-agent-sdk/Sample6_PersistentAgents_FileSearch.md

@@ -0,0 +1,253 @@
+# Sample file search with agent in Azure.AI.Agents.
+
+In this example we will create the local file, upload it to the newly created `VectorStore`, which will be used in the file search.
+
+1. First we need to create agent client and read the environment variables that will be used in the next steps.
+```C# Snippet:AgentsFileSearch_CreateClient
+// Get Connection information from Environment Variables
+// To use App Config instead:  https://learn.microsoft.com/en-us/visualstudio/ide/managing-application-settings-dotnet
+var projectEndpoint = System.Environment.GetEnvironmentVariable("PROJECT_ENDPOINT");
+var modelDeploymentName = System.Environment.GetEnvironmentVariable("MODEL_DEPLOYMENT_NAME");
+
+// Create the Agent Client
+PersistentAgentsClient client = new(projectEndpoint, new DefaultAzureCredential());
+```
+
+2. Now we will create a local file and upload it to the data store.
+
+Synchronous sample:
+```C# Snippet:AgentsFileSearch_UploadAgentFiles
+// Upload a file and wait for it to be processed
+// Create a local sample file
+System.IO.File.WriteAllText(
+    path: "sample_file_for_upload.txt",
+    contents: "The word 'apple' uses the code 442345, while the word 'banana' uses the code 673457."
+);
+
+// Upload local sample file to the agent
+PersistentAgentFile uploadedAgentFile = agentClient.UploadFile(
+    filePath: "sample_file_for_upload.txt",
+    purpose: PersistentAgentFilePurpose.Agents
+);
+
+// Setup dictionary with list of File IDs for the vector store
+Dictionary<string, string> fileIds = new()
+{
+    { uploadedAgentFile.Id, uploadedAgentFile.Filename }
+};
+```
+
+Asynchronous sample:
+```C# Snippet:AgentsFileSearchAsync_UploadAgentFiles
+// Create a local sample file
+await System.IO.File.WriteAllTextAsync(
+    path: "sample_file_for_upload.txt",
+    contents: "The word 'apple' uses the code 442345, while the word 'banana' uses the code 673457."
+);
+
+// Upload local sample file to the agent
+PersistentAgentFile uploadedAgentFile = await agentClient.UploadFileAsync(
+    filePath: "sample_file_for_upload.txt",
+    purpose: PersistentAgentFilePurpose.Agents
+);
+
+// Setup dictionary with list of File IDs for the vector store
+Dictionary<string, string> fileIds = new()
+{
+    { uploadedAgentFile.Id, uploadedAgentFile.Filename }
+};
+```
+
+3.  To create agent capable of using file search, we will create `VectorStore`, with the ID of uploaded file.
+
+Synchronous sample:
+```C# Snippet:AgentsFileSearch_CreateVectorStore
+// Create a vector store with the file and wait for it to be processed.
+// If you do not specify a vector store, CreateMessage will create a vector
+// store with a default expiration policy of seven days after they were last active
+VectorStore vectorStore = agentClient.CreateVectorStore(
+    fileIds: new List<string> { uploadedAgentFile.Id },
+    name: "my_vector_store");
+
+```
+
+Asynchronous sample:
+```C# Snippet:AgentsFileSearchAsync_CreateVectorStore
+// Create a vector store with the file and wait for it to be processed.
+// If you do not specify a vector store, CreateMessage will create a vector
+// store with a default expiration policy of seven days after they were last active
+VectorStore vectorStore = await agentClient.CreateVectorStoreAsync(
+    fileIds: new List<string> { uploadedAgentFile.Id },
+    name: "my_vector_store");
+
+```
+
+4.  Create the `FileSearchToolResource` using the Id of the created vector store and then create the agent
+
+Synchronous sample:
+```C# Snippet:AgentsFileSearch_CreateAgentWithFiles
+// Create tool definition for File Search
+FileSearchToolResource fileSearchToolResource = new FileSearchToolResource();
+fileSearchToolResource.VectorStoreIds.Add(vectorStore.Id);
+
+// Create an agent with Tools and Tool Resources
+PersistentAgent agent = agentClient.CreateAgent(
+        model: modelDeploymentName,
+        name: "SDK Test Agent - Retrieval",
+        instructions: "You are a helpful agent that can help fetch data from files you know about.",
+        tools: new List<ToolDefinition> { new FileSearchToolDefinition() },
+        toolResources: new ToolResources() { FileSearch = fileSearchToolResource });
+```
+
+Asynchronous sample:
+```C# Snippet:AgentsFileSearchAsync_CreateAgentWithFiles
+// Create tool definition for File Search
+FileSearchToolResource fileSearchToolResource = new FileSearchToolResource();
+fileSearchToolResource.VectorStoreIds.Add(vectorStore.Id);
+
+// Create an agent with Tools and Tool Resources
+PersistentAgent agent = await agentClient.CreateAgentAsync(
+        model: modelDeploymentName,
+        name: "SDK Test Agent - Retrieval",
+        instructions: "You are a helpful agent that can help fetch data from files you know about.",
+        tools: new List<ToolDefinition> { new FileSearchToolDefinition() },
+        toolResources: new ToolResources() { FileSearch = fileSearchToolResource });
+```
+
+5. Now we will create the thread, add the message containing a question for agent related to the file contents and start the run.
+
+Synchronous sample:
+```C# Snippet:AgentsFileSearch_CreateThreadAndRun
+// Create the agent thread for communication
+PersistentAgentThread thread = agentClient.CreateThread();
+
+// Create message and run the agent
+ThreadMessage messageResponse = agentClient.CreateMessage(
+    thread.Id,
+    MessageRole.User,
+    "Can you give me the documented codes for 'banana' and 'orange'?");
+
+ThreadRun run = agentClient.CreateRun(thread, agent);
+
+// Wait for the agent to finish running
+do
+{
+    Thread.Sleep(TimeSpan.FromMilliseconds(500));
+    run = agentClient.GetRun(thread.Id, run.Id);
+}
+while (run.Status == RunStatus.Queued
+    || run.Status == RunStatus.InProgress);
+
+// Confirm that the run completed successfully
+if (run.Status != RunStatus.Completed)
+{
+    throw new Exception("Run did not complete successfully, error: " + run.LastError?.Message);
+}
+
+```
+
+Asynchronous sample:
+```C# Snippet:AgentsFileSearchAsync_CreateThreadAndRun
+// Create the agent thread for communication
+PersistentAgentThread thread = await agentClient.CreateThreadAsync();
+
+// Create message and run the agent
+ThreadMessage messageResponse = await agentClient.CreateMessageAsync(
+    thread.Id,
+    MessageRole.User,
+    "Can you give me the documented codes for 'banana' and 'orange'?");
+
+ThreadRun run = await agentClient.CreateRunAsync(thread, agent);
+
+// Wait for the agent to finish running
+do
+{
+    await Task.Delay(TimeSpan.FromMilliseconds(500));
+    run = await agentClient.GetRunAsync(thread.Id, run.Id);
+}
+while (run.Status == RunStatus.Queued
+    || run.Status == RunStatus.InProgress);
+
+// Confirm that the run completed successfully
+if (run.Status != RunStatus.Completed)
+{
+    throw new Exception("Run did not complete successfully, error: " + run.LastError?.Message);
+}
+
+```
+
+6. Print the agent messages to console in chronological order (including formatting file citations).
+```C# Snippet:AgentsFileSearch_Print
+
+// Retrieve all messages from the agent client
+PageableList<ThreadMessage> messages = agentClient.GetMessages(
+    threadId: thread.Id,
+    order: ListSortOrder.Ascending
+);
+
+// Helper method for replacing references
+static string replaceReferences(Dictionary<string, string> fileIds, string fileID, string placeholder, string text)
+{
+    if (fileIds.TryGetValue(fileID, out string replacement))
+        return text.Replace(placeholder, $" [{replacement}]");
+    else
+        return text.Replace(placeholder, $" [{fileID}]");
+}
+
+// Process messages in order
+foreach (ThreadMessage threadMessage in messages)
+{
+    Console.Write($"{threadMessage.CreatedAt:yyyy-MM-dd HH:mm:ss} - {threadMessage.Role,10}: ");
+
+    foreach (MessageContent contentItem in threadMessage.ContentItems)
+    {
+        if (contentItem is MessageTextContent textItem)
+        {
+            if (threadMessage.Role == MessageRole.Agent && textItem.Annotations.Count > 0)
+            {
+                string strMessage = textItem.Text;
+
+                // If we file path or file citation annotations - rewrite the 'source' FileId with the file name
+                foreach (MessageTextAnnotation annotation in textItem.Annotations)
+                {
+                    if (annotation is MessageTextFilePathAnnotation pathAnnotation)
+                    {
+                        strMessage = replaceReferences(fileIds, pathAnnotation.FileId, pathAnnotation.Text, strMessage);
+                    }
+                    else if (annotation is MessageTextFileCitationAnnotation citationAnnotation)
+                    {
+                        strMessage = replaceReferences(fileIds, citationAnnotation.FileId, citationAnnotation.Text, strMessage);
+                    }
+                }
+                Console.Write(strMessage);
+            }
+            else
+            {
+                Console.Write(textItem.Text);
+            }
+        }
+        else if (contentItem is MessageImageFileContent imageFileItem)
+        {
+            Console.Write($"<image from ID: {imageFileItem.FileId}");
+        }
+        Console.WriteLine();
+    }
+}
+```
+7. Finally, we delete all the resources created in this sample.
+
+Synchronous sample:
+```C# Snippet:AgentsFileSearch_Cleanup
+client.DeleteVectorStore(vectorStore.Id);
+client.DeleteFile(uploadedAgentFile.Id);
+client.DeleteThread(thread.Id);
+client.DeleteAgent(agent.Id);
+```
+
+Asynchronous sample:
+```C# Snippet:AgentsFileSearchAsync_Cleanup
+await client.DeleteVectorStoreAsync(vectorStore.Id);
+await client.DeleteFileAsync(uploadedAgentFile.Id);
+await client.DeleteThreadAsync(thread.Id);
+await client.DeleteAgentAsync(agent.Id);
+```