Skip to content

Commit 85ce02b

Browse files
authored
Merge pull request #5254 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-ai-docs (branch main)
2 parents 9c6de2c + 5431323 commit 85ce02b

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

articles/ai-foundry/includes/create-content-filter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Follow these steps to create a content filter:
3535

3636
Now you can configure the input filters (for user prompts) and output filters (for model completion).
3737
1. On the **Input filters** page, you can set the filter for the input prompt. For the first four content categories there are three severity levels that are configurable: Low, medium, and high. You can use the sliders to set the severity threshold if you determine that your application or usage scenario requires different filtering than the default values.
38-
Some filters, such as Prompt Shields and Protected material detection, enable you to determine if the model should annotate and/or block content. Selecting **Annotate only** runs the respective model and return annotations via API response, but it will not filter content. In addition to annotate, you can also choose to block content.
38+
Some filters, such as Prompt Shields and Protected material detection, enable you to determine if the model should annotate and/or block content. Selecting **Annotate only** runs the respective model and returns annotations via API response, but it will not filter content. In addition to annotate, you can also choose to block content.
3939

4040
If your use case was approved for modified content filters, you receive full control over content filtering configurations and can choose to turn filtering partially or fully off, or enable annotate only for the content harms categories (violence, hate, sexual and self-harm).
4141

@@ -80,4 +80,4 @@ Follow these steps to apply a content filter to a deployment:
8080
Now, you can go to the playground to test whether the content filter works as expected.
8181

8282
> [!TIP]
83-
> You can also create and update content filters using the REST APIs. For more information, see the [API reference](/rest/api/aiservices/accountmanagement/rai-policies/create-or-update). Content filters can be configured at the resource level. Once a new configuration is created, it can be associated with one or more deployments. For more information about model deployment, see the resource [deployment guide](../../ai-services/openai/how-to/create-resource.md).
83+
> You can also create and update content filters using the REST APIs. For more information, see the [API reference](/rest/api/aiservices/accountmanagement/rai-policies/create-or-update). Content filters can be configured at the resource level. Once a new configuration is created, it can be associated with one or more deployments. For more information about model deployment, see the resource [deployment guide](../../ai-services/openai/how-to/create-resource.md).

articles/ai-services/language-service/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ The Language service also provides several new features as well, which can eithe
2323
* Preconfigured, which means the AI models that the feature uses aren't customizable. You just send your data, and use the feature's output in your applications.
2424
* Customizable, which means you train an AI model using our tools to fit your data specifically.
2525

26-
Language features are also utilized in [agent templates](https://aka.ms/ai-agent-catalog):
27-
* [Intent routing](https://aka.ms/intent-triage-agent-template) detects user intent and provides exact answering. Perfect for deterministically intent routing and exact question answering with human controls.
28-
* [Exact question answering](https://aka.ms/exact-answer-agent-template) answers high-value predefined questions deterministically to ensure consistent and accurate responses.
26+
Language features are also utilized in [agent templates](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/agent-catalog):
27+
* [Intent routing agent](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/agent-catalog/msft-agent-samples/foundry-agent-service-sdk/intent-routing-agent) detects user intent and provides exact answering. Perfect for deterministically intent routing and exact question answering with human controls.
28+
* [Exact question answering agent](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/agent-catalog/msft-agent-samples/foundry-agent-service-sdk/exact-qna-agent) answers high-value predefined questions deterministically to ensure consistent and accurate responses.
2929

3030
> [!TIP]
3131
> Unsure which feature to use? See [Which Language service feature should I use](#which-language-service-feature-should-i-use) to help you decide.

articles/ai-services/openai/how-to/responses.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,7 @@ curl GET https://YOUR-RESOURCE-NAME.openai.azure.com/openai/v1/responses/resp_12
929929
```python
930930
from openai import AzureOpenAI
931931
from azure.identity import DefaultAzureCredential, get_bearer_token_provider
932+
from time import sleep
932933

933934
token_provider = get_bearer_token_provider(
934935
DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
@@ -947,7 +948,7 @@ response = client.responses.create(
947948
)
948949

949950
while response.status in {"queued", "in_progress"}:
950-
print(f"Current status: {resp.status}")
951+
print(f"Current status: {response.status}")
951952
sleep(2)
952953
response = client.responses.retrieve(response.id)
953954

@@ -1293,4 +1294,4 @@ For examples of how to use reasoning models with the responses API see the [reas
12931294

12941295
## Computer use
12951296

1296-
Computer use with Playwright has moved to the [dedicated computer use model guide](./computer-use.md#playwright-integration)
1297+
Computer use with Playwright has moved to the [dedicated computer use model guide](./computer-use.md#playwright-integration)

articles/ai-services/openai/references/elasticsearch.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ The configurable options for Elasticsearch when using Azure OpenAI On Your Data.
3636
| `strictness` | integer | False | The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. Default is `3`.|
3737
| `top_n_documents` | integer | False | The configured top number of documents to feature for the configured query. Default is `5`. |
3838

39-
## Key and key ID authentication options
39+
## Authentication Options
40+
41+
Azure OpenAI On Your Data supports multiple authentication types:
42+
43+
### Key and key ID authentication options
4044

4145
The authentication options for Azure OpenAI On Your Data when using an API key.
4246

@@ -46,7 +50,7 @@ The authentication options for Azure OpenAI On Your Data when using an API key.
4650
| `key_id`|string|True|The Elasticsearch key ID to use for authentication.|
4751
| `type`|string|True| Must be `key_and_key_id`.|
4852

49-
## Encoded API key authentication options
53+
### Encoded API key authentication options
5054

5155
The authentication options for Azure OpenAI On Your Data when using an Elasticsearch encoded API key.
5256

@@ -74,23 +78,24 @@ The details of the vectorization source, used by Azure OpenAI On Your Data when
7478
| `authentication`| [ApiKeyAuthenticationOptions](#api-key-authentication-options)|True | Specifies the authentication options to use when retrieving embeddings from the specified endpoint.|
7579
| `type`|string|True| Must be `endpoint`.|
7680

77-
## Model ID vectorization source
81+
### API key authentication options
7882

79-
The details of the vectorization source, used by Azure OpenAI On Your Data when applying vector search. This vectorization source is based on Elasticsearch model ID.
83+
The authentication options for Azure OpenAI On Your Data when using an API key.
8084

8185
|Name | Type | Required | Description |
8286
|--- | --- | --- | --- |
83-
| `model_id`|string|True| Specifies the model ID to use for vectorization. This model ID must be defined in Elasticsearch.|
84-
| `type`|string|True| Must be `model_id`.|
87+
| `key`|string|True|The API key to use for authentication.|
88+
| `type`|string|True| Must be `api_key`.|
8589

86-
## API key authentication options
90+
## Model ID vectorization source
8791

88-
The authentication options for Azure OpenAI On Your Data when using an API key.
92+
The details of the vectorization source, used by Azure OpenAI On Your Data when applying vector search. This vectorization source is based on Elasticsearch model ID.
8993

9094
|Name | Type | Required | Description |
9195
|--- | --- | --- | --- |
92-
| `key`|string|True|The API key to use for authentication.|
93-
| `type`|string|True| Must be `api_key`.|
96+
| `model_id`|string|True| Specifies the model ID to use for vectorization. This model ID must be defined in Elasticsearch.|
97+
| `type`|string|True| Must be `model_id`.|
98+
9499

95100
## Fields mapping options
96101

articles/machine-learning/how-to-assign-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ The following table is a summary of Azure Machine Learning activities and the pe
273273
274274
| Activity | Subscription-level scope | Resource group-level scope | Workspace-level scope |
275275
| ----- | ----- | ----- | ----- |
276-
| Create new workspace <sub>1</sub> | Not required | Owner, contributor, or custom role allowing: `Microsoft.Resources/deployments/*` | N/A (becomes Owner or inherits higher scope role after creation) |
276+
| Create new workspace <sub>1</sub> | Not required | Owner, contributor, or custom role allowing: `Microsoft.Resources/deployments/*` and `Microsoft.MachineLearningServices/workspaces/write` | N/A (becomes Owner or inherits higher scope role after creation) |
277277
| Request subscription level Amlcompute quota or set workspace level quota | Owner, or contributor, or custom role <br>allowing `/locations/updateQuotas/action`<br> at subscription scope | Not authorized | Not authorized |
278278
| Create new compute cluster | Not required | Not required | Owner, contributor, or custom role allowing: `/workspaces/computes/write` |
279279
| Create new compute instance | Not required | Not required | Owner, contributor, or custom role allowing: `/workspaces/computes/write` |

0 commit comments

Comments
 (0)