Merge pull request #269593 from MicrosoftDocs/main

3/20 11:00 AM IST Publish

Author: Saisang

.openpublishing.redirection.azure-kubernetes-service.json

@@ -464,7 +464,7 @@
         },
         {
             "source_path_from_root": "/articles/aks/operator-best-practices-run-at-scale.md",
-            "redirect_url": "/azure/aks/best-practices-performance-scale-large.md",
+            "redirect_url": "/azure/aks/best-practices-performance-scale-large",
             "redirect_document_id": false
         }
     ]

articles/ai-services/openai/concepts/content-filter.md

@@ -325,7 +325,7 @@ import os
 from openai import AzureOpenAI
 client = AzureOpenAI(
     api_key=os.getenv("AZURE_OPENAI_API_KEY"),  
-    api_version="2023-10-01-preview",
+    api_version="2024-03-01-preview",
     azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT") 
     )
 
@@ -339,6 +339,93 @@ response = client.completions.create(
 print(response.model_dump_json(indent=2))
 ```
 
+### Output
+
+```json
+{ 
+  "choices": [ 
+    { 
+      "content_filter_results": { 
+        "hate": { 
+          "filtered": false, 
+          "severity": "safe" 
+        }, 
+        "protected_material_code": { 
+          "citation": { 
+            "URL": " https://github.com/username/repository-name/path/to/file-example.txt", 
+            "license": "EXAMPLE-LICENSE" 
+          }, 
+          "detected": true,
+          "filtered": false 
+        }, 
+        "protected_material_text": { 
+          "detected": false, 
+          "filtered": false 
+        }, 
+        "self_harm": { 
+          "filtered": false, 
+          "severity": "safe" 
+        }, 
+        "sexual": { 
+          "filtered": false, 
+          "severity": "safe" 
+        }, 
+        "violence": { 
+          "filtered": false, 
+          "severity": "safe" 
+        } 
+      }, 
+      "finish_reason": "stop", 
+      "index": 0, 
+      "message": { 
+        "content": "Example model response will be returned ", 
+        "role": "assistant" 
+      } 
+    } 
+  ], 
+  "created": 1699386280, 
+  "id": "chatcmpl-8IMI4HzcmcK6I77vpOJCPt0Vcf8zJ", 
+  "model": "gpt-35-turbo-instruct", 
+  "object": "text.completion",
+  "usage": { 
+    "completion_tokens": 40, 
+    "prompt_tokens": 11, 
+    "total_tokens": 417 
+  },  
+  "prompt_filter_results": [ 
+    { 
+      "content_filter_results": { 
+        "hate": { 
+          "filtered": false, 
+          "severity": "safe" 
+        }, 
+        "jailbreak": { 
+          "detected": false, 
+          "filtered": false 
+        }, 
+        "profanity": { 
+          "detected": false, 
+          "filtered": false 
+        }, 
+        "self_harm": { 
+          "filtered": false, 
+          "severity": "safe" 
+        }, 
+        "sexual": { 
+          "filtered": false, 
+          "severity": "safe" 
+        }, 
+        "violence": { 
+          "filtered": false, 
+          "severity": "safe" 
+        } 
+      }, 
+      "prompt_index": 0 
+    } 
+  ]
+} 
+```
+
 # [OpenAI Python 0.28.1](#tab/python)
 
 ```python
@@ -348,11 +435,11 @@ import os
 import openai
 openai.api_type = "azure"
 openai.api_base = os.getenv("AZURE_OPENAI_ENDPOINT") 
-openai.api_version = "2023-06-01-preview" # API version required to use Annotations
+openai.api_version = "2024-03-01-preview" # API version required to use Annotations
 openai.api_key = os.getenv("AZURE_OPENAI_API_KEY")
 
 response = openai.Completion.create(
-    engine="gpt-35-turbo", # engine = "deployment_name".
+    engine="gpt-35-turbo-instruct", # engine = "deployment_name".
     messages=[{"role": "system", "content": "You are a helpful assistant."}, {"role": "user", "content": "Example prompt that leads to a protected code completion that was detected, but not filtered"}]     # Content that is detected at severity level medium or high is filtered, 
     # while content detected at severity level low isn't filtered by the content filters.
 )
@@ -407,8 +494,13 @@ print(response)
   ], 
   "created": 1699386280, 
   "id": "chatcmpl-8IMI4HzcmcK6I77vpOJCPt0Vcf8zJ", 
-  "model": "gpt-35-turbo", 
-  "object": "chat.completion", 
+  "model": "gpt-35-turbo-instruct", 
+  "object": "text.completion",
+  "usage": { 
+    "completion_tokens": 40, 
+    "prompt_tokens": 11, 
+    "total_tokens": 417 
+  },  
   "prompt_filter_results": [ 
     { 
       "content_filter_results": { 
@@ -439,12 +531,7 @@ print(response)
       }, 
       "prompt_index": 0 
     } 
-  ], 
-  "usage": { 
-    "completion_tokens": 40, 
-    "prompt_tokens": 11, 
-    "total_tokens": 417 
-  } 
+  ]
 } 
 ```
 
@@ -457,7 +544,7 @@ import os
 import openai
 openai.api_type = "azure"
 openai.api_base = os.getenv("AZURE_OPENAI_ENDPOINT") 
-openai.api_version = "2023-06-01-preview" # API version required to use  Annotations
+openai.api_version = "2024-03-01-preview" # API version required to use  Annotations
 openai.api_key = os.getenv("AZURE_OPENAI_API_KEY")
 
 try:

articles/ai-services/openai/includes/whisper-python.md

@@ -36,7 +36,34 @@ pip install openai==0.28.1
 
 1. Replace the contents of quickstart.py with the following code. Modify the code to add your deployment name:
 
-    ```python
+# [OpenAI Python 1.x](#tab/python-new)
+
+```python
+    import os
+    from openai import AzureOpenAI
+        
+    client = AzureOpenAI(
+        api_key=os.getenv("AZURE_OPENAI_API_KEY"),  
+        api_version="2024-02-01",
+        azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
+    )
+    
+    deployment_id = "YOUR-DEPLOYMENT-NAME-HERE" #This will correspond to the custom name you chose for your deployment when you deployed a model."
+    audio_test_file = "./wikipediaOcelot.wav"
+    
+    result = client.audio.transcriptions.create(
+        file=open(audio_test_file, "rb"),            
+        model=deployment_id
+    )
+    
+    print(result)
+```
+
+# [OpenAI Python 0.28.1](#tab/python)
+
+
+
+```python
     import openai
     import time
     import os
@@ -59,7 +86,9 @@ pip install openai==0.28.1
             )
 
     print(result)
-    ```
+```
+
+---
 
 Run the application with the python command on your quickstart file:
 

articles/ai-services/translator/document-translation/reference/synchronous-rest-api-guide.md

@@ -30,7 +30,7 @@ Synchronously translate a single document.
 `POST`:
 
 ```bash
-{your-document-translation-endpoint}/translator/document:translate?sourceLanguage=en&targetLanguage=hi&api-version=2023-11-01-preview
+curl -i -X POST "{your-document-translation-endpoint}/translator/document:translate?sourceLanguage=en&targetLanguage=hi&api-version=2023-11-01-preview" -H "Ocp-Apim-Subscription-Key:{your-key}"  -F "document={path-to-your-document-with-file-extension};type={ContentType}/{file-extension}" -F "glossary={path-to-your-glossary-with-file-extension};type={ContentType}/{file-extension}" -o "{path-to-output-file}"
 
 ```
 

articles/aks/TOC.yml

@@ -703,8 +703,6 @@
       items:
         - name: Upgrade options
           href: upgrade-cluster.md
-        - name: Stop cluster upgrades automatically on API breaking changes
-          href: stop-cluster-upgrade-api-breaking-changes.md
         - name: Perform manual upgrades
           items:
           - name: Upgrade an AKS cluster
@@ -727,7 +725,8 @@
               href: auto-upgrade-node-os-image.md
             - name: Upgrade node OS images automatically with GitHub Actions
               href: node-upgrade-github-actions.md
-
+            - name: Stop cluster upgrades automatically on API breaking changes
+              href: stop-cluster-upgrade-api-breaking-changes.md
     - name: Azure Linux container host for AKS
       items:
         - name: Use Azure Linux for AKS