Skip to content

Commit bf81ea3

Browse files
authored
Merge pull request #283117 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents ddd2acd + b3796f8 commit bf81ea3

File tree

402 files changed

+533
-618
lines changed

Some content is hidden

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

402 files changed

+533
-618
lines changed

articles/ai-services/openai/how-to/file-search.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@ recommendations: false
1616

1717
File Search augments the Assistant with knowledge from outside its model, such as proprietary product information or documents provided by your users. OpenAI automatically parses and chunks your documents, creates and stores the embeddings, and use both vector and keyword search to retrieve relevant content to answer user queries.
1818

19-
<!--
2019
> [!IMPORTANT]
21-
> * File search has [additional charges](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) beyond the token based fees for Azure OpenAI usage. For example, if your Assistant calls file search simultaneously in two different threads, two file search sessions are created.
22-
-->
20+
> * File search has [additional charges](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) beyond the token based fees for Azure OpenAI usage.
2321
24-
> [!NOTE]
25-
> File search is currently not billed.
2622

2723
[!INCLUDE [Assistants v2 note](../includes/assistants-v2-note.md)]
2824

@@ -149,7 +145,7 @@ assistant = client.beta.assistants.update(
149145

150146
## Create a thread
151147

152-
You can also attach files as Message attachments on your thread. Doing so will create another `vector_store` associated with the thread, or, if there is already a vector store attached to this thread, attach the new files to the existing thread vector store. When you create a Run on this thread, the file search tool will query both the `vector_store` from your assistant and the `vector_store` on the thread.
148+
You can also attach files as Message attachments on your thread. Doing so will create another `vector_store` associated with the thread, or, if there's already a vector store attached to this thread, attach the new files to the existing thread vector store. When you create a Run on this thread, the file search tool will query both the `vector_store` from your assistant and the `vector_store` on the thread.
153149

154150
```python
155151
# Upload the user provided file to OpenAI
@@ -243,7 +239,7 @@ The file search tool implements several retrieval best practices out of the box
243239

244240
## Vector stores
245241

246-
Vector store objects give the file search tool the ability to search your files. Adding a file to a vector store automatically parses, chunks, embeds and stores the file in a vector database that's capable of both keyword and semantic search. Each vector store can hold up to 10,000 files. Vector stores can be attached to both Assistants and Threads. Currently you can attach at most one vector store to an assistant and at most one vector store to a thread.
242+
Vector store objects give the file search tool the ability to search your files. Adding a file to a vector store automatically parses, chunks, embeds, and stores the file in a vector database that's capable of both keyword and semantic search. Each vector store can hold up to 10,000 files. Vector stores can be attached to both Assistants and Threads. Currently you can attach at most one vector store to an assistant and at most one vector store to a thread.
247243

248244
### Creating vector stores and adding files
249245

@@ -313,9 +309,9 @@ You can also attach a vector store to Threads or Assistants after they're create
313309

314310
## Ensuring vector store readiness before creating runs
315311

316-
We highly recommend that you ensure all files in a vector_store are fully processed before you create a run. This will ensure that all the data in your vector store is searchable. You can check for vector store readiness by using the polling helpers in the SDKs, or by manually polling the `vector_store` object to ensure the status is completed.
312+
We highly recommend that you ensure all files in a vector_store are fully processed before you create a run. This ensures that all the data in your vector store is searchable. You can check for vector store readiness by using the polling helpers in the SDKs, or by manually polling the `vector_store` object to ensure the status is completed.
317313

318-
As a fallback, there is a 60-second maximum wait in the Run object when the thread's vector store contains files that are still being processed. This is to ensure that any files your users upload in a thread a fully searchable before the run proceeds. This fallback wait does not apply to the assistant's vector store.
314+
As a fallback, there's a 60-second maximum wait in the run object when the thread's vector store contains files that are still being processed. This is to ensure that any files your users upload in a thread a fully searchable before the run proceeds. This fallback wait does not apply to the assistant's vector store.
319315

320316
## Managing costs with expiration policies
321317

articles/ai-services/openai/includes/model-matrix/provisioned-models.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
88
ms.custom: references_regions
9-
ms.date: 07/12/2024
9+
ms.date: 08/01/2024
1010
---
1111

1212
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
@@ -24,12 +24,12 @@ ms.date: 07/12/2024
2424
| northcentralus |||||||||
2525
| norwayeast || - || - | - || - | - |
2626
| polandcentral |||| - | - ||||
27-
| southafricanorth ||| - | - | - ||| - |
27+
| southafricanorth ||| - | | - ||| - |
2828
| southcentralus |||||||||
2929
| southindia |||| - |||||
3030
| swedencentral |||||||||
3131
| switzerlandnorth |||||||||
3232
| switzerlandwest | - | - | - | - | - | - | - ||
33-
| uksouth ||||| - ||||
33+
| uksouth ||||| ||||
3434
| westus |||||||||
3535
| westus3 |||||||||

0 commit comments

Comments
 (0)