Fix datetime handling in trade.py to handle both datetime objects and strings

apps/api/main_hf.py

@@ -15,8 +15,8 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
 
-# 只导入HuggingFace专用的trade查询路由
-from apps.api.routers import trade_hf
+# 只导入核心trade查询路由
+from apps.api.routers import trade
 
 # 获取项目根目录
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
@@ -90,8 +90,8 @@ async def health_check():
         "db_path": str(db_path.absolute())
     }
 
-# 只包含HuggingFace专用的trade查询路由
-app.include_router(trade_hf.router, prefix="/api/v1/trade", tags=["Trade Search"])
+# 只包含核心trade查询路由
+app.include_router(trade.router, prefix="/api/v1/trade", tags=["Trade Search"])
 
 if __name__ == "__main__":
     import uvicorn

apps/api/routers/trade.py

@@ -160,7 +160,46 @@ async def _search_with_postgres(
     result = await db.execute(stmt)
     records = result.scalars().all()
     
+    # 转换为响应格式，处理datetime对象
+    items = []
+    for r in records:
+        # 处理日期：可能是datetime对象或字符串
+        trade_date_value = r.trade_date
+        if isinstance(trade_date_value, datetime):
+            trade_date = trade_date_value
+        elif isinstance(trade_date_value, str):
+            if not trade_date_value or trade_date_value.strip() == '':
+                trade_date = datetime(2020, 1, 1)
+            else:
+                try:
+                    trade_date = datetime.fromisoformat(trade_date_value.replace(' ', 'T'))
+                except:
+                    trade_date = datetime(2020, 1, 1)
+        else:
+            trade_date = datetime(2020, 1, 1)
+        
+        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,
+            product_name=r.product_name,
+            amount=r.amount,
+            currency=r.currency,
+            weight=r.weight,
+            weight_unit=r.weight_unit,
+            origin_country=r.origin_country,
+            destination_country=r.destination_country,
+            departure_port=r.departure_port,
+            arrival_port=r.arrival_port,
+            transport_mode=r.transport_mode
+        ))
+    
     return PaginatedResponse(
         total=total,
-        items=records
+        items=items
     )