Skip to content

Commit 28d23b4

Browse files
authored
Merge branch 'MicrosoftDocs:release-azure-agents' into release-azure-agents
2 parents 3458355 + cdab346 commit 28d23b4

File tree

194 files changed

+1301
-2018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+1301
-2018
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,21 @@
790790
"redirect_url": "/azure/ai-services/language-service/question-answering/overview",
791791
"redirect_document_id": true
792792
},
793+
{
794+
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/try-document-intelligence-studio.md",
795+
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/studio-custom-project",
796+
"redirect_document_id": true
797+
},
798+
{
799+
"source_path_from_root": "/articles/ai-services/document-intelligence/train/custom-generative-extraction.md",
800+
"redirect_url": "/azure/ai-services/document-intelligence/train/custom-model",
801+
"redirect_document_id": false
802+
},
803+
{
804+
"source_path_from_root": "/articles/ai-services/document-intelligence/how-to-guides/build-train-custom-generative-model.md",
805+
"redirect_url": "/azure/ai-services/document-intelligence/how-to-guides/build-a-custom-model",
806+
"redirect_document_id": true
807+
},
793808
{
794809
"source_path_from_root": "/articles/ai-services/openai/how-to/integrate-synapseml.md",
795810
"redirect_url": "/azure/ai-services/openai/overview",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ recommendations: false
1313

1414
# Models supported by Azure AI Agent Service
1515

16-
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 API, SDK, and Azure AI Foundry. 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.
16+
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.
1717

1818
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` | `gpt-4o-mini (2024-07-18)` |
1919
|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|

articles/ai-services/agents/how-to/tools/bing-grounding.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,27 @@ Developers and end users don't have access to raw content returned from Groundin
2525

2626
>[!IMPORTANT]
2727
> 1. Your usage of Grounding with Bing Search may incur costs. See the [pricing page](https://www.microsoft.com/bing/apis/grounding-pricing) for details.
28-
> 1. If you choose to create a new Grounding with Bing Search resource programatically, such as the Azure CLI or using a deployment template, you automatically agree to be bound by and comply with the [terms of use and use and display requirements](https://www.microsoft.com/en-us/bing/apis/grounding-legal).
28+
> 1. By creating and using a Grounding with Bing Search resource through code-first experience, such as Azure CLI, or deploying through deployment template, you agree to be bound by and comply with the terms available at https://www.microsoft.com/en-us/bing/apis/grounding-legal, which may be updated from time to time.
2929
3030

3131
## Setup
3232

3333
> [!NOTE]
34-
> Grounding with Bing Search only works with the following Azure OpenAI models: `gpt-3.5-turbo-0125`, `gpt-4-0125-preview`, `gpt-4-turbo-2024-04-09`, `gpt-4o-0513`
34+
> 1. Grounding with Bing Search only works with the following Azure OpenAI models: `gpt-3.5-turbo-0125`, `gpt-4-0125-preview`, `gpt-4-turbo-2024-04-09`, `gpt-4o-0513`
35+
> 1. It works in the following regions: `West Central US` and `West US 2`
36+
37+
In one click, you can start creating a **new Azure AI Foundry project and Grounding with Bing Search resource** with the available [deployment template](../../quickstart.md#choose-basic-or-standard-agent-setup). After the deployment, you can find your resources including: an AI hub, project, Grounding with Bing Search resource and more created in your resource group. You can find your Grounding with Bing Search connection in the **connected resources** for your project in Azure AI Foundry portal.
38+
39+
:::image type="content" source="../../media/tools/bing/connected-resources.png" alt-text="A screenshot showing the connected resources for a project in the Azure AI Foundry portal." lightbox="../../media/tools/bing/connected-resources.png":::
40+
41+
1. If you already have a Grounding with Bing Search resource, you can provide your resource ID in the bicep file. Your resource ID should be in this format `/subscriptions/{subscription ID}/resourceGroups/{resource group name}/providers/Microsoft.Bing/accounts/{resource name}`. Replace the following empty string with your resource ID:
42+
```bicep
43+
@description('The full ARM Bing Resource ID. This is an optional field, and if not provided, the resource will be created.')
44+
param bingSearchResourceID string = ''
45+
```
46+
47+
48+
Alternatively, you can also follow the step-by-step guide below:
3549
3650
1. Create a standard Azure AI Agent by following the steps in the [quickstart](../../quickstart.md).
3751

articles/ai-services/agents/how-to/tools/openapi-spec.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,27 @@ work together, generate client code, create tests, apply design standards, and m
4242
:::image type="content" source="../../media/tools/bing/project-connections.png" alt-text="A screenshot of the connections screen for the AI project." lightbox="../../media/tools/bing/project-connections.png":::
4343

4444
1. Select **custom keys** in **other resource types**.
45-
![image](https://github.com/user-attachments/assets/2e6e8efe-1a31-4097-a859-58ac5ee17a96)
45+
46+
:::image type="content" source="../../media/tools/bing/api-key-connection.png" alt-text="A screenshot of the custom keys selection for the AI project." lightbox="../../media/tools/bing/api-key-connection.png":::
4647

4748
1. Enter the following information
4849
- `key`: "key"
4950
- value: YOUR_API_KEY
5051
- Connection name: `YOUR_CONNECTION_NAME` (You will use this connection name in the sample code below.)
5152
- Access: you can choose either *this project only* or *shared to all projects*. Just make sure in the sample code below, the project you entered connection string for has access to this connection.
52-
53+
54+
1. Update your OpenAPI Spec with the following:
55+
```json
56+
"components": {
57+
"securitySchemes": {
58+
"cosoLocationApiLambdaAuthorizer": {
59+
"type": "apiKey",
60+
"name": "key",
61+
"in": "query"
62+
}
63+
}
64+
}
65+
```
5366
::: zone-end
5467

5568
::: zone pivot="code-example"

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,17 @@ Agents can access multiple tools in parallel. These can be both Azure OpenAI-hos
2626
2727
## Knowledge tools
2828

29-
|Tool |Description |
30-
|---------|---------|
31-
| [Grounding with Bing Search](./bing-grounding.md) | Allows your agents to incorporate real-time public web data when generating responses. |
32-
|[File search](./file-search.md) | Augments agents with knowledge from outside its model, such as proprietary product information or documents provided by your users. |
29+
|Tool |Description | Python SDK | C# SDK | JavaScript SDK |
30+
|---------|---------|---------|---------|---------|
31+
| [Grounding with Bing Search](./bing-grounding.md) | Allows your agents to incorporate real-time public web data when generating responses. | ✔️ | ✔️ | ✔️ |
32+
|[File search](./file-search.md) | Augments agents with knowledge from outside its model, such as proprietary product information or documents provided by your users. | ✔️ | ✔️ | ✔️ |
33+
| [Azure AI Search](./azure-ai-search.md) | Uses an existing Azure AI Search index as a knowledge base. | ✔️ | ✔️ | ✔️ |
3334

3435
## Action tools
3536

36-
|Tool |Description |
37-
|---------|---------|
38-
| [Code interpreter](./code-interpreter.md) | Enables agents to write and run Python code in a sandboxed execution environment. |
39-
|[Function calling](./function-calling.md) | Allows you to describe the structure of functions to an agent and then return the functions that need to be called along with their arguments. |
37+
|Tool |Description | Python SDK | C# SDK | JavaScript SDK |
38+
|---------|---------|---------|---------|---------|
39+
| [Code interpreter](./code-interpreter.md) | Enables agents to write and run Python code in a sandboxed execution environment. | ✔️ | ✔️ | ✔️ |
40+
|[Function calling](./function-calling.md) | Allows you to describe the structure of functions to an agent and then return the functions that need to be called along with their arguments. | ✔️ | ✔️ | ✔️ |
41+
| [OpenAPI specified tools](./openapi-spec.md) | Connects your Azure AI Agent to an external API using an OpenAPI 3.0 specified tool. | ✔️ | | |
4042

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

Lines changed: 0 additions & 68 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)