test: Improve cross-platform file handling in existing tests and add new tests for selector and grid logger utilities.

Author: NikkeTryHard

tests/api_utils/routers/test_static.py

@@ -48,7 +48,6 @@ def test_read_index_not_found(client):
     测试场景: index.html 不存在
     预期: 返回 404 错误 (lines 18-20)
     """
-    MagicMock()
 
     with patch("api_utils.routers.static.os.path.exists", return_value=False):
         response = client.get("/")
@@ -74,7 +73,6 @@ def test_get_css_not_found(client):
     测试场景: webui.css 不存在
     预期: 返回 404 错误 (lines 26-28)
     """
-    MagicMock()
 
     with patch("api_utils.routers.static.os.path.exists", return_value=False):
         response = client.get("/css")
@@ -100,7 +98,6 @@ def test_get_js_not_found(client):
     测试场景: webui.js 不存在
     预期: 返回 404 错误 (lines 34-36)
     """
-    MagicMock()
 
     with patch("api_utils.routers.static.os.path.exists", return_value=False):
         response = client.get("/js")

tests/api_utils/test_utils.py

@@ -31,6 +31,7 @@ def mock_logger():
 
 @pytest.fixture
 def mock_file_utils():
+    """Fixture providing mocked file utility functions for cross-platform testing."""
     with (
         patch("api_utils.utils.extract_data_url_to_local") as mock_extract,
         patch("api_utils.utils.save_blob_to_local") as mock_save,
@@ -438,28 +439,39 @@ def test_prepare_combined_prompt_input_video_processing(mock_file_utils, mock_lo
     mock_save.assert_called()
 
 
-def test_prepare_combined_prompt_complex_nested_dict(mock_file_utils, mock_logger):
-    """Test nested dictionary content with specific attachment keys."""
+def test_prepare_combined_prompt_complex_nested_dict(
+    mock_file_utils, mock_logger, tmp_path
+):
+    """Test nested dictionary content with specific attachment keys.
+
+    Uses platform-appropriate paths via tmp_path fixture for cross-platform compatibility.
+    """
     mock_extract, _, mock_exists = mock_file_utils
     mock_exists.return_value = True
 
+    # Create actual temp files for cross-platform path handling
+    img_file = tmp_path / "img1.png"
+    doc_file = tmp_path / "doc1.pdf"
+    img_file.touch()
+    doc_file.touch()
+
     content = {
         "text": "Look at these files",
-        "images": [{"url": "file:///c:/img1.png"}],
-        "files": [{"path": "c:/doc1.pdf"}],  # absolute path
+        "images": [{"url": f"file://{img_file}"}],  # Platform-appropriate file URL
+        "files": [{"path": str(doc_file)}],  # Platform-appropriate absolute path
         "media": [{"url": "data:video..."}],  # data url
     }
 
-    mock_extract.return_value = "/tmp/media.mp4"
+    mock_extract.return_value = str(tmp_path / "media.mp4")
 
     messages = [Message.model_construct(role="user", content=content)]
 
     prompt, files = prepare_combined_prompt(messages, "req1")
 
     assert "Look at these files" in prompt
-    assert "/tmp/media.mp4" in files
+    assert str(tmp_path / "media.mp4") in files
     assert any(f.endswith("img1.png") for f in files)
-    assert "c:/doc1.pdf" in files or "/c:/doc1.pdf" in files or "c:\\doc1.pdf" in files
+    assert any(f.endswith("doc1.pdf") for f in files)
 
 
 @pytest.mark.asyncio
@@ -860,13 +872,38 @@ def test_prepare_combined_prompt_non_existent_local_file(mock_file_utils, mock_l
     assert len(files) == 0
 
 
-def test_collect_and_validate_attachments_detailed(mock_file_utils, mock_logger):
-    """Test detailed attachment collection logic including top-level and various message keys."""
+def test_collect_and_validate_attachments_detailed(
+    mock_file_utils, mock_logger, tmp_path
+):
+    """Test detailed attachment collection logic including top-level and various message keys.
+
+    Uses tmp_path for platform-compatible paths.
+    """
     mock_extract, _, mock_exists = mock_file_utils
 
-    # Mock file existence
+    # Create actual temp files for cross-platform path handling
+    valid_initial = tmp_path / "valid_initial.png"
+    valid_top_level = tmp_path / "valid_top_level.png"
+    valid_file_url = tmp_path / "valid_file_url.txt"
+    valid_image = tmp_path / "valid_image.png"
+    valid_file = tmp_path / "valid_file.pdf"
+    valid_media = tmp_path / "valid_media.mp4"
+    missing_initial = tmp_path / "missing_initial.png"
+    missing = tmp_path / "missing.png"
+
+    # Create "valid" files, leave "missing" files uncreated
+    valid_initial.touch()
+    valid_top_level.touch()
+    valid_file_url.touch()
+    valid_image.touch()
+    valid_file.touch()
+    valid_media.touch()
+
+    # Mock file existence based on actual file existence
     def side_effect(path):
-        return "existing" in path or "valid" in path
+        from pathlib import Path
+
+        return Path(path).exists()
 
     mock_exists.side_effect = side_effect
 
@@ -875,10 +912,10 @@ def side_effect(path):
     # Mock request object with various attachment fields
     class MockRequest:
         attachments = [
-            "c:/tmp/valid_top_level.png",
-            "c:/tmp/missing.png",
+            str(valid_top_level),
+            str(missing),
             {"url": "data:image/png;base64,data1"},
-            {"url": "file:///c:/valid_file_url.txt"},
+            {"url": f"file://{valid_file_url}"},
             "",  # Empty string
             None,  # None
             {"url": ""},  # Empty URL in dict
@@ -887,31 +924,31 @@ class MockRequest:
             Message.model_construct(
                 role="user",
                 content="msg1",
-                images=["c:/tmp/valid_image.png"],
-                files=[{"path": "c:/tmp/valid_file.pdf"}],
-                media=["file:///c:/valid_media.mp4"],
+                images=[str(valid_image)],
+                files=[{"path": str(valid_file)}],
+                media=[f"file://{valid_media}"],
             )
         ]
 
     req = MockRequest()
-    initial_list = ["c:/tmp/valid_initial.png", "c:/tmp/missing_initial.png"]
+    initial_list = [str(valid_initial), str(missing_initial)]
 
     result = collect_and_validate_attachments(req, "req1", initial_list)
 
     # Check initial list filtering
-    assert "c:/tmp/valid_initial.png" in result
-    assert "c:/tmp/missing_initial.png" not in result
+    assert str(valid_initial) in result
+    assert str(missing_initial) not in result
 
     # Check top-level attachments
-    assert "c:/tmp/valid_top_level.png" in result
-    assert "c:/tmp/missing.png" not in result
+    assert str(valid_top_level) in result
+    assert str(missing) not in result
     # data: URL -> extracted (mock extract returns /tmp/...)
     assert mock_extract.called
 
     # Check message-level attachments
-    assert "c:/tmp/valid_image.png" in result
-    assert "c:/tmp/valid_file.pdf" in result
-    # file:///c:/valid_media.mp4 -> unquoted path
+    assert str(valid_image) in result
+    assert str(valid_file) in result
+    # file:// -> unquoted path
     assert any("valid_media.mp4" in f for f in result)
 
 
@@ -1034,15 +1071,24 @@ def test_prepare_combined_prompt_dict_image_url_with_detail(
     assert "[图像细节: detail=auto]" in prompt
 
 
-def test_prepare_combined_prompt_audio_absolute_path(mock_file_utils, mock_logger):
-    """Test audio with absolute path (lines 427-431)."""
+def test_prepare_combined_prompt_audio_absolute_path(
+    mock_file_utils, mock_logger, tmp_path
+):
+    """Test audio with absolute path (lines 427-431).
+
+    Uses tmp_path for platform-compatible paths.
+    """
     _, _, mock_exists = mock_file_utils
     mock_exists.return_value = True
 
+    # Create actual temp file for cross-platform path handling
+    audio_file = tmp_path / "test.mp3"
+    audio_file.touch()
+
     # Absolute path for audio
     content_item = {
         "type": "input_audio",
-        "input_audio": {"url": "c:/audio/test.mp3"},
+        "input_audio": {"url": str(audio_file)},
     }
 
     messages = [
@@ -1051,7 +1097,7 @@ def test_prepare_combined_prompt_audio_absolute_path(mock_file_utils, mock_logge
 
     prompt, files = prepare_combined_prompt(messages, "req1")
 
-    assert "c:/audio/test.mp3" in files
+    assert str(audio_file) in files
 
 
 def test_prepare_combined_prompt_video_absolute_path(mock_file_utils, mock_logger):
@@ -1185,36 +1231,47 @@ def __iter__(self):
 
 
 def test_collect_and_validate_attachments_empty_url_handling(
-    mock_file_utils, mock_logger
+    mock_file_utils, mock_logger, tmp_path
 ):
-    """Test attachment collection with empty URL strings (lines 802, 831, 834)."""
+    """Test attachment collection with empty URL strings (lines 802, 831, 834).
+
+    Uses tmp_path for platform-compatible paths.
+    """
     _, _, mock_exists = mock_file_utils
     mock_exists.return_value = True
 
+    # Create actual temp files for cross-platform path handling
+    valid_png = tmp_path / "valid.png"
+    valid_image = tmp_path / "valid_image.png"
+    valid_file = tmp_path / "valid_file.pdf"
+    valid_png.touch()
+    valid_image.touch()
+    valid_file.touch()
+
     class MockRequest:
         attachments = [
             "",  # Empty string
             "   ",  # Whitespace only
             {"url": ""},  # Empty URL in dict
             {"url": "   "},  # Whitespace URL in dict
-            "c:/valid.png",  # Valid path
+            str(valid_png),  # Valid path
         ]
         messages = [
             Message.model_construct(
                 role="user",
                 content="test",
-                images=["", "c:/valid_image.png"],
-                files=[{"path": ""}, {"path": "c:/valid_file.pdf"}],
+                images=["", str(valid_image)],
+                files=[{"path": ""}, {"path": str(valid_file)}],
             )
         ]
 
     req = MockRequest()
     result = collect_and_validate_attachments(req, "req1", [])
 
     # Only valid paths should be included
-    assert "c:/valid.png" in result
-    assert "c:/valid_image.png" in result
-    assert "c:/valid_file.pdf" in result
+    assert str(valid_png) in result
+    assert str(valid_image) in result
+    assert str(valid_file) in result
 
     # Empty strings should be filtered out
     assert "" not in result
@@ -1246,23 +1303,32 @@ def test_prepare_combined_prompt_dict_input_image_with_detail(
     assert "[图像细节: detail=low]" in prompt
 
 
-def test_prepare_combined_prompt_dict_content_file_field(mock_file_utils, mock_logger):
-    """Test dict content with generic 'file' field (lines 313-322)."""
+def test_prepare_combined_prompt_dict_content_file_field(
+    mock_file_utils, mock_logger, tmp_path
+):
+    """Test dict content with generic 'file' field (lines 313-322).
+
+    Uses tmp_path for platform-compatible paths.
+    """
     _, _, mock_exists = mock_file_utils
     mock_exists.return_value = True
 
+    # Create actual temp file for cross-platform path handling
+    file_path = tmp_path / "from_file_field.png"
+    file_path.touch()
+
     content = [
         {
             "type": "image_url",
-            "file": {"url": "c:/from_file_field.png"},
+            "file": {"url": str(file_path)},
         }
     ]
 
     messages = [Message.model_construct(role="user", content=content)]
 
     prompt, files = prepare_combined_prompt(messages, "req1")
 
-    assert "c:/from_file_field.png" in files
+    assert str(file_path) in files
 
 
 def test_prepare_combined_prompt_dict_content_file_path(mock_file_utils, mock_logger):
@@ -1284,20 +1350,29 @@ def test_prepare_combined_prompt_dict_content_file_path(mock_file_utils, mock_lo
     assert "/absolute/path/file.pdf" in files
 
 
-def test_prepare_combined_prompt_object_url_attribute(mock_file_utils, mock_logger):
-    """Test content item with direct url attribute (lines 249-250)."""
+def test_prepare_combined_prompt_object_url_attribute(
+    mock_file_utils, mock_logger, tmp_path
+):
+    """Test content item with direct url attribute (lines 249-250).
+
+    Uses tmp_path for platform-compatible paths.
+    """
     _, _, mock_exists = mock_file_utils
     mock_exists.return_value = True
 
+    # Create actual temp file for cross-platform path handling
+    url_path = tmp_path / "direct_url.png"
+    url_path.touch()
+
     class UrlItem:
         type = "image_url"
-        url = "c:/direct_url.png"
+        url = str(url_path)
 
     messages = [Message.model_construct(role="user", content=[UrlItem()])]
 
     prompt, files = prepare_combined_prompt(messages, "req1")
 
-    assert "c:/direct_url.png" in files
+    assert str(url_path) in files
 
 
 def test_prepare_combined_prompt_dict_attachments_nested_input_image(
@@ -1323,25 +1398,32 @@ def test_prepare_combined_prompt_dict_attachments_nested_input_image(
 
 
 def test_prepare_combined_prompt_content_item_input_image_string(
-    mock_file_utils, mock_logger
+    mock_file_utils, mock_logger, tmp_path
 ):
-    """Test content item with input_image as string (lines 283-284)."""
+    """Test content item with input_image as string (lines 283-284).
+
+    Uses tmp_path for platform-compatible paths.
+    """
     _, _, mock_exists = mock_file_utils
     mock_exists.return_value = True
 
+    # Create actual temp file for cross-platform path handling
+    img_path = tmp_path / "string_input_image.png"
+    img_path.touch()
+
     # This tests the case where item has input_image as a string directly
     content = [
         {
             "type": "image_url",
-            "input_image": "c:/string_input_image.png",  # String, not dict
+            "input_image": str(img_path),  # String, not dict
         }
     ]
 
     messages = [Message.model_construct(role="user", content=content)]
 
     prompt, files = prepare_combined_prompt(messages, "req1")
 
-    assert "c:/string_input_image.png" in files
+    assert str(img_path) in files
 
 
 def test_prepare_combined_prompt_audio_video_data_base64(mock_file_utils, mock_logger):