Merge branch 'main' into release-preview-informatica

Author: huypub

.openpublishing.publish.config.json

@@ -974,6 +974,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-typescript-e2e-apps",
+      "url": "https://github.com/Azure-Samples/azure-typescript-e2e-apps",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-webpubsub",
       "url": "https://github.com/Azure/azure-webpubsub",
@@ -1232,6 +1238,7 @@
   ".openpublishing.redirection.government.json",
   ".openpublishing.redirection.guidance.json",
   ".openpublishing.redirection.industry.json",
+  ".openpublishing.redirection.iot-accelerators.json",
   ".openpublishing.redirection.iot-develop.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
   ".openpublishing.redirection.json",
@@ -1297,7 +1304,6 @@
   "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
   "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
   "articles/internet-peering/.openpublishing.redirection.internet-peering.json",
-  "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
   "articles/iot-central/.openpublishing.redirection.iot-central.json",
   "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",

articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json renamed to .openpublishing.redirection.iot-accelerators.json

@@ -3974,6 +3974,11 @@
             "source_path_from_root":"/articles/trusted-signing/concept.md",
             "redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
             "redirect_document_id":false 
+        },
+        {
+            "source_path_from_root":"/articles/container-instances/availability-zones.md",
+            "redirect_url":"/azure/reliability/reliability-containers",
+            "redirect_document_id":false 
         }
     ]
 }

.openpublishing.redirection.json

@@ -2042,9 +2042,14 @@
     },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/migrate-v2-to-v3.md",
-      "redirect_url": "/azure/ai-services/speech-service/migrate-v2-to-v3",
+      "redirect_url": "/azure/ai-services/speech-service/migrate-v3-1-to-v3-2",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/ai-services/speech-service/migrate-v2-to-v3.md",
+      "redirect_url": "/azure/ai-services/speech-service/migrate-v3-1-to-v3-2",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/migrate-v3-0-to-v3-1.md",
       "redirect_url": "/azure/ai-services/speech-service/migrate-v3-0-to-v3-1",

articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json

@@ -42,6 +42,12 @@ Azure OpenAI Assistants (Preview) allows you to create AI assistants tailored to
 
 ::: zone-end
 
+::: zone pivot="programming-language-javascript"
+
+[!INCLUDE [JavaScript quickstart](includes/assistants-javascript.md)]
+
+::: zone-end
+
 ::: zone pivot="rest-api"
 
 [!INCLUDE [REST API quickstart](includes/assistants-rest.md)]

articles/ai-services/openai/assistants-quickstart.md

@@ -0,0 +1,87 @@
+---
+title: 'Use the Azure Developer CLI to deploy resources for Azure OpenAI On Your Data'
+titleSuffix: Azure OpenAI
+description: Use this article to learn how to automate resource deployment for Azure OpenAI On Your Data.
+manager: nitinme
+ms.service: azure-ai-openai
+ms.topic: quickstart
+author: aahill
+ms.author: aahi
+ms.date: 04/09/2024
+recommendations: false
+---
+
+# Use the Azure Developer CLI to deploy resources for Azure OpenAI On Your Data 
+
+Use this article to learn how to automate resource deployment for Azure OpenAI On Your Data. The Azure Developer CLI (`azd`) is an open-source, command-line tool that streamlines provisioning and deploying resources to Azure using a template system. The template contains infrastructure files to provision the necessary Azure OpenAI resources and configurations and includes the completed sample app code.
+
+## Prerequisites
+
+- An Azure subscription - <a href="https://azure.microsoft.com/free/cognitive-services" target="_blank">Create one for free</a>.
+- Access granted to Azure OpenAI in the desired Azure subscription.
+
+  Azure OpenAI requires registration and is currently only available to approved enterprise customers and partners. [See Limited access to Azure OpenAI Service](/legal/cognitive-services/openai/limited-access?context=/azure/ai-services/openai/context/context) for more information. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Open an issue on this repo to contact us if you have an issue.
+
+- The Azure Developer CLI [installed](/azure/developer/azure-developer-cli/install-azd) on your machine
+
+## Clone and initialize the Azure Developer CLI template
+
+
+
+1. For the steps ahead, clone and initialize the template.
+
+    ```bash
+    azd init --template openai-chat-your-own-data
+    ```
+    
+2. The `azd init` command prompts you for the following information:
+
+    * Environment name: This value is used as a prefix for all Azure resources created by Azure Developer CLI. The name must be unique across all Azure subscriptions and must be between 3 and 24 characters long. The name can contain numbers and lowercase letters only.
+
+## Use the template to deploy resources
+
+1. Sign-in to Azure:
+
+    ```bash
+    azd auth login
+    ```
+
+1. Provision and deploy the OpenAI resource to Azure:
+
+    ```bash
+    azd up
+    ```
+    
+    `azd` prompts you for the following information:
+    
+    * Subscription: The Azure subscription that your resources are deployed to.
+    * Location: The Azure region where your resources are deployed.
+    
+    > [!NOTE]
+    > The sample `azd` template uses the `gpt-35-turbo-16k` model. A recommended region for this template is East US, since different Azure regions support different OpenAI models. You can visit the [Azure OpenAI Service Models](/azure/ai-services/openai/concepts/models) support page for more details about model support by region.
+    
+    > [!NOTE]
+    > The provisioning process may take several minutes to complete. Wait for the task to finish before you proceed to the next steps.
+        
+1. Click the link `azd` outputs to navigate to the new resource group in the Azure portal. You should see the following top level resources:
+    
+    * An Azure OpenAI service with a deployed model
+    * An Azure Storage account you can use to upload your own data files
+    * An Azure AI Search service configured with the proper indexes and data sources
+
+## Upload data to the storage account
+
+`azd` provisioned all of the required resources for you to chat with your own data, but you still need to upload the data files you want to make available to your AI service.
+
+1. Navigate to the new storage account in the Azure portal.
+1. On the left navigation, select **Storage browser**.
+1. Select **Blob containers** and then navigate into the **File uploads** container.
+1. Click the **Upload** button at the top of the screen. 
+1. In the flyout menu that opens, upload _contoso_benefits_document_example.pdf_ file in the root `documents` folder of the example repo.
+ 
+> [!NOTE]
+> The search indexer is set to run every 5 minutes to index the data in the storage account. You can either wait a few minutes for the uploaded data to be indexed, or you can manually run the indexer from the search service page.
+
+## Connect or create an application
+
+After running the `azd` template and uploading your data, you're ready to start using Azure OpenAI on Your Data. See the [quickstart article](../use-your-data-quickstart.md) for code samples you can use to build your applications.

articles/ai-services/openai/how-to/azure-developer-cli.md

@@ -1,7 +1,7 @@
 ---
-title: How to work with the GPT-35-Turbo and GPT-4 models 
+title: Work with the GPT-35-Turbo and GPT-4 models 
 titleSuffix: Azure OpenAI Service
-description: Learn about the options for how to use the GPT-35-Turbo and GPT-4 models 
+description: Learn about the options for how to use the GPT-35-Turbo and GPT-4 models.
 author: mrbullwinkle #dereklegenzoff
 ms.author: mbullwin #delegenz
 ms.service: azure-ai-openai
@@ -12,10 +12,10 @@ manager: nitinme
 keywords: ChatGPT
 ---
 
-# Learn how to work with the GPT-3.5-Turbo and GPT-4 models
+# Work with the GPT-3.5-Turbo and GPT-4 models
 
-The GPT-3.5-Turbo and GPT-4 models are language models that are optimized for conversational interfaces. The models behave differently than the older GPT-3 models. Previous models were text-in and text-out, meaning they accepted a prompt string and returned a completion to append to the prompt. However, the GPT-3.5-Turbo and GPT-4 models are conversation-in and message-out. The models expect input formatted in a specific chat-like transcript format, and return a completion that represents a model-written message in the chat. While this format was designed specifically for multi-turn conversations, you'll find it can also work well for non-chat scenarios too.
+The GPT-3.5-Turbo and GPT-4 models are language models that are optimized for conversational interfaces. The models behave differently than the older GPT-3 models. Previous models were text-in and text-out, which means they accepted a prompt string and returned a completion to append to the prompt. However, the GPT-3.5-Turbo and GPT-4 models are conversation-in and message-out. The models expect input formatted in a specific chat-like transcript format. They return a completion that represents a model-written message in the chat. This format was designed specifically for multi-turn conversations, but it can also work well for nonchat scenarios.
 
-This article walks you through getting started with the GPT-3.5-Turbo and GPT-4 models. It's important to use the techniques described here to get the best results. If you try to interact with the models the same way you did with the older model series, the models will often be verbose and provide less useful responses.
+This article walks you through getting started with the GPT-3.5-Turbo and GPT-4 models. To get the best results, use the techniques described here. Don't try to interact with the models the same way you did with the older model series because the models are often verbose and provide less useful responses.
 
 [!INCLUDE [Chat Completions](../includes/chat-completion.md)]