Merge branch 'release-postgres-flexible' of https://github.com/MicrosoftDocs/azure-docs-pr into postgres-terms2

Author: v-thepet

.openpublishing.redirection.json

@@ -23678,6 +23678,11 @@
             "source_path_from_root": "/articles/aks/ai-toolchain-operator.md",
             "redirect_url": "https://azure.microsoft.com/updates/preview-ai-toolchain-operator-addon-for-aks/",
             "redirect_document_id": false  
+        },
+        {
+            "source_path_from_root": "/articles/reliability/disaster-recovery-guidance-overview.md",
+            "redirect_url": "/azure/reliability/reliability-guidance-overview",
+            "redirect_document_id": false  
         }
 
     ]

articles/ai-services/language-service/summarization/includes/quickstarts/rest-api.md

@@ -4,13 +4,17 @@ author: jboback
 manager: nitinme
 ms.service: azure-ai-language
 ms.topic: include
-ms.date: 02/17/2023
+ms.date: 12/13/2023
 ms.author: aahi
 ms.custom: ignite-fall-2021, event-tier1-build-2022, ignite-2022
 ---
 
+# [Document summarization](#tab/document-summarization)
+
 # [Conversation summarization](#tab/conversation-summarization)
 
+---
+
 Use this quickstart to send text summarization requests using the REST API. In the following example, you will use cURL to summarize documents or text-based customer service conversations.
 
 [!INCLUDE [Use Language Studio](../use-language-studio.md)]
@@ -111,8 +115,6 @@ curl -X GET $LANGUAGE_ENDPOINT/language/analyze-text/jobs/<my-job-id>?api-versio
 -H "Ocp-Apim-Subscription-Key: $LANGUAGE_KEY"
 ```
 
-
-
 ### Document extractive summarization example JSON response
 
 ```json
@@ -189,6 +191,8 @@ curl -X GET $LANGUAGE_ENDPOINT/language/analyze-text/jobs/<my-job-id>?api-versio
 }
 ```
 
+# [Conversation summarization](#tab/conversation-summarization)
+
 ## Conversation issue and resolution summarization
 
 The following example will get you started with conversation issue and resolution summarization:
@@ -296,8 +300,6 @@ curl -X GET $LANGUAGE_ENDPOINT/language/analyze-conversations/jobs/<my-job-id>?a
 -H "Ocp-Apim-Subscription-Key: $LANGUAGE_KEY"
 ```
 
-
-
 ### Conversation issue and resolution summarization example JSON response
 
 ```json

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

@@ -115,7 +115,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 
 ### GPT-3.5 models
 
-GPT-3.5 Turbo is used with the Chat Completion API. GPT-3.5 Turbo (0301) can also be used with the Completions API.  GPT3.5 Turbo (0613) only supports the Chat Completions API.
+GPT-3.5 Turbo is used with the Chat Completion API. GPT-3.5 Turbo version 0301 can also be used with the Completions API.  GPT-3.5 Turbo versions 0613 and 1106 only support the Chat Completions API.
 
 GPT-3.5 Turbo version 0301 is the first version of the model released.  Version 0613 is the second version of the model and adds function calling support.
 

articles/ai-services/openai/how-to/gpt-with-vision.md

@@ -143,6 +143,14 @@ Every response includes a `"finish_details"` field. The subfield `"type"` has th
 
 If `finish_details.type` is `stop`, then there is another `"stop"` property that specifies the token that caused the output to end.
 
+## Detail parameter settings in image processing: Low, High, Auto  
+
+The detail parameter in the model offers three choices: `low`, `high`, or `auto`, to adjust the way the model interprets and processes images. The default setting is auto, where the model decides between low or high based on the size of the image input. 
+- `low` setting: the model does not activate the "high res" mode, instead processes a lower resolution 512x512 version, resulting in quicker responses and reduced token consumption for scenarios where fine detail isn't crucial.
+- `high` setting: the model activates "high res" mode. Here, the model initially views the low-resolution image and then generates detailed 512x512 segments from the input image. Each segment uses double the token budget, allowing for a more detailed interpretation of the image.''
+
+For details on how the image parameters impact tokens used and pricing please see - [What is OpenAI? Image Tokens with GPT-4 Turbo with Vision](../overview.md#image-tokens-gpt-4-turbo-with-vision)
+
 ## Use Vision enhancement with images
 
 GPT-4 Turbo with Vision provides exclusive access to Azure AI Services tailored enhancements. When combined with Azure AI Vision, it enhances your chat experience by providing the chat model with more detailed information about visible text in the image and the locations of objects.
@@ -396,11 +404,33 @@ Every response includes a `"finish_details"` field. The subfield `"type"` has th
 
 If `finish_details.type` is `stop`, then there is another `"stop"` property that specifies the token that caused the output to end.
 
-## Detail parameter settings in image processing: Low, High, Auto  
+### Pricing example for Video prompts
+The pricing for GPT-4 Turbo with Vision is dynamic and depends on the specific features and inputs used. For a comprehensive view of Azure OpenAI pricing see [Azure OpenAI Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
 
-The detail parameter in the model offers three choices: `low`, `high`, or `auto`, to adjust the way the model interprets and processes images. The default setting is auto, where the model decides between low or high based on the size of the image input. 
-- `low` setting: the model does not activate the "high res" mode, instead processes a lower resolution 512x512 version, resulting in quicker responses and reduced token consumption for scenarios where fine detail isn't crucial.
-- `high` setting: the model activates "high res" mode. Here, the model initially views the low-resolution image and then generates detailed 512x512 segments from the input image. Each segment uses double the token budget, allowing for a more detailed interpretation of the image.
+The base charges and additional features are outlined below:
+
+Base Pricing for GPT-4 Turbo with Vision is:
+- Input: $0.01 per 1000 tokens
+- Output: $0.03 per 1000 tokens
+  
+Video prompt integration with Video Retrieval Add-on:
+- Ingestion: $0.05 per minute of video
+- Transactions: $0.25 per 1000 queries of the Video Retrieval index
+
+Processing videos will involve 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.
+
+#### Calculation
+For a typical use case let's imagine that I have use a 3-minute video with a 100-token prompt input. The section of video has a transcript that's 100-tokens long and when I process the prompt, I generate 100-tokens of output. The pricing for this transaction would be as follows:
+
+| Item                                      | Detail                                                        | Total Cost   |
+|-------------------------------------------|---------------------------------------------------------------|--------------|
+| GPT-4 Turbo with Vision Input Tokens      | 100 text tokens                                               | $0.001       |
+| Additional Cost to identify frames        | 100 input tokens + 700 tokens + 1 Video Retrieval txn         | $0.00825     |
+| Image Inputs and Transcript Input         | 20 images (85 tokens each) + 100 transcript tokens            | $0.018       |
+| Output Tokens                             | 100 tokens (assumed)                                          | $0.003       |
+| **Total Cost**                            |                                                               | **$0.03025** |
+
+Additionally, there's a one-time indexing cost of $0.15 to generate the Video Retrieval index for this 3-minute segment of video. This index can be reused across any number of Video Retrieval and GPT-4 Turbo with Vision calls.
 
 ## Limitations
 

articles/ai-services/speech-service/embedded-speech.md

@@ -131,7 +131,7 @@ Follow these steps to install the Speech SDK for Java using Apache Maven:
             <dependency>
             <groupId>com.microsoft.cognitiveservices.speech</groupId>
             <artifactId>client-sdk-embedded</artifactId>
-            <version>1.33.0</version>
+            <version>1.34.0</version>
             </dependency>
         </dependencies>
     </project>
@@ -152,7 +152,7 @@ Be sure to use the `@aar` suffix when the dependency is specified in `build.grad
 
 ```
 dependencies {
-    implementation 'com.microsoft.cognitiveservices.speech:client-sdk-embedded:1.33.0@aar'
+    implementation 'com.microsoft.cognitiveservices.speech:client-sdk-embedded:1.34.0@aar'
 }
 ```
 ::: zone-end

articles/ai-services/speech-service/includes/quickstarts/captioning/java.md

@@ -43,7 +43,7 @@ Before you can do anything, you need to [install the Speech SDK](~/articles/ai-s
             <dependency>
             <groupId>com.microsoft.cognitiveservices.speech</groupId>
             <artifactId>client-sdk</artifactId>
-            <version>1.33.0</version>
+            <version>1.34.0</version>
             </dependency>
         </dependencies>
     </project>

articles/ai-services/speech-service/includes/quickstarts/platform/java-android.md

@@ -50,6 +50,6 @@ Add the Speech SDK as a dependency in your project.
 
    :::image type="content" source="../../../media/sdk/android-studio/sdk-install-3-zoom.png" alt-text="Screenshot that shows how to add a library dependency in Android Studio." lightbox="../../../media/sdk/android-studio/sdk-install-3.png":::
 
-1. In the **Add Library Dependency** window that appears, enter the name and version of the Speech SDK for Java: *com.microsoft.cognitiveservices.speech:client-sdk:1.33.0*. Then select **Search**.
+1. In the **Add Library Dependency** window that appears, enter the name and version of the Speech SDK for Java: *com.microsoft.cognitiveservices.speech:client-sdk:1.34.0*. Then select **Search**.
 1. Make sure that the selected **Group ID** is **com.microsoft.cognitiveservices.speech**, and then select **OK**.
 1. Select **OK** to close the **Project Structure** window and apply your changes to the project.

articles/ai-services/speech-service/includes/quickstarts/platform/java-jre.md

@@ -52,7 +52,7 @@ Follow these steps to install the Speech SDK for Java using Apache Maven:
            <dependency>
            <groupId>com.microsoft.cognitiveservices.speech</groupId>
            <artifactId>client-sdk</artifactId>
-           <version>1.33.0</version>
+           <version>1.34.0</version>
            </dependency>
        </dependencies>
    </project>
@@ -107,7 +107,7 @@ Follow these steps to install the Speech SDK for Java using Apache Maven:
      <dependency>
        <groupId>com.microsoft.cognitiveservices.speech</groupId>
        <artifactId>client-sdk</artifactId>
-       <version>1.33.0</version>
+       <version>1.34.0</version>
      </dependency>
    </dependencies>
    ```
@@ -124,7 +124,7 @@ Gradle configurations require an explicit reference to the *.jar* dependency ext
 // build.gradle
 
 dependencies {
-    implementation group: 'com.microsoft.cognitiveservices.speech', name: 'client-sdk', version: "1.33.0", ext: "jar"
+    implementation group: 'com.microsoft.cognitiveservices.speech', name: 'client-sdk', version: "1.34.0", ext: "jar"
 }
 ```
 

articles/ai-services/speech-service/includes/quickstarts/platform/objectivec.md

@@ -34,7 +34,7 @@ The macOS CocoaPod package is available for download and use with the [Xcode 9.4
    use_frameworks!
 
    target 'AppName' do
-     pod 'MicrosoftCognitiveServicesSpeech-macOS', '~> 1.33.0'
+     pod 'MicrosoftCognitiveServicesSpeech-macOS', '~> 1.34.0'
    end
    ```
 
@@ -65,7 +65,7 @@ The macOS CocoaPod package is available for download and use with the [Xcode 9.4
     use_frameworks!
 
     target 'AppName' do
-      pod 'MicrosoftCognitiveServicesSpeech-iOS', '~> 1.33.0'
+      pod 'MicrosoftCognitiveServicesSpeech-iOS', '~> 1.34.0'
     end
     ```
 

articles/ai-services/speech-service/includes/quickstarts/platform/swift.md

@@ -34,7 +34,7 @@ The macOS CocoaPod package is available for download and use with the [Xcode 9.4
    use_frameworks!
 
    target 'AppName' do
-     pod 'MicrosoftCognitiveServicesSpeech-macOS', '~> 1.33.0'
+     pod 'MicrosoftCognitiveServicesSpeech-macOS', '~> 1.34.0'
    end
    ```
 
@@ -65,7 +65,7 @@ The macOS CocoaPod package is available for download and use with the [Xcode 9.4
     use_frameworks!
 
     target 'AppName' do
-      pod 'MicrosoftCognitiveServicesSpeech-iOS', '~> 1.33.0'
+      pod 'MicrosoftCognitiveServicesSpeech-iOS', '~> 1.34.0'
     end
     ```