Resolve merge conflicts

Author: JKirsch1

.openpublishing.publish.config.json

@@ -104,6 +104,24 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureai-samples-main",
+      "url": "https://github.com/Azure-Samples/azureai-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azureai-samples-nov2024",
+      "url": "https://github.com/Azure-Samples/azureai-samples",
+      "branch": "dantaylo/nov2024",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azureai-samples-csharp",
+      "url": "https://github.com/Azure-Samples/azureai-samples",
+      "branch": "dantaylo/csharp",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-main",
       "url": "https://github.com/azure/azureml-examples",

.openpublishing.redirection.json

@@ -24,6 +24,11 @@
       "source_path_from_root": "/articles/search/search-howto-large-index.md",
       "redirect_url": "/azure/search/search-how-to-large-index",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/openai/how-to/use-your-data-securely.md",
+      "redirect_url": "/azure/ai-services/openai/how-to/on-your-data-configuration",
+      "redirect_document_id": false
     }
   ]
 }

articles/ai-services/.openpublishing.redirection.ai-services.json

@@ -155,6 +155,11 @@
       "redirect_url": "/azure/ai-services/content-safety/concepts/custom-categories",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/ai-services/content-safety/how-to/custom-categories.md",
+      "redirect_url": "/azure/ai-services/content-safety/quickstart-custom-categories",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-voice-create-voice.md",
       "redirect_url": "/azure/ai-services/speech-service/professional-voice-train-voice",
@@ -770,6 +775,11 @@
       "redirect_url": "/azure/ai-services/speech-service/video-translation-get-started",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/ai-services/speech-service/custom-speech-ai-studio.md",
+      "redirect_url": "/azure/ai-services/speech-service/custom-speech-ai-foundry-portal",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/ai-services/qnamaker/how-to/migrate-to-openai.md",
       "redirect_url": "/azure/ai-services/qnamaker/overview/overview",
@@ -779,6 +789,26 @@
       "source_path_from_root": "/articles/ai-services/language-service/question-answering/how-to/azure-openai-integration.md",
       "redirect_url": "/azure/ai-services/language-service/question-answering/overview",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/try-document-intelligence-studio.md",
+      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/studio-custom-project",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/document-intelligence/train/custom-generative-extraction.md",
+      "redirect_url": "/azure/ai-services/document-intelligence/train/custom-model",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/document-intelligence/how-to-guides/build-train-custom-generative-model.md",
+      "redirect_url": "/azure/ai-services/document-intelligence/how-to-guides/build-a-custom-model",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/openai/how-to/integrate-synapseml.md",
+      "redirect_url": "/azure/ai-services/openai/overview",
+      "redirect_document_id": true
     }
   ]
 }

articles/ai-services/agents/breadcrumb/toc.yml

@@ -0,0 +1,22 @@
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure AI services
+    tocHref: /azure/ai-services/
+    topicHref: /azure/ai-services/index
+    items:
+    - name: Azure AI Agent Service
+      tocHref: /azure/ai-services/
+      topicHref: /azure/ai-services/agents/index
+- name: Azure
+  tocHref: /legal/
+  topicHref: /azure/index
+  items:
+  - name: Azure AI services                # Original doc set name
+    tocHref: /legal/cognitive-services/openai    # Destination doc set route
+    topicHref: /azure/ai-services/agents/index    # Original doc set route
+    items:
+    - name: Azure AI Agent Service      # Destination doc set name
+      tocHref: /legal/cognitive-services/openai      # Destination doc set route
+      topicHref: /azure/ai-services/agents/index    # Original doc set route

articles/ai-services/agents/concepts/agents.md

@@ -0,0 +1,81 @@
+---
+title: What are agents?
+titleSuffix: Azure AI services
+description: Learn about using agents in the Azure AI Agent Service.
+manager: nitinme
+author: aahill
+ms.author: aahi
+ms.service: azure
+ms.topic: conceptual
+ms.date: 12/11/2024
+ms.custom: azure-ai-agents
+---
+
+# What are agents?
+
+Azure AI Agent Service is now available in public preview. The service makes it easier for developers to create applications with sophisticated copilot-like experiences that can sift through data, suggest solutions, and automate tasks.
+
+* Agents can call Azure OpenAI and other [models](./model-region-support.md) with specific instructions to tune their personality and capabilities.
+* Agents can access **multiple tools in parallel**. These can be both tools like [code interpreter](../how-to/tools/code-interpreter.md) <!--and [file search](../how-to/tools/file-search.md),--> or tools you build, host, and access through [function calling](../how-to/tools/function-calling.md).
+* Agents can access **persistent Threads**. Threads simplify AI application development by storing message history and truncating it when the conversation gets too long for the model's context length. You create a thread once, and append messages to it as your users reply.
+* Agents can access files in several formats. Either as part of their creation or as part of threads between agents and users. When using tools, agents can also create files (such as images or spreadsheets) and cite files they reference in the messages they create.
+
+## Overview
+
+Previously, building custom AI agents needed heavy lifting even for experienced developers. While many APIs are lightweight and powerful like Azure OpenAI's chat completions API, it's inherently stateless which means that developers had to manage conversation state and chat threads, tool integrations, retrieval documents and indexes, and execute code manually.
+
+Azure AI Agents Service, as the evolution of the chat completion API and Assistants, provides a solution for these challenges. Agents support persistent automatically managed threads. This means that as a developer you no longer need to develop conversation state management systems and work around a model’s context window constraints. Agents will automatically handle the optimizations to keep the thread below the max context window of your chosen model. Once you create a thread, you can append new messages to it as users respond. Agents can also access multiple [tools](../how-to/tools/overview.md) in parallel.
+
+Azure AI Agents Service is built on the same capabilities that power Azure OpenAI's assistants. Some possible use cases range from AI-powered product recommender, sales analyst app, coding assistant, employee Q&A chatbot, and more.
+
+> [!IMPORTANT]
+> Retrieving untrusted data using Function Calling, Code Interpreter or File Search with file input, and agent threads functionalities could compromise the security of your agent, or the application that uses the agent.
+
+## Agents components
+
+<!-- :::image type="content" source="../media/agents/agents-overview.png" alt-text="A diagram showing the components of an agent." lightbox="../media/agents/agents-overview.png"::: -->
+
+| **Component** | **Description** |
+|---|---|
+| **Agent** | Custom AI that uses models in conjunction with tools. |
+|**Thread** | A conversation session between an agent and a user. Threads store Messages and automatically handle truncation to fit content into a model’s context.|
+| **Message** | A message created by an agent or a user. Messages can include text, images, and other files. Messages are stored as a list on the Thread. |
+|**Run** | Activation of an agent to begin running based on the contents of the Thread. The agent uses its configuration and the Thread’s Messages to perform tasks by calling models and tools. As part of a Run, the agent appends Messages to the Thread.|
+|**Run Step** | A detailed list of steps the agent took as part of a Run. An agent can call tools or create Messages during it’s run. Examining Run Steps allows you to understand how the agent is getting to its final results. |
+
+<!--## Agents data access
+
+Currently, agents, threads, messages, and files created for agents are scoped at the resource level. Therefore, anyone with access to the resource or API key access is able to read/write agents, threads, messages, and files.
+
+We strongly recommend the following data access controls:
+
+- Implement authorization. Before performing reads or writes on agents, threads, messages, and files, ensure that the end-user is authorized to do so.
+- Restrict resource and API key access. Carefully consider who has access to resources where agents are being used, and the associated API keys.
+- Routinely audit which accounts/individuals have access to the resource. API keys and resource level access enable a wide range of operations including reading and modifying messages and files.
+- If you're using Azure OpenAI models, enabling [diagnostic settings](../../openai/how-to/monitor-openai.md#configure-diagnostic-settings) to allow long-term tracking of certain aspects of the Azure OpenAI resource's activity log.
+-->
+
+## Parameters
+
+The agents API has support for several parameters that let you customize the agents' output. The `tool_choice` parameter lets you force the agent to use a specified tool. You can also create messages with the `assistant` role to create custom conversation histories in Threads. `temperature`, `top_p`, `response_format` let you further tune responses. <!-- For more information, see the [reference](../agents-reference.md#create-an-assistant) documentation. -->
+
+## Context window management
+
+Agents automatically truncate text to ensure it stays within the model's maximum context length. You can customize this behavior by specifying the maximum tokens you'd like a run to utilize and/or the maximum number of recent messages you'd like to include in a run.
+
+### Max completion and max prompt tokens
+
+To control the token usage in a single Run, set `max_prompt_tokens` and `max_completion_tokens` when you create the Run. These limits apply to the total number of tokens used in all completions throughout the Run's lifecycle.
+
+For example, initiating a Run with `max_prompt_tokens` set to 500 and `max_completion_tokens` set to 1000 means the first completion will truncate the thread to 500 tokens and cap the output at 1,000 tokens. If only 200 prompt tokens and 300 completion tokens are used in the first completion, the second completion will have available limits of 300 prompt tokens and 700 completion tokens.
+
+If a completion reaches the `max_completion_tokens` limit, the run will terminate with a status of incomplete, and details will be provided in the `incomplete_details` field of the run object.
+
+When using the File Search tool, we recommend setting the `max_prompt_tokens` to no less than 20,000. For longer conversations or multiple interactions with File Search, consider increasing this limit to 50,000, or ideally, removing the `max_prompt_tokens` limits altogether to get the highest quality results.
+
+## Truncation strategy
+
+You can also specify a truncation strategy to control how your thread should be rendered into the model's context window. Using a truncation strategy of type `auto` will use OpenAI's default truncation strategy. Using a truncation strategy of type `last_messages` will allow you to specify the number of the most recent messages to include in the context window.
+
+## See also
+* Learn more about [agents](../overview.md). <!--and [File Search](../how-to/tools/file-search.md)-->

articles/ai-services/agents/concepts/model-region-support.md

@@ -0,0 +1,76 @@
+---
+title: Supported models in Azure AI Agent Service
+titleSuffix: Azure AI services
+description: Learn about the models you can use with Azure AI Agent Service.
+manager: nitinme
+author: aahill
+ms.author: aahi
+ms.service: azure
+ms.topic: conceptual
+ms.date: 12/11/2024
+ms.custom: azure-ai-agents
+---
+
+# Models supported by Azure AI Agent Service
+
+Agents are powered by a diverse set of models with different capabilities and price points. Model availability varies by region and cloud. Certain tools and capabilities require the latest models. The following models are available in the available SDKs. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](../../openai/concepts/provisioned-throughput.md) in the OpenAI documentation. You can use [global standard models](../../openai/concepts/models.md#global-standard-model-availability) if they're supported in the regions listed here. 
+
+## Azure OpenAI models
+
+Azure AI Agent service supports the same models as the chat completions API in Azure OpenAI, in the following regions.
+
+| **Region**   | **o1-preview**, **2024-09-12**   | **o1-mini**, **2024-09-12**   | **gpt-4o**, **2024-05-13**   | **gpt-4o**, **2024-08-06**   | **gpt-4o-mini**, **2024-07-18**   | **gpt-4**, **0613**   | **gpt-4**, **1106-Preview**   | **gpt-4**, **0125-Preview**   | **gpt-4**, **vision-preview**   | **gpt-4**, **turbo-2024-04-09**   | **gpt-4-32k**, **0613**   | **gpt-35-turbo**, **0301**   | **gpt-35-turbo**, **0613**   | **gpt-35-turbo**, **1106**   | **gpt-35-turbo**, **0125**   | **gpt-35-turbo-16k**, **0613**   |
+|:-----------------|:------------------------------:|:---------------------------:|:--------------------------:|:--------------------------:|:-------------------------------:|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------------:|:-------------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:------------------------------:|
+| eastus           | ✅                           | ✅                        | ✅                       | ✅                       | ✅                            | -               | -                       | ✅                        | -                         | ✅                            | -                   | ✅                       | ✅                       | -                      | ✅                       | ✅                           |
+| francecentral    | -                          | -                       | -                      | -                      | -                           | ✅                | ✅                        | -                       | -                         | -                           | ✅                    | ✅                       | ✅                       | ✅                       | -                      | ✅                           |
+| japaneast        | -                          | -                       | -                      | -                      | -                           | -               | -                       | -                       | ✅                          | -                           | -                   | -                      | ✅                       | -                      | ✅                       | ✅                           |
+| uksouth          | -                          | -                       | -                      | -                      | -                           | -               | ✅                        | ✅                        | -                         | -                           | -                   | ✅                       | ✅                       | ✅                       | ✅                       | ✅                           |
+| westus           | ✅                           | ✅                        | ✅                       | ✅                       | ✅                            | -               | ✅                        | -                       | ✅                          | ✅                            | -                   | -                      | -                      | ✅                       | ✅                       | -                          |
+
+
+## Additional models
+
+In addition to the supported Azure OpenAI models, you can also use the following 3rd party models with Azure AI Agent Service. 
+
+* Llama 3.1-70B-instruct
+* Mistral-large-2407
+* Cohere command R+
+
+To use these models, you can use Azure AI Foundry portal to make a deployment, and then reference it in your agent. 
+
+1. Go to the [Azure AI Foundry portal](https://ai.azure.com/) and select **Model catalog** in the left navigation menu, and scroll down to **Meta-Llama-3-70B-Instruct**. You can also find and use one of the models listed above.  
+
+1. Select **Deploy**. 
+
+1. In the Deployment options screen that appears, select **Serverless API** with Azure AI Content Safety. 
+
+    :::image type="content" source="../media/llama/llama-deployment.png" alt-text="An image of the llama model project selection screen.":::
+ 
+1. Select your project and click **Subscribe and deploy**. 
+
+    :::image type="content" source="../media/llama/llama-deployment-2.png" alt-text="An image of the llama model deployment screen.":::
+
+1. Add the serverless connection to your hub/project. The deployment name you choose will be the one you reference in your code.  
+
+1. When calling agent creation API, set the `models` parameter to your deployment name. For example:
+
+    # [Python](#tab/python)
+
+    ```python
+    agent = project_client.agents.create_agent( model="llama-3", name="my-agent", instructions="You are a helpful agent" ) 
+    ```
+
+    # [C#](#tab/csharp)
+
+    ```csharp
+    Response<Agent> agentResponse = await client.CreateAgentAsync(
+            model: "llama-3",
+            name: "My agent",
+            instructions: "You are a helpful agent"
+    ```
+    ---
+
+
+## Next steps
+
+[Create a new Agent project](../quickstart.md)