Add Pydantic validator to handle empty trade_date strings

apps/api/routers/trade_hf.py

@@ -74,38 +74,29 @@ async def search_trade_records(
         records = result.scalars().all()
         
         # 转换为响应格式
-        items = []
-        for r in records:
-            try:
-                # 处理trade_date：如果是空字符串或None，使用默认日期
-                if not r.trade_date or (isinstance(r.trade_date, str) and r.trade_date.strip() == ''):
-                    trade_date = datetime(2020, 1, 1)
-                else:
-                    trade_date = r.trade_date
-                
-                items.append(TradeRecordResponse(
-                    record_id=r.record_id,
-                    source_record_id=r.source_record_id,
-                    source_country=r.source_country,
-                    trade_direction=r.trade_direction,
-                    trade_date=trade_date,
-                    importer_name=r.importer_name or "",
-                    exporter_name=r.exporter_name or "",
-                    hs_code=r.hs_code or "",
-                    product_name=r.product_name or "",
-                    amount=r.amount,
-                    currency=r.currency or "",
-                    weight=r.weight,
-                    weight_unit=r.weight_unit or "",
-                    origin_country=r.origin_country or "",
-                    destination_country=r.destination_country or "",
-                    departure_port=r.departure_port or "",
-                    arrival_port=r.arrival_port or "",
-                    transport_mode=r.transport_mode or ""
-                ))
-            except Exception as e:
-                print(f"Error processing record {r.record_id}: trade_date={repr(r.trade_date)}, error={e}")
-                raise
+        items = [
+            TradeRecordResponse(
+                record_id=r.record_id,
+                source_record_id=r.source_record_id,
+                source_country=r.source_country,
+                trade_direction=r.trade_direction,
+                trade_date=r.trade_date,
+                importer_name=r.importer_name or "",
+                exporter_name=r.exporter_name or "",
+                hs_code=r.hs_code or "",
+                product_name=r.product_name or "",
+                amount=r.amount,
+                currency=r.currency or "",
+                weight=r.weight,
+                weight_unit=r.weight_unit or "",
+                origin_country=r.origin_country or "",
+                destination_country=r.destination_country or "",
+                departure_port=r.departure_port or "",
+                arrival_port=r.arrival_port or "",
+                transport_mode=r.transport_mode or ""
+            )
+            for r in records
+        ]
         
         return PaginatedResponse(
             items=items,

apps/api/schemas/trade.py

@@ -1,5 +1,5 @@
-from pydantic import BaseModel, Field
-from typing import List, Optional, TypeVar, Generic
+from pydantic import BaseModel, Field, field_validator
+from typing import List, Optional, TypeVar, Generic, Union
 from datetime import datetime
 
 class TradeQueryRequest(BaseModel):
@@ -40,6 +40,13 @@ class TradeRecordResponse(BaseModel):
     arrival_port: Optional[str]
     transport_mode: Optional[str]
 
+    @field_validator('trade_date', mode='before')
+    @classmethod
+    def validate_trade_date(cls, v):
+        if not v or (isinstance(v, str) and v.strip() == ''):
+            return datetime(2020, 1, 1)
+        return v
+
     class Config:
         from_attributes = True