LCORE-3316: Switch to flat OGX client APIs

src/app/endpoints/vector_stores.py

@@ -596,7 +596,7 @@ async def add_file_to_vector_store(  # pylint: disable=too-many-locals,too-many-
 
         for attempt in range(max_retries):
             try:
-                vs_file = await client.vector_stores.files.create(
+                vs_file = await client.vector_stores_files.create(
                     vector_store_id=vector_store_id,
                     **body.model_dump(exclude_none=True),
                 )
@@ -704,7 +704,7 @@ async def list_vector_store_files(
 
     try:
         client = AsyncOgxClientHolder().get_client()
-        files = await client.vector_stores.files.list(vector_store_id=vector_store_id)
+        files = await client.vector_stores_files.list(vector_store_id=vector_store_id)
 
         data = [
             VectorStoreFileResponse(
@@ -775,7 +775,7 @@ async def get_vector_store_file(
 
     try:
         client = AsyncOgxClientHolder().get_client()
-        vs_file = await client.vector_stores.files.retrieve(
+        vs_file = await client.vector_stores_files.retrieve(
             vector_store_id=vector_store_id,
             file_id=file_id,
         )
@@ -842,7 +842,7 @@ async def delete_vector_store_file(
 
     try:
         client = AsyncOgxClientHolder().get_client()
-        await client.vector_stores.files.delete(
+        await client.vector_stores_files.delete(
             vector_store_id=vector_store_id,
             file_id=file_id,
         )

src/utils/conversation_compaction.py

@@ -276,7 +276,7 @@ async def _write_summary_marker(
     summary_text: str,
 ) -> None:
     """Write the summary into the conversation as a recognizable marker message."""
-    await client.conversations.items.create(
+    await client.items.create(
         conversation_id,
         add_items_request=build_add_items_request(
             [

src/utils/conversations.py

@@ -547,7 +547,7 @@ async def append_turn_items_to_conversation(
 
     items.extend(item.model_dump(exclude_none=True) for item in llm_output)
     try:
-        await client.conversations.items.create(
+        await client.items.create(
             conversation_id,
             add_items_request=build_add_items_request(items),
         )
@@ -580,7 +580,7 @@ async def get_all_conversation_items(
     has_more = True
     try:
         while has_more:
-            page = await client.conversations.items.list(
+            page = await client.items.list(
                 conversation_id=conversation_id_llama_stack,
                 order="asc",
                 after=after,
@@ -620,7 +620,7 @@ async def append_turn_to_conversation(
         assistant_message: The shield violation response message.
     """
     try:
-        await client.conversations.items.create(
+        await client.items.create(
             conversation_id,
             add_items_request=build_add_items_request(
                 [

tests/integration/endpoints/test_conversations_v1_integration.py

@@ -268,7 +268,7 @@ async def test_conversation_validation_errors(
             "endpoint": "get",
             "error_type": "connection",
             "expected_status": 503,
-            "mock_path": "conversations.items.list",
+            "mock_path": "items.list",
         },
         id="get_handles_connection_error",
     ),
@@ -277,7 +277,7 @@ async def test_conversation_validation_errors(
             "endpoint": "get",
             "error_type": "api_status",
             "expected_status": 500,
-            "mock_path": "conversations.items.list",
+            "mock_path": "items.list",
         },
         id="get_handles_api_status_error",
     ),
@@ -454,7 +454,7 @@ async def test_get_conversation_returns_chat_history(
     mock_items = mocker.Mock()
     mock_items.data = [mock_user_message, mock_assistant_message]
     mock_items.has_more = False
-    mock_ogx_client.conversations.items.list = mocker.AsyncMock(return_value=mock_items)
+    mock_ogx_client.items.list = mocker.AsyncMock(return_value=mock_items)
 
     response = await get_conversation_endpoint_handler(
         request=non_admin_test_request,
@@ -544,7 +544,7 @@ async def test_get_conversation_with_turns_metadata(
     mock_items = mocker.Mock()
     mock_items.data = [mock_user_message, mock_assistant_message]
     mock_items.has_more = False
-    mock_ogx_client.conversations.items.list = mocker.AsyncMock(return_value=mock_items)
+    mock_ogx_client.items.list = mocker.AsyncMock(return_value=mock_items)
 
     response = await get_conversation_endpoint_handler(
         request=non_admin_test_request,

tests/integration/endpoints/test_streaming_query_byok_integration.py

@@ -55,12 +55,12 @@ def _build_base_streaming_mock_client(mocker: MockerFixture) -> Any:
     """Build a base mock Llama Stack client configured for streaming responses.
 
     Extends the base query mock client with streaming-specific stubs:
-    conversations.items.create and a non-streaming responses.create stub for
+    items.create and a non-streaming responses.create stub for
     topic summary generation. Agent inference is mocked separately via
     ``mock_streaming_query_agent``.
     """
     mock_client = _build_base_mock_client(mocker)
-    mock_client.conversations.items.create = mocker.AsyncMock()
+    mock_client.items.create = mocker.AsyncMock()
 
     async def _responses_create(**_kwargs: Any) -> Any:
         mock_resp = mocker.MagicMock()

tests/integration/endpoints/test_streaming_query_integration.py

@@ -49,7 +49,7 @@ def mock_llama_stack_streaming_fixture(
 
     mock_client.shields.list.return_value = []
 
-    mock_client.conversations.items.create = mocker.AsyncMock()
+    mock_client.items.create = mocker.AsyncMock()
 
     mock_vector_io_response = mocker.MagicMock()
     mock_vector_io_response.chunks = []

tests/unit/app/endpoints/test_conversations.py

@@ -529,7 +529,7 @@ async def test_llama_stack_connection_error(
         mock_database_session(mocker, query_result=[mock_conversation], db_turns=[])
 
         mock_client = mocker.AsyncMock()
-        mock_client.conversations.items.list.side_effect = APIConnectionError(
+        mock_client.items.list.side_effect = APIConnectionError(
             request=None  # type: ignore[arg-type]
         )
         mock_client_holder = mocker.patch(
@@ -578,7 +578,7 @@ async def test_llama_stack_not_found_error(
         mock_database_session(mocker, db_turns=[])
 
         mock_client = mocker.AsyncMock()
-        mock_client.conversations.items.list.side_effect = NotFoundError(
+        mock_client.items.list.side_effect = NotFoundError(
             message="Conversation not found",
             response=mocker.Mock(request=None),
             body=None,
@@ -686,7 +686,7 @@ async def test_get_others_conversations_allowed_for_authorized_user(
         mock_item2.content = "Hi there!"
         mock_items_response.data = [mock_item1, mock_item2]
         mock_items_response.has_more = False
-        mock_client.conversations.items.list = mocker.AsyncMock(
+        mock_client.items.list = mocker.AsyncMock(
             return_value=mock_items_response
         )
 
@@ -742,7 +742,7 @@ async def test_successful_conversation_retrieval(
             ),
         ]
         mock_items.has_more = False
-        mock_client.conversations.items.list = mocker.AsyncMock(return_value=mock_items)
+        mock_client.items.list = mocker.AsyncMock(return_value=mock_items)
 
         mock_client_holder = mocker.patch(
             "app.endpoints.conversations_v1.AsyncOgxClientHolder"
@@ -818,7 +818,7 @@ async def test_no_items_found_in_get_conversation(
         mock_items_response = mocker.Mock()
         mock_items_response.data = []
         mock_items_response.has_more = False
-        mock_client.conversations.items.list = mocker.AsyncMock(
+        mock_client.items.list = mocker.AsyncMock(
             return_value=mock_items_response
         )
         mock_client_holder = mocker.patch(
@@ -864,7 +864,7 @@ async def test_api_status_error_in_get_conversation(
         mock_database_session(mocker, db_turns=[])
 
         mock_client = mocker.AsyncMock()
-        mock_client.conversations.items.list.side_effect = APIStatusError(
+        mock_client.items.list.side_effect = APIStatusError(
             message="Conversation not found",
             response=mocker.Mock(status_code=404, request=None),
             body=None,
@@ -969,7 +969,7 @@ def query_side_effect(model_class: type[Any]) -> Any:
             mocker.Mock(type="message", role="assistant", content="Hi!"),
         ]
         mock_items_response.has_more = False
-        mock_client.conversations.items.list.return_value = mock_items_response
+        mock_client.items.list.return_value = mock_items_response
         mock_client_holder = mocker.patch(
             "app.endpoints.conversations_v1.AsyncOgxClientHolder"
         )

tests/unit/app/endpoints/test_responses.py

@@ -757,7 +757,7 @@ async def test_handle_non_streaming_blocked_returns_refusal(
         mock_moderation.refusal_response = mock_refusal
 
         _patch_handle_non_streaming_common(mocker, minimal_config)
-        mock_client.conversations.items.create = mocker.AsyncMock()
+        mock_client.items.create = mocker.AsyncMock()
         mock_api_response = mocker.Mock()
         mock_api_response.output = [mock_refusal]
         mock_api_response.model_dump.return_value = {
@@ -1170,7 +1170,7 @@ async def test_handle_streaming_blocked_returns_sse_consumes_shield_generator(
         )
         mocker.patch(f"{MODULE}.store_query_results")
 
-        mock_client.conversations.items.create = mocker.AsyncMock()
+        mock_client.items.create = mocker.AsyncMock()
         api_params, context = build_api_params_and_context(
             updated_request=request,
             client=mock_client,

tests/unit/app/endpoints/test_responses_splunk.py

@@ -242,7 +242,7 @@ async def test_non_streaming_shield_blocked(
         mock_moderation.refusal_response = mock_refusal
 
         _patch_handle_non_streaming_common(mocker, minimal_config)
-        mock_client.conversations.items.create = mocker.AsyncMock()
+        mock_client.items.create = mocker.AsyncMock()
         mock_api_response = mocker.Mock()
         mock_api_response.output = [mock_refusal]
         mock_api_response.model_dump.return_value = {
@@ -489,7 +489,7 @@ async def test_streaming_shield_blocked(
             new=mocker.AsyncMock(return_value=None),
         )
         mocker.patch(f"{MODULE}.store_query_results")
-        mock_client.conversations.items.create = mocker.AsyncMock()
+        mock_client.items.create = mocker.AsyncMock()
 
         mock_queue = mocker.patch(f"{TELEMETRY_MODULE}.queue_responses_splunk_event")
 
@@ -713,7 +713,7 @@ async def test_splunk_disabled_no_background_tasks(
         mock_moderation.refusal_response = mock_refusal
 
         _patch_handle_non_streaming_common(mocker, minimal_config)
-        mock_client.conversations.items.create = mocker.AsyncMock()
+        mock_client.items.create = mocker.AsyncMock()
         mock_api_response = mocker.Mock()
         mock_api_response.output = [mock_refusal]
         mock_api_response.model_dump.return_value = {