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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nora_lib
-Version: 0.0.6.dev0
+Version: 0.0.7
 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}/nora_lib/context/context_service.py

@@ -1,17 +1,7 @@
-from datetime import datetime, timezone
-from typing import List, Optional
-from uuid import UUID
+from typing import Optional
 
 from nora_lib.interactions.interactions_service import InteractionsService
-from nora_lib.interactions.models import (
-    ReturnedMessage,
-    ReturnedAgentContextMessage,
-    ReturnedAgentContextEvent,
-    EventType,
-    AgentMessageData,
-    Event,
-)
-from nora_lib.context.models import WrappedTaskObject
+from nora_lib.interactions.models import ReturnedMessage
 
 
 class ContextService:

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

@@ -1,17 +1,13 @@
-from datetime import datetime
-import logging
 import requests
-from typing import List, Optional
+from typing import Optional
 import json
 
 from nora_lib.interactions.models import (
     AnnotationBatch,
     Event,
-    EventType,
     Message,
     ReturnedMessage,
     ThreadRelationsResponse,
-    ThreadForkEventData,
 )
 
 
@@ -98,43 +94,6 @@ class InteractionsService:
         response.raise_for_status()
         return response.json()
 
-    def fetch_messages_and_agent_context_events_for_thread(
-        self, message_id: str, event_type: str
-    ) -> List[ReturnedMessage]:
-        """Build a history of messages for a given message including associated events.
-        This includes messages from pre-forked threads."""
-        messages_with_events: List[ReturnedMessage] = []
-
-        messages_for_thread: ThreadRelationsResponse = (
-            self.fetch_thread_messages_and_events_for_message(
-                message_id, [event_type, EventType.THREAD_FORK.value]
-            )
-        )
-        messages_with_events.extend(messages_for_thread.messages)
-
-        # Process any thread_fork events
-        try:
-            for msg in messages_for_thread.messages:
-                events = msg.events if msg.events else []
-                for event in events:
-                    if event.type == EventType.THREAD_FORK.value:
-                        event_data = ThreadForkEventData.model_validate(event.data)
-                        forked_thread: ThreadRelationsResponse = (
-                            self.fetch_thread_messages_and_events_for_message(
-                                event_data.previous_message_id, [event_type]
-                            )
-                        )
-                        messages_with_events.extend(forked_thread.messages)
-        except Exception as e:  # pylint: disable=broad-except
-            logging.exception(
-                "Failed to fetch forked thread messages for message %s: %s",
-                message_id,
-                e,
-            )
-
-        messages_with_events.sort(key=lambda x: x.ts)
-        return messages_with_events
-
     def fetch_thread_messages_and_events_for_message(
         self, message_id: str, event_types: list[str]
     ) -> ThreadRelationsResponse:
@@ -183,41 +142,6 @@ class InteractionsService:
         response.raise_for_status()
         return response.json()
 
-    def fetch_messages_and_events_for_forked_thread(
-        self, message_id: str, event_type: str
-    ) -> List[ReturnedMessage]:
-        """Build a history of messages for a given message including associated events.
-        This includes messages from pre-forked threads."""
-        returned_messages: List[ReturnedMessage] = []
-
-        messages_for_thread: ThreadRelationsResponse = (
-            self.fetch_thread_messages_and_events_for_message(message_id, [event_type])
-        )
-        if messages_for_thread.messages:
-            returned_messages.extend(messages_for_thread.messages)
-
-        # Lookup any thread_fork events (conversation across surfaces)
-        thread_fork_events = self.fetch_messages_and_events_for_thread(
-            messages_for_thread.thread_id, EventType.THREAD_FORK.value
-        )
-        for forked_thread_event in thread_fork_events.get("thread", {}).get(
-            "events", []
-        ):
-            event_data = ThreadForkEventData.model_validate(
-                forked_thread_event.get("data", {})
-            )
-            forked_thread: ThreadRelationsResponse = (
-                self.fetch_thread_messages_and_events_for_message(
-                    event_data.previous_message_id, [event_type]
-                )
-            )
-            if forked_thread.messages:
-                returned_messages.extend(forked_thread.messages)
-
-        returned_messages.sort(key=lambda x: x.ts)
-
-        return returned_messages
-
     def fetch_events_for_message(
         self,
         message_id: str,

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7}/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):
@@ -54,15 +55,6 @@ class Message(BaseModel):
         return ts.isoformat()
 
 
-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):
     """event object to be sent to the interactions service; requires association with a message, thread or channel id"""
 
@@ -89,15 +81,25 @@ class Event(BaseModel):
 class ReturnedMessage(BaseModel):
     """Message format returned by interaction service"""
 
-    message_id: str
     actor_id: UUID
     text: str
     ts: datetime
+    message_id: Optional[str] = None
     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"""
+        return ReturnedMessage(
+            actor_id=event.actor_id,
+            text=json.dumps(event.data),
+            ts=event.timestamp,
+            message_id=event.message_id,
+        )
 
 
 class AgentMessageData(BaseModel):
@@ -127,13 +129,7 @@ class ReturnedAgentContextMessage(BaseModel):
     text: str
     ts: str
     annotated_text: Optional[str] = None
-    events: Optional[List[ReturnedAgentContextEvent]] = None
-
-
-class ThreadForkEventData(BaseModel):
-    """Event data for a thread fork event"""
-
-    previous_message_id: str
+    events: List[ReturnedAgentContextEvent] = Field(default_factory=list)
 
 
 class ThreadRelationsResponse(BaseModel):

{nora_lib-0.0.6.dev0 → nora_lib-0.0.7}/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
 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}/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",
     description="For making and coordinating agents and tools",
     url="https://github.com/allenai/nora_lib",
     packages=setuptools.find_packages(exclude=(["tests"])),