Skip to content

Commit 456256b

Browse files
authored
Merge pull request #1233 from MicrosoftDocs/main
11/4 11:00 AM IST Publish
2 parents 8de853c + 7208a9e commit 456256b

File tree

5 files changed

+36
-22
lines changed

5 files changed

+36
-22
lines changed

articles/ai-studio/how-to/develop/llama-index.md

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ To run this tutorial, you need:
4545
```bash
4646
pip install -U llama-index-llms-azure-inference
4747
pip install -U llama-index-embeddings-azure-inference
48-
```
48+
```
49+
50+
> [!IMPORTANT]
51+
> Using the [Azure AI model inference service](https://aka.ms/aiservices/inference) requires version `0.2.4` for `llama-index-llms-azure-inference` or `llama-index-embeddings-azure-inference`.
4952

5053
## Configure the environment
5154

@@ -67,7 +70,7 @@ export AZURE_INFERENCE_ENDPOINT="<your-model-endpoint-goes-here>"
6770
export AZURE_INFERENCE_CREDENTIAL="<your-key-goes-here>"
6871
```
6972
70-
Once configured, create a client to connect to the endpoint. The parameter `model_name` in the constructor is not required for endpoints serving a single model, like serverless endpoints.
73+
Once configured, create a client to connect to the endpoint.
7174
7275
```python
7376
import os
@@ -80,7 +83,20 @@ llm = AzureAICompletionsModel(
8083
```
8184
8285
> [!TIP]
83-
> If your model is an OpenAI model deployed to Azure OpenAI service or AI services resource, configure the client as indicated at [Azure OpenAI models](#azure-openai-models).
86+
> If your model is an OpenAI model deployed to Azure OpenAI service or AI services resource, configure the client as indicated at [Azure OpenAI models and Azure AI model inference service](#azure-openai-models-and-azure-ai-model-infernece-service).
87+
88+
If your endpoint is serving more than one model, like with the [Azure AI model inference service](../../ai-services/model-inference.md) or [GitHub Models](https://github.com/marketplace/models), you have to indicate `model_name` parameter:
89+
90+
```python
91+
import os
92+
from llama_index.llms.azure_inference import AzureAICompletionsModel
93+
94+
llm = AzureAICompletionsModel(
95+
endpoint=os.environ["AZURE_INFERENCE_ENDPOINT"],
96+
credential=os.environ["AZURE_INFERENCE_CREDENTIAL"],
97+
model_name="mistral-large-2407",
98+
)
99+
```
84100
85101
Alternatively, if your endpoint support Microsoft Entra ID, you can use the following code to create the client:
86102
@@ -112,22 +128,23 @@ llm = AzureAICompletionsModel(
112128
)
113129
```
114130

115-
### Azure OpenAI models
131+
### Azure OpenAI models and Azure AI model infernece service
116132

117-
If you are using Azure OpenAI models with key-based authentication, you need to pass the authentication key in the header `api-key`, which is the one expected in the Azure OpenAI service and in Azure AI Services. This configuration is not required if you are using Microsoft Entra ID (formerly known as Azure AD). The following example shows how to configure the client:
133+
If you are using Azure OpenAI models or [Azure AI model inference service](../../ai-services/model-inference.md), ensure you have at least version `0.2.4` of the LlamaIndex integration. Use `api_version` parameter in case you need to select a specific `api_version`. For the [Azure AI model inference service](../../ai-services/model-inference.md), you need to pass `model_name` parameter:
118134

119135
```python
120-
import os
121136
from llama_index.llms.azure_inference import AzureAICompletionsModel
122137
123138
llm = AzureAICompletionsModel(
124139
endpoint=os.environ["AZURE_INFERENCE_ENDPOINT"],
125-
credential="",
126-
client_kwargs={"headers" : { "api-key": os.environ["AZURE_INFERENCE_CREDENTIAL"] } }
140+
credential=os.environ["AZURE_INFERENCE_CREDENTIAL"],
141+
model_name="gpt-4o",
142+
api_version="2024-05-01-preview",
127143
)
128144
```
129145

130-
Notice that `credentials` is still being passed with an empty value since it's a required parameter.
146+
> [!TIP]
147+
> Using a wrong `api_version` or one not supported by the model results in a `ResourceNotFound` exception.
131148

132149
### Inference parameters
133150

articles/machine-learning/concept-customer-managed-keys.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,17 @@ Data that previously was stored in Azure Cosmos DB in your subscription, is stor
124124

125125
Pipelines metadata that previously was stored in a storage account in a managed resource group, is now stored on the storage account in your subscription that is associated to the Azure Machine Learning workspace. Since this Azure Storage resource is managed separately in your subscription, you're responsible to configure encryption settings on it.
126126

127-
To opt in for this preview, set the `enableServiceSideCMKEncryption` on a REST API or in your Bicep or Resource Manager template. You can also use Azure portal. Preview availability varies by [workspace kind](concept-workspace.md):
128-
129-
| Kind | Supported |
130-
| ----- | ----- |
131-
| Default | Yes |
132-
| Hub | No |
133-
| Project | No |
127+
To opt in for this preview, set the `enableServiceSideCMKEncryption` on a REST API or in your Bicep or Resource Manager template. You can also use Azure portal.
134128

135129
:::image type="content" source="./media/concept-customer-managed-keys/cmk-service-side-encryption.png" alt-text="Screenshot of the encryption tab with the option for server side encryption selected." lightbox="./media/concept-customer-managed-keys/cmk-service-side-encryption.png":::
136130

137131
> [!NOTE]
138132
> During this preview key rotation and data labeling capabilities are not supported. Server-side encryption is currently not supported in reference to an Azure Key Vault for storing your encryption key that has public network access disabled.
139133
140-
For a template that creates a workspace with service-side encryption of metadata, see [https://github.com/azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.machinelearningservices/machine-learning-workspace-cmk-service-side-encryption](https://github.com/azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.machinelearningservices/machine-learning-workspace-cmk-service-side-encryption).
134+
For templates that create a workspace with service-side encryption of metadata, see
135+
136+
- [Bicep template for creating default workspace](https://github.com/azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.machinelearningservices/machine-learning-workspace-cmk-service-side-encryption).
137+
- [Bicep template for creating hub workspace](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.machinelearningservices/aistudio-cmk-service-side-encryption).
141138

142139
## hbi_workspace flag
143140

articles/search/includes/quickstarts/java.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.service: azure-ai-search
55
ms.custom:
66
- ignite-2023
77
ms.topic: include
8-
ms.date: 10/07/2024
8+
ms.date: 11/01/2024
99
---
1010

1111
Build a Java console application using the [Azure.Search.Documents](/java/api/overview/azure/search) library to create, load, and query a search index.
@@ -65,12 +65,12 @@ Use the following tools to create this quickstart.
6565
<dependency>
6666
<groupId>com.azure</groupId>
6767
<artifactId>azure-search-documents</artifactId>
68-
<version>11.5.2</version>
68+
<version>11.7.3</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>com.azure</groupId>
7272
<artifactId>azure-core</artifactId>
73-
<version>1.34.0</version>
73+
<version>1.53.0</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>junit</groupId>

articles/search/search-get-started-text.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom:
1414
- devx-track-python
1515
- ignite-2023
1616
ms.topic: quickstart
17-
ms.date: 10/07/2024
17+
ms.date: 11/01/2024
1818
---
1919

2020
# Quickstart: Full text search using the Azure SDKs

articles/search/search-synonyms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ If the synonym map exists on the search service, it's used on the next query, wi
155155
Use the [Create or Update Index (REST API)](/rest/api/searchservice/indexes/create-or-update) to modify a field definition.
156156

157157
```http
158-
POST /indexes?api-version=2024-07-01
158+
PUT /indexes?api-version=2024-07-01
159159
{
160160
"name":"hotels-sample-index",
161161
"fields":[

0 commit comments

Comments
 (0)