More changes

Author: tisnik

tests/unit/app/test_database.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 import tempfile
 import pytest
+from pytest_mock import MockerFixture
 from sqlalchemy.engine.base import Engine
 from sqlalchemy.orm import Session
 
@@ -46,7 +47,7 @@ def base_postgres_config_fixture():
 class TestGetEngine:
     """Test cases for get_engine function."""
 
-    def test_get_engine_when_initialized(self, mocker):
+    def test_get_engine_when_initialized(self, mocker: MockerFixture):
         """Test get_engine returns engine when initialized."""
         mock_engine = mocker.MagicMock(spec=Engine)
         database.engine = mock_engine
@@ -67,7 +68,7 @@ def test_get_engine_when_not_initialized(self):
 class TestGetSession:
     """Test cases for get_session function."""
 
-    def test_get_session_when_initialized(self, mocker):
+    def test_get_session_when_initialized(self, mocker: MockerFixture):
         """Test get_session returns session when initialized."""
         mock_session_local = mocker.MagicMock()
         mock_session = mocker.MagicMock(spec=Session)
@@ -90,7 +91,7 @@ def test_get_session_when_not_initialized(self):
 class TestCreateTables:
     """Test cases for create_tables function."""
 
-    def test_create_tables_success(self, mocker):
+    def test_create_tables_success(self, mocker: MockerFixture):
         """Test create_tables calls Base.metadata.create_all with engine."""
         mock_base = mocker.patch("app.database.Base")
         mock_get_engine = mocker.patch("app.database.get_engine")
@@ -102,7 +103,7 @@ def test_create_tables_success(self, mocker):
         mock_get_engine.assert_called_once()
         mock_base.metadata.create_all.assert_called_once_with(mock_engine)
 
-    def test_create_tables_when_engine_not_initialized(self, mocker):
+    def test_create_tables_when_engine_not_initialized(self, mocker: MockerFixture):
         """Test create_tables raises error when engine not initialized."""
         mock_get_engine = mocker.patch("app.database.get_engine")
         mock_get_engine.side_effect = RuntimeError("Database engine not initialized")
@@ -134,7 +135,7 @@ def test_create_sqlite_engine_directory_not_exists(self):
         ):
             database._create_sqlite_engine(config)
 
-    def test_create_sqlite_engine_creation_failure(self, mocker):
+    def test_create_sqlite_engine_creation_failure(self, mocker: MockerFixture):
         """Test _create_sqlite_engine handles engine creation failure."""
         mock_create_engine = mocker.patch("app.database.create_engine")
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -150,7 +151,7 @@ class TestCreatePostgresEngine:
     """Test cases for _create_postgres_engine function."""
 
     def test_create_postgres_engine_success_default_schema(
-        self, mocker, base_postgres_config
+        self, mocker: MockerFixture, base_postgres_config
     ):
         """Test _create_postgres_engine creates engine successfully with default schema."""
         mock_create_engine = mocker.patch("app.database.create_engine")
@@ -170,7 +171,7 @@ def test_create_postgres_engine_success_default_schema(
         assert expected_url == call_args[0][0]
 
     def test_create_postgres_engine_success_custom_schema(
-        self, mocker, base_postgres_config
+        self, mocker: MockerFixture, base_postgres_config
     ):
         """Test _create_postgres_engine creates engine successfully with custom schema."""
         mock_create_engine = mocker.patch("app.database.create_engine")
@@ -191,7 +192,9 @@ def test_create_postgres_engine_success_custom_schema(
         mock_connection.execute.assert_called_once()
         mock_connection.commit.assert_called_once()
 
-    def test_create_postgres_engine_with_ca_cert(self, mocker, base_postgres_config):
+    def test_create_postgres_engine_with_ca_cert(
+        self, mocker: MockerFixture, base_postgres_config
+    ):
         """Test _create_postgres_engine with CA certificate path."""
         mock_create_engine = mocker.patch("app.database.create_engine")
         mock_engine = mocker.MagicMock(spec=Engine)
@@ -209,7 +212,7 @@ def test_create_postgres_engine_with_ca_cert(self, mocker, base_postgres_config)
             assert call_args[1]["connect_args"]["sslrootcert"] == cert_file.name
 
     def test_create_postgres_engine_creation_failure(
-        self, mocker, base_postgres_config
+        self, mocker: MockerFixture, base_postgres_config
     ):
         """Test _create_postgres_engine handles engine creation failure."""
         mock_create_engine = mocker.patch("app.database.create_engine")
@@ -219,7 +222,7 @@ def test_create_postgres_engine_creation_failure(
             database._create_postgres_engine(base_postgres_config)
 
     def test_create_postgres_engine_schema_creation_failure(
-        self, mocker, base_postgres_config
+        self, mocker: MockerFixture, base_postgres_config
     ):
         """Test _create_postgres_engine handles schema creation failure."""
         mock_create_engine = mocker.patch("app.database.create_engine")
@@ -240,7 +243,12 @@ class TestInitializeDatabase:
     """Test cases for initialize_database function."""
 
     def _setup_common_mocks(
-        self, *, mocker, mock_sessionmaker, mock_logger, enable_debug=False
+        self,
+        *,
+        mocker: MockerFixture,
+        mock_sessionmaker,
+        mock_logger,
+        enable_debug=False,
     ):
         """Setup common mocks for initialize_database tests."""
         mock_engine = mocker.MagicMock(spec=Engine)
@@ -261,7 +269,7 @@ def _verify_common_assertions(
 
     def test_initialize_database_sqlite(
         self,
-        mocker,
+        mocker: MockerFixture,
     ):
         """Test initialize_database with SQLite configuration."""
         # Setup mocks
@@ -295,7 +303,7 @@ def test_initialize_database_sqlite(
 
     def test_initialize_database_postgres(
         self,
-        mocker,
+        mocker: MockerFixture,
         base_postgres_config,
     ):
         """Test initialize_database with PostgreSQL configuration."""

tests/unit/utils/test_endpoints.py

@@ -284,7 +284,7 @@ async def test_get_agent_with_conversation_id(
 
 @pytest.mark.asyncio
 async def test_get_agent_with_conversation_id_and_no_agent_in_llama_stack(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function when conversation_id is provided."""
     mock_client, mock_agent = prepare_agent_mocks
@@ -342,7 +342,7 @@ async def test_get_agent_with_conversation_id_and_no_agent_in_llama_stack(
 
 @pytest.mark.asyncio
 async def test_get_agent_no_conversation_id(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function when conversation_id is None."""
     mock_client, mock_agent = prepare_agent_mocks
@@ -396,7 +396,7 @@ async def test_get_agent_no_conversation_id(
 
 @pytest.mark.asyncio
 async def test_get_agent_empty_shields(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function with empty shields list."""
     mock_client, mock_agent = prepare_agent_mocks
@@ -450,7 +450,7 @@ async def test_get_agent_empty_shields(
 
 @pytest.mark.asyncio
 async def test_get_agent_multiple_mcp_servers(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function with multiple MCP servers."""
     mock_client, mock_agent = prepare_agent_mocks
@@ -506,7 +506,7 @@ async def test_get_agent_multiple_mcp_servers(
 
 @pytest.mark.asyncio
 async def test_get_agent_session_persistence_enabled(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function ensures session persistence is enabled."""
     mock_client, mock_agent = prepare_agent_mocks
@@ -555,7 +555,7 @@ async def test_get_agent_session_persistence_enabled(
 
 @pytest.mark.asyncio
 async def test_get_agent_no_tools_no_parser(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function sets tool_parser=None when no_tools=True."""
     mock_client, mock_agent = prepare_agent_mocks
@@ -610,7 +610,7 @@ async def test_get_agent_no_tools_no_parser(
 
 @pytest.mark.asyncio
 async def test_get_agent_no_tools_false_preserves_parser(
-    setup_configuration, prepare_agent_mocks, mocker
+    setup_configuration, prepare_agent_mocks, mocker: MockerFixture
 ):
     """Test get_agent function preserves tool_parser when no_tools=False."""
     mock_client, mock_agent = prepare_agent_mocks