Skip to content

Commit 65994cf

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vpn-peer-update
2 parents 3671c56 + e3996ef commit 65994cf

File tree

33 files changed

+445
-493
lines changed

33 files changed

+445
-493
lines changed

articles/ai-services/openai/concepts/gpt-with-vision.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ If you turn on Enhancements, additional usage applies for using GPT-4 Turbo with
6868
|-----------------|-----------------|
6969
| + Enhanced add-on features for OCR | $1.5 per 1000 transactions |
7070
| + Enhanced add-on features for Object Detection | $1.5 per 1000 transactions |
71-
| + Enhanced add-on feature for “Add your Image” Image Embeddings | $1.5 per 1000 transactions |
7271
| + Enhanced add-on feature for “Video Retrieval” integration **<sup>1</sup>** | Ingestion: $0.05 per minute of video <br>Transactions: $0.25 per 1000 queries of the Video Retrieval index |
7372

7473
**<sup>1</sup>** Processing videos involves the use of extra tokens to identify key frames for analysis. The number of these additional tokens will be roughly equivalent to the sum of the tokens in the text input, plus 700 tokens.
@@ -79,13 +78,14 @@ If you turn on Enhancements, additional usage applies for using GPT-4 Turbo with
7978
8079
For a typical use case, take an image with both visible objects and text and a 100-token prompt input. When the service processes the prompt, it generates 100 tokens of output. In the image, both text and objects can be detected. The price of this transaction would be:
8180

82-
| Item | Detail | Total Cost |
81+
| Item | Detail | Cost |
8382
|-----------------|-----------------|--------------|
84-
| GPT-4 Turbo with Vision input tokens | 100 text tokens | $0.001 |
83+
| Text prompt input | 100 text tokens | $0.001 |
84+
| Example image input (see [Image tokens](/ai-services/openai/overview#image-tokens-gpt-4-turbo-with-vision)) | 170 + 85 image tokens | $0.00255 |
8585
| Enhanced add-on features for OCR | $1.50 / 1000 transactions | $0.0015 |
8686
| Enhanced add-on features for Object Grounding | $1.50 / 1000 transactions | $0.0015 |
8787
| Output Tokens | 100 tokens (assumed) | $0.003 |
88-
| **Total Cost** | | $0.007 |
88+
| **Total** | |**$0.00955** |
8989

9090

9191
### Example video price calculation
@@ -95,13 +95,13 @@ For a typical use case, take an image with both visible objects and text and a 1
9595
9696
For a typical use case, take a 3-minute video with a 100-token prompt input. The video has a transcript that's 100 tokens long, and when the service processes the prompt, it generates 100 tokens of output. The pricing for this transaction would be:
9797

98-
| Item | Detail | Total Cost |
98+
| Item | Detail | Cost |
9999
|-----------------|-----------------|--------------|
100100
| GPT-4 Turbo with Vision input tokens | 100 text tokens | $0.001 |
101101
| Additional Cost to identify frames | 100 input tokens + 700 tokens + 1 Video Retrieval transaction | $0.00825 |
102102
| Image Inputs and Transcript Input | 20 images (85 tokens each) + 100 transcript tokens | $0.018 |
103103
| Output Tokens | 100 tokens (assumed) | $0.003 |
104-
| **Total Cost** | | **$0.03025** |
104+
| **Total** | | **$0.03025** |
105105

106106
Additionally, there's a one-time indexing cost of $0.15 to generate the Video Retrieval index for this 3-minute video. This index can be reused across any number of Video Retrieval and GPT-4 Turbo with Vision API calls.
107107

articles/ai-services/openai/how-to/dall-e.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following command shows the most basic way to use DALL-E with code. If this
4747
Send a POST request to:
4848

4949
```
50-
https://<your_resource_name>.deployments/<your_deployment_name>/images/generations?api-version=<api_version>
50+
https://<your_resource_name>.openai.azure.com/openai/deployments/<your_deployment_name>/images/generations?api-version=<api_version>
5151
```
5252

5353
where:

articles/container-apps/sessions.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,20 @@ You pass the session identifier in a query parameter named `identifier` in the U
7575

7676
For code interpreter sessions, you can also use an integration with an [LLM framework](./sessions-code-interpreter.md#llm-framework-integrations). The framework handles the token generation and management for you. Ensure that the application is configured with a managed identity that has the necessary role assignments on the session pool.
7777

78+
##### Protecting session identifiers
79+
80+
The session identifier is sensitive information which requires a secure process as you create and manage its value. To protect this value, your application must ensure each user or tenant only has access to their own sessions.
81+
82+
The specific strategies that prevent misuse of session identifiers differ depending on the design and architecture of your app. However, your app must always have complete control over the creation and use of session identifiers so that a malicious user can't access another user's session.
83+
84+
Example strategies include:
85+
86+
* **One session per user**: If your app uses one session per user, each user must be securely authenticated, and your app must use a unique session identifier for each logged in user.
87+
* **One session per agent conversation**: If your app uses one session per AI agent conversation, ensure your app uses a unique session identifier for each conversation that can't be modified by the end user.
88+
89+
> [!IMPORTANT]
90+
> Failure to secure access to sessions may result in misuse or unauthorized access to data stored in your users' sessions.
91+
7892
### Authentication
7993

8094
Authentication is handled using Microsoft Entra (formerly Azure Active Directory) tokens. Valid Microsoft Entra tokens are generated by an identity belonging to the *Azure ContainerApps Session Executor* and *Contributor* roles on the session pool.

articles/postgresql/migrate/migration-service/best-practices-migration-service-postgresql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Best practices for a seamless migration into Azure Database for Pos
44
author: hariramt
55
ms.author: hariramt
66
ms.reviewer: maghan
7-
ms.date: 01/30/2024
7+
ms.date: 06/19/2024
88
ms.service: postgresql
99
ms.subservice: flexible-server
1010
ms.topic: conceptual
@@ -193,4 +193,4 @@ In this case, you can grant the `migration user` permission to close all active
193193
## Related content
194194
195195
- [Migration service](concepts-migration-service-postgresql.md)
196-
- [Known issues and limitations](concepts-known-issues-migration-service.md)
196+
- [Known issues and limitations](concepts-known-issues-migration-service.md)

articles/postgresql/migrate/migration-service/concepts-known-issues-migration-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Providing the limitations and known issues of the migration service
44
author: apduvuri
55
ms.author: adityaduvuri
66
ms.reviewer: maghan
7-
ms.date: 01/30/2024
7+
ms.date: 06/19/2024
88
ms.service: postgresql
99
ms.topic: conceptual
1010
---

articles/postgresql/migrate/migration-service/concepts-migration-service-runtime-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: "Concepts about the migration runtime server in migration service A
44
author: apduvuri
55
ms.author: adityaduvuri
66
ms.reviewer: maghan
7-
ms.date: 06/13/2024
7+
ms.date: 06/19/2024
88
ms.service: postgresql
99
ms.topic: conceptual
1010
---
@@ -49,4 +49,4 @@ Choose your Azure subscription and resource group and the location of the VNet-i
4949

5050
- [Migration service](concepts-migration-service-postgresql.md)
5151
- [Network setup](how-to-network-setup-migration-service.md)
52-
- [Premigration validations](concepts-premigration-migration-service.md)
52+
- [Premigration validations](concepts-premigration-migration-service.md)

articles/postgresql/migrate/migration-service/concepts-premigration-migration-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: premigration validations to identify issues before running migratio
44
author: apduvuri
55
ms.author: adityaduvuri
66
ms.reviewer: maghan
7-
ms.date: 01/30/2024
7+
ms.date: 06/19/2024
88
ms.service: postgresql
99
ms.topic: conceptual
1010
---

articles/postgresql/migrate/migration-service/concepts-user-roles-migration-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Migration of users/roles, ownerships, and privileges along with sch
44
author: shriramm
55
ms.author: shriramm
66
ms.reviewer: maghan
7-
ms.date: 03/13/2024
7+
ms.date: 06/19/2024
88
ms.service: postgresql
99
ms.topic: conceptual
1010
---

articles/postgresql/migrate/migration-service/how-to-network-setup-migration-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Network scenarios for connecting source and target
55
author: apduvuri
66
ms.author: adityaduvuri
77
ms.reviewer: maghan
8-
ms.date: 06/13/2024
8+
ms.date: 06/19/2024
99
ms.service: postgresql
1010
ms.topic: how-to
1111
---

articles/postgresql/migrate/migration-service/how-to-setup-azure-cli-commands-postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: How to set up Azure CLI for migration service in Azure Database for Postg
33
description: Learn how to set up Azure CLI for migration service in Azure Database for PostgreSQL - Flexible Server and begin migrating your data.
44
author: markingmyname
55
ms.author: maghan
6-
ms.date: 06/13/2024
6+
ms.date: 06/19/2024
77
ms.service: postgresql
88
ms.subservice: flexible-server
99
ms.topic: how-to

0 commit comments

Comments
 (0)