Skip to content

Commit b291167

Browse files
committed
Merge branch 'main' of https://github.com/microsoftdocs/azure-ai-docs-pr into endpoints
2 parents 65bb6e6 + 3bafd34 commit b291167

File tree

79 files changed

+929
-613
lines changed

Some content is hidden

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

79 files changed

+929
-613
lines changed

articles/ai-services/cognitive-services-container-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: aahill
77
manager: nitinme
88
ms.service: azure-ai-services
99
ms.topic: overview
10-
ms.date: 08/23/2024
10+
ms.date: 09/25/2024
1111
ms.author: aahi
1212
keywords: on-premises, Docker, container, Kubernetes
1313
#Customer intent: As a potential customer, I want to know more about how Azure AI services provides and supports Docker containers for each service.

articles/ai-services/content-safety/quickstart-protected-material-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ curl --location --request POST '<endpoint>/contentsafety/text:detectProtectedMat
5050
--header 'Ocp-Apim-Subscription-Key: <your_subscription_key>' \
5151
--header 'Content-Type: application/json' \
5252
--data-raw '{
53-
"code": "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"
53+
"code": "python import pygame pygame.init() win = pygame.display.set_mode((500, 500)) pygame.display.set_caption(My Game) x = 50 y = 50 width = 40 height = 60 vel = 5 run = True while run: pygame.time.delay(100) for event in pygame.event.get(): if event.type == pygame.QUIT: run = False keys = pygame.key.get_pressed() if keys[pygame.K_LEFT] and x > vel: x -= vel if keys[pygame.K_RIGHT] and x < 500 - width - vel: x += vel if keys[pygame.K_UP] and y > vel: y -= vel if keys[pygame.K_DOWN] and y < 500 - height - vel: y += vel win.fill((0, 0, 0)) pygame.draw.rect(win, (255, 0, 0), (x, y, width, height)) pygame.display.update() pygame.quit()"
5454
}'
5555
```
5656
The below fields must be included in the url:
@@ -120,4 +120,4 @@ If you want to clean up and remove an Azure AI services subscription, you can de
120120
## Related content
121121

122122
* [Protected material detection concepts](./concepts/protected-material.md)
123-
* Configure filters for each category and test on datasets using [Content Safety Studio](studio-quickstart.md), export the code and deploy.
123+
* Configure filters for each category and test on datasets using [Content Safety Studio](studio-quickstart.md), export the code and deploy.

articles/ai-services/openai/assistants-reference-messages.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ description: Learn how to use Azure OpenAI's Python & REST API messages with Ass
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: conceptual
8-
ms.date: 07/25/2024
9-
author: mrbullwinkle
10-
ms.author: mbullwin
8+
ms.date: 09/25/2024
9+
author: aahill
10+
ms.author: aahi
1111
recommendations: false
1212
ms.custom: devx-track-python
1313
---

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-ai-openai
88
ms.topic: how-to
99
author: aahill
1010
ms.author: aahi
11-
ms.date: 07/15/2024
11+
ms.date: 09/24/2024
1212
recommendations: false
1313
---
1414

@@ -83,6 +83,11 @@ If you are using a published [web app](./use-web-app.md), you need to redeploy i
8383

8484
When using the API, pass the `filter` parameter in each API request. For example:
8585

86+
> [!IMPORTANT]
87+
> The following is for example only. If you use an API key, store it securely somewhere else, such as in [Azure Key Vault](/azure/key-vault/general/overview). Don't include the API key directly in your code, and never post it publicly.
88+
89+
For more information about AI services security, see [Authenticate requests to Azure AI services](/azure/ai-services/authentication).
90+
8691
```json
8792
{
8893
"messages": [
@@ -91,13 +96,13 @@ When using the API, pass the `filter` parameter in each API request. For example
9196
"content": "who is my manager?"
9297
}
9398
],
94-
"dataSources": [
99+
"data_sources": [
95100
{
96-
"type": "AzureCognitiveSearch",
101+
"type": "azure_search",
97102
"parameters": {
98-
"endpoint": "'$AZURE_AI_SEARCH_ENDPOINT'",
99-
"key": "'$AZURE_AI_SEARCH_API_KEY'",
100-
"indexName": "'$AZURE_AI_SEARCH_INDEX'",
103+
"endpoint": "<AZURE_AI_SEARCH_ENDPOINT>",
104+
"key": "<AZURE_AI_SEARCH_API_KEY>",
105+
"index_name": "<AZURE_AI_SEARCH_INDEX>",
101106
"filter": "my_group_ids/any(g:search.in(g, 'group_id1, group_id2'))"
102107
}
103108
}
@@ -152,13 +157,13 @@ To set the managed identities via the management API, see [the management API re
152157
```json
153158

154159
"identity": {
155-
"principalId": "12345678-abcd-1234-5678-abc123def",
156-
"tenantId": "1234567-abcd-1234-1234-abcd1234",
160+
"principalId": "<YOUR-PRINCIPAL-ID>",
161+
"tenantId": "<YOUR-TENNANT-ID>",
157162
"type": "SystemAssigned, UserAssigned",
158163
"userAssignedIdentities": {
159-
"/subscriptions/1234-5678-abcd-1234-1234abcd/resourceGroups/my-resource-group",
160-
"principalId": "12345678-abcd-1234-5678-abcdefg1234",
161-
"clientId": "12345678-abcd-efgh-1234-12345678"
164+
"/subscriptions/<YOUR-SUBSCIRPTION-ID>/resourceGroups/my-resource-group",
165+
"principalId": "<YOUR-PRINCIPAL-ID>",
166+
"clientId": "<YOUR-CLIENT-ID>"
162167
}
163168
}
164169
```

articles/ai-services/openai/references/cosmos-db.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI on your Azure Cosmos DB data Python &
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: conceptual
8-
ms.date: 03/12/2024
8+
ms.date: 09/24/2024
99
author: mrbullwinkle
1010
ms.author: mbullwin
1111
recommendations: false
@@ -93,10 +93,14 @@ Prerequisites:
9393
* Configure the role assignments from the user to the Azure OpenAI resource. Required role: `Cognitive Services OpenAI User`.
9494
* Install [Az CLI](/cli/azure/install-azure-cli) and run `az login`.
9595
* Define the following environment variables: `AzureOpenAIEndpoint`, `ChatCompletionsDeploymentName`,`ConnectionString`, `Database`, `Container`, `Index`, `EmbeddingDeploymentName`.
96+
97+
> [!NOTE]
98+
> The following is for example only. If you use a connection string, store it securely somewhere else, such as in [Azure Key Vault](/azure/key-vault/general/overview). Don't include the API key directly in your code, and never post it publicly.
99+
96100
```bash
97101
export AzureOpenAIEndpoint=https://example.openai.azure.com/
98102
export ChatCompletionsDeploymentName=turbo
99-
export ConnectionString='mongodb+srv://username:***@example.mongocluster.cosmos.azure.com/?tls=true&authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000'
103+
export ConnectionString='<db-connection-string>'
100104
export Database=testdb
101105
export Container=testcontainer
102106
export Index=testindex

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@
119119
"source_path": "articles/ai-studio/how-to/commitment-tier.md",
120120
"redirect_url": "/azure/ai-services/commitment-tier.md",
121121
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/ai-studio/how-to/develop/flow-evaluate-sdk.md",
125+
"redirect_url": "/azure/ai-studio/how-to/develop/evaluate-sdk",
126+
"redirect_document_id": true
127+
},
128+
{
129+
"source_path_from_root": "/articles/ai-studio/how-to/evaluate-flow-results.md",
130+
"redirect_url": "/azure/ai-studio/how-to/evaluate-results",
131+
"redirect_document_id": true
122132
}
123133
]
124134
}

articles/ai-studio/concepts/evaluation-approach-gen-ai.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,5 @@ After assessing your applications, flows, or data from any of these channels, yo
101101

102102
- [Evaluate your generative AI apps via the playground](../how-to/evaluate-prompts-playground.md)
103103
- [Evaluate your generative AI apps with the Azure AI Studio or SDK](../how-to/evaluate-generative-ai-app.md)
104-
- [View the evaluation results](../how-to/evaluate-flow-results.md)
104+
- [View the evaluation results](../how-to/evaluate-results.md)
105105
- [Transparency Note for Azure AI Studio safety evaluations](safety-evaluations-transparency-note.md)

articles/ai-studio/concepts/evaluation-improvement-strategies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ We recommend implementing the following user-centered design and user experience
139139

140140
- [Evaluate your generative AI apps via the playground](../how-to/evaluate-prompts-playground.md)
141141
- [Evaluate your generative AI apps with the Azure AI Studio or SDK](../how-to/evaluate-generative-ai-app.md)
142-
- [View the evaluation results](../how-to/evaluate-flow-results.md)
142+
- [View the evaluation results](../how-to/evaluate-results.md)

0 commit comments

Comments
 (0)