Skip to content

Commit d810107

Browse files
authored
Merge pull request #293045 from MicrosoftDocs/main
1/14/2025 PM Publish
2 parents 4dc0cd3 + 3f26b07 commit d810107

File tree

63 files changed

+1673
-867
lines changed

Some content is hidden

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

63 files changed

+1673
-867
lines changed

articles/api-management/set-edit-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ To modify the policy evaluation order using the policy editor:
221221

222222
> [!NOTE]
223223
> * You can place the `base` element before or after any policy element in a section.
224-
> * If you want to prevent inheriting policies from the parent scope, remove the `base` element. In most cases, this isn't recommended.
224+
> * If you want to prevent inheriting policies from the parent scope, remove the `base` element. In most cases, this isn't recommended. However, it may be useful in certain situations, such as when you want to apply different policies to a specific operation than are configured for the API (all operations) scope.
225225

226226
1. Continue to configure the `base` element in policy definitions at successively broader scopes.
227227

articles/azure-app-configuration/quickstart-feature-flag-spring-boot.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,28 @@ To create a new Spring Boot project:
8585
## Connect to an App Configuration store
8686

8787

88-
1. Navigate to the `resources` directory of your app and open `bootstrap.properties`. If the file does not exist, create it. Add the following line to the file.
88+
1. Navigate to the `resources` directory of your app and open the `bootstrap.properties` or `bootstrap.yaml` file. If the file does not exist, create it. Add the following line to the file.
8989

9090
### [Microsoft Entra ID (recommended)](#tab/entra-id)
9191
You use the `DefaultAzureCredential` to authenticate to your App Configuration store. Follow the [instructions](./concept-enable-rbac.md#authentication-with-token-credentials) to assign your credential the **App Configuration Data Reader** role. Be sure to allow sufficient time for the permission to propagate before running your application. Create a new file named *AppConfigCredential.java* and add the following lines:
9292

93-
```properties
93+
If you are using a properties file, use the following code:
94+
```properties
9495
spring.cloud.azure.appconfiguration.stores[0].endpoint= ${APP_CONFIGURATION_ENDPOINT}
9596
spring.cloud.azure.appconfiguration.stores[0].feature-flags.enabled=true
9697
```
98+
99+
If you are using a yaml file, use the following code:
100+
```yaml
101+
spring:
102+
cloud:
103+
azure:
104+
appconfiguration:
105+
stores[0]:
106+
feature-flags:
107+
enabled: 'true'
108+
connection-string: ${APP_CONFIGURATION_CONNECTION_STRING}
109+
```
97110

98111
Additionally, you need to add the following code to your project, unless you want to use Managed Identity:
99112

@@ -122,10 +135,23 @@ To create a new Spring Boot project:
122135
```
123136

124137
### [Connection string](#tab/connection-string)
125-
```properties
138+
If you are using a properties file, use the following code:
139+
```properties
126140
spring.cloud.azure.appconfiguration.stores[0].endpoint= ${APP_CONFIGURATION_CONNECTION_STRING}
127141
spring.cloud.azure.appconfiguration.stores[0].feature-flags.enabled=true
128142
```
143+
144+
If you are using a yaml file, use the following code:
145+
```yaml
146+
spring:
147+
cloud:
148+
azure:
149+
appconfiguration:
150+
stores[0]:
151+
feature-flags:
152+
enabled: 'true'
153+
connection-string: ${APP_CONFIGURATION_CONNECTION_STRING}
154+
```
129155
---
130156

131157
1. Set an environment variable.

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/24/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -40,21 +40,17 @@ This example demonstrates how to create an assistant that adds a new todo task t
4040
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantSkills.java" range="27-43":::
4141

4242
::: zone-end
43+
::: zone pivot="programming-language-javascript,programming-language-typescript"
44+
This example demonstrates how to create an assistant that adds a new todo task to a database. The trigger has a static description of `Create a new todo task` used by the model. The function itself takes a string, which represents a new task to add. When executed, the function adds the task as a new todo item in a custom item store and returns a response from the store.
45+
::: zone-end
4346
::: zone pivot="programming-language-javascript"
44-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
45-
<!---uncomment when code example is available:
46-
{{This comes from the example code comment}}
4747

48-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.ts}}" range="{{named is better than range}}":::
48+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantSkills.js" range="4-25":::
4949

50-
{{Add more examples if available}}
51-
-->
5250
::: zone-end
5351
::: zone pivot="programming-language-typescript"
5452

55-
This example demonstrates how to create an assistant that adds a new todo task to a database. The trigger has a static description of `Create a new todo task` used by the model. The function itself takes a string, which represents a new task to add. When executed, the function adds the task as a new todo item in a custom item store and returns a response from the store.
56-
57-
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantSkills.ts" range="9-24" :::
53+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantSkills.ts" range="4-24" :::
5854

5955
::: zone-end
6056
::: zone pivot="programming-language-powershell"

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -35,26 +35,20 @@ This example demonstrates the creation process, where the HTTP PUT function that
3535
::: zone pivot="programming-language-java"
3636
This example demonstrates the creation process, where the HTTP PUT function that creates a new assistant chat bot with the specified ID. The response to the prompt is returned in the HTTP response.
3737

38-
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="33-58":::
39-
38+
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="33-58":::
4039

40+
::: zone-end
41+
::: zone pivot="programming-language-javascript,programming-language-typescript"
42+
This example demonstrates the creation process, where the HTTP PUT function that creates a new assistant chat bot with the specified ID. The response to the prompt is returned in the HTTP response.
4143
::: zone-end
4244
::: zone pivot="programming-language-javascript"
43-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
44-
<!---uncomment when code example is available:
4545

46-
{{This comes from the example code comment}}
46+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantApis.js" range="6-33" :::
4747

48-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
49-
50-
{{Add more examples if available}}
51-
-->
52-
::: zone-end
48+
::: zone-end
5349
::: zone pivot="programming-language-typescript"
5450

55-
This example demonstrates the creation process, where the HTTP PUT function that creates a new assistant chat bot with the specified ID. The response to the prompt is returned in the HTTP response.
56-
57-
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="7-29" :::
51+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="4-33" :::
5852

5953
::: zone-end
6054
::: zone pivot="programming-language-powershell"

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -38,24 +38,19 @@ This example demonstrates the creation process, where the HTTP POST function tha
3838

3939
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="83-103":::
4040

41+
::: zone-end
42+
::: zone pivot="programming-language-javascript,programming-language-typescript"
43+
This example demonstrates the creation process, where the HTTP POST function that sends user prompts to the assistant chat bot. The response to the prompt is returned in the HTTP response.
4144
::: zone-end
4245
::: zone pivot="programming-language-javascript"
43-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
44-
<!---uncomment when code example is available:
45-
{{This comes from the example code comment}}
46-
47-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
46+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantApis.js" range="6-7,36-60":::
4847

49-
{{Add more examples if available}}
50-
-->
5148
::: zone-end
5249
::: zone pivot="programming-language-typescript"
5350

54-
This example demonstrates the creation process, where the HTTP POST function that sends user prompts to the assistant chat bot. The response to the prompt is returned in the HTTP response.
55-
56-
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="32-50":::
51+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="6-7,36-60":::
5752

58-
::: zone-end
53+
::: zone-end
5954
::: zone pivot="programming-language-powershell"
6055

6156
This example demonstrates the creation process, where the HTTP POST function that sends user prompts to the assistant chat bot. The response to the prompt is returned in the HTTP response.

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -40,30 +40,26 @@ This example demonstrates the creation process, where the HTTP GET function that
4040
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="63-78":::
4141

4242

43+
::: zone-end
44+
::: zone pivot="programming-language-javascript,programming-language-typescript"
45+
This example demonstrates the creation process, where the HTTP GET function that queries the conversation history of the assistant chat bot. The response to the prompt is returned in the HTTP response.
4346
::: zone-end
4447
::: zone pivot="programming-language-javascript"
45-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
46-
<!---uncomment when code example is available:
47-
48-
{{This comes from the example code comment}}
4948

50-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
49+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantApis.js" range="6-7,63-79":::
5150

52-
{{Add more examples if available}}
53-
-->
5451
::: zone-end
5552
::: zone pivot="programming-language-typescript"
5653

5754
This example demonstrates the creation process, where the HTTP GET function that queries the conversation history of the assistant chat bot. The response to the prompt is returned in the HTTP response.
5855

59-
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="57-71":::
56+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="6-7,63-79":::
6057

61-
::: zone-end
58+
::: zone-end
6259
::: zone pivot="programming-language-powershell"
6360

6461
This example demonstrates the creation process, where the HTTP GET function that queries the conversation history of the assistant chat bot. The response to the prompt is returned in the HTTP response.
6562

66-
6763
Here's the _function.json_ file for Get Chat State:
6864

6965
:::code language="json" source="~/functions-openai-extension/samples/assistant/powershell/GetChatState/function.json" :::

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -46,24 +46,30 @@ This example shows how to retrieve embeddings stored at a specified file that is
4646
:::code language="java" source="~/functions-openai-extension/samples/embeddings/java/src/main/java/com/azfs/EmbeddingsGenerator.java" range="61-90":::
4747

4848
::: zone-end
49-
::: zone pivot="programming-language-javascript"
50-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
51-
<!---uncomment when code example is available:
52-
{{This comes from the example code comment}}
49+
::: zone pivot="programming-language-javascript,programming-language-typescript"
50+
This example shows how to generate embeddings for a raw text string.
51+
::: zone-end
52+
::: zone pivot="programming-language-javascript"
5353

54-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
54+
:::code language="javascript" source="~/functions-openai-extension/samples/embeddings/javascript/src/app.js" range="3-31":::
5555

56-
{{Add more examples if available}}
57-
-->
5856
::: zone-end
5957
::: zone pivot="programming-language-typescript"
58+
59+
:::code language="typescript" source="~/functions-openai-extension/samples/embeddings/typescript/src/app.ts" range="3-31":::
60+
61+
::: zone-end
62+
::: zone pivot="programming-language-javascript,programming-language-typescript"
6063
This example shows how to generate embeddings for a raw text string.
64+
::: zone-end
65+
::: zone pivot="programming-language-javascript"
6166

62-
:::code language="typescript" source="~/functions-openai-extension/samples/embeddings/typescript/src/app.ts" range="7-31":::
67+
:::code language="javascript" source="~/functions-openai-extension/samples/embeddings/javascript/src/app.js" range="29-54":::
6368

64-
This example shows how to retrieve embeddings stored at a specified file that is accessible to the function.
69+
::: zone-end
70+
::: zone pivot="programming-language-typescript"
6571

66-
:::code language="typescript" source="~/functions-openai-extension/samples/embeddings/typescript/src/app.ts" range="37-61":::
72+
:::code language="typescript" source="~/functions-openai-extension/samples/embeddings/typescript/src/app.ts" range="33-62":::
6773

6874
::: zone-end
6975
::: zone pivot="programming-language-powershell"

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
16-
<!--- Question: It seems like this binding uses Azure AI Search and not Azure OpenAI. Do we need to rename the article to:
17-
"Azure AI Search semantic output binding" or something like that?-->
16+
1817
# Azure OpenAI embeddings store output binding for Azure Functions
1918

2019
[!INCLUDE [preview-support](../../includes/functions-openai-support-limitations.md)]
@@ -30,29 +29,26 @@ For information on setup and configuration details of the Azure OpenAI extension
3029
::: zone pivot="programming-language-csharp"
3130
This example writes an HTTP input stream to a semantic document store at the provided URL.
3231

33-
:::code language="csharp" source="~/functions-openai-extension/samples/rag-aisearch/csharp-ooproc/FilePrompt.cs" range="29-61":::
32+
:::code language="csharp" source="~/functions-openai-extension/samples/rag-aisearch/csharp-ooproc/FilePrompt.cs" range="29-70":::
3433

3534
::: zone-end
3635
::: zone pivot="programming-language-java"
3736
This example writes an HTTP input stream to a semantic document store at the provided URL.
3837

3938
:::code language="java" source="~/functions-openai-extension/samples/rag-aisearch/java/src/main/java/com/azfs/FilePrompt.java" range="24-68":::
4039

40+
::: zone-end
41+
::: zone pivot="programming-language-javascript,programming-language-typescript"
42+
This example writes an HTTP input stream to a semantic document store at the provided URL.
4143
::: zone-end
4244
::: zone pivot="programming-language-javascript"
43-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
44-
<!---uncomment when code example is available:
45-
{{This comes from the example code comment}}
4645

47-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
46+
:::code language="javascript" source="~/functions-openai-extension/samples/rag-aisearch/javascript/src/app.js" range="5-37":::
4847

49-
{{Add more examples if available}}
50-
-->
5148
::: zone-end
5249
::: zone pivot="programming-language-typescript"
53-
This example writes an HTTP input stream to a semantic document store at the provided URL.
5450

55-
:::code language="typescript" source="~/functions-openai-extension/samples/embeddings/typescript/src/app.ts" range="7-38":::
51+
:::code language="typescript" source="~/functions-openai-extension/samples/rag-aisearch/typescript/src/app.ts" range="4-40":::
5652

5753
::: zone-end
5854
::: zone pivot="programming-language-powershell"

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/08/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616
# Azure OpenAI Semantic Search Input Binding for Azure Functions
@@ -32,31 +32,24 @@ This example shows how to perform a semantic search on a file.
3232

3333
::: zone-end
3434
::: zone pivot="programming-language-java"
35-
36-
This example shows how to perform a semantic search on a file.
37-
35+
This example shows how to perform a semantic search on a file.
3836

3937
:::code language="java" source="~/functions-openai-extension/samples/rag-aisearch/java/src/main/java/com/azfs/FilePrompt.java" range="70-84":::
4038

39+
::: zone-end
40+
::: zone pivot="programming-language-javascript,programming-language-typescript"
41+
This example shows how to perform a semantic search on a file.
4142
::: zone-end
4243
::: zone pivot="programming-language-javascript"
43-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
44-
<!---uncomment when code example is available:
45-
{{This comes from the example code comment}}
4644

47-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
45+
:::code language="javascript" source="~/functions-openai-extension/samples/rag-aisearch/javascript/src/app.js" range="39-57":::
4846

49-
{{Add more examples if available}}
50-
-->
5147
::: zone-end
5248
::: zone pivot="programming-language-typescript"
5349

54-
This example shows how to perform a semantic search on a file.
50+
:::code language="typescript" source="~/functions-openai-extension/samples/rag-aisearch/typescript/src/app.ts" range="42-60":::
5551

56-
:::code language="typescript" source="~/functions-openai-extension/samples/embeddings/typescript/src/app.ts" range="40-58":::
57-
58-
59-
::: zone-end
52+
::: zone-end
6053
::: zone pivot="programming-language-powershell"
6154

6255
This example shows how to perform a semantic search on a file.

0 commit comments

Comments
 (0)