Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into atm-howto

Author: greg-lindsay

.openpublishing.publish.config.json

@@ -254,6 +254,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "function-flex-consumption",
+      "url": "https://github.com/Azure-Samples/azure-functions-flex-consumption-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -506,6 +512,12 @@
       "branch": "sdk-codetest",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "rag-data-openai-python-promptflow-main",
+      "url": "https://github.com/Azure-Samples/rag-data-openai-python-promptflow",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-main",
       "url": "https://github.com/azure/azureml-examples",

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-image.md

@@ -51,9 +51,7 @@ curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-versi
   "image": {
     "content": "<base_64_string>"
   },
-  "categories": [
-    "Hate", "SelfHarm", "Sexual", "Violence"
-  ],
+  "categories": ["Hate", "SelfHarm", "Sexual", "Violence"],
   "outputType": "FourSeverityLevels"
 }'
 ```
@@ -63,9 +61,9 @@ curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-versi
 >
 > ```
 > {
->  "image": {
->    "blobUrl": "<your_storage_url>"
->  }
+>   "image": {
+>     "blobUrl": "<your_storage_url>"
+>   }
 > }
 > ```
 
@@ -91,24 +89,24 @@ You should see the image moderation results displayed as JSON data in the consol
 
 ```json
 {
-    "categoriesAnalysis": [
-        {
-            "category": "Hate",
-            "severity": 2
-        },
-        {
-            "category": "SelfHarm",
-            "severity": 0
-        },
-        {
-            "category": "Sexual",
-            "severity": 0
-        },
-        {
-            "category": "Violence",
-            "severity": 0
-        }
-    ]
+  "categoriesAnalysis": [
+    {
+      "category": "Hate",
+      "severity": 2
+    },
+    {
+      "category": "SelfHarm",
+      "severity": 0
+    },
+    {
+      "category": "Sexual",
+      "severity": 0
+    },
+    {
+      "category": "Violence",
+      "severity": 0
+    }
+  ]
 }
 ```
 

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-text.md

@@ -36,14 +36,10 @@ curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-versio
 --header 'Content-Type: application/json' \
 --data-raw '{
   "text": "I hate you",
-  "categories": [
-   "Hate","Sexual","SelfHarm","Violence"
-  ],
-   "blocklistNames": [
-      "string"
-    ],
-   "haltOnBlocklistHit": true,
-   "outputType": "FourSeverityLevels"
+  "categories": ["Hate", "Sexual", "SelfHarm", "Violence"],
+  "blocklistNames": ["string"],
+  "haltOnBlocklistHit": true,
+  "outputType": "FourSeverityLevels"
 }'
 ```
 
@@ -68,12 +64,8 @@ See the following sample request body:
 ```json
 {
   "text": "I hate you",
-  "categories": [
-   "Hate","Sexual","SelfHarm","Violence"
-  ],
-  "blocklistNames": [
-    "array"
-  ],
+  "categories": ["Hate", "Sexual", "SelfHarm", "Violence"],
+  "blocklistNames": ["array"],
   "haltOnBlocklistHit": false,
   "outputType": "FourSeverityLevels"
 }
@@ -96,21 +88,22 @@ You should see the text moderation results displayed as JSON data in the console
     }
   ],
   "categoriesAnalysis": [
-        {
-            "category": "Hate",
-            "severity": 2
-        },
-        {
-            "category": "SelfHarm",
-            "severity": 0
-        },
-        {
-            "category": "Sexual",
-            "severity": 0
-        },
-        {
-            "category": "Violence",
-            "severity": 0
+    {
+      "category": "Hate",
+      "severity": 2
+    },
+    {
+      "category": "SelfHarm",
+      "severity": 0
+    },
+    {
+      "category": "Sexual",
+      "severity": 0
+    },
+    {
+      "category": "Violence",
+      "severity": 0
+    }
   ]
 }
 ```

articles/ai-services/content-safety/quickstart-custom-categories.md

@@ -61,9 +61,9 @@ curl -X PUT "<your_endpoint>/contentsafety/text/categories/survival-advice?api-v
      -H "Ocp-Apim-Subscription-Key: <your_api_key>" \
      -H "Content-Type: application/json" \
      -d "{
-        \"categoryName\": \"survival-advice\",
-        \"definition\": \"text prompts about survival advice in camping/wilderness situations\",
-        \"sampleBlobUrl\": \"https://<your-azure-storage-url>/example-container/survival-advice.jsonl\"
+            \"categoryName\": \"survival-advice\",
+            \"definition\": \"text prompts about survival advice in camping/wilderness situations\",
+            \"sampleBlobUrl\": \"https://<your-azure-storage-url>/example-container/survival-advice.jsonl\"
         }"
 ```
 
@@ -95,9 +95,9 @@ curl -X POST "<your_endpoint>/contentsafety/text:analyzeCustomCategory?api-versi
      -H "Ocp-Apim-Subscription-Key: <your_api_key>" \
      -H "Content-Type: application/json" \
      -d "{
-        \"text\": \"<Example text to analyze>\",
-        \"categoryName\": \"survival-advice\", 
-        \"version\": 1
+            \"text\": \"<Example text to analyze>\",
+            \"categoryName\": \"survival-advice\", 
+            \"version\": 1
         }"
 ```
 

articles/ai-services/content-safety/quickstart-groundedness.md

@@ -45,7 +45,7 @@ This section walks through a sample request with cURL. Paste the command below i
       "domain": "Generic",
       "task": "QnA",
       "qna": {
-           "query": "How much does she currently get paid per hour at the bank?"
+        "query": "How much does she currently get paid per hour at the bank?"
       },
       "text": "12/hour",
       "groundingSources": [
@@ -108,11 +108,13 @@ To test a summarization task instead of a question answering (QnA) task, use the
 
 ```json
 {
-    "domain": "Medical",
-    "task": "Summarization",
-    "text": "Ms Johnson has been in the hospital after experiencing a stroke.",
-    "groundingSources": ["Our patient, Ms. Johnson, presented with persistent fatigue, unexplained weight loss, and frequent night sweats. After a series of tests, she was diagnosed with Hodgkin’s lymphoma, a type of cancer that affects the lymphatic system. The diagnosis was confirmed through a lymph node biopsy revealing the presence of Reed-Sternberg cells, a characteristic of this disease. She was further staged using PET-CT scans. Her treatment plan includes chemotherapy and possibly radiation therapy, depending on her response to treatment. The medical team remains optimistic about her prognosis given the high cure rate of Hodgkin’s lymphoma."],
-    "reasoning": false
+  "domain": "Medical",
+  "task": "Summarization",
+  "text": "Ms Johnson has been in the hospital after experiencing a stroke.",
+  "groundingSources": [
+    "Our patient, Ms. Johnson, presented with persistent fatigue, unexplained weight loss, and frequent night sweats. After a series of tests, she was diagnosed with Hodgkin’s lymphoma, a type of cancer that affects the lymphatic system. The diagnosis was confirmed through a lymph node biopsy revealing the presence of Reed-Sternberg cells, a characteristic of this disease. She was further staged using PET-CT scans. Her treatment plan includes chemotherapy and possibly radiation therapy, depending on her response to treatment. The medical team remains optimistic about her prognosis given the high cure rate of Hodgkin’s lymphoma."
+  ],
+  "reasoning": false
 }
 ```
 
@@ -140,13 +142,13 @@ After you submit your request, you'll receive a JSON response reflecting the Gro
 
 ```json
 {
-    "ungroundedDetected": true,
-    "ungroundedPercentage": 1,
-    "ungroundedDetails": [
-        {
-            "text": "12/hour."
-        }
-    ]
+  "ungroundedDetected": true,
+  "ungroundedPercentage": 1,
+  "ungroundedDetails": [
+    {
+      "text": "12/hour."
+    }
+  ]
 }
 ```
 
@@ -176,7 +178,7 @@ In order to use your Azure OpenAI GPT4-Turbo (1106-preview) resource to enable t
 In your request to the Groundedness detection API, set the `"reasoning"` body parameter to `true`, and provide the other needed parameters:
 
 ```json
- {
+{
   "reasoning": true,
   "llmResource": {
     "resourceType": "AzureOpenAI",
@@ -203,7 +205,7 @@ This section walks through a sample request with cURL. Paste the command below i
       "domain": "Generic",
       "task": "QnA",
       "qna": {
-           "query": "How much does she currently get paid per hour at the bank?"
+        "query": "How much does she currently get paid per hour at the bank?"
       },
       "text": "12/hour",
       "groundingSources": [
@@ -291,24 +293,24 @@ After you submit your request, you'll receive a JSON response reflecting the Gro
 
 ```json
 {
-    "ungroundedDetected": true,
-    "ungroundedPercentage": 1,
-    "ungroundedDetails": [
-        {
-            "text": "12/hour.",
-            "offset": {
-                "utf8": 0,
-                "utf16": 0,
-                "codePoint": 0
-            },
-            "length": {
-                "utf8": 8,
-                "utf16": 8,
-                "codePoint": 8
-            },
-            "reason": "None. The premise mentions a pay of \"10/hour\" but does not mention \"12/hour.\" It's neutral. "
-        }
-    ]
+  "ungroundedDetected": true,
+  "ungroundedPercentage": 1,
+  "ungroundedDetails": [
+    {
+      "text": "12/hour.",
+      "offset": {
+        "utf8": 0,
+        "utf16": 0,
+        "codePoint": 0
+      },
+      "length": {
+        "utf8": 8,
+        "utf16": 8,
+        "codePoint": 8
+      },
+      "reason": "None. The premise mentions a pay of \"10/hour\" but does not mention \"12/hour.\" It's neutral. "
+    }
+  ]
 }
 ```
 

articles/ai-services/content-safety/quickstart-protected-material.md

@@ -37,7 +37,7 @@ curl --location --request POST '<endpoint>/contentsafety/text:detectProtectedMat
 --header 'Ocp-Apim-Subscription-Key: <your_subscription_key>' \
 --header 'Content-Type: application/json' \
 --data-raw '{
-  "text": "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine, they\'re yours, they\'re mine. and love can come to everyone, the best things in life are"
+  "text": "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"
 }'
 ```
 The below fields must be included in the url:

articles/ai-services/content-safety/studio-quickstart.md

@@ -23,7 +23,7 @@ In this quickstart, get started with the Azure AI Content Safety service using C
 
 * An active Azure account. If you don't have one, you can [create one for free](https://azure.microsoft.com/free/cognitive-services/).
 * A [Content Safety](https://aka.ms/acs-create) Azure resource.
-* The `Cognitive Services User` role assigned to the Content Safety resource in the desired Azure subscription.
+* Assign `Cognitive Services User` role to your account to ensure the studio experience. Go to [Azure Portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then click **+ Add role assignment**, choose the `Cognitive Services User` role and select the memeber of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
 * Sign in to [Content Safety Studio](https://contentsafety.cognitive.azure.com) with your Azure subscription and Content Safety resource. 
 
 

articles/ai-services/language-service/media/prompt-flow/prompt-flow-wizard.png

@@ -801,6 +801,8 @@ items:
     href: tutorials/use-kubernetes-service.md
   - name: Use language in power automate flows
     href: tutorials/power-automate.md
+  - name: Use language in prompt flow
+    href: tutorials/prompt-flow.md
   - name: 🆕 Native document support
     items:
     - name: 🆕 Use native documents for language processing