fix: make messages appear in the correct order again (#5309)
This commit is contained in:
Gabriel Luiz Freitas Almeida
GitHub
parent
d31cb351f3
commit
5a8d73c5b2
5 changed files with 189 additions and 26 deletions
|
|
@ -22,7 +22,7 @@ from langflow.schema.content_types import ErrorContent
|
|||
from langflow.schema.data import Data
|
||||
from langflow.schema.image import Image, get_file_paths, is_image_file
|
||||
from langflow.schema.properties import Properties, Source
|
||||
from langflow.schema.validators import timestamp_to_str_validator
|
||||
from langflow.schema.validators import timestamp_to_str, timestamp_to_str_validator
|
||||
from langflow.utils.constants import (
|
||||
MESSAGE_SENDER_AI,
|
||||
MESSAGE_SENDER_NAME_AI,
|
||||
|
|
@ -91,7 +91,7 @@ class Message(Data):
|
|||
def serialize_timestamp(self, value):
|
||||
try:
|
||||
# Try parsing with timezone
|
||||
return datetime.strptime(value.strip(), "%Y-%m-%d %H:%M:%S %Z").astimezone(timezone.utc)
|
||||
return datetime.strptime(value.strip(), "%Y-%m-%d %H:%M:%S %Z").replace(tzinfo=timezone.utc)
|
||||
except ValueError:
|
||||
# Try parsing without timezone
|
||||
return datetime.strptime(value.strip(), "%Y-%m-%d %H:%M:%S").replace(tzinfo=timezone.utc)
|
||||
|
|
@ -311,6 +311,24 @@ class MessageResponse(DefaultModel):
|
|||
category: str | None = None
|
||||
content_blocks: list[ContentBlock] | None = None
|
||||
|
||||
@field_validator("content_blocks", mode="before")
|
||||
@classmethod
|
||||
def validate_content_blocks(cls, v):
|
||||
if isinstance(v, str):
|
||||
v = json.loads(v)
|
||||
if isinstance(v, list):
|
||||
return [cls.validate_content_blocks(block) for block in v]
|
||||
if isinstance(v, dict):
|
||||
return ContentBlock.model_validate(v)
|
||||
return v
|
||||
|
||||
@field_validator("properties", mode="before")
|
||||
@classmethod
|
||||
def validate_properties(cls, v):
|
||||
if isinstance(v, str):
|
||||
v = json.loads(v)
|
||||
return v
|
||||
|
||||
@field_validator("files", mode="before")
|
||||
@classmethod
|
||||
def validate_files(cls, v):
|
||||
|
|
@ -321,8 +339,7 @@ class MessageResponse(DefaultModel):
|
|||
@field_serializer("timestamp")
|
||||
@classmethod
|
||||
def serialize_timestamp(cls, v):
|
||||
v = v.replace(microsecond=0)
|
||||
return v.strftime("%Y-%m-%d %H:%M:%S %Z")
|
||||
return timestamp_to_str(v)
|
||||
|
||||
@field_serializer("files")
|
||||
@classmethod
|
||||
|
|
|
|||
|
|
@ -1,35 +1,114 @@
|
|||
from datetime import datetime
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from pydantic import BeforeValidator
|
||||
|
||||
|
||||
def timestamp_to_str(timestamp: datetime | str) -> str:
|
||||
"""Convert timestamp to standardized string format.
|
||||
|
||||
Handles multiple input formats and ensures consistent UTC timezone output.
|
||||
|
||||
Args:
|
||||
timestamp (datetime | str): Input timestamp either as datetime object or string
|
||||
|
||||
Returns:
|
||||
str: Formatted timestamp string in 'YYYY-MM-DD HH:MM:SS UTC' format
|
||||
|
||||
Raises:
|
||||
ValueError: If string timestamp is in invalid format
|
||||
"""
|
||||
if isinstance(timestamp, str):
|
||||
# Try parsing with different formats
|
||||
formats = [
|
||||
"%Y-%m-%dT%H:%M:%S", # ISO format
|
||||
"%Y-%m-%d %H:%M:%S %Z", # Standard with timezone
|
||||
"%Y-%m-%d %H:%M:%S", # Without timezone
|
||||
"%Y-%m-%dT%H:%M:%S.%f", # ISO with microseconds
|
||||
"%Y-%m-%dT%H:%M:%S%z", # ISO with numeric timezone
|
||||
]
|
||||
|
||||
for fmt in formats:
|
||||
try:
|
||||
parsed = datetime.strptime(timestamp.strip(), fmt).replace(tzinfo=timezone.utc)
|
||||
return parsed.strftime("%Y-%m-%d %H:%M:%S %Z")
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
msg = f"Invalid timestamp format: {timestamp}"
|
||||
raise ValueError(msg)
|
||||
|
||||
# Handle datetime object
|
||||
if timestamp.tzinfo is None:
|
||||
timestamp = timestamp.replace(tzinfo=timezone.utc)
|
||||
return timestamp.strftime("%Y-%m-%d %H:%M:%S %Z")
|
||||
|
||||
|
||||
def str_to_timestamp(timestamp: str | datetime) -> datetime:
|
||||
"""Convert timestamp to datetime object.
|
||||
|
||||
Handles multiple input formats and ensures consistent UTC timezone output.
|
||||
|
||||
Args:
|
||||
timestamp (str | datetime): Input timestamp either as string or datetime object
|
||||
|
||||
Returns:
|
||||
datetime: Datetime object with UTC timezone
|
||||
|
||||
Raises:
|
||||
ValueError: If string timestamp is not in 'YYYY-MM-DD HH:MM:SS UTC' format
|
||||
"""
|
||||
if isinstance(timestamp, str):
|
||||
# Just check if the string is a valid datetime
|
||||
try:
|
||||
datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S %Z") # noqa: DTZ007
|
||||
result = timestamp
|
||||
return datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S %Z").replace(tzinfo=timezone.utc)
|
||||
except ValueError as e:
|
||||
msg = f"Invalid timestamp: {timestamp}"
|
||||
msg = f"Invalid timestamp format: {timestamp}. Expected format: YYYY-MM-DD HH:MM:SS UTC"
|
||||
raise ValueError(msg) from e
|
||||
else:
|
||||
result = timestamp.strftime("%Y-%m-%d %H:%M:%S %Z")
|
||||
return result
|
||||
return timestamp
|
||||
|
||||
|
||||
def timestamp_with_fractional_seconds(timestamp: datetime | str) -> str:
|
||||
"""Convert timestamp to string format including fractional seconds.
|
||||
|
||||
Handles multiple input formats and ensures consistent UTC timezone output.
|
||||
|
||||
Args:
|
||||
timestamp (datetime | str): Input timestamp either as datetime object or string
|
||||
|
||||
Returns:
|
||||
str: Formatted timestamp string in 'YYYY-MM-DD HH:MM:SS.ffffff UTC' format
|
||||
|
||||
Raises:
|
||||
ValueError: If string timestamp is in invalid format
|
||||
"""
|
||||
if isinstance(timestamp, str):
|
||||
# Just check if the string is a valid datetime
|
||||
try:
|
||||
datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S.%f %Z") # noqa: DTZ007
|
||||
result = timestamp
|
||||
except ValueError as e:
|
||||
msg = f"Invalid timestamp: {timestamp}"
|
||||
raise ValueError(msg) from e
|
||||
else:
|
||||
result = timestamp.strftime("%Y-%m-%d %H:%M:%S.%f %Z")
|
||||
return result
|
||||
# Try parsing with different formats
|
||||
formats = [
|
||||
"%Y-%m-%d %H:%M:%S.%f %Z", # Standard with timezone
|
||||
"%Y-%m-%d %H:%M:%S.%f", # Without timezone
|
||||
"%Y-%m-%dT%H:%M:%S.%f", # ISO format
|
||||
"%Y-%m-%dT%H:%M:%S.%f%z", # ISO with numeric timezone
|
||||
# Also try without fractional seconds
|
||||
"%Y-%m-%d %H:%M:%S %Z",
|
||||
"%Y-%m-%d %H:%M:%S",
|
||||
"%Y-%m-%dT%H:%M:%S",
|
||||
]
|
||||
|
||||
for fmt in formats:
|
||||
try:
|
||||
parsed = datetime.strptime(timestamp.strip(), fmt).replace(tzinfo=timezone.utc)
|
||||
return parsed.strftime("%Y-%m-%d %H:%M:%S.%f %Z")
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
msg = f"Invalid timestamp format: {timestamp}"
|
||||
raise ValueError(msg)
|
||||
|
||||
# Handle datetime object
|
||||
if timestamp.tzinfo is None:
|
||||
timestamp = timestamp.replace(tzinfo=timezone.utc)
|
||||
return timestamp.strftime("%Y-%m-%d %H:%M:%S.%f %Z")
|
||||
|
||||
|
||||
timestamp_to_str_validator = BeforeValidator(timestamp_to_str)
|
||||
timestamp_with_fractional_seconds_validator = BeforeValidator(timestamp_with_fractional_seconds)
|
||||
str_to_timestamp_validator = BeforeValidator(str_to_timestamp)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import json
|
||||
from datetime import datetime, timezone
|
||||
from typing import TYPE_CHECKING
|
||||
from typing import TYPE_CHECKING, Annotated
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
from pydantic import field_serializer, field_validator
|
||||
|
|
@ -9,6 +9,7 @@ from sqlmodel import JSON, Column, Field, Relationship, SQLModel
|
|||
|
||||
from langflow.schema.content_block import ContentBlock
|
||||
from langflow.schema.properties import Properties
|
||||
from langflow.schema.validators import str_to_timestamp_validator
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from langflow.schema.message import Message
|
||||
|
|
@ -16,7 +17,9 @@ if TYPE_CHECKING:
|
|||
|
||||
|
||||
class MessageBase(SQLModel):
|
||||
timestamp: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
|
||||
timestamp: Annotated[datetime, str_to_timestamp_validator] = Field(
|
||||
default_factory=lambda: datetime.now(timezone.utc)
|
||||
)
|
||||
sender: str
|
||||
sender_name: str
|
||||
session_id: str
|
||||
|
|
@ -29,6 +32,13 @@ class MessageBase(SQLModel):
|
|||
category: str = Field(default="message")
|
||||
content_blocks: list[ContentBlock] = Field(default_factory=list)
|
||||
|
||||
@field_validator("timestamp", mode="before")
|
||||
@classmethod
|
||||
def validate_timestamp(cls, value):
|
||||
if isinstance(value, str):
|
||||
return datetime.fromisoformat(value)
|
||||
return value
|
||||
|
||||
@field_validator("files", mode="before")
|
||||
@classmethod
|
||||
def validate_files(cls, value):
|
||||
|
|
@ -110,6 +120,25 @@ class MessageTable(MessageBase, table=True): # type: ignore[call-arg]
|
|||
category: str = Field(sa_column=Column(Text))
|
||||
content_blocks: list[ContentBlock] = Field(default_factory=list, sa_column=Column(JSON)) # type: ignore[assignment]
|
||||
|
||||
# We need to make sure the datetimes have timezone after running session.refresh
|
||||
# because we are losing the timezone information when we save the message to the database
|
||||
# and when we read it back. We use field_validator to make sure the datetimes have timezone
|
||||
# after running session.refresh
|
||||
@field_validator("timestamp", mode="after")
|
||||
@classmethod
|
||||
def validate_timestamp(cls, value):
|
||||
if isinstance(value, datetime):
|
||||
return value.replace(tzinfo=timezone.utc)
|
||||
return value
|
||||
|
||||
@field_serializer("timestamp")
|
||||
def serialize_timestamp(self, value, _info):
|
||||
if isinstance(value, datetime):
|
||||
if value.tzinfo is None:
|
||||
value = value.replace(tzinfo=timezone.utc)
|
||||
return value.strftime("%Y-%m-%d %H:%M:%S %Z")
|
||||
return value
|
||||
|
||||
@field_validator("flow_id", mode="before")
|
||||
@classmethod
|
||||
def validate_flow_id(cls, value):
|
||||
|
|
@ -136,6 +165,8 @@ class MessageTable(MessageBase, table=True): # type: ignore[call-arg]
|
|||
return [self.serialize_properties_or_content_blocks(item) for item in value]
|
||||
if hasattr(value, "model_dump"):
|
||||
return value.model_dump()
|
||||
if isinstance(value, str):
|
||||
return json.loads(value)
|
||||
return value
|
||||
|
||||
# Needed for Column(JSON)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue