3.13 test

Author: OliverBryant

xinference/model/embedding/tests/test_embedding_models.py

@@ -16,7 +16,6 @@
 import os
 import shutil
 import tempfile
-import warnings
 
 import pytest
 
@@ -303,7 +302,8 @@ def custom_warning_handler(
         # Restore original warning handler
         warnings.showwarning = old_showwarning
 
-        # Now run with pytest.warns to capture the official warningswith pytest.warns(UserWarning) as record:
+        # Now run with pytest.warns to capture the official warnings
+        with pytest.warns(UserWarning) as record:
             _install()
         print(f"DEBUG: pytest.warns captured {len(record)} warnings")
         for i, warning in enumerate(record):
@@ -318,8 +318,8 @@ def custom_warning_handler(
             print(f"DEBUG: Checking warning message: {message}")
             if (
                 "has error" in message
-                and(
-            "Invalid model URI " in message
+                and (
+                    "Invalid model URI " in message
                     or "Model URI cannot be a relative path" in message
                 )
                 and "/new_data/cache/gte-Qwen2" in message
@@ -330,23 +330,22 @@ def custom_warning_handler(
 
         assert (
             found_warning
-        ), f"Expected warning about invalid model URI not found. Warnings: {[str(w.message)
-            for w in record]}"
-        finally:
+        ), f"Expected warning about invalid model URI not found. Warnings: {[str(w.message) for w in record]}"
+
         # Restore original warning handler
         warnings.showwarning = old_showwarning
 
+    finally:
+        # Restore original warning handler in case of any exceptions
+        warnings.showwarning = old_showwarning
+
     # Debug: Check if file still exists after test
     print(f"DEBUG: File exists after test: {os.path.exists(file_path)}")
 
     # Clean up
     if os.path.exists(file_path):
         os.remove(file_path)
         print("DEBUG: Test file cleaned up")
-    finally:
-        # Clean up the test file to avoid interference with subsequent test runs
-        if os.path.exists(file_path):
-            os.remove(file_path)
 
 
 def test_convert_ids_to_tokens():