nora-lib 0.0.6.dev0__tar.gz → 0.0.7.dev0__tar.gz

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nora_lib
-Version: 0.0.6.dev0
+Version: 0.0.7.dev0
 Summary: For making and coordinating agents and tools
 Home-page: https://github.com/allenai/nora_lib
 Requires-Python: >=3.9

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7.dev0}/nora_lib/interactions/interactions_service.py

@@ -115,8 +115,7 @@ class InteractionsService:
         # Process any thread_fork events
         try:
             for msg in messages_for_thread.messages:
-                events = msg.events if msg.events else []
-                for event in events:
+                for event in msg.events:
                     if event.type == EventType.THREAD_FORK.value:
                         event_data = ThreadForkEventData.model_validate(event.data)
                         forked_thread: ThreadRelationsResponse = (

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7.dev0}/nora_lib/interactions/models.py

@@ -2,6 +2,7 @@
 Model for interactions to be sent to the interactions service.
 """
 
+import json
 from datetime import datetime
 from enum import Enum
 from typing import Dict, List, Optional, Tuple
@@ -43,7 +44,7 @@ class Message(BaseModel):
     channel_id: str
     surface: Surface
     ts: datetime
-    annotations: Optional[List[Annotation]] = None
+    annotations: List[Annotation] = Field(default_factory=list)
 
     @field_serializer("actor_id")
     def serialize_actor_id(self, actor_id: UUID):
@@ -94,10 +95,21 @@ class ReturnedMessage(BaseModel):
     text: str
     ts: datetime
     annotated_text: Optional[str] = None
-    events: Optional[List[Event]] = None
+    events: List[Event] = Field(default_factory=list)
     thread_id: Optional[str] = None
     channel_id: Optional[str] = None
-    annotations: Optional[List[Annotation]] = None
+    annotations: List[Annotation] = Field(default_factory=list)
+
+    @classmethod
+    def from_event(cls, event: Event) -> "ReturnedMessage":
+        """Convert an event to a message"""
+        assert event.message_id is not None
+        return ReturnedMessage(
+            actor_id=event.actor_id,
+            text=json.dumps(event.data),
+            ts=event.timestamp,
+            message_id=event.message_id,
+        )
 
 
 class AgentMessageData(BaseModel):
@@ -127,7 +139,7 @@ class ReturnedAgentContextMessage(BaseModel):
     text: str
     ts: str
     annotated_text: Optional[str] = None
-    events: Optional[List[ReturnedAgentContextEvent]] = None
+    events: List[ReturnedAgentContextEvent] = Field(default_factory=list)
 
 
 class ThreadForkEventData(BaseModel):

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7.dev0}/nora_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nora_lib
-Version: 0.0.6.dev0
+Version: 0.0.7.dev0
 Summary: For making and coordinating agents and tools
 Home-page: https://github.com/allenai/nora_lib
 Requires-Python: >=3.9

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7.dev0}/setup.py

@@ -7,7 +7,7 @@ dev_requirements = ["mypy", "pytest", "black", "types-requests"]
 
 setuptools.setup(
     name="nora_lib",
-    version="0.0.6.dev0",
+    version="0.0.7.dev0",
     description="For making and coordinating agents and tools",
     url="https://github.com/allenai/nora_lib",
     packages=setuptools.find_packages(exclude=(["tests"])),