Python: Feature/fix context provider lifecycle agentic mode

python/packages/core/agent_framework/_agents.py

@@ -1268,22 +1268,24 @@ async def _prepare_thread_and_messages(
             thread_messages.extend(await thread.message_store.list_messages() or [])
         context: Context | None = None
         if self.context_provider:
-            async with self.context_provider:
-                context = await self.context_provider.invoking(input_messages or [], **kwargs)
-                if context:
-                    if context.messages:
-                        thread_messages.extend(context.messages)
-                    if context.tools:
-                        if chat_options.tools is not None:
-                            chat_options.tools.extend(context.tools)
-                        else:
-                            chat_options.tools = list(context.tools)
-                    if context.instructions:
-                        chat_options.instructions = (
-                            context.instructions
-                            if not chat_options.instructions
-                            else f"{chat_options.instructions}\n{context.instructions}"
-                        )
+            # Note: We don't use 'async with' here because the context provider's lifecycle
+            # should be managed by the user (via async with) or persist across multiple invocations.
+            # Using async with here would close resources (like retrieval clients) after each query.
+            context = await self.context_provider.invoking(input_messages or [], **kwargs)
+            if context:
+                if context.messages:
+                    thread_messages.extend(context.messages)
+                if context.tools:
+                    if chat_options.tools is not None:
+                        chat_options.tools.extend(context.tools)
+                    else:
+                        chat_options.tools = list(context.tools)
+                if context.instructions:
+                    chat_options.instructions = (
+                        context.instructions
+                        if not chat_options.instructions
+                        else f"{chat_options.instructions}\n{context.instructions}"
+                    )
         thread_messages.extend(input_messages or [])
         if (
             thread.service_thread_id

python/samples/getting_started/context_providers/azure_ai_search/README.md

@@ -64,7 +64,7 @@ Run `az login` if using Entra ID authentication.
 ```env
 AZURE_SEARCH_ENDPOINT=https://myservice.search.windows.net
 AZURE_SEARCH_INDEX_NAME=my-index
-AZURE_AI_PROJECT_ENDPOINT=https://myproject.api.azureml.ms
+AZURE_AI_PROJECT_ENDPOINT=https://<resource-name>.services.ai.azure.com/api/projects/<project-name>
 AZURE_AI_MODEL_DEPLOYMENT_NAME=gpt-4o
 # Optional - omit to use Entra ID
 AZURE_SEARCH_API_KEY=your-search-key