Add more metadata to events, use data message type for events

declan-scale · declan-scale · commit 998e3e9fa7de · 2025-11-18T16:28:37.000-05:00
diff --git a/examples/demos/procurement_agent/project/models/events.py b/examples/demos/procurement_agent/project/models/events.py
@@ -15,23 +15,32 @@ class EventType(Enum):
 class SubmitalApprovalEvent(BaseModel):
     event_type: EventType = Field(default=EventType.SUBMITTAL_APPROVED)
     item: str
+    document_url: str
+    document_name: str
 
 class ShipmentDepartedFactoryEvent(BaseModel):
     event_type: EventType = Field(default=EventType.SHIPMENT_DEPARTED_FACTORY)
     item: str
     eta: datetime
+    date_departed: datetime
+    location_address: str
 
 class ShipmentArrivedSiteEvent(BaseModel):
     event_type: EventType = Field(default=EventType.SHIPMENT_ARRIVED_SITE)
     item: str
     date_arrived: datetime
+    location_address: str
 
 class InspectionFailedEvent(BaseModel):
     event_type: EventType = Field(default=EventType.INSPECTION_FAILED)
     item: str
     inspection_date: datetime
+    document_url: str
+    document_name: str
 
 class InspectionPassedEvent(BaseModel):
     event_type: EventType = Field(default=EventType.INSPECTION_PASSED)
     item: str
-    inspection_date: datetime
+    inspection_date: datetime
+    document_url: str
+    document_name: str
diff --git a/examples/demos/procurement_agent/project/scripts/send_test_events.py b/examples/demos/procurement_agent/project/scripts/send_test_events.py
@@ -49,22 +49,29 @@ async def send_fake_events(workflow_id: str):
     steel_beams_events = [
         SubmitalApprovalEvent(
             event_type=EventType.SUBMITTAL_APPROVED,
-            item="Steel Beams"
+            item="Steel Beams",
+            document_name="Steel Beams Submittal.pdf",
+            document_url="/submittal_approval.pdf"
         ),
         ShipmentDepartedFactoryEvent(
             event_type=EventType.SHIPMENT_DEPARTED_FACTORY,
             item="Steel Beams",
-            eta=datetime(2026, 2, 10)
+            eta=datetime(2026, 2, 10, 14, 30),
+            date_departed=datetime(2026, 2, 3, 9, 15),
+            location_address="218 W 18th St, New York, NY 10011"
         ),
         ShipmentArrivedSiteEvent(
             event_type=EventType.SHIPMENT_ARRIVED_SITE,
             item="Steel Beams",
-            date_arrived=datetime(2026, 2, 10)
+            date_arrived=datetime(2026, 2, 10, 15, 45),
+            location_address="650 Townsend St, San Francisco, CA 94103"
         ),
         InspectionPassedEvent(
             event_type=EventType.INSPECTION_PASSED,
             item="Steel Beams",
-            inspection_date=datetime(2026, 2, 11)
+            inspection_date=datetime(2026, 2, 11, 10, 20),
+            document_name="Steel Beams Inspection Report.pdf",
+            document_url="/inspection_passed.pdf"
         )
     ]
 
@@ -74,22 +81,29 @@ async def send_fake_events(workflow_id: str):
     hvac_events = [
         SubmitalApprovalEvent(
             event_type=EventType.SUBMITTAL_APPROVED,
-            item="HVAC Units"
+            item="HVAC Units",
+            document_name="HVAC Units Submittal.pdf",
+            document_url="/submittal_approval.pdf"
         ),
         ShipmentDepartedFactoryEvent(
             event_type=EventType.SHIPMENT_DEPARTED_FACTORY,
             item="HVAC Units",
-            eta=datetime(2026, 2, 22)
+            eta=datetime(2026, 2, 22, 11, 0),
+            date_departed=datetime(2026, 2, 15, 13, 45),
+            location_address="218 W 18th St, New York, NY 10011"
         ),
         ShipmentArrivedSiteEvent(
             event_type=EventType.SHIPMENT_ARRIVED_SITE,
             item="HVAC Units",
-            date_arrived=datetime(2026, 2, 22)
+            date_arrived=datetime(2026, 2, 22, 10, 30),
+            location_address="650 Townsend St, San Francisco, CA 94103"
         ),
         InspectionFailedEvent(
             event_type=EventType.INSPECTION_FAILED,
             item="HVAC Units",
-            inspection_date=datetime(2026, 2, 23)
+            inspection_date=datetime(2026, 2, 23, 14, 15),
+            document_name="HVAC Units Inspection Report.pdf",
+            document_url="/inspection_failed.pdf"
         )
     ]
 
@@ -99,28 +113,36 @@ async def send_fake_events(workflow_id: str):
     windows_events = [
         SubmitalApprovalEvent(
             event_type=EventType.SUBMITTAL_APPROVED,
-            item="Windows"
+            item="Windows",
+            document_name="Windows Submittal.pdf",
+            document_url="/submittal_approval.pdf"
         ),
         ShipmentDepartedFactoryEvent(
             event_type=EventType.SHIPMENT_DEPARTED_FACTORY,
             item="Windows",
-            eta=datetime(2026, 3, 5)
+            eta=datetime(2026, 3, 5, 16, 0),
+            date_departed=datetime(2026, 2, 20, 8, 30),
+            location_address="218 W 18th St, New York, NY 10011"
         ),
         ShipmentArrivedSiteEvent(
             event_type=EventType.SHIPMENT_ARRIVED_SITE,
             item="Windows",
-            date_arrived=datetime(2026, 3, 5)
+            date_arrived=datetime(2026, 3, 5, 16, 20),
+            location_address="650 Townsend St, San Francisco, CA 94103"
         ),
         InspectionPassedEvent(
             event_type=EventType.INSPECTION_PASSED,
             item="Windows",
-            inspection_date=datetime(2026, 3, 6)
+            inspection_date=datetime(2026, 3, 6, 9, 45),
+            document_name="Windows Inspection Report.pdf",
+            document_url="/inspection_passed.pdf"
         ),
         # Duplicate arrival event to test agent doesn't double-process
         ShipmentArrivedSiteEvent(
             event_type=EventType.SHIPMENT_ARRIVED_SITE,
             item="Windows",
-            date_arrived=datetime(2026, 3, 5)
+            date_arrived=datetime(2026, 3, 5, 16, 20),
+            location_address="650 Townsend St, San Francisco, CA 94103"
         )
     ]
 
@@ -130,22 +152,29 @@ async def send_fake_events(workflow_id: str):
     flooring_events = [
         SubmitalApprovalEvent(
             event_type=EventType.SUBMITTAL_APPROVED,
-            item="Flooring Materials"
+            item="Flooring Materials",
+            document_name="Flooring Materials Submittal.pdf",
+            document_url="/submittal_approval.pdf"
         ),
         ShipmentDepartedFactoryEvent(
             event_type=EventType.SHIPMENT_DEPARTED_FACTORY,
             item="Flooring Materials",
-            eta=datetime(2026, 3, 29)
+            eta=datetime(2026, 3, 29, 13, 15),
+            date_departed=datetime(2026, 3, 22, 11, 30),
+            location_address="218 W 18th St, New York, NY 10011"
         ),
         ShipmentArrivedSiteEvent(
             event_type=EventType.SHIPMENT_ARRIVED_SITE,
             item="Flooring Materials",
-            date_arrived=datetime(2026, 3, 29)
+            date_arrived=datetime(2026, 3, 29, 12, 45),
+            location_address="650 Townsend St, San Francisco, CA 94103"
         ),
         InspectionPassedEvent(
             event_type=EventType.INSPECTION_PASSED,
             item="Flooring Materials",
-            inspection_date=datetime(2026, 3, 30)
+            inspection_date=datetime(2026, 3, 30, 15, 30),
+            document_name="Flooring Materials Inspection Report.pdf",
+            document_url="/inspection_passed.pdf"
         )
     ]
 
@@ -156,22 +185,29 @@ async def send_fake_events(workflow_id: str):
     electrical_events = [
         SubmitalApprovalEvent(
             event_type=EventType.SUBMITTAL_APPROVED,
-            item="Electrical Panels"
+            item="Electrical Panels",
+            document_name="Electrical Panels Submittal.pdf",
+            document_url="/submittal_approval.pdf"
         ),
         ShipmentDepartedFactoryEvent(
             event_type=EventType.SHIPMENT_DEPARTED_FACTORY,
             item="Electrical Panels",
-            eta=datetime(2026, 4, 10)
+            eta=datetime(2026, 4, 10, 10, 45),
+            date_departed=datetime(2026, 4, 1, 14, 0),
+            location_address="218 W 18th St, New York, NY 10011"
         ),
         ShipmentArrivedSiteEvent(
             event_type=EventType.SHIPMENT_ARRIVED_SITE,
             item="Electrical Panels",
-            date_arrived=datetime(2026, 4, 10)
+            date_arrived=datetime(2026, 4, 10, 11, 15),
+            location_address="650 Townsend St, San Francisco, CA 94103"
         ),
         InspectionFailedEvent(
             event_type=EventType.INSPECTION_FAILED,
             item="Electrical Panels",
-            inspection_date=datetime(2026, 4, 11)
+            inspection_date=datetime(2026, 4, 11, 13, 0),
+            document_name="Electrical Panels Inspection Report.pdf",
+            document_url="/inspection_failed.pdf"
         )
     ]
 
diff --git a/examples/demos/procurement_agent/project/workflow.py b/examples/demos/procurement_agent/project/workflow.py
@@ -19,8 +19,9 @@
     ShipmentArrivedSiteEvent,
     ShipmentDepartedFactoryEvent,
 )
-from agentex.lib.utils.logging import make_logger
+from agentex.types.data_content import DataContent
 from agentex.types.text_content import TextContent
+from agentex.lib.utils.logging import make_logger
 from project.utils.summarization import (
     should_summarize,
     find_last_summary_index,
@@ -100,10 +101,6 @@ async def on_task_event_send(self, params: SendEventParams) -> None:
         if self._state is None:
             raise ValueError("State is not initialized")
 
-        self._task_id = params.task.id
-        self._trace_id = params.task.id
-        self._parent_span_id = params.task.id
-
         if params.event.content is None:
             workflow.logger.warning("Received event with no content")
             return
@@ -124,6 +121,10 @@ async def on_task_create(self, params: CreateTaskParams) -> str:
 
         self._state = StateModel(input_list=[])
 
+        self._task_id = params.task.id
+        self._trace_id = params.task.id
+        self._parent_span_id = params.task.id
+
         workflow_id = workflow.info().workflow_id
 
         # Create the master construction schedule with error handling
@@ -181,9 +182,9 @@ async def on_task_create(self, params: CreateTaskParams) -> str:
             if not self.event_queue.empty():
                 event = await self.event_queue.get()
 
-                await adk.messages.create(task_id=params.task.id, content=TextContent(
+                await adk.messages.create(task_id=params.task.id, content=DataContent(
                     author="user",
-                    content=event,
+                    data=json.loads(event),
                 ))
 
                 self._state.input_list.append({
