diff --git a/langfuse/_utils/serializer.py b/langfuse/_utils/serializer.py index 2f25ddd0e..2f87d8b73 100644 --- a/langfuse/_utils/serializer.py +++ b/langfuse/_utils/serializer.py @@ -6,7 +6,7 @@ from asyncio import Queue from collections.abc import Sequence from dataclasses import asdict, is_dataclass -from datetime import date, datetime +from datetime import date, datetime, time, timedelta from json import JSONEncoder from logging import getLogger from pathlib import Path @@ -15,6 +15,11 @@ from pydantic import BaseModel, SecretBytes, SecretStr +try: + from pydantic_core import to_jsonable_python +except ImportError: + to_jsonable_python = None + from langfuse.media import LangfuseMedia, LangfuseMediaReference # Attempt to import Serializable @@ -38,6 +43,38 @@ class Serializable: # type: ignore _MIN_SAFE_INT = -(2**53) + 1 +def _timedelta_to_iso8601(td: timedelta) -> str: + """Format a datetime.timedelta as an ISO 8601 duration string (e.g. PT5M, PT1M30S).""" + total_seconds = td.total_seconds() + if total_seconds == 0: + return "PT0S" + + sign = "-" if total_seconds < 0 else "" + total_seconds = abs(total_seconds) + + days = int(total_seconds // 86400) + rem = total_seconds % 86400 + hours = int(rem // 3600) + rem = rem % 3600 + minutes = int(rem // 60) + seconds = rem % 60 + + sec_str = f"{seconds:.6f}".rstrip("0").rstrip(".") if seconds % 1 != 0 else str(int(seconds)) + + time_parts = [] + if hours > 0: + time_parts.append(f"{hours}H") + if minutes > 0: + time_parts.append(f"{minutes}M") + if seconds > 0 or (days == 0 and hours == 0 and minutes == 0): + time_parts.append(f"{sec_str}S") + + date_part = f"{days}D" if days > 0 else "" + t_part = f"T{''.join(time_parts)}" if time_parts else "" + + return f"{sign}P{date_part}{t_part}" + + class EventSerializer(JSONEncoder): _MAX_DEPTH = 20 @@ -136,6 +173,14 @@ def _default_inner(self, obj: Any) -> Any: if isinstance(obj, (date)): return obj.isoformat() + if isinstance(obj, (time)): + return obj.isoformat() + + if isinstance(obj, (timedelta)): + if to_jsonable_python is not None: + return to_jsonable_python(obj) + return _timedelta_to_iso8601(obj) + if isinstance(obj, Path): return str(obj) diff --git a/tests/unit/test_serializer.py b/tests/unit/test_serializer.py index 3e5112f6b..8ed9dae9e 100644 --- a/tests/unit/test_serializer.py +++ b/tests/unit/test_serializer.py @@ -1,7 +1,7 @@ import json import threading from dataclasses import dataclass -from datetime import date, datetime, timezone +from datetime import date, datetime, time, timedelta, timezone from enum import Enum from pathlib import Path from uuid import UUID @@ -570,3 +570,66 @@ def test_dict_with_non_string_keys_is_serialized(input_obj, expected): result = json.loads(EventSerializer().encode(input_obj)) assert result == expected + + +def test_time(): + """Resolves Issue #20158: datetime.time serializes to ISO format instead of '