fix: consistent UTC timestamp handling for PostgreSQL in DatabaseSessionService

src/google/adk/sessions/database_session_service.py

@@ -64,6 +64,7 @@
 _MARIADB_DIALECT = "mariadb"
 _MYSQL_DIALECT = "mysql"
 _POSTGRESQL_DIALECT = "postgresql"
+_DATABRICKS_DIALECT = "databricks"
 # Tuple key order for in-process per-session lock maps:
 # (app_name, user_id, session_id).
 _SessionLockKey: TypeAlias = tuple[str, str, str]
@@ -627,12 +628,12 @@ async def append_event(self, session: Session, event: Event) -> Event:
           if session_state_delta:
             storage_session.state = storage_session.state | session_state_delta
 
-        if is_sqlite:
-          update_time = datetime.fromtimestamp(
-              event.timestamp, timezone.utc
-          ).replace(tzinfo=None)
-        else:
-          update_time = datetime.fromtimestamp(event.timestamp)
+        # Convert event timestamp to a UTC datetime.  SQLite and PostgreSQL
+        # use TIMESTAMP WITHOUT TIME ZONE, so the tzinfo must be stripped to
+        # avoid asyncpg DataError / SQLite comparison issues.
+        update_time = datetime.fromtimestamp(event.timestamp, timezone.utc)
+        if is_sqlite or self.db_engine.dialect.name == _POSTGRESQL_DIALECT:
+          update_time = update_time.replace(tzinfo=None)
         storage_session.update_time = update_time
         sql_session.add(schema.StorageEvent.from_event(session, event))
 

src/google/adk/sessions/schemas/v1.py

@@ -119,12 +119,15 @@ def update_timestamp_tz(self) -> float:
     )
     return self.get_update_timestamp(is_sqlite=is_sqlite)
 
-  def get_update_timestamp(self, is_sqlite: bool) -> float:
-    """Returns the time zone aware update timestamp."""
-    if is_sqlite:
-      # SQLite does not support timezone. SQLAlchemy returns a naive datetime
-      # object without timezone information. We need to convert it to UTC
-      # manually.
+  def get_update_timestamp(self, is_sqlite: bool = False) -> float:
+    """Returns the update timestamp as a POSIX float.
+
+    Naive datetimes (returned by SQLite and PostgreSQL which use
+    ``TIMESTAMP WITHOUT TIME ZONE``) are interpreted as UTC.  Timezone-aware
+    datetimes (MySQL, MariaDB) are used directly.
+    """
+    if self.update_time.tzinfo is None:
+      # Naive datetimes from SQLite / PostgreSQL are stored as UTC.
       return self.update_time.replace(tzinfo=timezone.utc).timestamp()
     return self.update_time.timestamp()