Merge pull request #4979 from aahill/release-build-agents-2

Connected agents updates

Author: Stacyrch140

articles/ai-services/agents/how-to/connected-agents.md

@@ -110,71 +110,70 @@ To enable your Agent to use a connected agent, you use `ConnectedAgentToolDefini
 1. First we need to create agent client and read the environment variables, which will be used in the next steps.
 
     ```csharp
-    var connectionString = System.Environment.GetEnvironmentVariable("PROJECT_CONNECTION_STRING");
-    var modelDeploymentName = System.Environment.GetEnvironmentVariable("MODEL_DEPLOYMENT_NAME");
-    
-    var projectClient = new AIProjectClient(connectionString, new DefaultAzureCredential());
-    
-    AgentsClient agentClient = projectClient.GetAgentsClient();
+    var projectEndpoint = configuration["ProjectEndpoint"];
+    var modelDeploymentName = configuration["ModelDeploymentName"];
+
+    PersistentAgentsClient client = new(projectEndpoint, new DefaultAzureCredential());
     ```
 
-2. Next we will create the connected agent using the agent client. This agent will be used to initialize the `ConnectedAgentToolDefinition`.
+2. Next we will create the main agent `mainAgent`, and the connected `stockAgent` agent using the agent client. This connected agent will be used to initialize the `ConnectedAgentToolDefinition`.
 
     ```csharp
-    Agent connectedAgent = agentClient.CreateAgent(
-       model: modelDeploymentName,
-       name: "stock_price_bot",
-       instructions: "Your job is to get the stock price of a company. If you don't know the realtime stock price, return the last known stock price.");
-    
-    ConnectedAgentToolDefinition connectedAgentDefinition = new(new ConnectedAgentDetails(connectedAgent.Id, connectedAgent.Name, "Gets the stock price of a company"));
-    ```
+    PersistentAgent stockAgent = client.Administration.CreateAgent(
+            model: modelDeploymentName,
+            name: "stock_price_bot",
+            instructions: "Your job is to get the stock price of a company. If you don't know the realtime stock price, return the last known stock price."
+            // tools: [...] tools that would be used to get stock prices
+        );
+    ConnectedAgentToolDefinition connectedAgentDefinition = new(new ConnectedAgentDetails(stockAgent.Id, stockAgent.Name, "Gets the stock price of a company"));
+
+    PersistentAgent mainAgent = client.Administration.CreateAgent(
+            model: modelDeploymentName,
+            name: "stock_price_bot",
+            instructions: "Your job is to get the stock price of a company, using the available tools.",
+            tools: [connectedAgentDefinition]
+        );
 
-3. We will use the `ConnectedAgentToolDefinition` during the agent initialization.
 
-    ```csharp
-    Agent agent = agentClient.CreateAgent(
-       model: modelDeploymentName,
-       name: "my-assistant",
-       instructions: "You are a helpful assistant, and use the connected agent to get stock prices.",
-       tools: [ connectedAgentDefinition ]);
     ```
 
 4. Now we will create the thread, add the message, containing a question for agent and start the run.
 
     ```csharp
-    AgentThread thread = agentClient.CreateThread();
-    
+    PersistentAgentThread thread = client.Threads.CreateThread();
+
     // Create message to thread
-    ThreadMessage message = agentClient.CreateMessage(
+    PersistentThreadMessage message = client.Messages.CreateMessage(
         thread.Id,
         MessageRole.User,
         "What is the stock price of Microsoft?");
-    
+
     // Run the agent
-    ThreadRun run = agentClient.CreateRun(thread, agent);
+    ThreadRun run = client.Runs.CreateRun(thread, agent);
     do
     {
         Thread.Sleep(TimeSpan.FromMilliseconds(500));
-        run = agentClient.GetRun(thread.Id, run.Id);
+        run = client.Runs.GetRun(thread.Id, run.Id);
     }
     while (run.Status == RunStatus.Queued
         || run.Status == RunStatus.InProgress);
-    
-    Assert.AreEqual(
-        RunStatus.Completed,
-        run.Status,
-        run.LastError?.Message);
+
+    // Confirm that the run completed successfully
+    if (run.Status != RunStatus.Completed)
+    {
+        throw new Exception("Run did not complete successfully, error: " + run.LastError?.Message);
+    }
     ```
 
 5. Print the agent messages to console in chronological order.
 
     ```csharp
-    PageableList<ThreadMessage> messages = agentClient.GetMessages(
+    Pageable<PersistentThreadMessage> messages = client.Messages.GetMessages(
         threadId: thread.Id,
         order: ListSortOrder.Ascending
     );
-    
-    foreach (ThreadMessage threadMessage in messages)
+
+    foreach (PersistentThreadMessage threadMessage in messages)
     {
         Console.Write($"{threadMessage.CreatedAt:yyyy-MM-dd HH:mm:ss} - {threadMessage.Role,10}: ");
         foreach (MessageContent contentItem in threadMessage.ContentItems)
@@ -186,9 +185,9 @@ To enable your Agent to use a connected agent, you use `ConnectedAgentToolDefini
                 {
                     foreach (MessageTextAnnotation annotation in textItem.Annotations)
                     {
-                        if (annotation is MessageTextUrlCitationAnnotation urlAnnotation)
+                        if (annotation is MessageTextUriCitationAnnotation urlAnnotation)
                         {
-                            response = response.Replace(urlAnnotation.Text, $" [{urlAnnotation.UrlCitation.Title}]({urlAnnotation.UrlCitation.Url})");
+                            response = response.Replace(urlAnnotation.Text, $" [{urlAnnotation.UriCitation.Title}]({urlAnnotation.UriCitation.Uri})");
                         }
                     }
                 }
@@ -229,23 +228,21 @@ To create a multi-agent setup, follow these steps:
     from azure.identity import DefaultAzureCredential
 
 
-    project_client = AIProjectClient.from_connection_string(
-        credential=DefaultAzureCredential(),
-        conn_str=os.environ["PROJECT_CONNECTION_STRING"],
+    project_client = AIProjectClient(
+    endpoint=os.environ["PROJECT_ENDPOINT"],
+    credential=DefaultAzureCredential(),
+    api_version="latest",
     )
     ```
 
 1. Create an agent that will be connected to a "main" agent.
 
     ```python
-    connected_agent_name = "stock_price_bot"
-    
     stock_price_agent = project_client.agents.create_agent(
         model=os.environ["MODEL_DEPLOYMENT_NAME"],
-        name=connected_agent_name,
-        instructions=(
-            "Your job is to get the stock price of a company. If you don't know the realtime stock price, return the last known stock price."
-        ),
+        name="stock_price_bot",
+        instructions="Your job is to get the stock price of a company. If you don't know the realtime stock price, return the last known stock price.",
+        #tools=... # tools to help the agent get stock prices
     )
     ```
 
@@ -263,7 +260,7 @@ To create a multi-agent setup, follow these steps:
     agent = project_client.agents.create_agent(
         model=os.environ["MODEL_DEPLOYMENT_NAME"],
         name="my-agent",
-        instructions="You are a helpful agent, and use the connected agent to get stock prices.",
+        instructions="You are a helpful agent, and use the available tools to get stock prices.",
         tools=connected_agent.definitions,
     )
 

articles/ai-services/agents/how-to/tools/overview.md

@@ -74,15 +74,17 @@ The Foundry Agent Service provides the following built-in tools. You can use the
 The following tools are authored by third-party partners. Use the links below to view the documentation and code samples. 
 
 > [!IMPORTANT]
-> * Your use of connected non-Microsoft services is subject to the terms between you and the service provider. By connecting to a non-Microsoft service, you acknowledge that some of your data, such as prompt content, is passed to the non-Microsoft service, and/or your application might receive data from the non-Microsoft service. You're responsible for your use of non-Microsoft data. 
-> * Using tools might incur usage with tool providers, review the pricing plan with your selected tool providers. 
+> * Your use of connected non-Microsoft services is subject to the terms between you and the service provider. By connecting to a non-Microsoft service, you acknowledge that some of your data, such as prompt content, is passed to the non-Microsoft service, and/or your application might receive data from the non-Microsoft service. You are responsible for your use (and any charges associated with your use) of non-Microsoft services and data. 
+> * The code in these non-Microsfot files were created by third parties, not Microsoft, and have not been tested or verified by Microsoft. Your use of the code samples is subject to the terms provided by the relevant third party. By using any third-party sample in this file, you are acknowledging that Microsoft has no responsibility to you or others with respect to these samples.
 
 |Tool  |Description  |
 |---------|---------|
-| [Auquan](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/auquan) | Utilize Auquan to perform your financial data crunching |
+| [Auquan](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/auquan) | AI-powered workflow automation for institutional finance |
 | [Celonis](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/Celonis) | Celonis delivers Process Intelligence to accelerate enterprise AI at scale |
 | [InsureMO Insurance Quotation](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/InsureMO) | Action APIs for insurance quotations for Car, Home, and Travel |
 | [LEGALFLY](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/legalfly) | Legal insights grounded in trusted sources from your jurisdiction. |
+| [LexisNexis](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/LexisNexis) | Seamless access to LexisNexis content. |
 | [MiHCM](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/MiHCM) | seamless integration with MiHCM's HR functionalities |
-| [Morningstar](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/Morningstar) | Access up-to-date analyst research, expert commentary, and essential Morningstar data. |
+| [Morningstar](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/Morningstar) | Access up-to-date investment research and data such as analyst research, expert commentary, and essential Morningstar data. |
+| [Trademo](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/Trademo_Glocal_trade) | Provide latest duties and past shipment data for trade between multiple countries |
 | [Tripadvisor](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/getting-started-agents/3p-tools/Tripadvisor) | Get travel data, guidance and reviews |

articles/ai-services/agents/how-to/triggers.md

@@ -23,9 +23,10 @@ For example, consider a workflow with the *Microsoft Forms* connector (which has
 
 To check if a specific connector has a trigger capability, view its documentation and see if it has a **Trigger** section. For example, the [Triggers](/connectors/microsoftforms/#triggers) section of the *Microsoft Forms* connector. 
 
-## Prerequisite 
+## Prerequisites
 
 * [An existing agent](../quickstart.md)
+* Supported Logic Apps regions: `west us 2`, `west central us`, `east asia`, and `southeast asia`.
 
 ## Set up 
 

articles/ai-services/agents/includes/quickstart-python.md

@@ -91,7 +91,7 @@ message = project_client.agents.messages.create(
 )
 print(f"Created message, ID: {message['id']}")
 
- Create and process an agent run
+# Create and process an agent run
 run = project_client.agents.runs.create_and_process(thread_id=thread.id, agent_id=agent.id)
 print(f"Run finished with status: {run.status}")