Skip to content

Commit 1faf292

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into bluegreenafd
2 parents dd47124 + c215ef6 commit 1faf292

File tree

731 files changed

+3865
-2764
lines changed

Some content is hidden

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

731 files changed

+3865
-2764
lines changed

articles/ai-services/computer-vision/Tutorials/liveness.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The liveness detection solution successfully defends against a variety of spoof
2828
- Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFace" title="Create a Face resource" target="_blank">create a Face resource</a> in the Azure portal to get your key and endpoint. After it deploys, select **Go to resource**.
2929
- You need the key and endpoint from the resource you create to connect your application to the Face service. You'll paste your key and endpoint into the code later in the quickstart.
3030
- You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
31-
- Access to the Azure AI Vision SDK for mobile (IOS and Android). To get started, you need to apply for the [Face Recognition Limited Access features](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUQjA5SkYzNDM4TkcwQzNEOE1NVEdKUUlRRCQlQCN0PWcu) to get access to the SDK. For more information, see the [Face Limited Access](/legal/cognitive-services/computer-vision/limited-access-identity?context=%2Fazure%2Fcognitive-services%2Fcomputer-vision%2Fcontext%2Fcontext) page.
31+
- Access to the Azure AI Vision Face Client SDK for mobile (IOS and Android). To get started, you need to apply for the [Face Recognition Limited Access features](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUQjA5SkYzNDM4TkcwQzNEOE1NVEdKUUlRRCQlQCN0PWcu) to get access to the SDK. For more information, see the [Face Limited Access](/legal/cognitive-services/computer-vision/limited-access-identity?context=%2Fazure%2Fcognitive-services%2Fcomputer-vision%2Fcontext%2Fcontext) page.
3232

3333
## Perform liveness detection
3434

@@ -222,7 +222,7 @@ The high-level steps involved in liveness with verification orchestration are il
222222

223223
```json
224224
Request:
225-
curl --location '<insert-api-endpoint>/face/v1.1-preview.1/detectlivenesswithverify/singlemodal' \
225+
curl --location '<insert-api-endpoint>/face/v1.1-preview.1/detectlivenesswithverify/singlemodal/sessions/3847ffd3-4657-4e6c-870c-8e20de52f567' \
226226
--header 'Content-Type: multipart/form-data' \
227227
--header 'apim-recognition-model-preview-1904: true' \
228228
--header 'Authorization: Bearer.<session-authorization-token> \

articles/ai-services/computer-vision/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,10 @@ items:
374374
href: /python/api/overview/azure/cognitiveservices-vision-face-readme
375375
- name: Client-side
376376
items:
377-
- name: Java (Android)
378-
href: https://aka.ms/liveness-sdk-java
377+
- name: Kotlin (Android)
378+
href: https://aka.ms/azure-ai-vision-face-liveness-client-sdk-android-api-reference
379379
- name: Swift (iOS)
380-
href: https://aka.ms/liveness-sdk-ios
380+
href: https://aka.ms/azure-ai-vision-face-liveness-client-sdk-ios-api-reference
381381
- name: Spatial Analysis
382382
items:
383383
- name: Spatial Analysis overview

articles/ai-services/openai/concepts/content-filter.md

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ The default content filtering configuration is set to filter at the medium sever
5656
| Severity filtered | Configurable for prompts | Configurable for completions | Descriptions |
5757
|-------------------|--------------------------|------------------------------|--------------|
5858
| Low, medium, high | Yes | Yes | Strictest filtering configuration. Content detected at severity levels low, medium and high is filtered.|
59-
| Medium, high | Yes | Yes | Default setting. Content detected at severity level low is not filtered, content at medium and high is filtered.|
59+
| Medium, high | Yes | Yes | Default setting. Content detected at severity level low isn't filtered, content at medium and high is filtered.|
6060
| High | Yes| Yes | Content detected at severity levels low and medium isn't filtered. Only content at severity level high is filtered.|
6161
| No filters | If approved<sup>\*</sup>| If approved<sup>\*</sup>| No content is filtered regardless of severity level detected. Requires approval<sup>\*</sup>.|
6262

63-
<sup>\*</sup> Only customers who have been approved for modified content filtering have full content filtering control and can turn content filters partially or fully off. Content filtering control does not apply to content filters for DALL-E (preview) or GPT-4 Turbo with Vision (preview). Apply for modified content filters using this form: [Azure OpenAI Limited Access Review: Modified Content Filtering (microsoft.com)](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUMlBQNkZMR0lFRldORTdVQzQ0TEI5Q1ExOSQlQCN0PWcu).
63+
<sup>\*</sup> Only customers who have been approved for modified content filtering have full content filtering control and can turn content filters partially or fully off. Content filtering control doesn't apply to content filters for DALL-E (preview) or GPT-4 Turbo with Vision (preview). Apply for modified content filters using this form: [Azure OpenAI Limited Access Review: Modified Content Filtering (microsoft.com)](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUMlBQNkZMR0lFRldORTdVQzQ0TEI5Q1ExOSQlQCN0PWcu).
6464

6565
Customers are responsible for ensuring that applications integrating Azure OpenAI comply with the [Code of Conduct](/legal/cognitive-services/openai/code-of-conduct?context=%2Fazure%2Fai-services%2Fopenai%2Fcontext%2Fcontext).
6666

@@ -628,40 +628,39 @@ For details on the inference REST API endpoints for Azure OpenAI and how to crea
628628
}
629629
```
630630
631-
## Streaming
631+
## Content streaming
632632
633-
Azure OpenAI Service includes a content filtering system that works alongside core models. The following section describes the AOAI streaming experience and options in the context of content filters.
633+
This section describes the Azure OpenAI content streaming experience and options. With approval, you have the option to receive content from the API as it's generated, instead of waiting for chunks of content that have been verified to pass your content filters.
634634
635635
### Default
636636
637-
The content filtering system is integrated and enabled by default for all customers. In the default streaming scenario, completion content is buffered, the content filtering system runs on the buffered content, and – depending on content filtering configuration – content is either returned to the user if it does not violate the content filtering policy (Microsoft default or custom user configuration), or it’s immediately blocked which returns a content filtering error, without returning harmful completion content. This process is repeated until the end of the stream. Content was fully vetted according to the content filtering policy before returned to the user. Content is not returned token-by-token in this case, but in “content chunks” of the respective buffer size.
637+
The content filtering system is integrated and enabled by default for all customers. In the default streaming scenario, completion content is buffered, the content filtering system runs on the buffered content, and – depending on the content filtering configuration – content is either returned to the user if it doesn't violate the content filtering policy (Microsoft's default or a custom user configuration), or it’s immediately blocked and returns a content filtering error, without returning the harmful completion content. This process is repeated until the end of the stream. Content is fully vetted according to the content filtering policy before it's returned to the user. Content isn't returned token-by-token in this case, but in “content chunks” of the respective buffer size.
638638
639639
### Asynchronous modified filter
640640
641-
Customers who have been approved for modified content filters can choose Asynchronous Modified Filter as an additional option, providing a new streaming experience. In this case, content filters are run asynchronously, completion content is returned immediately with a smooth token-by-token streaming experience. No content is buffered, the content filters run asynchronously, which allows for zero latency in this context.
641+
Customers who have been approved for modified content filters can choose the asynchronous modified filter as an additional option, providing a new streaming experience. In this case, content filters are run asynchronously, and completion content is returned immediately with a smooth token-by-token streaming experience. No content is buffered, which allows for zero latency.
642642
643-
> [!NOTE]
644-
> Customers must be aware that while the feature improves latency, it can bring a trade-off in terms of the safety and real-time vetting of smaller sections of model output. Because content filters are run asynchronously, content moderation messages and the content filtering signal in case of a policy violation are delayed, which means some sections of harmful content that would otherwise have been filtered immediately could be displayed to the user.
643+
Customers must be aware that while the feature improves latency, it's a trade-off against the safety and real-time vetting of smaller sections of model output. Because content filters are run asynchronously, content moderation messages and policy violation signals are delayed, which means some sections of harmful content that would otherwise have been filtered immediately could be displayed to the user.
645644
646-
**Annotations**: Annotations and content moderation messages are continuously returned during the stream. We strongly recommend to consume annotations and implement additional AI content safety mechanisms, such as redacting content or returning additional safety information to the user.
645+
**Annotations**: Annotations and content moderation messages are continuously returned during the stream. We strongly recommend you consume annotations in your app and implement additional AI content safety mechanisms, such as redacting content or returning additional safety information to the user.
647646
648-
**Content filtering signal**: The content filtering error signal is delayed; in case of a policy violation, it’s returned as soon as it’s available, and the stream is stopped. The content filtering signal is guaranteed within ~1,000-character windows in case of a policy violation.
647+
**Content filtering signal**: The content filtering error signal is delayed. In case of a policy violation, it’s returned as soon as it’s available, and the stream is stopped. The content filtering signal is guaranteed within a ~1,000-character window of the policy-violating content.
649648
650-
Approval for Modified Content Filtering is required for access to Streaming – Asynchronous Modified Filter. The application can be found [here](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xURE01NDY1OUhBRzQ3MkQxMUhZSE1ZUlJKTiQlQCN0PWcu). To enable it via Azure OpenAI Studio please follow the instructions [here](/azure/ai-services/openai/how-to/content-filters) to create a new content filtering configuration, and select Asynchronous Modified Filter in the Streaming section, as shown in the below screenshot.
649+
Approval for modified content filtering is required for access to the asynchronous modified filter. The application can be found [here](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xURE01NDY1OUhBRzQ3MkQxMUhZSE1ZUlJKTiQlQCN0PWcu). To enable it in Azure OpenAI Studio, follow the [Content filter how-to guide](/azure/ai-services/openai/how-to/content-filters) to create a new content filtering configuration, and select **Asynchronous Modified Filter** in the Streaming section.
651650
652-
### Overview
651+
### Comparison of content filtering modes
653652
654-
| Category | Streaming - Default | Streaming - Asynchronous Modified Filter |
653+
| | Streaming - Default | Streaming - Asynchronous Modified Filter |
655654
|---|---|---|
656655
|Status |GA |Public Preview |
657-
| Access | Enabled by default, no action needed |Customers approved for Modified Content Filtering can configure directly via Azure OpenAI Studio (as part of a content filtering configuration; applied on deployment-level) |
658-
| Eligibility |All customers |Customers approved for Modified Content Filtering |
659-
|Modality and Availability |Text; all GPT-models |Text; all GPT-models except gpt-4-vision |
656+
| Eligibility |All customers |Customers approved for modified content filtering |
657+
| How to enable | Enabled by default, no action needed |Customers approved for modified content filtering can configure it directly in Azure OpenAI Studio (as part of a content filtering configuration, applied at the deployment level) |
658+
|Modality and availability |Text; all GPT models |Text; all GPT models except gpt-4-vision |
660659
|Streaming experience |Content is buffered and returned in chunks |Zero latency (no buffering, filters run asynchronously) |
661-
|Content filtering signal |Immediate filtering signal |Delayed filtering signal (in up to ~1,000 char increments) |
662-
|Content filtering configurations |Supports default and any customer-defined filter setting (including optional models) |Supports default and any customer-defined filter setting (including optional models) |
660+
|Content filtering signal |Immediate filtering signal |Delayed filtering signal (in up to ~1,000-character increments) |
661+
|Content filtering configurations |Supports default and any customer-defined filter setting (including optional models) |Supports default and any customer-defined filter setting (including optional models) |
663662
664-
### Annotations and sample response stream
663+
### Annotations and sample responses
665664
666665
#### Prompt annotation message
667666
@@ -709,11 +708,11 @@ data: {
709708
710709
#### Annotation message
711710
712-
The text field will always be an empty string, indicating no new tokens. Annotations will only be relevant to already-sent tokens. There may be multiple Annotation Messages referring to the same tokens.
711+
The text field will always be an empty string, indicating no new tokens. Annotations will only be relevant to already-sent tokens. There may be multiple annotation messages referring to the same tokens.
713712
714-
start_offset and end_offset are low-granularity offsets in text (with 0 at beginning of prompt) which the annotation is relevant to.
713+
`"start_offset"` and `"end_offset"` are low-granularity offsets in text (with 0 at beginning of prompt) to mark which text the annotation is relevant to.
715714
716-
check_offset represents how much text has been fully moderated. It is an exclusive lower bound on the end_offsets of future annotations. It is nondecreasing.
715+
`"check_offset"` represents how much text has been fully moderated. It's an exclusive lower bound on the `"end_offset"` values of future annotations. It's non-decreasing.
717716
718717
```json
719718
data: {
@@ -739,9 +738,9 @@ data: {
739738
```
740739
741740
742-
### Sample response stream
741+
#### Sample response stream (passes filters)
743742
744-
Below is a real chat completion response using Asynchronous Modified Filter. Note how prompt annotations are not changed; completion tokens are sent without annotations; and new annotation messages are sent without tokens, instead associated with certain content filter offsets.
743+
Below is a real chat completion response using asynchronous modified filter. Note how the prompt annotations aren't changed, completion tokens are sent without annotations, and new annotation messages are sent without tokens&mdash;they are instead associated with certain content filter offsets.
745744
746745
`{"temperature": 0, "frequency_penalty": 0, "presence_penalty": 1.0, "top_p": 1.0, "max_tokens": 800, "messages": [{"role": "user", "content": "What is color?"}], "stream": true}`
747746
@@ -769,7 +768,7 @@ data: {"id":"","object":"","created":0,"model":"","choices":[{"index":0,"finish_
769768
data: [DONE]
770769
```
771770
772-
### Sample response stream (blocking)
771+
#### Sample response stream (blocked by filters)
773772
774773
`{"temperature": 0, "frequency_penalty": 0, "presence_penalty": 1.0, "top_p": 1.0, "max_tokens": 800, "messages": [{"role": "user", "content": "Tell me the lyrics to \"Hey Jude\"."}], "stream": true}`
775774

articles/ai-services/openai/concepts/models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
113113
| gpt-4 (0314) | | East US <br> France Central <br> South Central US <br> UK South |
114114
| gpt-4 (0613) | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | East US <br> East US 2 <br> Japan East <br> UK South |
115115
| gpt-4 (1106-preview) | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | |
116-
| gpt-4 (vision-preview) | Sweden Central <br> West US| Switzerland North <br> Australia East |
116+
| gpt-4 (vision-preview) | Sweden Central <br> West US <br> Japan East| Switzerland North <br> Australia East |
117117

118118
### GPT-3.5 models
119119

articles/aks/TOC.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
href: release-tracker.md
1111
- name: Supported Kubernetes versions
1212
href: supported-kubernetes-versions.md
13-
- name: Long Term Support
13+
- name: Long-term support
1414
href: long-term-support.md
1515
- name: Add-ons, extensions, and other integrations
1616
href: integrations.md
@@ -238,7 +238,7 @@
238238
href: cluster-configuration.md
239239
- name: Manually scale nodes in an AKS cluster
240240
href: scale-cluster.md
241-
- name: Stop an AKS cluster
241+
- name: Stop and start an AKS cluster
242242
href: start-stop-cluster.md
243243
- name: Configure private clusters
244244
items:
@@ -266,7 +266,7 @@
266266
href: istio-deploy-addon.md
267267
- name: Deploy external or internal Istio Ingress
268268
href: istio-deploy-ingress.md
269-
- name: Plug in CA certificates for Istio
269+
- name: Plug-in CA certificates for Istio
270270
href: istio-plugin-ca.md
271271
- name: Upgrade Istio service mesh add-on
272272
href: istio-upgrade.md
@@ -359,15 +359,15 @@
359359
href: use-metrics-server-vertical-pod-autoscaler.md
360360
- name: Proximity placement groups
361361
href: reduce-latency-ppg.md
362-
- name: Cluster Autoscaler
362+
- name: Cluster autoscaler
363363
items:
364-
- name: Cluster Autoscaler overview
364+
- name: Cluster autoscaler overview
365365
href: cluster-autoscaler-overview.md
366-
- name: Use the Cluster Autoscaler on AKS
366+
- name: Use the cluster autoscaler on AKS
367367
href: cluster-autoscaler.md
368368
- name: Node autoprovision
369369
href: node-autoprovision.md
370-
- name: Availability Zones
370+
- name: Availability zones
371371
href: availability-zones.md
372372
- name: Cluster management
373373
items:
@@ -393,7 +393,7 @@
393393
href: image-cleaner.md
394394
- name: Scan images in your CI/CD Workflow
395395
href: ../defender-for-cloud/defender-for-container-registries-cicd.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
396-
- name: Scanning images in ACR registries
396+
- name: Scan images in ACR registries
397397
href: ../defender-for-cloud/defender-for-containers-introduction.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
398398
- name: Cluster security
399399
items:
@@ -421,7 +421,7 @@
421421
href: use-kms-etcd-encryption.md
422422
- name: Node security
423423
items:
424-
- name: BYOK for disks
424+
- name: BYOK for Azure managed disks
425425
href: azure-disk-customer-managed-keys.md
426426
- name: Enable host-based encryption
427427
href: enable-host-encryption.md

0 commit comments

Comments
 (0)