Merge pull request #261489 from MicrosoftDocs/main

12/18/2023 AM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -4570,7 +4570,12 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/configure-language-ruby.md",
-            "redirect_url": "/azure/app-service/configure-language-ruby",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/configure-language-ruby.md",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
             "redirect_document_id": false
         },
         {
@@ -5360,17 +5365,22 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/quickstart-ruby.md",
-            "redirect_url": "/azure/app-service/quickstart-ruby",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/quickstart-ruby.md",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/app-service-web/app-service-linux-ruby-get-started.md",
-            "redirect_url": "/azure/app-service/quickstart-ruby",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/app-service-web/app-service-linux-using-ruby.md",
-            "redirect_url": "/azure/app-service/quickstart-ruby",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
             "redirect_document_id": false
         },
         {
@@ -5995,12 +6005,17 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/tutorial-ruby-mysql-app.md",
-            "redirect_url": "/azure/app-service/tutorial-ruby-postgres-app",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/app-service/containers/tutorial-ruby-postgres-app.md",
-            "redirect_url": "/azure/app-service/tutorial-ruby-postgres-app",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/tutorial-ruby-postgres-app.md",
+            "redirect_url": "https://github.com/Azure/app-service-linux-docs/blob/master/HowTo/use_ruby_with_container.md",
             "redirect_document_id": false
         },
         {

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

@@ -37,7 +37,7 @@ The liveness solution integration involves two different components: a mobile ap
 ### Integrate liveness into mobile application 
 
 Once you have access to the SDK, follow instruction in the [azure-ai-vision-sdk](https://github.com/Azure-Samples/azure-ai-vision-sdk) GitHub repository to integrate the UI and the code into your native mobile application. The liveness SDK supports both Java/Kotlin for Android and Swift for iOS mobile applications:
-- For Swift iOS, follow the instructions in the [iOS sample](https://aka.ms/liveness-sample-ios) 
+- For Swift iOS, follow the instructions in the [iOS sample](https://aka.ms/azure-ai-vision-face-liveness-client-sdk-ios-readme) 
 - For Kotlin/Java Android, follow the instructions in the [Android sample](https://aka.ms/liveness-sample-java) 
 
 Once you've added the code into your application, the SDK will handle starting the camera, guiding the end-user to adjust their position, composing the liveness payload, and calling the Azure AI Face cloud service to process the liveness payload.
@@ -54,7 +54,7 @@ The high-level steps involved in liveness orchestration are illustrated below:
 
     ```json
     Request:
-    curl --location 'https://face-gating-livenessdetection.ppe.cognitiveservices.azure.com/face/v1.1-preview.1/detectliveness/singlemodal/sessions' \
+    curl --location '<insert-api-endpoint>/face/v1.1-preview.1/detectliveness/singlemodal/sessions' \
     --header 'Ocp-Apim-Subscription-Key:<insert-api-key>
     --header 'Content-Type: application/json' \
     --data '{
@@ -93,7 +93,7 @@ The high-level steps involved in liveness orchestration are illustrated below:
 
     ```json
     Request:
-    curl --location 'https://face-gating-livenessdetection.ppe.cognitiveservices.azure.com/face/v1.1-preview.1/detectliveness/singlemodal/sessions/a3dc62a3-49d5-45a1-886c-36e7df97499a' \
+    curl --location '<insert-api-endpoint>/face/v1.1-preview.1/detectliveness/singlemodal/sessions/a3dc62a3-49d5-45a1-886c-36e7df97499a' \
     --header 'Ocp-Apim-Subscription-Key: <insert-api-key>
 
     Response:
@@ -178,13 +178,13 @@ The high-level steps involved in liveness with verification orchestration are il
 
         ```json
         Request:
-        curl --location 'https://face-gating-livenessdetection.ppe.cognitiveservices.azure.com/face/v1.1-preview.1/detectlivenesswithverify/singlemodal/sessions' \
+        curl --location '<insert-api-endpoint>/face/v1.1-preview.1/detectlivenesswithverify/singlemodal/sessions' \
         --header 'Ocp-Apim-Subscription-Key: <api_key>' \
         --form 'Parameters="{
           \"livenessOperationMode\": \"passive\",
           \"deviceCorrelationId\": \"723d6d03-ef33-40a8-9682-23a1feb7bccd\"
         }"' \
-        --form 'VerifyImage=@"/C:/Users/nabilat/Pictures/test.png"'
+        --form 'VerifyImage=@"test.png"'
 
         Response:
         {
@@ -222,11 +222,11 @@ The high-level steps involved in liveness with verification orchestration are il
 
     ```json
     Request:
-    curl --location 'https://face-gating-livenessdetection.ppe.cognitiveservices.azure.com/face/v1.1-preview.1/detectlivenesswithverify/singlemodal' \
+    curl --location '<insert-api-endpoint>/face/v1.1-preview.1/detectlivenesswithverify/singlemodal' \
     --header 'Content-Type: multipart/form-data' \
     --header 'apim-recognition-model-preview-1904: true' \
     --header 'Authorization: Bearer.<session-authorization-token> \
-    --form 'Content=@"/D:/work/scratch/data/clips/webpapp6/video.webp"' \
+    --form 'Content=@"video.webp"' \
     --form 'Metadata="<insert-metadata>"
 
     Response:
@@ -286,7 +286,7 @@ If you want to clean up and remove an Azure AI services subscription, you can de
 
 ## Next steps
 
-See the liveness SDK reference to learn about other options in the liveness APIs.
+See the Azure AI Vision SDK reference to learn about other options in the liveness APIs.
 
-- [Java (Android)](https://aka.ms/liveness-sdk-java)
-- [Swift (iOS)](https://aka.ms/liveness-sdk-ios)
+- [Kotlin (Android)](https://aka.ms/liveness-sample-java)
+- [Swift (iOS)](https://aka.ms/azure-ai-vision-face-liveness-client-sdk-ios-readme)

articles/ai-services/openai/includes/use-your-data-go.md

@@ -36,91 +36,86 @@ ms.date: 08/29/2023
    package main
 
    import (
-       "context"
-       "fmt"
-       "log"
-       "os"
-
-       "github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai"
-       "github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
+   	"context"
+   	"fmt"
+   	"log"
+   	"os"
+   
+   	"github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai"
+   	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
+   	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
    )
-
+   
    func main() {
-       azureOpenAIKey := os.Getenv("AOAIKey")
-       modelDeploymentID := os.Getenv("AOAIDeploymentId")
-
-       // Ex: "https://<your-azure-openai-host>.openai.azure.com"
-       azureOpenAIEndpoint := os.Getenv("AOAIEndpoint")
-
-       // Azure AI Search configuration
-       searchIndex := os.Getenv("SearchIndex")
-       searchEndpoint := os.Getenv("SearchEndpoint")
-       searchAPIKey := os.Getenv("SearchKey")
-
-       if azureOpenAIKey == "" || modelDeploymentID == "" || azureOpenAIEndpoint == "" || searchIndex == "" || searchEndpoint == "" || searchAPIKey == "" {
-           fmt.Fprintf(os.Stderr, "Skipping example, environment variables missing\n")
-           return
-       }
-
-       keyCredential, err := azopenai.NewKeyCredential(azureOpenAIKey)
-
-       if err != nil {
-           //  TODO: Update the following line with your application specific error handling logic
-           log.Fatalf("ERROR: %s", err)
-       }
-
-       // In Azure OpenAI you must deploy a model before you can use it in your client. For more information
-       // see here: https://learn.microsoft.com/azure/cognitive-services/openai/how-to/create-resource
-       client, err := azopenai.NewClientWithKeyCredential(azureOpenAIEndpoint, keyCredential, nil)
-
-       if err != nil {
-           //  TODO: Update the following line with your application specific error handling logic
-           log.Fatalf("ERROR: %s", err)
-       }
-
-       resp, err := client.GetChatCompletions(context.TODO(), azopenai.ChatCompletionsOptions{
-           Messages: []azopenai.ChatMessage{
-               {Content: to.Ptr("What are the differences between Azure Machine Learning and Azure AI services?"), Role: to.Ptr(azopenai.ChatRoleUser)},
-           },
-           MaxTokens: to.Ptr[int32](512),
-           AzureExtensionsOptions: &azopenai.AzureChatExtensionOptions{
-               Extensions: []azopenai.AzureChatExtensionConfiguration{
-                   {
-                       // This allows Azure OpenAI to use an Azure AI Search index.
-                       //
-                       // > Because the model has access to, and can reference specific sources to support its responses, answers are not only based on its pretrained knowledge
-                       // > but also on the latest information available in the designated data source. This grounding data also helps the model avoid generating responses
-                       // > based on outdated or incorrect information.
-                       //
-                       // Quote from here: https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/use-your-data
-                       Type: to.Ptr(azopenai.AzureChatExtensionTypeAzureCognitiveSearch),
-                       Parameters: azopenai.AzureCognitiveSearchChatExtensionConfiguration{
-                           Endpoint:  &searchEndpoint,
-                           IndexName: &searchIndex,
-                           Key:       &searchAPIKey,
-                       },
-                   },
-               },
-           },
-           Deployment: modelDeploymentID,
-       }, nil)
-
-       if err != nil {
-       //  TODO: Update the following line with your application specific error handling logic
-       log.Fatalf("ERROR: %s", err)
-   }
-
-   // Contains contextual information from your Azure chat completion extensions, configured above in `AzureExtensionsOptions`
-   msgContext := resp.Choices[0].Message.Context
-
-       fmt.Fprintf(os.Stderr, "Extensions Context Role: %s\nExtensions Context (length): %d\n",
-           *msgContext.Messages[0].Role,
-           len(*msgContext.Messages[0].Content))
-
-       fmt.Fprintf(os.Stderr, "ChatRole: %s\nChat content: %s\n",
-           *resp.Choices[0].Message.Role,
-           *resp.Choices[0].Message.Content,
-       )
+   	azureOpenAIKey := os.Getenv("AOAIKey")
+   	modelDeploymentID := os.Getenv("AOAIDeploymentId")
+   
+   	// Ex: "https://<your-azure-openai-host>.openai.azure.com"
+   	azureOpenAIEndpoint := os.Getenv("AOAIEndpoint")
+   
+   	// Azure AI Search configuration
+   	searchIndex := os.Getenv("SearchIndex")
+   	searchEndpoint := os.Getenv("SearchEndpoint")
+   	searchAPIKey := os.Getenv("SearchKey")
+   
+   	if azureOpenAIKey == "" || modelDeploymentID == "" || azureOpenAIEndpoint == "" || searchIndex == "" || searchEndpoint == "" || searchAPIKey == "" {
+   		fmt.Fprintf(os.Stderr, "Skipping example, environment variables missing\n")
+   		return
+   	}
+   
+   	keyCredential := azcore.NewKeyCredential(azureOpenAIKey)
+   
+   	// In Azure OpenAI you must deploy a model before you can use it in your client. For more information
+   	// see here: https://learn.microsoft.com/azure/cognitive-services/openai/how-to/create-resource
+   	client, err := azopenai.NewClientWithKeyCredential(azureOpenAIEndpoint, keyCredential, nil)
+   
+   	if err != nil {
+   		//  TODO: Update the following line with your application specific error handling logic
+   		log.Fatalf("ERROR: %s", err)
+   	}
+   
+   	resp, err := client.GetChatCompletions(context.TODO(), azopenai.ChatCompletionsOptions{
+   		Messages: []azopenai.ChatRequestMessageClassification{
+   			&azopenai.ChatRequestUserMessage{Content: azopenai.NewChatRequestUserMessageContent("What are the differences between Azure Machine Learning and Azure AI services?")},
+   		},
+   		MaxTokens: to.Ptr[int32](512),
+   		AzureExtensionsOptions: []azopenai.AzureChatExtensionConfigurationClassification{
+   			&azopenai.AzureCognitiveSearchChatExtensionConfiguration{
+   				// This allows Azure OpenAI to use an Azure AI Search index.
+   				//
+   				// > Because the model has access to, and can reference specific sources to support its responses, answers are not only based on its pretrained knowledge
+   				// > but also on the latest information available in the designated data source. This grounding data also helps the model avoid generating responses
+   				// > based on outdated or incorrect information.
+   				//
+   				// Quote from here: https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/use-your-data
+   				Parameters: &azopenai.AzureCognitiveSearchChatExtensionParameters{
+   					Endpoint:  &searchEndpoint,
+   					IndexName: &searchIndex,
+   					Authentication: &azopenai.OnYourDataAPIKeyAuthenticationOptions{
+   						Key: &searchAPIKey,
+   					},
+   				},
+   			},
+   		},
+   		DeploymentName: &modelDeploymentID,
+   	}, nil)
+   
+   	if err != nil {
+   		//  TODO: Update the following line with your application specific error handling logic
+   		log.Fatalf("ERROR: %s", err)
+   	}
+   
+   	// Contains contextual information from your Azure chat completion extensions, configured above in `AzureExtensionsOptions`
+   	msgContext := resp.Choices[0].Message.Context
+   
+   	fmt.Fprintf(os.Stderr, "Extensions Context Role: %s\nExtensions Context (length): %d\n",
+   		*msgContext.Messages[0].Role,
+   		len(*msgContext.Messages[0].Content))
+   
+   	fmt.Fprintf(os.Stderr, "ChatRole: %s\nChat content: %s\n",
+   		*resp.Choices[0].Message.Role,
+   		*resp.Choices[0].Message.Content,
+   	)
    }
    ```
 
@@ -136,4 +131,4 @@ ms.date: 08/29/2023
    The application prints the response including both answers to your query and citations from your uploaded files.
 
 > [!div class="nextstepaction"]
-> [I ran into an issue when running the code samples.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=dotnet&Pillar=AOAI&Product=ownData&Page=quickstart&Section=Create-dotnet-application)
+> [I ran into an issue when running the code samples.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=dotnet&Pillar=AOAI&Product=ownData&Page=quickstart&Section=Create-dotnet-application)

articles/ai-services/openai/supported-languages.md

@@ -0,0 +1,31 @@
+---
+title: Azure OpenAI Service supported programming languages
+titleSuffix: Azure AI services
+description: Programming language support for Azure OpenAI.
+author: mrbullwinkle
+manager: nitinme
+ms.service: azure-ai-openai
+ms.custom:
+ms.topic: conceptual
+ms.date: 12/18/2023
+ms.author: mbullwin
+---
+
+# Azure OpenAI supported programming languages
+
+Azure OpenAI supports the following programming languages.
+
+## Programming languages
+
+| Language   | Source code | Package | Examples |
+|------------|---------|-----|-------|
+| C#         | [Source code](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/src) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.OpenAI/) | [C# examples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples)       |
+| Go         | [Source code](https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/ai/azopenai) | [Package (Go)](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai)| [ Go examples](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai#pkg-examples) |
+| Java       | [Source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai) | [Artifact (Maven)](https://central.sonatype.com/artifact/com.azure/azure-ai-openai/) | [Java examples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai/src/samples) |
+| JavaScript | [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/openai/openai) | [Package (npm)](https://www.npmjs.com/package/@azure/openai) | [JavaScript examples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples) |
+| Python     |  [Source code](https://github.com/openai/openai-python) | [Package (PyPi)](https://pypi.org/project/openai/) | [Python examples](./how-to/switching-endpoints.md) |
+
+## Next steps
+
+- Explore each programming language in our step-by-step [quickstarts](./chatgpt-quickstart.md)
+- To see what models are currently supported, check out the [Azure OpenAI models page](./concepts/models.md)

articles/ai-services/openai/toc.yml

@@ -16,6 +16,8 @@ items:
       href: https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/
     - name: What's new
       href: whats-new.md
+    - name: Programming languages/SDKs
+      href: ./supported-languages.md
     - name: Azure OpenAI FAQ
       href: faq.yml
 - name: Quickstarts

articles/app-service/configure-common.md

@@ -33,7 +33,6 @@ Other language stacks, likewise, get the app settings as environment variables a
 - [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-app-settings-as-environment-variables)
 - [Java](configure-language-java.md#configure-data-sources)
-- [Ruby](configure-language-ruby.md#access-environment-variables)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 App settings are always encrypted when stored (encrypted-at-rest).
@@ -224,7 +223,6 @@ For example, a MySQL connection string named *connectionstring1* can be accessed
 - [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-environment-variables)
 - [Java](configure-language-java.md#configure-data-sources)
-- [Ruby](configure-language-ruby.md#access-environment-variables)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 Connection strings are always encrypted when stored (encrypted-at-rest).
@@ -409,7 +407,6 @@ It's not possible to edit connection strings in bulk by using a JSON file with A
 - [PHP](configure-language-php.md)
 - [Python](configure-language-python.md)
 - [Java](configure-language-java.md)
-- [Ruby](configure-language-ruby.md)
 
 <a name="alwayson"></a>