nora-lib 0.0.3__tar.gz → 0.0.5.dev0__tar.gz

{nora_lib-0.0.3 → nora_lib-0.0.5.dev0}/PKG-INFO

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

@@ -0,0 +1,42 @@
+from datetime import datetime, timezone
+from typing import List, Optional
+from uuid import UUID
+
+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
+
+
+class ContextService:
+    """
+    Save and retrieve task agent context from interaction store
+    """
+
+    def __init__(
+        self,
+        agent_actor_id: str,  # uuid representing this agent in interaction store
+        interactions_base_url: str,
+        interactions_bearer_token: Optional[str],
+        timeout: int = 30,
+    ):
+        self.interactions_service = self._get_interactions_service(
+            interactions_base_url, interactions_bearer_token, timeout
+        )
+        self.agent_actor_id = agent_actor_id
+
+    def _get_interactions_service(self, url, token, timeout) -> InteractionsService:
+        return InteractionsService(url, timeout, token)
+
+    def get_message(self, message_id: str) -> str:
+        message: ReturnedMessage = self.interactions_service.get_message(message_id)
+        if message.annotated_text:
+            return message.annotated_text
+        else:
+            return message.text

nora_lib-0.0.5.dev0/nora_lib/context/models.py

@@ -0,0 +1,11 @@
+from typing import Optional
+from pydantic import BaseModel, Field
+
+
+class WrappedTaskObject(BaseModel):
+    """Encloses request or response object with additional metadata"""
+
+    message_id: str = Field(
+        description="id of originating message; key for istore retrieval"
+    )
+    data: dict = Field(description="Tool-defined request or response")

{nora_lib-0.0.3 → nora_lib-0.0.5.dev0}/nora_lib/interactions/interactions_service.py

@@ -5,6 +5,7 @@ from typing import List, Optional
 from nora_lib.interactions.models import (
     Event,
     EventType,
+    Message,
     ReturnedMessage,
     ThreadRelationsResponse,
     ThreadForkEventData,
@@ -22,6 +23,17 @@ class InteractionsService:
         self.timeout = timeout
         self.headers = {"Authorization": f"Bearer {token}"}
 
+    def save_message(self, message: Message) -> None:
+        """Save a message to the Interactions API"""
+        message_url = f"{self.base_url}/interaction/v1/message"
+        response = requests.post(
+            message_url,
+            json=message.model_dump(),
+            headers=self.headers,
+            timeout=int(self.timeout),
+        )
+        response.raise_for_status()
+
     def save_event(self, event: Event) -> None:
         """Save an event to the Interactions API"""
         event_url = f"{self.base_url}/interaction/v1/event"
@@ -33,6 +45,23 @@ class InteractionsService:
         )
         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"
+        request_body = {
+            "id": message_id,
+        }
+        response = requests.post(
+            message_url,
+            json=request_body,
+            headers=self.headers,
+            timeout=int(self.timeout),
+        )
+        response.raise_for_status()
+        res_dict = response.json()["message"]
+
+        return ReturnedMessage.model_validate(res_dict)
+
     def fetch_thread_messages_and_events_for_message(
         self, message_id: str, event_type: str
     ) -> ThreadRelationsResponse:

{nora_lib-0.0.3 → nora_lib-0.0.5.dev0}/nora_lib/interactions/models.py

@@ -4,10 +4,44 @@ Model for interactions to be sent to the interactions service.
 
 from datetime import datetime
 from enum import Enum
-from typing import Optional, List
+from typing import Dict, List, Optional, Tuple
 from uuid import UUID
 
-from pydantic import BaseModel, Field, field_serializer
+from pydantic import BaseModel, Field, field_serializer, ConfigDict
+
+
+class Surface(str, Enum):
+    SLACK = "Slack"
+    WEB = "NoraWebapp"
+
+
+class Annotation(BaseModel):
+    # Need this config to stringify numeric values in attributes.
+    # Otherwise, we'll get 'Input should be a valid string' error.
+    model_config = ConfigDict(coerce_numbers_to_str=True)
+
+    tag: str
+    span: Tuple[int, int]
+    attributes: Optional[Dict[str, str]] = None
+
+
+class Message(BaseModel):
+    message_id: str
+    actor_id: UUID
+    text: str
+    thread_id: Optional[str]
+    channel_id: str
+    surface: Surface
+    ts: datetime
+    annotations: Optional[List[Annotation]] = None
+
+    @field_serializer("actor_id")
+    def serialize_actor_id(self, actor_id: UUID):
+        return str(actor_id)
+
+    @field_serializer("ts")
+    def serialize_ts(self, ts: datetime):
+        return ts.isoformat()
 
 
 class EventType(str, Enum):
@@ -40,6 +74,17 @@ class Event(BaseModel):
         return timestamp.isoformat()
 
 
+class ReturnedMessage(BaseModel):
+    """Message format returned by interaction service"""
+
+    message_id: str
+    actor_id: str
+    text: str
+    ts: str
+    annotated_text: Optional[str] = None
+    events: Optional[List[dict]] = None
+
+
 class AgentMessageData(BaseModel):
     """capture requests to and responses from tools within Events"""
 
@@ -76,17 +121,6 @@ class ThreadForkEventData(BaseModel):
     previous_message_id: str
 
 
-class ReturnedMessage(BaseModel):
-    """Message format returned by interaction service for search by thread"""
-
-    message_id: str
-    actor_id: str
-    text: str
-    ts: str
-    annotated_text: Optional[str] = None
-    events: Optional[List[dict]] = None
-
-
 class ThreadRelationsResponse(BaseModel):
     """Thread format returned by interaction service for thread relations in a search response"""
 

{nora_lib-0.0.3 → nora_lib-0.0.5.dev0}/nora_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nora_lib
-Version: 0.0.3
+Version: 0.0.5.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.3 → nora_lib-0.0.5.dev0}/setup.py

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

nora_lib-0.0.3/nora_lib/context/context_service.py

@@ -1,88 +0,0 @@
-from datetime import datetime, timezone
-from typing import List, Optional
-from uuid import UUID
-
-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
-
-
-class ContextService:
-    """
-    Save and retrieve task agent context from interaction store
-    """
-
-    def __init__(
-        self,
-        agent_actor_id: str,  # uuid representing this agent in interaction store
-        interactions_base_url: str,
-        interactions_bearer_token: Optional[str],
-        timeout: int = 30,
-    ):
-        self.interactions_service = self._get_interactions_service(
-            interactions_base_url, interactions_bearer_token, timeout
-        )
-        self.agent_actor_id = agent_actor_id
-
-    def _get_interactions_service(self, url, token, timeout) -> InteractionsService:
-        return InteractionsService(url, timeout, token)
-
-    def fetch_context(
-        self, request: WrappedTaskObject
-    ) -> List[ReturnedAgentContextMessage]:
-        message_id = request.message_id
-
-        returned_messages: List[ReturnedMessage] = (
-            self.interactions_service.fetch_messages_and_events_for_forked_thread(
-                message_id, EventType.AGENT_CONTEXT
-            )
-        )
-
-        messages_with_filtered_events: List[ReturnedAgentContextMessage] = []
-        for message in returned_messages:
-            events_saved_by_this_agent: List[ReturnedAgentContextEvent] = []
-            if message.events:
-                for event in message.events:
-                    context_event = ReturnedAgentContextEvent.model_validate(event)
-                    if context_event.actor_id == self.agent_actor_id:
-                        events_saved_by_this_agent.append(context_event)
-
-                events_saved_by_this_agent.sort(
-                    key=lambda event: datetime.fromisoformat(event.timestamp)
-                )
-
-            updated_message = ReturnedAgentContextMessage(
-                message_id=message.message_id,
-                actor_id=message.actor_id,
-                text=message.text,
-                ts=message.ts,
-                annotated_text=message.annotated_text,
-                events=events_saved_by_this_agent,
-            )
-
-            messages_with_filtered_events.append(updated_message)
-
-        return messages_with_filtered_events
-
-    def save_context(self, event_data: WrappedTaskObject):
-        agent_data = AgentMessageData(
-            message_data=event_data.model_dump(),
-            data_sender_actor_id=event_data.sender_actor_id,
-            virtual_thread_id=event_data.virtual_thread_id,
-        )
-        event = Event(
-            type=EventType.AGENT_CONTEXT,
-            actor_id=UUID(self.agent_actor_id),
-            timestamp=datetime.now(timezone.utc),
-            data=agent_data.model_dump(),
-            message_id=event_data.message_id,
-        )
-
-        self.interactions_service.save_event(event)

nora_lib-0.0.3/nora_lib/context/models.py

@@ -1,21 +0,0 @@
-from typing import Generic, Optional, TypeVar
-from pydantic import BaseModel, Field
-
-
-R = TypeVar("R", bound=BaseModel)
-
-
-class WrappedTaskObject(BaseModel, Generic[R]):
-    """Encloses request or response object with additional metadata"""
-
-    message_id: str = Field(
-        description="id of originating message; key for istore retrieval"
-    )
-    sender_actor_id: str = Field(
-        description="string representation of uuid identifying agent sending data"
-    )
-    virtual_thread_id: Optional[str] = Field(
-        description="Tool-defined local thread to associate follow up requests"
-    )
-    task_id: Optional[str] = Field(description="Reference to a long-running task")
-    data: R = Field(description="Tool-defined request or response")