Skip to content

Commit 2d92bfc

Browse files
committed
Merge branch 'main' into release-preview-eval-redteaming
2 parents 6c7866d + 12c944b commit 2d92bfc

File tree

13 files changed

+177
-139
lines changed

13 files changed

+177
-139
lines changed

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@
925925
{
926926
"source_path_from_root": "/articles/ai-services/translator/modifications-deprecations.md",
927927
"redirect_url": "/azure/ai-services/translator/reference/release-history",
928-
"redirect_document_id": true
928+
"redirect_document_id": false
929929
},
930930
{
931931
"source_path_from_root": "/articles/ai-services/translator/neural-dictionary.md",
@@ -965,7 +965,7 @@
965965
{
966966
"source_path_from_root": "/articles/ai-services/translator/translator-faq.md",
967967
"redirect_url": "/azure/ai-services/translator/faq",
968-
"redirect_document_id": true
968+
"redirect_document_id": false
969969
},
970970
{
971971
"source_path_from_root": "/articles/ai-services/translator/word-alignment.md",
@@ -978,13 +978,8 @@
978978
"redirect_document_id": true
979979
},
980980
{
981-
"source_path_from_root": "/articles/ai-services/translator/reference/known-issues.md",
981+
"source_path_from_root": "/articles/ai-services/translator/known-issues.md",
982982
"redirect_url": "/azure/ai-services/translator/text-translation/reference/known-issues",
983-
"redirect_document_id": true
984-
},
985-
{
986-
"source_path_from_root": "/articles/ai-services/translator/reference/release-history.md",
987-
"redirect_url": "/azure/ai-services/translator/text-translation/reference/release-history",
988983
"redirect_document_id": false
989984
},
990985
{
@@ -1058,8 +1053,18 @@
10581053
"redirect_document_id": true
10591054
},
10601055
{
1061-
"source_path_from_root": "/articles/ai-services/translator/text-translation/reference/release-history.md",
1062-
"redirect_url": "/azure/ai-services/translator/release-history",
1056+
"source_path_from_root": "/articles/ai-services/translator/text-translation/reference/known-issues.md",
1057+
"redirect_url": "/azure/ai-services/translator/reference/known-issues",
1058+
"redirect_document_id": true
1059+
},
1060+
{
1061+
"source_path_from_root": "/articles/ai-services/translator/release-history.md",
1062+
"redirect_url": "/azure/ai-services/translator/reference/release-history",
1063+
"redirect_document_id": true
1064+
},
1065+
{
1066+
"source_path_from_root": "/articles/ai-services/translator/sovereign-clouds.md",
1067+
"redirect_url": "/azure/ai-services/translator/reference/sovereign-clouds",
10631068
"redirect_document_id": true
10641069
}
10651070
]

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ Developers and end users don't have access to raw content returned from Groundin
3333
The user query is the message that an end user sends to an agent, such as *"should I take an umbrella with me today? I'm in Seattle."* Instructions are the system message a developer can provide to share context and provide instructions to the AI model on how to use various tools or behave.
3434

3535
When a user sends a query, the customer's AI model deployment first processes it (using the provided instructions) to later perform a Bing search query (which is [visible to developers](#how-to-display-grounding-with-bing-search-results)).
36-
Grounding with Bing returns relevant search results to the customer's model deployment, which then generates the final output. When using Grounding with Bing Search, only the Bing search query and your resource key are sent to Bing, and no end user-specific information is included. Your resource key is sent to Bing solely for billing and rate limiting purposes. The authorization will happen between Grounding with Bing Search service and Azure AI Agent service. Any Bing search query that is generated and sent to Bing for the purposes of grounding is transferred, along with the resource key, outside of the Azure compliance boundary to the Grounding with Bing Search service. Grounding with Bing Search is subject to Bing's terms and do not have the same compliance standards and certifications as the Azure AI Agent Service, as described in the [Grounding with Bing Search Terms of Use](https://www.microsoft.com/bing/apis/grounding-legal). It is your responsibility to assess whether the use of Grounding with Bing Search in your agent meets your needs and requirements.
36+
Grounding with Bing returns relevant search results to the customer's model deployment, which then generates the final output.
37+
38+
> [!NOTE]
39+
> When using Grounding with Bing Search, only the Bing search query and your resource key are sent to Bing, and no end user-specific information is included. Your resource key is sent to Bing solely for billing and rate limiting purposes.
40+
41+
The authorization will happen between Grounding with Bing Search service and Azure AI Agent service. Any Bing search query that is generated and sent to Bing for the purposes of grounding is transferred, along with the resource key, outside of the Azure compliance boundary to the Grounding with Bing Search service. Grounding with Bing Search is subject to Bing's terms and do not have the same compliance standards and certifications as the Azure AI Agent Service, as described in the [Grounding with Bing Search Terms of Use](https://www.microsoft.com/bing/apis/grounding-legal). It is your responsibility to assess whether the use of Grounding with Bing Search in your agent meets your needs and requirements.
3742

3843
## Usage support
3944

@@ -44,7 +49,7 @@ Grounding with Bing returns relevant search results to the customer's model depl
4449
## Setup
4550

4651
> [!NOTE]
47-
> 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`
52+
> 1. Grounding with Bing Search works with [all Azure OpenAI models](../../concepts/model-region-support.md) that Azure AI Agent Service supports, except `gpt-4o-mini, 2024-07-18`.
4853
4954
1. Create an Azure AI Agent by following the steps in the [quickstart](../../quickstart.md).
5055

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ You need to first build and publish a Fabric data agent and then connect your Fa
4848
1. Select **Microsoft Fabric** and follow the prompts to add the tool. You can add only one per agent.
4949

5050
1. Click to add new connections. Once you have added a connection, you can directly select from existing list.
51-
1. To create a new connection, you need to find `workspace-id` and `artifact-id` in your published Fabric data agent endpoint. Your Fabric data agent endpoint would look like `https://fabric.microsoft.com/groups/<workspace_id>/aiskills/<artifact-id>`
51+
1. To create a new connection, you need to find `workspace-id` and `artifact-id` in your published Fabric data agent endpoint. Your Fabric data agent endpoint would look like `https://<environment>.fabric.microsoft.com/groups/<workspace_id>/aiskills/<artifact-id>`
5252

5353
1. Then, you can add both to your connection. Make sure you have checked `is secret` for both of them
5454

@@ -325,4 +325,4 @@ curl $AZURE_AI_AGENTS_ENDPOINT/threads/thread_abc123/messages?api-version=2024-1
325325
326326
## Next steps
327327
328-
[See the full sample for Fabric data agent.](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/ai/azure-ai-projects/samples/agents/sample_agents_fabric.py)
328+
[See the full sample for Fabric data agent.](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/ai/azure-ai-projects/samples/agents/sample_agents_fabric.py)

0 commit comments

Comments
 (0)