fix tests/lint/mypy (5 failures remain)

Author: maorfr

src/app/endpoints/query.py

@@ -8,8 +8,6 @@
 from pathlib import Path
 from typing import Any
 
-from cachetools import TTLCache  # type: ignore
-
 from llama_stack_client.lib.agents.agent import Agent
 from llama_stack_client import APIConnectionError
 from llama_stack_client import LlamaStackClient  # type: ignore
@@ -83,7 +81,9 @@ def get_agent(  # pylint: disable=too-many-arguments,too-many-positional-argumen
     existing_agent_id = None
     if conversation_id:
         with suppress(ValueError):
-            existing_agent_id = client.agents.retrieve(agent_id=conversation_id).agent_id
+            existing_agent_id = client.agents.retrieve(
+                agent_id=conversation_id
+            ).agent_id
 
     logger.debug("Creating new agent")
     # TODO(lucasagomes): move to ReActAgent
@@ -101,7 +101,7 @@ def get_agent(  # pylint: disable=too-many-arguments,too-many-positional-argumen
         agent.agent_id = conversation_id
         client.agents.delete(agent_id=orphan_agent_id)
         sessions_response = client.agents.session.list(agent_id=conversation_id)
-        logger.info(f"session response: {sessions_response}")
+        logger.info("session response: %s", sessions_response)
         session_id = str(sessions_response.data[0]["session_id"])
     else:
         conversation_id = agent.agent_id

src/app/endpoints/streaming_query.py

@@ -7,8 +7,6 @@
 import logging
 from typing import Any, AsyncIterator, Iterator
 
-from cachetools import TTLCache  # type: ignore
-
 from llama_stack_client import APIConnectionError
 from llama_stack_client.lib.agents.agent import AsyncAgent  # type: ignore
 from llama_stack_client import AsyncLlamaStackClient  # type: ignore
@@ -77,10 +75,10 @@ async def get_agent(
 
     if existing_agent_id and conversation_id:
         orphan_agent_id = agent.agent_id
-        agent._agent_id = conversation_id
+        agent._agent_id = conversation_id  # type: ignore[assignment]  # pylint: disable=protected-access
         await client.agents.delete(agent_id=orphan_agent_id)
         sessions_response = await client.agents.session.list(agent_id=conversation_id)
-        logger.info(f"session response: {sessions_response}")
+        logger.info("session response: %s", sessions_response)
         session_id = str(sessions_response.data[0]["session_id"])
     else:
         conversation_id = agent.agent_id

tests/unit/app/endpoints/test_conversations.py

@@ -116,17 +116,12 @@ class TestSimplifySessionData:
     """Test cases for the simplify_session_data function."""
 
     def test_simplify_session_data_with_model_dump(
-        self, mock_session_data, expected_chat_history, mocker
+        self, mock_session_data, expected_chat_history
     ):
-        """Test simplify_session_data with session data that has model_dump method."""
-        # Create a mock object with model_dump method
-        mock_session_obj = mocker.Mock()
-        mock_session_obj.model_dump.return_value = mock_session_data
-
-        result = simplify_session_data(mock_session_obj)
+        """Test simplify_session_data with session data."""
+        result = simplify_session_data(mock_session_data)
 
         assert result == expected_chat_history
-        mock_session_obj.model_dump.assert_called_once()
 
     def test_simplify_session_data_empty_turns(self, mocker):
         """Test simplify_session_data with empty turns."""
@@ -136,10 +131,7 @@ def test_simplify_session_data_empty_turns(self, mocker):
             "turns": [],
         }
 
-        mock_session_obj = mocker.Mock()
-        mock_session_obj.model_dump.return_value = session_data
-
-        result = simplify_session_data(mock_session_obj)
+        result = simplify_session_data(session_data)
 
         assert not result
 
@@ -172,9 +164,8 @@ def test_simplify_session_data_filters_unwanted_fields(self, mocker):
         }
 
         mock_session_obj = mocker.Mock()
-        mock_session_obj.model_dump.return_value = session_data
 
-        result = simplify_session_data(mock_session_obj)
+        result = simplify_session_data(session_data)
 
         expected = [
             {
@@ -455,5 +446,5 @@ def test_successful_conversation_deletion(self, mocker, setup_configuration):
         assert response.success is True
         assert response.response == "Conversation deleted successfully"
         mock_client.agents.session.delete.assert_called_once_with(
-            agent_id=VALID_AGENT_ID, session_id=VALID_CONVERSATION_ID
+            agent_id=VALID_CONVERSATION_ID, session_id=VALID_CONVERSATION_ID
         )