Skip to content

Commit 255510d

Browse files
authored
Merge pull request #262304 from MicrosoftDocs/main
1/3/2024 AM Publish
2 parents b959873 + ae52e79 commit 255510d

38 files changed

+395
-247
lines changed

articles/ai-services/computer-vision/how-to/shelf-modify-images.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ To run the image stitching operation on a set of images, follow these steps:
4545
```bash
4646
curl.exe -H "Ocp-Apim-Subscription-Key: <subscriptionKey>" -H "Content-Type: application/json" "https://<endpoint>/computervision/imagecomposition:stitch?api-version=2023-04-01-preview" --output <your_filename> -d "{
4747
'images': [
48-
{
49-
'url':'<your_url_string>'
50-
},
51-
{
52-
'url':'<your_url_string_2>'
53-
},
48+
'<your_url_string_>',
49+
'<your_url_string_2>',
5450
...
5551
]
5652
}"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Each family includes models across a range of capability. The following list ind
4747

4848
| Base Model | Model(s) | Dimensions |
4949
|---|---|---|
50-
| Ada | | 1024 |
51-
| Babbage | | 2048 |
52-
| Curie | | 4096 |
53-
| Davinci | | 12288 |
50+
| Ada | | 1,024 |
51+
| Babbage | | 2,048 |
52+
| Curie | | 4,096 |
53+
| Davinci | | 12,288 |
5454

5555

5656
### Similarity embedding
@@ -116,7 +116,7 @@ Region availability is for customers with deployments of the models prior to Jul
116116
| --- | --- | --- | --- | --- |
117117
| text-similarity-ada-001| East US, South Central US, West Europe | N/A | 2,046 | Aug 2020 |
118118
| text-similarity-babbage-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
119-
| text-similarity-curie-001 | East US, South Central US, West Europe | N/A | 2046 | Aug 2020 |
119+
| text-similarity-curie-001 | East US, South Central US, West Europe | N/A | 2,046 | Aug 2020 |
120120
| text-similarity-davinci-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
121121
| text-search-ada-doc-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
122122
| text-search-ada-query-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the different model capabilities that are available with Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 11/22/2023
7+
ms.date: 01/03/2024
88
ms.custom: event-tier1-build-2022, references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -93,8 +93,8 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
9393
| `gpt-4-32k`(0314) | 32,768 | Sep 2021 |
9494
| `gpt-4` (0613) | 8,192 | Sep 2021 |
9595
| `gpt-4-32k` (0613) | 32,768 | Sep 2021 |
96-
| `gpt-4` (1106-preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4096 | Apr 2023 |
97-
| `gpt-4` (vision-preview)**<sup>2</sup>**<br>**GPT-4 Turbo with Vision Preview** | Input: 128,000 <br> Output: 4096 | Apr 2023 |
96+
| `gpt-4` (1106-preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
97+
| `gpt-4` (vision-preview)**<sup>2</sup>**<br>**GPT-4 Turbo with Vision Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
9898

9999
**<sup>1</sup>** GPT-4 Turbo Preview = `gpt-4` (1106-preview). To deploy this model, under **Deployments** select model **gpt-4**. For **Model version** select **1106-preview**.
100100

@@ -128,13 +128,13 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
128128

129129
| Model ID | Model Availability | Max Request (tokens) | Training Data (up to) |
130130
| --------- | -------------------- |:------:|:----:|
131-
| `gpt-35-turbo`**<sup>1</sup>** (0301) | East US <br> France Central <br> South Central US <br> UK South <br> West Europe | 4096 | Sep 2021 |
132-
| `gpt-35-turbo` (0613) | Australia East <br> Canada East <br> East US <br> East US 2 <br> France Central <br> Japan East <br> North Central US <br> Sweden Central <br> Switzerland North <br> UK South | 4096 | Sep 2021 |
131+
| `gpt-35-turbo`**<sup>1</sup>** (0301) | East US <br> France Central <br> South Central US <br> UK South <br> West Europe | 4,096 | Sep 2021 |
132+
| `gpt-35-turbo` (0613) | Australia East <br> Canada East <br> East US <br> East US 2 <br> France Central <br> Japan East <br> North Central US <br> Sweden Central <br> Switzerland North <br> UK South | 4,096 | Sep 2021 |
133133
| `gpt-35-turbo-16k` (0613) | Australia East <br> Canada East <br> East US <br> East US 2 <br> France Central <br> Japan East <br> North Central US <br> Sweden Central <br> Switzerland North<br> UK South | 16,384 | Sep 2021 |
134-
| `gpt-35-turbo-instruct` (0914) | East US <br> Sweden Central | 4097 |Sep 2021 |
134+
| `gpt-35-turbo-instruct` (0914) | East US <br> Sweden Central | 4,097 |Sep 2021 |
135135
| `gpt-35-turbo` (1106) | Australia East <br> Canada East <br> France Central <br> South India <br> Sweden Central<br> UK South <br> West US | Input: 16,385<br> Output: 4,096 | Sep 2021|
136136

137-
**<sup>1</sup>** This model will accept requests > 4096 tokens. It is not recommended to exceed the 4096 input token limit as the newer version of the model are capped at 4096 tokens. If you encounter issues when exceeding 4096 input tokens with this model this configuration is not officially supported.
137+
**<sup>1</sup>** This model will accept requests > 4,096 tokens. It is not recommended to exceed the 4,096 input token limit as the newer version of the model are capped at 4,096 tokens. If you encounter issues when exceeding 4,096 input tokens with this model this configuration is not officially supported.
138138

139139
### Embeddings models
140140

@@ -145,15 +145,15 @@ These models can only be used with Embedding API requests.
145145
146146
| Model ID | Model Availability | Max Request (tokens) | Training Data (up to) | Output Dimensions |
147147
|---|---| :---:|:---:|:---:|
148-
| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe |8,191 | Sep 2021 | 1536 |
149-
| `text-embedding-ada-002` (version 1) | East US <br> South Central US <br> West Europe |2,046 | Sep 2021 | 1536 |
148+
| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe |8,191 | Sep 2021 | 1,536 |
149+
| `text-embedding-ada-002` (version 1) | East US <br> South Central US <br> West Europe |2,046 | Sep 2021 | 1,536 |
150150

151151
### DALL-E models (Preview)
152152

153153
| Model ID | Feature Availability | Max Request (characters) |
154154
| --- | --- | :---: |
155-
| dalle2 | East US | 1000 |
156-
| dalle3 | Sweden Central | 4000 |
155+
| dalle2 | East US | 1,000 |
156+
| dalle3 | Sweden Central | 4,000 |
157157

158158
### Fine-tuning models
159159

@@ -165,7 +165,7 @@ These models can only be used with Embedding API requests.
165165
| --- | --- | :---: | :---: |
166166
| `babbage-002` | North Central US <br> Sweden Central | 16,384 | Sep 2021 |
167167
| `davinci-002` | North Central US <br> Sweden Central | 16,384 | Sep 2021 |
168-
| `gpt-35-turbo` (0613) | North Central US <br> Sweden Central | 4096 | Sep 2021 |
168+
| `gpt-35-turbo` (0613) | North Central US <br> Sweden Central | 4,096 | Sep 2021 |
169169

170170
### Whisper models (Preview)
171171

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Walkthrough on how to get started with Azure OpenAI and make your f
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: include
9-
ms.date: 02/02/2023
9+
ms.date: 01/03/2024
1010
keywords:
1111
---
1212

@@ -107,12 +107,12 @@ client = AzureOpenAI(
107107
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
108108
)
109109

110-
deployment_name='REPLACE_WITH_YOUR_DEPLOYMENT_NAME' #This will correspond to the custom name you chose for your deployment when you deployed a model.
110+
deployment_name='REPLACE_WITH_YOUR_DEPLOYMENT_NAME' #This will correspond to the custom name you chose for your deployment when you deployed a model. Use a gpt-35-turbo-instruct deployment.
111111

112112
# Send a completion call to generate an answer
113113
print('Sending a test completion job')
114114
start_phrase = 'Write a tagline for an ice cream shop. '
115-
response = client.chat.completions.create(model=deployment_name, prompt=start_phrase, max_tokens=10)
115+
response = client.completions.create(model=deployment_name, prompt=start_phrase, max_tokens=10)
116116
print(response.choices[0].text)
117117
```
118118

articles/ai-services/openai/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYM
237237
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/chat/completions?api-version=2023-12-01-preview \
238238
-H "Content-Type: application/json" \
239239
-H "api-key: YOUR_API_KEY" \
240-
-d '{"messages":[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":[{"type":"text","text":"Describe this picture:"},{ "type": "image_url", "image_url": { "url": https://learn.microsoft.com/azure/ai-services/computer-vision/media/quickstarts/presentation.png, "detail": "high" } }]}]}'
240+
-d '{"messages":[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":[{"type":"text","text":"Describe this picture:"},{ "type": "image_url", "image_url": { "url": "https://learn.microsoft.com/azure/ai-services/computer-vision/media/quickstarts/presentation.png", "detail": "high" } }]}]}'
241241
```
242242

243243
**Enhanced chat with vision**

0 commit comments

Comments
 (0)