Skip to content

Commit 41cd55e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 5c3f8b2 + 74028a7 commit 41cd55e

File tree

210 files changed

+6331
-2939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+6331
-2939
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4060,7 +4060,7 @@
40604060
},
40614061
{
40624062
"source_path_from_root":"/articles/cosmos-db/high-availability.md",
4063-
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
4063+
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql",
40644064
"redirect_document_id":false
40654065
},
40664066
{

articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-python-multivariate.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ from datetime import datetime, timezone
120120
from azure.ai.anomalydetector import AnomalyDetectorClient
121121
from azure.core.credentials import AzureKeyCredential
122122
from azure.ai.anomalydetector.models import *
123+
import os
123124

124125
SUBSCRIPTION_KEY = os.environ['ANOMALY_DETECTOR_API_KEY']
125126
ANOMALY_DETECTOR_ENDPOINT = os.environ['ANOMALY_DETECTOR_ENDPOINT']
@@ -175,12 +176,12 @@ result = ad_client.detect_multivariate_batch_anomaly(model_id, batch_inference_b
175176
result_id = result.result_id
176177

177178
# Get results (may need a few seconds)
178-
r = ad_client.get_multivariate_batch_detection_result(result_id)
179+
anomaly_results = ad_client.get_multivariate_batch_detection_result(result_id)
179180
print("Get detection result...(it may take a few seconds)")
180181

181-
while r.summary.status != MultivariateBatchDetectionStatus.READY and r.summary.status != MultivariateBatchDetectionStatus.FAILED and r.summary.status !=MultivariateBatchDetectionStatus.CREATED:
182+
while anomaly_results.summary.status != MultivariateBatchDetectionStatus.READY and anomaly_results.summary.status != MultivariateBatchDetectionStatus.FAILED:
182183
anomaly_results = ad_client.get_multivariate_batch_detection_result(result_id)
183-
print("Detection is {}".format(r.summary.status))
184+
print("Detection is {}".format(anomaly_results.summary.status))
184185
time.sleep(5)
185186

186187

articles/ai-services/computer-vision/how-to/image-retrieval.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ The Multimodal embeddings APIs enable the _vectorization_ of images and text que
2020
The `2024-02-01` API includes a multi-lingual model that supports text search in 102 languages. The original English-only model is still available, but it cannot be combined with the new model in the same search index. If you vectorized text and images using the English-only model, these vectors won’t be compatible with multi-lingual text and image vectors.
2121

2222
> [!IMPORTANT]
23-
> These APIs are only available in the following geographic regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
23+
> These APIs are only available in the following geographic regions: SwedenCentral, EastUS, NorthEurope, WestEurope,WestUS, SoutheastAsia, KoreaCentral, FranceCentral, AustraliaEast, WestUS2, SwitzerlandNorth, JapanEast.
2424
2525
## Prerequisites
2626

2727
* Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
28-
* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision" title="Create a Computer Vision resource" target="_blank">create a Computer Vision resource </a> in the Azure portal to get your key and endpoint. Be sure to create it in one of the permitted geographic regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
28+
* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision" title="Create a Computer Vision resource" target="_blank">create a Computer Vision resource </a> in the Azure portal to get your key and endpoint. Be sure to create it in one of the permitted geographic regions: SwedenCentral, EastUS, NorthEurope, WestEurope,WestUS, SoutheastAsia, KoreaCentral, FranceCentral, AustraliaEast, WestUS2, SwitzerlandNorth, JapanEast.
2929
* After it deploys, select **Go to resource**. Copy the key and endpoint to a temporary location to use later on.
3030

3131
## Try out Multimodal embeddings

articles/ai-services/document-intelligence/concept-id-document.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,24 @@ Extract data, including name, birth date, and expiration date, from ID documents
231231

232232
The following are the fields extracted per document type. The Document Intelligence ID model `prebuilt-idDocument` extracts the following fields in the `documents.*.fields`. The json output includes all the extracted text in the documents, words, lines, and styles.
233233

234+
::: moniker-end
235+
236+
::: moniker range="doc-intel-3.1.0"
237+
238+
> [!div class="nextstepaction"]
239+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/v3.1(2023-07-31-GA)/Python(v3.1)/Prebuilt_model/sample_analyze_identity_documents.py)
240+
241+
::: moniker-end
242+
243+
::: moniker range="doc-intel-4.0.0"
244+
245+
> [!div class="nextstepaction"]
246+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Python(v4.0)/Prebuilt_model/sample_analyze_identity_documents.py)
247+
248+
::: moniker-end
249+
250+
::: moniker range=">=doc-intel-3.0.0"
251+
234252
### `idDocument.driverLicense`
235253

236254
| Field | Type | Description | Example |

articles/ai-services/document-intelligence/concept-invoice.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,21 @@ See how data, including customer information, vendor details, and line items, is
186186
*See* our [Language Support—prebuilt models](language-support-prebuilt.md) page for a complete list of supported languages.
187187

188188
## Field extraction
189+
The Document Intelligence invoice model `prebuilt-invoice` extracts the following fields.
190+
191+
::: moniker range="doc-intel-3.1.0"
192+
193+
> [!div class="nextstepaction"]
194+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/v3.1(2023-07-31-GA)/Python(v3.1)/Prebuilt_model/sample_analyze_invoices.py)
195+
196+
::: moniker-end
197+
198+
::: moniker range="doc-intel-4.0.0"
199+
200+
> [!div class="nextstepaction"]
201+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Python(v4.0)/Prebuilt_model/sample_analyze_invoices.py)
202+
203+
::: moniker-end
189204

190205
|Name| Type | Description | Standardized output |
191206
|:-----|:----|:----|:----|

articles/ai-services/document-intelligence/concept-receipt.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,24 @@ See how Document Intelligence extracts data, including time and date of transact
228228
Document Intelligence v3.0 and later versions introduce several new features and capabilities. In addition to thermal receipts, the **Receipt** model supports single-page hotel receipt processing and tax detail extraction for all receipt types.
229229

230230
Document Intelligence v4.0 and later versions introduces support for currency for all price-related fields for thermal and hotel receipts.
231+
232+
::: moniker-end
233+
234+
::: moniker range="doc-intel-3.1.0"
235+
236+
> [!div class="nextstepaction"]
237+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/v3.1(2023-07-31-GA)/Python(v3.1)/Prebuilt_model/sample_analyze_receipts.py)
238+
239+
::: moniker-end
240+
241+
::: moniker range="doc-intel-4.0.0"
242+
243+
> [!div class="nextstepaction"]
244+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Python(v4.0)/Prebuilt_model/sample_analyze_receipts.py)
245+
246+
::: moniker-end
247+
248+
::: moniker range=">=doc-intel-3.0.0"
231249

232250
### Receipt
233251

articles/ai-services/document-intelligence/concept-tax-document.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,20 @@ See how data, including customer information, vendor details, and line items, is
106106

107107
The following are the fields extracted from a W-2 tax form in the JSON output response.
108108

109+
::: moniker range="doc-intel-3.1.0"
110+
111+
> [!div class="nextstepaction"]
112+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/v3.1(2023-07-31-GA)/Python(v3.1)/Prebuilt_model/sample_analyze_tax_us_w2.py)
113+
114+
::: moniker-end
115+
116+
::: moniker range="doc-intel-4.0.0"
117+
118+
> [!div class="nextstepaction"]
119+
> [View samples on GitHub.](https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Python(v4.0)/Prebuilt_model/sample_analyze_tax_us_w2.py)
120+
121+
::: moniker-end
122+
109123
|Name| Type | Description | Example output |dependents
110124
|:-----|:----|:----|:---:|
111125
| `W-2FormVariant`| String | IR W-2 Form variant. This field can have the one of the following values: `W-2`, `W-2AS`, `W-2CM`, `W-2GU`, or `W-2VI`| W-2 |

articles/ai-services/openai/assistants-reference-runs.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,30 @@ curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/runs
259259

260260
## Retrieve run
261261

262+
# [Python 1.x](#tab/python)
263+
264+
```python
265+
from openai import OpenAI
266+
client = OpenAI()
267+
268+
run = client.beta.threads.runs.retrieve(
269+
thread_id="thread_abc123",
270+
run_id="run_abc123"
271+
)
272+
273+
print(run)
274+
```
275+
276+
# [REST](#tab/rest)
277+
262278
```http
263-
GET https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/runs/{run_id}?api-version=2024-05-01-preview
279+
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/runs/{run_id}?api-version=2024-05-01-preview
280+
-H "api-key: $AZURE_OPENAI_API_KEY" \
281+
-H 'Content-Type: application/json'
264282
```
265283

284+
---
285+
266286
Retrieves a run.
267287

268288
**Path parameters**
@@ -565,6 +585,7 @@ Represents an execution run on a thread.
565585
| `tool_choice` | string or object | Controls which (if any) tool is called by the model. `none` means the model won't call any tools and instead generates a message. `auto` is the default value and means the model can pick between generating a message or calling a tool. Specifying a particular tool like `{"type": "file_search"}` or `{"type": "function", "function": {"name": "my_function"}}` forces the model to call that tool. |
566586
| `max_prompt_tokens` | integer or null | The maximum number of prompt tokens specified to have been used over the course of the run. |
567587
| `max_completion_tokens` | integer or null | The maximum number of completion tokens specified to have been used over the course of the run. |
588+
| `usage` | object or null | Usage statistics related to the run. This value will be null if the run is not in a terminal state (for example `in_progress`, `queued`). |
568589

569590

570591
## Run step object

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI's Python & REST API with Assistants.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: conceptual
8-
ms.date: 02/07/2024
8+
ms.date: 05/22/2024
99
author: mrbullwinkle
1010
ms.author: mbullwin
1111
recommendations: false
@@ -34,7 +34,7 @@ Create an assistant with a model and instructions.
3434
| model| string | Required | Model deployment name of the model to use.|
3535
| name | string or null | Optional | The name of the assistant. The maximum length is 256 characters.|
3636
| description| string or null | Optional | The description of the assistant. The maximum length is 512 characters.|
37-
| instructions | string or null | Optional | The system instructions that the assistant uses. The maximum length is 32768 characters.|
37+
| instructions | string or null | Optional | The system instructions that the assistant uses. The maximum length is 256,000 characters.|
3838
| tools | array | Optional | Defaults to []. A list of tools enabled on the assistant. There can be a maximum of 128 tools per assistant. Tools can currently be of types `code_interpreter`, or `function`.|
3939
| file_ids | array | Optional | Defaults to []. A list of file IDs attached to this assistant. There can be a maximum of 20 files attached to the assistant. Files are ordered by their creation date in ascending order.|
4040
| metadata | map | Optional | Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maximum of 512 characters long.|

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ In addition to the regions above which are available to all Azure OpenAI custome
194194

195195
| Model | Region |
196196
|---|:---|
197-
| `gpt-4` (0314) | East US <br> France Central <br> South Central US <br> UK South |
198-
| `gpt-4` (0613) | East US <br> East US 2 <br> Japan East <br> UK South |
197+
| `gpt-4` (0314) <br> `gpt-4-32k` (0314) | East US <br> France Central <br> South Central US <br> UK South |
198+
| `gpt-4` (0613) <br> `gpt-4-32k` (0613) | East US <br> East US 2 <br> Japan East <br> UK South |
199199

200200
#### Azure Government regions
201201

@@ -309,7 +309,6 @@ For Assistants you need a combination of a supported model, and a supported regi
309309
| East US || | | | ||
310310
| East US 2 || |||| |
311311
| France Central ||| ||| |
312-
| India South | || | || |
313312
| Japan East || | | | | |
314313
| Norway East | | | | || |
315314
| Sweden Central |||||| |

0 commit comments

Comments
 (0)