Skip to content

Commit d0b323c

Browse files
authored
Merge pull request #280707 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 5de0e2a + 9d07618 commit d0b323c

18 files changed

+524
-242
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/digital-twins/how-to-integrate-maps.md",
5+
"redirect_url": "/previous-versions/azure/digital-twins/how-to-integrate-maps",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/mysql/single-server/azure-pipelines-mysql-deploy.md",
510
"redirect_url": "/previous-versions/azure/mysql/single-server/azure-pipelines-mysql-deploy",

articles/azure-functions/TOC.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,26 @@
189189
- name: Azure SQL
190190
displayName: Connect to a database, Azure SQL
191191
href: functions-add-output-binding-azure-sql-vs-code.md?pivots=programming-language-python
192+
- name: Connect to OpenAI
193+
items:
194+
- name: C#
195+
href: functions-add-openai-text-completion.md?pivots=programming-language-csharp
196+
displayName: Connect to OpenAI, text completion
197+
- name: Java
198+
href: functions-add-openai-text-completion.md?pivots=programming-language-java
199+
displayName: Connect to OpenAI, text completion
200+
- name: JavaScript
201+
href: functions-add-openai-text-completion.md?pivots=programming-language-javascript
202+
displayName: Connect to OpenAI, text completion
203+
- name: PowerShell
204+
href: functions-add-openai-text-completion.md?pivots=programming-language-powershell
205+
displayName: Connect to OpenAI, text completion
206+
- name: Python
207+
href: functions-add-openai-text-completion.md?pivots=programming-language-python
208+
displayName: Connect to OpenAI, text completion
209+
- name: TypeScript
210+
href: functions-add-openai-text-completion.md?pivots=programming-language-typescript
211+
displayName: Connect to OpenAI, text completion
192212
- name: Tutorials
193213
items:
194214
- name: Functions with Logic Apps
@@ -222,10 +242,14 @@
222242
href: ../event-grid/resize-images-on-storage-blob-upload-event.md?toc=/azure/azure-functions/toc.json
223243
- name: Create a serverless web app
224244
href: /training/modules/automatic-update-of-a-webapp-using-azure-functions-and-signalr/
225-
- name: Machine learning with TensorFlow
226-
href: functions-machine-learning-tensorflow.md
227-
- name: Image classification with PyTorch
228-
href: machine-learning-pytorch.md
245+
- name: Data + AI
246+
items:
247+
- name: Azure OpenAI for text completion
248+
href: functions-add-openai-text-completion.md
249+
- name: Machine learning with TensorFlow
250+
href: functions-machine-learning-tensorflow.md
251+
- name: Image classification with PyTorch
252+
href: machine-learning-pytorch.md
229253
- name: Functions on IoT Edge device
230254
href: ../iot-edge/tutorial-deploy-function.md?toc=/azure/azure-functions/toc.json
231255
- name: Java with Azure Cosmos DB and Event Hubs

articles/azure-functions/functions-add-openai-text-completion.md

Lines changed: 275 additions & 0 deletions
Large diffs are not rendered by default.

articles/azure-functions/functions-bindings-openai.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,19 @@ You can add the preview extension by adding or replacing the following code in y
8282

8383
::: zone-end
8484

85+
## Application settings
86+
87+
To use the Azure OpenAI binding extension, you need to add one or more of these settings, which are used to connect to your OpenAI resource. During local development, you also need to add these settings to your `local.settings.json` file.
88+
89+
| Setting name | Description |
90+
| ---- | ----- |
91+
| **`AZURE_OPENAI_ENDPOINT`** | Required. Sets the endpoint of the OpenAI resource used by your bindings. |
92+
| **`AZURE_OPENAI_KEY`** | Sets the key used to access an Azure OpenAI resource. |
93+
| **`OPENAI_API_KEY`** | Sets the key used to access a non-Azure OpenAI resource. |
94+
| **`AZURE_CLIENT_ID`** | Sets a user-assigned managed identity used to access the Azure OpenAI resource. |
95+
96+
For more information, see [Work with application settings](functions-how-to-use-azure-function-app-settings.md#settings).
97+
8598
<!---Include this section if there are any host.json settings defined by the extension:
8699
## host.json settings
87100
-->

articles/azure-functions/functions-scenarios.md

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,51 @@ public static async Task Run(
137137

138138
## Machine learning and AI
139139

140-
Besides data processing, Azure Functions can be used to infer on models.
140+
Besides data processing, Azure Functions can be used to infer on models. The [Azure OpenAI binding extension](./functions-bindings-openai.md) lets easily integrate features and behaviors of the [Azure OpenAI service](../ai-services/openai/overview.md) into your function code executions.
141141

142-
For example, a function that calls a TensorFlow model or submits it to Azure AI services can process and classify a stream of images.
142+
Functions can connect to an OpenAI resources to enable text and chat completions, use assistants, and leverage embeddings and semantic search.
143143

144-
Functions can also connect to other services to help process data and perform other AI-related tasks, like [text summarization](https://github.com/Azure-Samples/function-csharp-ai-textsummarize).
144+
A function might also call a TensorFlow model or Azure AI services to process and classify a stream of images.
145145

146146
[ ![Diagram of a machine learning and AI process using Azure Functions.](./media/functions-scenarios/machine-learning-and-ai.png) ](./media/functions-scenarios/machine-learning-and-ai-expanded.png#lightbox)
147147

148-
149-
::: zone pivot="programming-language-csharp"
148+
::: zone pivot="programming-language-csharp"
149+
+ Tutorial: [Text completion using Azure OpenAI](functions-add-openai-text-completion.md?pivots=programming-language-csharp)
150150
+ Sample: [Text summarization using AI Cognitive Language Service](https://github.com/Azure-Samples/function-csharp-ai-textsummarize)
151-
::: zone-end
152-
153-
::: zone pivot="programming-language-javascript"
151+
+ Sample: [Text completion using Azure OpenAI](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/textcompletion/csharp-ooproc)
152+
+ Sample: [Provide assistant skills to your model](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/assistant/csharp-ooproc)
153+
+ Sample: [Generate embeddings](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/embeddings/csharp-ooproc/Embeddings)
154+
+ Sample: [Leverage semantic search](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/rag-aisearch/csharp-ooproc)
155+
::: zone-end
156+
::: zone pivot="programming-language-java"
157+
+ Tutorial: [Text completion using Azure OpenAI](functions-add-openai-text-completion.md?pivots=programming-language-java)
158+
+ Sample: [Text completion using Azure OpenAI](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/textcompletion/java)
159+
+ Sample: [Provide assistant skills to your model](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/assistant/java)
160+
+ Sample: [Generate embeddings](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/embeddings/java)
161+
+ Sample: [Leverage semantic search](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/rag-aisearch/java)
162+
::: zone-end
163+
::: zone pivot="programming-language-javascript"
164+
+ Tutorial: [Text completion using Azure OpenAI](functions-add-openai-text-completion.md?pivots=programming-language-javascript)
154165
+ Training: [Create a custom skill for Azure AI Search](/training/modules/create-enrichment-pipeline-azure-cognitive-search)
155166
+ Sample: [Chat using ChatGPT](https://github.com/Azure-Samples/function-javascript-ai-openai-chatgpt)
156-
::: zone-end
157-
158-
::: zone pivot="programming-language-python"
167+
::: zone-end
168+
::: zone pivot="programming-language-python"
169+
+ Tutorial: [Text completion using Azure OpenAI](functions-add-openai-text-completion.md?pivots=programming-language-python)
159170
+ Tutorial: [Apply machine learning models in Azure Functions with Python and TensorFlow](./functions-machine-learning-tensorflow.md)
160171
+ Tutorial: [Deploy a pretrained image classification model to Azure Functions with PyTorch](./machine-learning-pytorch.md)
172+
+ Sample: [Text completion using Azure OpenAI](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/textcompletion/python)
173+
+ Sample: [Provide assistant skills to your model](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/assistant/python)
174+
+ Sample: [Generate embeddings](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/embeddings/python)
175+
+ Sample: [Leverage semantic search](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/rag-aisearch/python)
161176
+ Sample: [Chat using ChatGPT](https://github.com/Azure-Samples/function-python-ai-openai-chatgpt)
162177
+ Sample: [LangChain with Azure OpenAI and ChatGPT](https://github.com/Azure-Samples/function-python-ai-langchain)
178+
::: zone-end
179+
::: zone pivot="programming-language-powershell"
180+
+ Tutorial: [Text completion using Azure OpenAI](functions-add-openai-text-completion.md?pivots=programming-language-powershell)
181+
+ Sample: [Text completion using Azure OpenAI](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/textcompletion/powershell)
182+
+ Sample: [Provide assistant skills to your model](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/assistant/powershell)
183+
+ Sample: [Generate embeddings](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/embeddings/powershell)
184+
+ Sample: [Leverage semantic search](https://github.com/Azure/azure-functions-openai-extension/tree/main/samples/rag-aisearch/powershell)
163185
::: zone-end
164186

165187
## Run scheduled tasks

articles/cosmos-db/mongodb/vcore/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@
9090
href: how-to-create-wildcard-indexes.md
9191
- name: Search and query text
9292
href: how-to-create-text-index.md
93-
- name: Optimize index creation
94-
href: how-to-create-indexes.md
9593
- name: Scale cluster
9694
href: how-to-scale-cluster.md
9795
- name: Restore cluster

articles/cosmos-db/mongodb/vcore/release-notes.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,39 @@ ms.reviewer: gahllevy
88
ms.service: cosmos-db
99
ms.subservice: mongodb-vcore
1010
ms.topic: release-notes
11-
ms.date: 05/09/2024
11+
ms.date: 07/02/2024
1212
#Customer intent: As a database administrator, I want to review the release notes, so I can understand what new features are released for the service.
1313
---
1414

1515
# Release notes for Azure Cosmos DB for MongoDB vCore
1616

1717
This article contains release notes for the API for MongoDB vCore. These release notes are composed of feature release dates, and feature updates.
1818

19-
## Latest release: May 06, 2024
19+
## Latest release: July 02, 2024
20+
21+
- Metrics added
22+
- Customer Activity.
23+
- Requests.
24+
25+
(Preview feature list)
26+
- Support for accumulators
27+
- $mergeObjects.
28+
- Support for aggregation operator
29+
- $let.
30+
- Geospatial query operators
31+
- $minDistance.
32+
- $maxDistance.
33+
34+
## Previous releases
35+
36+
### May 06, 2024
2037

2138
- Query operator enhancements.
22-
- $geoNear aggregation. This can be enabled through Flag - `Geospatial support for vcore "MongoDB for CosmosDB"` (Public Preview)
39+
- $geoNear aggregation. This can be enabled through Flag - `Geospatial support for vcore "MongoDB for CosmosDB"`
40+
41+
(Preview feature list)
2342
- Support for accumulators
2443
- $push.
25-
- $mergeObjects.
2644
- $addToSet.
2745
- $tsSecond/$tsIncrement.
2846
- $map/$reduce.
@@ -35,8 +53,6 @@ This article contains release notes for the API for MongoDB vCore. These release
3553
- Improved performance of group and distinct.
3654
- Improved performance for $geoWithin queries with $centerSphere when radius is greater than π.
3755

38-
## Previous releases
39-
4056
### April 16, 2024
4157

4258
- Query operator enhancements.

articles/data-factory/connector-salesforce.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: data-factory
88
ms.subservice: data-movement
99
ms.topic: conceptual
1010
ms.custom: synapse
11-
ms.date: 06/25/2024
11+
ms.date: 07/11/2024
1212
---
1313

1414
# Copy data from and to Salesforce using Azure Data Factory or Azure Synapse Analytics
@@ -210,8 +210,8 @@ To copy data from and to Salesforce, set the type property of the dataset to **S
210210
| Property | Description | Required |
211211
|:--- |:--- |:--- |
212212
| type | The type property must be set to **SalesforceV2Object**. | Yes |
213-
| objectApiName | The Salesforce object name to retrieve data from. | No for source (if "SOQLQuery" in source is specified), Yes for sink |
214-
| reportId | The ID of the Salesforce report to retrieve data from. It isn't supported in sink. There are [limitations](https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_limits_limitations.htm) when you use reports. | No for source (if "SOQLQuery" in source is specified), not support sink |
213+
| objectApiName | The Salesforce object name to retrieve data from. | No for source (if "query" in source is specified), Yes for sink |
214+
| reportId | The ID of the Salesforce report to retrieve data from. It isn't supported in sink. There are [limitations](https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_limits_limitations.htm) when you use reports. | No for source (if "query" in source is specified), not support sink |
215215

216216
> [!IMPORTANT]
217217
> The "__c" part of **API Name** is needed for any custom object.
@@ -248,7 +248,7 @@ To copy data from Salesforce, set the source type in the copy activity to **Sale
248248
| Property | Description | Required |
249249
|:--- |:--- |:--- |
250250
| type | The type property of the copy activity source must be set to **SalesforceV2Source**. | Yes |
251-
| SOQLQuery | Use the custom query to read data. You can only use [Salesforce Object Query Language (SOQL)](https://developer.salesforce.com/docs/atlas.en-us.soql_sosl.meta/soql_sosl/sforce_api_calls_soql.htm) query with limitations. For SOQL limitations, see this [article](https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/queries.htm#SOQL%20Considerations). If query isn't specified, all the data of the Salesforce object specified in "ObjectApiName/reportId" in dataset is retrieved. | No (if "ObjectApiName/reportId" in the dataset is specified) |
251+
| query | Use the custom query to read data. You can only use [Salesforce Object Query Language (SOQL)](https://developer.salesforce.com/docs/atlas.en-us.soql_sosl.meta/soql_sosl/sforce_api_calls_soql.htm) query with limitations. For SOQL limitations, see this [article](https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/queries.htm#SOQL%20Considerations). If query isn't specified, all the data of the Salesforce object specified in "ObjectApiName/reportId" in dataset is retrieved. | No (if "ObjectApiName/reportId" in the dataset is specified) |
252252
| includeDeletedObjects | Indicates whether to query the existing records, or query all records including the deleted ones. If not specified, the default behavior is false. <br>Allowed values: **false** (default), **true**. | No |
253253

254254
> [!IMPORTANT]
@@ -278,7 +278,7 @@ To copy data from Salesforce, set the source type in the copy activity to **Sale
278278
"typeProperties": {
279279
"source": {
280280
"type": "SalesforceV2Source",
281-
"SOQLQuery": "SELECT Col_Currency__c, Col_Date__c, Col_Email__c FROM AllDataType__c",
281+
"query": "SELECT Col_Currency__c, Col_Date__c, Col_Email__c FROM AllDataType__c",
282282
"includeDeletedObjects": false
283283
},
284284
"sink": {

0 commit comments

Comments
 (0)