Skip to content

Commit 310c121

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram24-0508
2 parents 3334dcd + 1df134a commit 310c121

File tree

656 files changed

+11266
-6575
lines changed

Some content is hidden

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

656 files changed

+11266
-6575
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/network-watcher-security-group-view-powershell.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-powershell",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/network-watcher/network-watcher-security-group-view-cli.md",
10+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-cli",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/storage/blobs/blob-v11-samples-dotnet.md",
15+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-dotnet",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/storage/blobs/blob-v11-samples-javascript.md",
20+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-javascript",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/storage/blobs/blob-v2-samples-python.md",
25+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v2-samples-python",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/storage/common/geo-redundant-design-legacy.md",
30+
"redirect_url": "/previous-versions/azure/storage/common/geo-redundant-design-legacy",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path": "articles/germany/index.yml",
535
"redirect_url": "/previous-versions/azure/germany/index",
@@ -4004,6 +4034,11 @@
40044034
"source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
40054035
"redirect_url":"/azure/aks/generation-2-vm",
40064036
"redirect_document_id":false
4037+
},
4038+
{
4039+
"source_path_from_root":"/articles/cosmos-db/high-availability.md",
4040+
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
4041+
"redirect_document_id":false
40074042
}
40084043
]
40094044
}

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in-federation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Notice the claims transformations we defined in [step 3.2](#step-32---define-cla
225225

226226
Just like in sign-in with a local account, you need to configure the [Microsoft Entra Technical Profiles](active-directory-technical-profile.md), which you use to connect to Microsoft Entra ID storage, to store or read a user social account.
227227

228-
1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile by using the following code:
228+
1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile below it by using the following code:
229229

230230
```xml
231231
<TechnicalProfile Id="AAD-UserWriteUsingAlternativeSecurityId">
@@ -517,6 +517,7 @@ Use the following steps to add a combined local and social account:
517517
```xml
518518
<OutputClaim ClaimTypeReferenceId="authenticationSource" DefaultValue="localIdpAuthentication" AlwaysUseDefaultValue="true" />
519519
```
520+
Make sure you also add the `authenticationSource` claim in the output claims collection of the `UserSignInCollector` self-asserted technical profile.
520521

521522
1. In the `UserJourneys` section, add a new user journey, `LocalAndSocialSignInAndSignUp` by using the following code:
522523

articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99

1010
ms.topic: reference
11-
ms.date: 01/11/2024
11+
ms.date: 05/11/2024
1212
ms.subservice: B2C
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -169,7 +169,7 @@ The following table lists the administrative configuration limits in the Azure A
169169
|String Limit per Attribute |250 Chars |
170170
|Number of B2C tenants per subscription |20 |
171171
|Total number of objects (user accounts and applications) per tenant (default limit)|1.25 million |
172-
|Total number of objects (user accounts and applications) per tenant (using a verified custom domain)|5.25 million |
172+
|Total number of objects (user accounts and applications) per tenant (using a verified custom domain). If you want to increase this limit, please contact [Microsoft Support](find-help-open-support-ticket.md).|5.25 million |
173173
|Levels of [inheritance](custom-policy-overview.md#inheritance-model) in custom policies |10 |
174174
|Number of policies per Azure AD B2C tenant (user flows + custom policies) |200 |
175175
|Maximum policy file size |1024 KB |

articles/ai-services/content-moderator/includes/tool-deprecation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: pafarley
1313

1414

1515
> [!IMPORTANT]
16-
> Azure Content Moderator is being deprecated in February 2024, and will be retired by February 2027. It is being replaced by [Azure AI Content Safety](/azure/ai-services/content-safety/overview), which offers advanced AI features and enhanced performance.
16+
> Azure Content Moderator is deprecated as of February 2024 and will be retired by February 2027. It is replaced by [Azure AI Content Safety](/azure/ai-services/content-safety/overview), which offers advanced AI features and enhanced performance.
1717
>
1818
> Azure AI Content Safety is a comprehensive solution designed to detect harmful user-generated and AI-generated content in applications and services. Azure AI Content Safety is suitable for many scenarios such as online marketplaces, gaming companies, social messaging platforms, enterprise media companies, and K-12 education solution providers. Here's an overview of its features and capabilities:
1919
>

articles/ai-services/content-moderator/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### YamlMime:Landing
22

33
title: Content Moderator documentation # < 60 chars
4-
summary: "The Azure Content Moderator API checks text, image, and video content for material that is potentially offensive, risky, or otherwise undesirable. Content Moderator is being deprecated in February 2024, and will be retired by February 2027. It is being replaced by Azure AI Content Safety, which offers advanced AI features and enhanced performance. Azure AI Content Safety is a comprehensive solution designed to detect harmful user-generated and AI-generated content in applications and services. Azure AI Content Safety is suitable for many scenarios such as online marketplaces, gaming companies, social messaging platforms, enterprise media companies, and K-12 education solution providers." # < 160 chars
4+
summary: "Azure Content Moderator is deprecated as of February 2024 and will be retired by February 2027. It is replaced by Azure AI Content Safety, which offers advanced AI features and enhanced performance. Azure AI Content Safety is a comprehensive solution designed to detect harmful user-generated and AI-generated content in applications and services. Azure AI Content Safety is suitable for many scenarios such as online marketplaces, gaming companies, social messaging platforms, enterprise media companies, and K-12 education solution providers." # < 160 chars
55

66
metadata:
77
title: Content Moderator Documentation - Quickstarts, Tutorials, API Reference - Azure AI services | Microsoft Docs

articles/ai-services/language-service/conversational-language-understanding/concepts/best-practices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,3 +251,4 @@ Once the request is sent, you can track the progress of the training job in Lang
251251
Caveats:
252252
- The None Score threshold for the app (confidence threshold below which the topIntent is marked as None) when using this recipe should be set to 0. This is because this new recipe attributes a certain portion of the in domain probabiliities to out of domain so that the model is not incorrectly overconfident about in domain utterances. As a result, users may see slightly reduced confidence scores for in domain utterances as compared to the prod recipe.
253253
- This recipe is not recommended for apps with just two (2) intents, such as IntentA and None, for example.
254+
- This recipe is not recommended for apps with low number of utterances per intent. A minimum of 25 utterances per intent is highly recommended.

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

Lines changed: 113 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI's Python & REST API runs with Assista
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: conceptual
8-
ms.date: 02/01/2024
8+
ms.date: 04/16/2024
99
author: mrbullwinkle
1010
ms.author: mbullwin
1111
recommendations: false
@@ -585,3 +585,115 @@ Represent a step in execution of a run.
585585
| `failed_at`| integer or null | The Unix timestamp (in seconds) for when the run step failed.|
586586
| `completed_at`| integer or null | The Unix timestamp (in seconds) for when the run step completed.|
587587
| `metadata`| map | Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maximum of 512 characters long.|
588+
589+
## Stream a run result (preview)
590+
591+
Stream the result of executing a Run or resuming a Run after submitting tool outputs. You can stream events after:
592+
* [Create Thread and Run](#create-thread-and-run)
593+
* [Create Run](#create-run)
594+
* [Submit Tool Outputs](#submit-tool-outputs-to-run)
595+
596+
To stream a result, pass `"stream": true` while creating a run. The response will be a [Server-Sent events](https://html.spec.whatwg.org/multipage/server-sent-events.html#server-sent-events) stream.
597+
598+
### Streaming example
599+
600+
```python
601+
from typing_extensions import override
602+
from openai import AssistantEventHandler
603+
604+
# First, we create a EventHandler class to define
605+
# how we want to handle the events in the response stream.
606+
607+
class EventHandler(AssistantEventHandler):
608+
@override
609+
def on_text_created(self, text) -> None:
610+
print(f"\nassistant > ", end="", flush=True)
611+
612+
@override
613+
def on_text_delta(self, delta, snapshot):
614+
print(delta.value, end="", flush=True)
615+
616+
def on_tool_call_created(self, tool_call):
617+
print(f"\nassistant > {tool_call.type}\n", flush=True)
618+
619+
def on_tool_call_delta(self, delta, snapshot):
620+
if delta.type == 'code_interpreter':
621+
if delta.code_interpreter.input:
622+
print(delta.code_interpreter.input, end="", flush=True)
623+
if delta.code_interpreter.outputs:
624+
print(f"\n\noutput >", flush=True)
625+
for output in delta.code_interpreter.outputs:
626+
if output.type == "logs":
627+
print(f"\n{output.logs}", flush=True)
628+
629+
# Then, we use the `create_and_stream` SDK helper
630+
# with the `EventHandler` class to create the Run
631+
# and stream the response.
632+
633+
with client.beta.threads.runs.stream(
634+
thread_id=thread.id,
635+
assistant_id=assistant.id,
636+
instructions="Please address the user as Jane Doe. The user has a premium account.",
637+
event_handler=EventHandler(),
638+
) as stream:
639+
stream.until_done()
640+
```
641+
642+
643+
## Message delta object
644+
645+
Represents a message delta. For example any changed fields on a message during streaming.
646+
647+
|Name | Type | Description |
648+
|--- |--- |--- |
649+
| `id` | string | The identifier of the message, which can be referenced in API endpoints. |
650+
| `object` | string | The object type, which is always `thread.message.delta`. |
651+
| `delta` | object | The delta containing the fields that have changed on the Message. |
652+
653+
## Run step delta object
654+
655+
Represents a run step delta. For example any changed fields on a run step during streaming.
656+
657+
|Name | Type | Description |
658+
|--- |--- |--- |
659+
| `id` | string | The identifier of the run step, which can be referenced in API endpoints. |
660+
| `object` | string | The object type, which is always `thread.run.step.delta`. |
661+
| `delta` | object | The delta containing the fields that have changed on the run step.
662+
663+
## Assistant stream events
664+
665+
Represents an event emitted when streaming a Run. Each event in a server-sent events stream has an event and data property:
666+
667+
```json
668+
event: thread.created
669+
data: {"id": "thread_123", "object": "thread", ...}
670+
```
671+
672+
Events are emitted whenever a new object is created, transitions to a new state, or is being streamed in parts (deltas). For example, `thread.run.created` is emitted when a new run is created, `thread.run.completed` when a run completes, and so on. When an Assistant chooses to create a message during a run, we emit a `thread.message.created` event, a `thread.message.in_progress` event, many thread.`message.delta` events, and finally a `thread.message.completed` event.
673+
674+
|Name | Type | Description |
675+
|--- |--- |--- |
676+
| `thread.created` | `data` is a thread. | Occurs when a new thread is created. |
677+
| `thread.run.created` | `data` is a run. | Occurs when a new run is created. |
678+
| `thread.run.queued` | `data` is a run. | Occurs when a run moves to a queued status. |
679+
| `thread.run.in_progress` | `data` is a run. | Occurs when a run moves to an in_progress status. |
680+
| `thread.run.requires_action` | `data` is a run. | Occurs when a run moves to a `requires_action` status. |
681+
| `thread.run.completed` | `data` is a run. | Occurs when a run is completed. |
682+
| `thread.run.failed` | `data` is a run. | Occurs when a run fails. |
683+
| `thread.run.cancelling` | `data` is a run. | Occurs when a run moves to a `cancelling` status. |
684+
| `thread.run.cancelled` | `data` is a run. | Occurs when a run is cancelled. |
685+
| `thread.run.expired` | `data` is a run. | Occurs when a run expires. |
686+
| `thread.run.step.created` | `data` is a run step. | Occurs when a run step is created. |
687+
| `thread.run.step.in_progress` | `data` is a run step. | Occurs when a run step moves to an `in_progress` state. |
688+
| `thread.run.step.delta` | `data` is a run step delta. | Occurs when parts of a run step are being streamed. |
689+
| `thread.run.step.completed` | `data` is a run step. | Occurs when a run step is completed. |
690+
| `thread.run.step.failed` | `data` is a run step. | Occurs when a run step fails. |
691+
| `thread.run.step.cancelled` | `data` is a run step. | Occurs when a run step is cancelled. |
692+
| `thread.run.step.expired` | `data` is a run step. | Occurs when a run step expires. |
693+
| `thread.message.created` | `data` is a message. | Occurs when a message is created. |
694+
| `thread.message.in_progress` | `data` is a message. | Occurs when a message moves to an in_progress state. |
695+
| `thread.message.delta` | `data` is a message delta. | Occurs when parts of a Message are being streamed. |
696+
| `thread.message.completed` | `data` is a message. | Occurs when a message is completed. |
697+
| `thread.message.incomplete` | `data` is a message. | Occurs when a message ends before it is completed. |
698+
| `error` | `data` is an error. | Occurs when an error occurs. This can happen due to an internal server error or a timeout. |
699+
| `done` | `data` is `[DONE]` | Occurs when a stream ends. |

0 commit comments

Comments
 (0)