updates for durable execution

Author: marcusmotill

src/google/adk/a2a/converters/event_converter.py

@@ -22,7 +22,8 @@
 from typing import Dict
 from typing import List
 from typing import Optional
-import uuid
+
+from google.adk.platform import uuid as platform_uuid
 
 from a2a.server.events import Event as A2AEvent
 from a2a.types import DataPart
@@ -254,7 +255,7 @@ def convert_a2a_task_to_event(
         invocation_id=(
             invocation_context.invocation_id
             if invocation_context
-            else str(uuid.uuid4())
+            else platform_uuid.new_uuid()
         ),
         author=author or "a2a agent",
         branch=invocation_context.branch if invocation_context else None,
@@ -299,7 +300,7 @@ def convert_a2a_message_to_event(
         invocation_id=(
             invocation_context.invocation_id
             if invocation_context
-            else str(uuid.uuid4())
+            else platform_uuid.new_uuid()
         ),
         author=author or "a2a agent",
         branch=invocation_context.branch if invocation_context else None,
@@ -349,7 +350,7 @@ def convert_a2a_message_to_event(
         invocation_id=(
             invocation_context.invocation_id
             if invocation_context
-            else str(uuid.uuid4())
+            else platform_uuid.new_uuid()
         ),
         author=author or "a2a agent",
         branch=invocation_context.branch if invocation_context else None,
@@ -408,7 +409,7 @@ def convert_event_to_a2a_message(
 
     if output_parts:
       return Message(
-          message_id=str(uuid.uuid4()), role=role, parts=output_parts
+          message_id=platform_uuid.new_uuid(), role=role, parts=output_parts
       )
 
   except Exception as e:
@@ -449,7 +450,7 @@ def _create_error_status_event(
       status=TaskStatus(
           state=TaskState.failed,
           message=Message(
-              message_id=str(uuid.uuid4()),
+              message_id=platform_uuid.new_uuid(),
               role=Role.agent,
               parts=[TextPart(text=error_message)],
               metadata={

src/google/adk/agents/invocation_context.py

@@ -16,7 +16,8 @@
 
 from typing import Any
 from typing import Optional
-import uuid
+
+from google.adk.platform import uuid as platform_uuid
 
 from google.genai import types
 from pydantic import BaseModel
@@ -409,4 +410,4 @@ def _find_matching_function_call(
 
 
 def new_invocation_context_id() -> str:
-  return "e-" + str(uuid.uuid4())
+  return "e-" + platform_uuid.new_uuid()

src/google/adk/artifacts/base_artifact_service.py

@@ -19,6 +19,8 @@
 from typing import Any
 from typing import Optional
 
+from google.adk.platform import time as platform_time
+
 from google.genai import types
 from pydantic import alias_generators
 from pydantic import BaseModel
@@ -47,7 +49,7 @@ class ArtifactVersion(BaseModel):
       description="Optional user-supplied metadata stored with the artifact.",
   )
   create_time: float = Field(
-      default_factory=lambda: datetime.now().timestamp(),
+      default_factory=lambda: platform_time.get_time(),
       description=(
           "Unix timestamp (seconds) when the version record was created."
       ),

src/google/adk/flows/llm_flows/functions.py

@@ -29,8 +29,8 @@
 from typing import Dict
 from typing import Optional
 from typing import TYPE_CHECKING
-import uuid
 
+from google.adk.platform import uuid as platform_uuid
 from google.genai import types
 
 from ...agents.active_streaming_tool import ActiveStreamingTool
@@ -175,7 +175,7 @@ def run_async_tool_in_new_loop():
 
 
 def generate_client_function_call_id() -> str:
-  return f'{AF_FUNCTION_CALL_ID_PREFIX}{uuid.uuid4()}'
+  return f'{AF_FUNCTION_CALL_ID_PREFIX}{platform_uuid.new_uuid()}'
 
 
 def populate_client_function_call_id(model_response_event: Event) -> None:

src/google/adk/sessions/sqlite_session_service.py

@@ -29,6 +29,9 @@
 import aiosqlite
 from typing_extensions import override
 
+from google.adk.platform import time as platform_time
+from google.adk.platform import uuid as platform_uuid
+
 from . import _session_util
 from ..errors.already_exists_error import AlreadyExistsError
 from ..events.event import Event
@@ -165,8 +168,8 @@ async def create_session(
     if session_id:
       session_id = session_id.strip()
     if not session_id:
-      session_id = str(uuid.uuid4())
-    now = time.time()
+      session_id = platform_uuid.new_uuid()
+    now = platform_time.get_time()
 
     async with self._get_db_connection() as db:
       # Check if session_id already exists

tests/unittests/a2a/converters/test_event_converter.py

@@ -742,7 +742,7 @@ def test_convert_a2a_task_to_event_no_message(self):
     assert result.branch == "test-branch"
     assert result.invocation_id == "test-invocation-id"
 
-  @patch("google.adk.a2a.converters.event_converter.uuid.uuid4")
+  @patch("google.adk.a2a.converters.event_converter.platform_uuid.new_uuid")
   def test_convert_a2a_task_to_event_default_author(self, mock_uuid):
     """Test converting A2A task with default author and no invocation context."""
     from google.adk.a2a.converters.event_converter import convert_a2a_task_to_event
@@ -974,7 +974,7 @@ def test_convert_a2a_message_to_event_missing_tool_id(self):
     # Parts will be empty since conversion returned None
     assert len(result.content.parts) == 0
 
-  @patch("google.adk.a2a.converters.event_converter.uuid.uuid4")
+  @patch("google.adk.a2a.converters.event_converter.platform_uuid.new_uuid")
   def test_convert_a2a_message_to_event_default_author(self, mock_uuid):
     """Test conversion with default author and no invocation context."""
     from google.adk.a2a.converters.event_converter import convert_a2a_message_to_event

tests/unittests/artifacts/test_artifact_service.py

@@ -418,9 +418,9 @@ async def test_list_artifact_versions_and_get_artifact_version(
   ]
 
   with patch(
-      "google.adk.artifacts.base_artifact_service.datetime"
-  ) as mock_datetime:
-    mock_datetime.now.return_value = FIXED_DATETIME
+      "google.adk.artifacts.base_artifact_service.platform_time"
+  ) as mock_platform_time:
+    mock_platform_time.get_time.return_value = FIXED_DATETIME.timestamp()
 
     for i in range(4):
       custom_metadata = {"key": "value" + str(i)}
@@ -505,9 +505,9 @@ async def test_list_artifact_versions_with_user_prefix(
   ]
 
   with patch(
-      "google.adk.artifacts.base_artifact_service.datetime"
-  ) as mock_datetime:
-    mock_datetime.now.return_value = FIXED_DATETIME
+      "google.adk.artifacts.base_artifact_service.platform_time"
+  ) as mock_platform_time:
+    mock_platform_time.get_time.return_value = FIXED_DATETIME.timestamp()
 
     for i in range(4):
       custom_metadata = {"key": "value" + str(i)}