formatting

src/va_agent/session.py

@@ -6,7 +6,6 @@ import asyncio
 import logging
 import time
 import uuid
-from datetime import UTC, datetime
 from typing import TYPE_CHECKING, Any, override
 
 from google.adk.errors.already_exists_error import AlreadyExistsError
@@ -43,9 +42,8 @@ class FirestoreSessionService(BaseSessionService):
         adk_user_states/{app_name}__{user_id}
             → user-scoped state key/values
 
-        adk_sessions/{app_name}__{user_id}
+        adk_sessions/{app_name}__{user_id}__{session_id}
             → {app_name, user_id, session_id, state: {…}, last_update_time}
-            → Single continuous session per user (session_id is ignored)
             └─ events/{event_id}  →  serialised Event
     """
 
@@ -97,32 +95,13 @@ class FirestoreSessionService(BaseSessionService):
         )
 
     def _session_ref(self, app_name: str, user_id: str, session_id: str) -> Any:
-        # Single continuous session per user: use only user_id, ignore session_id
         return self._db.collection(f"{self._prefix}_sessions").document(
-            f"{app_name}__{user_id}"
+            f"{app_name}__{user_id}__{session_id}"
         )
 
     def _events_col(self, app_name: str, user_id: str, session_id: str) -> Any:
         return self._session_ref(app_name, user_id, session_id).collection("events")
 
-    @staticmethod
-    def _timestamp_to_float(value: Any, default: float = 0.0) -> float:
-        if value is None:
-            return default
-        if isinstance(value, (int, float)):
-            return float(value)
-        if hasattr(value, "timestamp"):
-            try:
-                return float(value.timestamp())
-            except (
-                TypeError,
-                ValueError,
-                OSError,
-                OverflowError,
-            ) as exc:  # pragma: no cover
-                logger.debug("Failed to convert timestamp %r: %s", value, exc)
-        return default
-
     # ------------------------------------------------------------------
     # State helpers
     # ------------------------------------------------------------------
@@ -192,7 +171,7 @@ class FirestoreSessionService(BaseSessionService):
                 )
             )
 
-        now = datetime.now(UTC)
+        now = time.time()
         write_coros.append(
             self._session_ref(app_name, user_id, session_id).set(
                 {
@@ -217,7 +196,7 @@ class FirestoreSessionService(BaseSessionService):
             user_id=user_id,
             id=session_id,
             state=merged,
-            last_update_time=now.timestamp(),
+            last_update_time=now,
         )
 
     @override
@@ -304,9 +283,7 @@ class FirestoreSessionService(BaseSessionService):
             id=session_id,
             state=merged,
             events=events,
-            last_update_time=self._timestamp_to_float(
+            last_update_time=session_data.get("last_update_time", 0.0),
-                session_data.get("last_update_time"), 0.0
-            ),
         )
 
     @override
@@ -349,9 +326,7 @@ class FirestoreSessionService(BaseSessionService):
                     id=data["session_id"],
                     state=merged,
                     events=[],
-                    last_update_time=self._timestamp_to_float(
+                    last_update_time=data.get("last_update_time", 0.0),
-                        data.get("last_update_time"), 0.0
-                    ),
                 )
             )
 
@@ -391,8 +366,6 @@ class FirestoreSessionService(BaseSessionService):
         # Persist state deltas
         session_ref = self._session_ref(app_name, user_id, session_id)
 
-        last_update_dt = datetime.fromtimestamp(event.timestamp, UTC)
-
         if event.actions and event.actions.state_delta:
             state_deltas = _session_util.extract_state_delta(event.actions.state_delta)
 
@@ -413,16 +386,16 @@ class FirestoreSessionService(BaseSessionService):
                     FieldPath("state", k).to_api_repr(): v
                     for k, v in state_deltas["session"].items()
                 }
-                field_updates["last_update_time"] = last_update_dt
+                field_updates["last_update_time"] = event.timestamp
                 write_coros.append(session_ref.update(field_updates))
             else:
                 write_coros.append(
-                    session_ref.update({"last_update_time": last_update_dt})
+                    session_ref.update({"last_update_time": event.timestamp})
                 )
 
             await asyncio.gather(*write_coros)
         else:
-            await session_ref.update({"last_update_time": last_update_dt})
+            await session_ref.update({"last_update_time": event.timestamp})
 
         # Log token usage
         if event.usage_metadata: