From aa1d8a6c520914be707f559f81c6e82cea5b0f41 Mon Sep 17 00:00:00 2001
From: panda <1415243231@qq.com>
Date: Thu, 21 May 2026 22:28:07 +0800
Subject: [PATCH] fix: logging KeyError with reserved 'filename' key, pytest
 return-not-none warnings

- api_server.py: rename 'filename' to 'file_name' in upload_file log extra
  dict to avoid collision with Python logging's reserved LogRecord attribute
- test_e2e_ocr.py: replace return statements with assert in test functions
  to fix PytestReturnNotNoneWarning
---
 api_server.py         | 2 +-
 tests/test_e2e_ocr.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api_server.py b/api_server.py
index 2140449..feca84f 100644
--- a/api_server.py
+++ b/api_server.py
@@ -361,7 +361,7 @@ async def upload_file(file: UploadFile = File(...), session_id: str = ""):
     }
 
     _api_log.info("文件上传", extra={
-        "file_id": file_id, "filename": safe_name, "size": len(content),
+        "file_id": file_id, "file_name": safe_name, "size": len(content),
     })
 
     return {
diff --git a/tests/test_e2e_ocr.py b/tests/test_e2e_ocr.py
index 7eba9c1..817b4aa 100644
--- a/tests/test_e2e_ocr.py
+++ b/tests/test_e2e_ocr.py
@@ -85,7 +85,8 @@ def test_ocr_extraction_pipeline():
         print(f"  值: {fields[0].get('field_value', 'N/A')}")
         print(f"  坐标: {fields[0].get('bbox', 'N/A')}")
 
-    return all_ok
+    # OCR field extraction is informational; verify we got a valid response
+    assert extraction.get("ocr_available") is not None
 
 
 def test_validation_service():
@@ -94,7 +95,7 @@ def test_validation_service():
     result = validate_jrxml("<jasperReport/>")
     print(f"  状态: {'OK' if result else 'FAIL'}")
     print(f"  响应: {result}")
-    return True
+    assert result is not None
 
 
 def test_ocr_fallback():