Skip to content

Commit 4a24f59

Browse files
authored
Merge pull request #278887 from MicrosoftDocs/main
Publish to live, Friday 4 AM PST, 6/21
2 parents 1ba0a15 + 90bc328 commit 4a24f59

File tree

248 files changed

+351
-333
lines changed

Some content is hidden

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

248 files changed

+351
-333
lines changed
101 KB
Loading
231 KB
Loading

articles/governance/policy/samples/built-in-initiatives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: List of built-in policy initiatives
33
description: List built-in policy initiatives for Azure Policy. Categories include Regulatory Compliance, Guest Configuration, and more.
4-
ms.date: 06/17/2024
4+
ms.date: 06/21/2024
55
ms.topic: sample
66
ms.custom: generated
77
---

articles/governance/policy/samples/built-in-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: List of built-in policy definitions
33
description: List built-in policy definitions for Azure Policy. Categories include Tags, Regulatory Compliance, Key Vault, Kubernetes, Guest Configuration, and more.
4-
ms.date: 06/17/2024
4+
ms.date: 06/21/2024
55
ms.topic: sample
66
ms.custom: generated
77
---

articles/machine-learning/prompt-flow/how-to-deploy-to-code.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,9 @@ environment_variables:
371371
my_connection: <override_connection_name>
372372
```
373373

374+
If you want to override a specific field of the connection, you can override by adding environment variables with naming pattern `<connection_name>_<field_name>`. For example, if your flow uses a connection named `my_connection` with a configuration key called `chat_deployment_name`, the serving backend will attempt to retrieve `chat_deployment_name` from the environment variable 'MY_CONNECTION_CHAT_DEPLOYMENT_NAME' by default. If the environment variable is not set, it will use the original value from the flow definition.
375+
376+
374377
**Option 2**: override by referring to asset
375378

376379
```yaml
@@ -461,7 +464,7 @@ environment_variables:
461464
While tuning above parameters, you need to monitor the following metrics to ensure optimal performance and stability:
462465
- Instance CPU/Memory utilization of this deployment
463466
- Non-200 responses (4xx, 5xx)
464-
- If you receive a 429 response, this typically indicates that you need to either re-tune your concurrency settings following the above guide or scale your deployment.
467+
- If you receive a 429 response, this typically indicates that you need to either retune your concurrency settings following the above guide or scale your deployment.
465468
- Azure OpenAI throttle status
466469

467470
### Monitor endpoints
@@ -497,6 +500,16 @@ request_settings:
497500
request_timeout_ms: 300000
498501
```
499502

503+
> [!NOTE]
504+
>
505+
> 300,000 ms timeout only works for maanged online deployments from prompt flow. You need to make sure that you have added properties for your model as below (either inline model specification in the deployment yaml or standalone model specification yaml) to indicate this is a deployment from prompt flow.
506+
507+
```yaml
508+
properties:
509+
# indicate a deployment from prompt flow
510+
azureml.promptflow.source_flow_id: <value>
511+
```
512+
500513
## Next steps
501514

502515
- Learn more about [managed online endpoint schema](../reference-yaml-endpoint-online.md) and [managed online deployment schema](../reference-yaml-deployment-managed-online.md).

articles/machine-learning/prompt-flow/how-to-enable-streaming-mode.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ To learn how to deploy your flow as an online endpoint, see [Deploy a flow to o
7474

7575
> [!NOTE]
7676
>
77-
> Deploy with Runtime environment version later than version `20230710.v2`.
77+
> Deploy with Runtime environment version later than version `20230816.v10`.
7878
7979
You can check your runtime version and update runtime in the run time detail page.
8080

@@ -258,17 +258,27 @@ If the response code is "424 Model Error", it means that the error is caused by
258258

259259
### Consume using Python
260260

261+
In this sample usage, we are using the `SSEClient` class. This class is not a built-in Python class and needs to be installed separately. You can install it via pip:
262+
263+
```bash
264+
pip install sseclient-py
265+
```
266+
261267
A sample usage would like:
262268

263269
```python
270+
import requests
271+
from sseclient import SSEClient
272+
from requests.exceptions import HTTPError
273+
264274
try:
265275
response = requests.post(url, json=body, headers=headers, stream=stream)
266276
response.raise_for_status()
267277

268278
content_type = response.headers.get('Content-Type')
269279
if "text/event-stream" in content_type:
270-
event_stream = EventStream(response.iter_lines())
271-
for event in event_stream:
280+
client = SSEClient(response)
281+
for event in client.events():
272282
# Handle event, i.e. print to stdout
273283
else:
274284
# Handle json response
@@ -279,15 +289,15 @@ except HTTPError:
279289

280290
### Consume using JavaScript
281291

282-
There are several libraries to consume server-sent events in JavaScript. For example, this is the [sse.js library](https://www.npmjs.com/package/sse.js?activeTab=code).
292+
There are several libraries to consume server-sent events in JavaScript. Here is [one of them as an example](https://www.npmjs.com/package/sse.js?activeTab=code).
283293

284294
## A sample chat app using Python
285295

286-
Here's a sample chat app written in Python.
296+
[Here's a sample chat app written in Python](https://github.com/microsoft/promptflow/blob/main/docs/media/how-to-guides/how-to-enable-streaming-mode/scripts/chat_app.py).
287297

288298
:::image type="content" source="./media/how-to-enable-streaming-mode/chat-app.gif" alt-text="Gif a sample chat app using Python."lightbox ="./media/how-to-enable-streaming-mode/chat-app.gif":::
289299

290-
## Advance usage - hybrid stream and non-stream flow output
300+
## Advanced usage - hybrid stream and non-stream flow output
291301

292302
Sometimes, you might want to get both stream and non-stream results from a flow output. For example, in the “Chat with Wikipedia” flow, you might want to get not only LLM’s answer, but also the list of URLs that the flow searched. To do this, you need to modify the flow to output a combination of stream LLM’s answer and non-stream URL list.
293303

@@ -297,7 +307,7 @@ In the sample "Chat With Wikipedia" flow, the output is connected to the LLM nod
297307

298308
The output of the flow will be a non-stream field as the base and a stream field as the delta. Here's an example of request and response.
299309

300-
### Advance usage - 0. The client sends a message to the server
310+
### Advanced usage - 0. The client sends a message to the server
301311

302312
```JSON
303313
POST https://<your-endpoint>.inference.ml.azure.com/score

articles/postgresql/flexible-server/how-to-connect-with-managed-identity.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,11 @@ This section shows how to get an access token using the VM's user-assigned manag
111111

112112
## Connect using Managed Identity in Python
113113

114-
For a Python code example, please refer to the [Quickstart: Use Python to connect and query data in Azure Database for PostgreSQL - Flexible Server
115-
](./connect-python.md)
114+
For a Python code example, please refer to the [Quickstart: Use Python to connect and query data in Azure Database for PostgreSQL - Flexible Server](./connect-python.md)
115+
116+
## Connect using Managed Identity in Java
117+
118+
For a Java code example, please refer to the [Quickstart: Use Java and JDBC with Azure Database for PostgreSQL - Flexible Server](./connect-java.md)
116119

117120
## Connect using Managed Identity in C#
118121

@@ -202,7 +205,7 @@ Opening connection using access token...
202205
203206
Connected!
204207
205-
Postgres version: PostgreSQL 11.11, compiled by Visual C++ build 1800, 64-bit
208+
Postgres version: PostgreSQL 11.11, compiled by Visual C++ build 1800, 64-bit
206209
```
207210

208211
## Next steps

articles/postgresql/flexible-server/how-to-use-pgvector.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Vector search on Azure Database for PostgreSQL
3-
description: Enable semantic simiolarity search for Retrieval Augemented Generation (RAG) on Azure Database for PostgreSQL with pgvector database extension.
3+
description: Enable semantic similarity search for Retrieval Augmented Generation (RAG) on Azure Database for PostgreSQL with pgvector database extension.
44
author: AvijitkGupta
55
ms.author: avijitgupta
66
ms.reviewer: kabharati, maghan
@@ -13,7 +13,7 @@ ms.custom:
1313
- ignite-2023
1414
---
1515

16-
# How to enable and use `pgvector` on Azure Database for PostgreSQL - Flexible Server
16+
# How to enable and use pgvector on Azure Database for PostgreSQL - Flexible Server
1717

1818
[!INCLUDE [applies-to-postgresql-flexible-server](~/reusable-content/ce-skilling/azure/includes/postgresql/includes/applies-to-postgresql-flexible-server.md)]
1919

@@ -23,6 +23,9 @@ ms.custom:
2323

2424
Before you can enable `pgvector` on your Azure Database for PostgreSQL flexible server instance, you need to add it to your allowlist as described in [how to use PostgreSQL extensions](./concepts-extensions.md#how-to-use-postgresql-extensions) and check if correctly added by running `SHOW azure.extensions;`.
2525

26+
> [!IMPORTANT]
27+
> Notice that although all PostgreSQL community tends to refer to this extension as pgvector, the name of the binary and the extension itself is simply `vector`. Take that into consideration, because that is the name you must use to allowlist it or to create it on any database via the CREATE EXTENSION command.
28+
2629
Then you can install the extension, by connecting to your target database and running the [CREATE EXTENSION](https://www.postgresql.org/docs/current/static/sql-createextension.html) command. You need to repeat the command separately for every database you want the extension to be available in.
2730

2831
```sql

articles/search/search-howto-index-sharepoint-online.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Here are the limitations of this feature:
5858

5959
+ Renaming a SharePoint folder doesn't trigger incremental indexing. A renamed folder is treated as new content.
6060

61-
+ SharePoint supports a granular authorization model that determines per-user access at the document level. The indexer doesn't pull these permissions into the index, and Azure AI Search doesn't support document-level authorization. When a document is indexed from SharePoint into a search service, the content is available to anyone who has read access to the index. If you require document-level permissions, you should consider [security filters to trim results](search-security-trimming-for-azure-search-with-aad.md) and automate copying the permissions at a file level to a field in the index.
61+
+ SharePoint supports a granular authorization model that determines per-user access at the document level. The indexer doesn't pull these permissions into the index, and Azure AI Search doesn't support document-level authorization. When a document is indexed from SharePoint into a search service, the content is available to anyone who has read access to the index. If you require document-level permissions, you should consider [security filters to trim results](search-security-trimming-for-azure-search.md) and automate copying the permissions at a file level to a field in the index.
6262

6363
+ Indexing user-encrypted files, Information Rights Management (IRM) protected files, ZIP files with passwords or similar encrypted content isn't supported. For encrypted content to be processed, the user with proper permissions to the specific file must remove the encryption so the item can be indexed accordingly when the indexer runs the next scheduled iteration.
6464

@@ -287,7 +287,7 @@ There are a few steps to creating the indexer:
287287
}
288288
```
289289
290-
If you're using application permissions, it's necessary to wait until the initial run is complete before starting to query your index. The following instructions provided in this step pertain specifically to delegated permissions, and are not applicable to application permissions.
290+
If you're using application permissions, it's necessary to wait until the initial run is complete before starting to query your index. The following instructions provided in this step pertain specifically to delegated permissions, and are not applicable to application permissions.
291291
292292
1. When you create the indexer for the first time, the [Create Indexer (preview)](/rest/api/searchservice/indexers/create-or-update?view=rest-searchservice-2023-10-01-preview&tabs=HTTP&preserve-view=true) request waits until you complete the next step. You must call [Get Indexer Status](/rest/api/searchservice/indexers/get-status?view=rest-searchservice-2023-10-01-preview&tabs=HTTP&preserve-view=true) to get the link and enter your new device code.
293293
@@ -299,7 +299,7 @@ If you're using application permissions, it's necessary to wait until the initia
299299
300300
If you don’t run the [Get Indexer Status](/rest/api/searchservice/indexers/get-status?view=rest-searchservice-2023-10-01-preview&tabs=HTTP&preserve-view=true) within 10 minutes, the code expires and you’ll need to recreate the [data source](#create-data-source).
301301
302-
1. Copy the device login code from the [Get Indexer Status](/rest/api/searchservice/indexers/get-status?view=rest-searchservice-2023-10-01-preview&tabs=HTTP&preserve-view=true) response. The device login can be found in the "errorMessage".
302+
1. Copy the device login code from the [Get Indexer Status](/rest/api/searchservice/indexers/get-status?view=rest-searchservice-2023-10-01-preview&tabs=HTTP&preserve-view=true) response. The device login can be found in the "errorMessage".
303303
304304
```http
305305
{
@@ -309,6 +309,7 @@ If you're using application permissions, it's necessary to wait until the initia
309309
}
310310
}
311311
```
312+
312313
1. Provide the code that was included in the error message.
313314
314315
:::image type="content" source="media/search-howto-index-sharepoint-online/enter-device-code.png" alt-text="Screenshot showing how to enter a device code.":::

articles/search/search-security-overview.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,7 @@ For multitenancy solutions requiring security boundaries at the index level, it'
156156

157157
User permissions at the document level, also known as *row-level security*, isn't natively supported in Azure AI Search. If you import data from an external system that provides row-level security, such as Azure Cosmos DB, those permissions won't transfer with the data as its being indexed by Azure AI Search.
158158

159-
If you require permissioned access over content in search results, there's a technique for applying filters that include or exclude documents based on user identity. This workaround adds a string field in the data source that represents a group or user identity, which you can make filterable in your index. The following table describes two approaches for trimming search results of unauthorized content.
160-
161-
| Approach | Description |
162-
|----------|-------------|
163-
|[Security trimming based on identity filters](search-security-trimming-for-azure-search.md) | Documents the basic workflow for implementing user identity access control. It covers adding security identifiers to an index, and then explains filtering against that field to trim results of prohibited content. |
164-
|[Security trimming based on Microsoft Entra identities](search-security-trimming-for-azure-search-with-aad.md) | This article expands on the previous article, providing steps for retrieving identities from Microsoft Entra ID, one of the [free services](https://azure.microsoft.com/free/) in the Azure cloud platform. |
159+
If you require permissioned access over content in search results, there's a technique for applying filters that include or exclude documents based on user identity. This workaround adds a string field in the data source that represents a group or user identity, which you can make filterable in your index. For more information about this pattern, see [Security trimming based on identity filters](search-security-trimming-for-azure-search.md).
165160

166161
## Data residency
167162

0 commit comments

Comments
 (0)