nora-lib 0.0.5.dev1__tar.gz → 0.0.5.dev3__tar.gz

{nora_lib-0.0.5.dev1 → nora_lib-0.0.5.dev3}/PKG-INFO

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

{nora_lib-0.0.5.dev1 → nora_lib-0.0.5.dev3}/nora_lib/interactions/interactions_service.py

@@ -4,6 +4,7 @@ import requests
 from typing import List, Optional
 
 from nora_lib.interactions.models import (
+    AnnotationBatch,
     Event,
     EventType,
     Message,
@@ -45,6 +46,17 @@ class InteractionsService:
         )
         response.raise_for_status()
 
+    def save_annotation(self, annotation: AnnotationBatch) -> None:
+        """Save an annotation to the Interactions API"""
+        annotation_url = f"{self.base_url}/interaction/v1/annotation"
+        response = requests.post(
+            annotation_url,
+            json=annotation.model_dump(),
+            headers=self.headers,
+            timeout=int(self.timeout),
+        )
+        response.raise_for_status()
+
     def get_message(self, message_id: str) -> ReturnedMessage:
         """Fetch a message from the Interactions API"""
         message_url = f"{self.base_url}/interaction/v1/search/message"
@@ -118,7 +130,7 @@ class InteractionsService:
                 e,
             )
 
-        messages_with_events.sort(key=lambda x: datetime.fromisoformat(x.ts))
+        messages_with_events.sort(key=lambda x: x.ts)
         return messages_with_events
 
     def fetch_thread_messages_and_events_for_message(

{nora_lib-0.0.5.dev1 → nora_lib-0.0.5.dev3}/nora_lib/interactions/models.py

@@ -25,6 +25,16 @@ class Annotation(BaseModel):
     attributes: Optional[Dict[str, str]] = None
 
 
+class AnnotationBatch(BaseModel):
+    actor_id: UUID
+    message_id: str
+    annotations: List[Annotation]
+
+    @field_serializer("actor_id")
+    def serialize_actor_id(self, actor_id: UUID):
+        return str(actor_id)
+
+
 class Message(BaseModel):
     message_id: str
     actor_id: UUID
@@ -48,7 +58,9 @@ class EventType(str, Enum):
     """Event types for the interactions service"""
 
     AGENT_CONTEXT = "agent:message_context"
+    S2_ANNOTATION = "s2_annotation"
     THREAD_FORK = "thread_fork"
+    UI_INTERACTION = "ui_interaction"
 
 
 class Event(BaseModel):
@@ -78,9 +90,9 @@ class ReturnedMessage(BaseModel):
     """Message format returned by interaction service"""
 
     message_id: str
-    actor_id: str
+    actor_id: UUID
     text: str
-    ts: str
+    ts: datetime
     annotated_text: Optional[str] = None
     events: List[Event] = Field(default_factory=list)
     thread_id: Optional[str] = None
@@ -101,8 +113,8 @@ class AgentMessageData(BaseModel):
 class ReturnedAgentContextEvent(BaseModel):
     """Event format returned by interaction service for agent context events"""
 
-    actor_id: str  # agent that saved this context
-    timestamp: str
+    actor_id: UUID  # agent that saved this context
+    timestamp: datetime
     data: AgentMessageData
     type: str
 
@@ -111,7 +123,7 @@ class ReturnedAgentContextMessage(BaseModel):
     """Message format returned by interaction service for search by thread"""
 
     message_id: str
-    actor_id: str
+    actor_id: UUID
     text: str
     ts: str
     annotated_text: Optional[str] = None

{nora_lib-0.0.5.dev1 → nora_lib-0.0.5.dev3}/nora_lib.egg-info/PKG-INFO

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

{nora_lib-0.0.5.dev1 → nora_lib-0.0.5.dev3}/setup.py

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