langchain-trigger-server 0.1.14__tar.gz → 0.1.16__tar.gz

{langchain_trigger_server-0.1.14 → langchain_trigger_server-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-trigger-server
-Version: 0.1.14
+Version: 0.1.16
 Summary: Generic event-driven triggers framework
 Project-URL: Homepage, https://github.com/langchain-ai/open-agent-platform
 Project-URL: Repository, https://github.com/langchain-ai/open-agent-platform

{langchain_trigger_server-0.1.14 → langchain_trigger_server-0.1.16}/langchain_triggers/app.py

@@ -255,18 +255,18 @@ class TriggerServer:
                         detail=f"Invalid payload for trigger: {str(e)}"
                     )
                 
-                # Check for duplicate registration based on resource data
+                # Check for duplicate registration based on resource data within this user's scope
                 resource_dict = registration_instance.model_dump()
-                existing_registration = await self.database.find_registration_by_resource(
+                existing_registration = await self.database.find_user_registration_by_resource(
+                    user_id=user_id,
                     template_id=trigger.id,
                     resource_data=resource_dict
                 )
                 
-                # TODO(sam) figure out how to allow duplicates across users.....very unnatural constraint to have
                 if existing_registration:
                     raise HTTPException(
                         status_code=400,
-                        detail=f"A registration with this configuration already exists for trigger type '{trigger.id}'. Registration ID: {existing_registration.get('id')}"
+                        detail=f"You already have a registration with this configuration for trigger type '{trigger.id}'. Registration ID: {existing_registration.get('id')}"
                     )
                 
                 
@@ -443,26 +443,28 @@ class TriggerServer:
             agent_links = await self.database.get_agents_for_trigger(registration_id)
 
             agents_invoked = 0
-            for agent_link in agent_links:
-                agent_id = agent_link if isinstance(agent_link, str) else agent_link.get("agent_id")
+            # Iterate through each message and invoke agents for each
+            for message in result.agent_messages:
+                for agent_link in agent_links:
+                    agent_id = agent_link if isinstance(agent_link, str) else agent_link.get("agent_id")
 
-                agent_input = {
-                    "messages": [
-                        {"role": "human", "content": result.agent_message}
-                    ]
-                }
+                    agent_input = {
+                        "messages": [
+                            {"role": "human", "content": message}
+                        ]
+                    }
 
-                try:
-                    success = await self._invoke_agent(
-                        agent_id=agent_id,
-                        user_id=result.registration["user_id"],
-                        input_data=agent_input,
-                    )
-                    if success:
-                        agents_invoked += 1
-                except Exception as e:
-                    logger.error(f"Error invoking agent {agent_id}: {e}", exc_info=True)
-            logger.info(f"Processed trigger handler, invoked {agents_invoked} agents")
+                    try:
+                        success = await self._invoke_agent(
+                            agent_id=agent_id,
+                            user_id=result.registration["user_id"],
+                            input_data=agent_input,
+                        )
+                        if success:
+                            agents_invoked += 1
+                    except Exception as e:
+                        logger.error(f"Error invoking agent {agent_id}: {e}", exc_info=True)
+            logger.info(f"Processed trigger handler with {len(result.agent_messages)} messages, invoked {agents_invoked} agents")
             
             return {
                 "success": True,

{langchain_trigger_server-0.1.14 → langchain_trigger_server-0.1.16}/langchain_triggers/core.py

@@ -44,14 +44,14 @@ class AgentInvocationRequest(BaseModel):
 class TriggerHandlerResult(BaseModel):
     """Result returned by trigger handlers."""
     invoke_agent: bool = Field(default=True, description="Whether to invoke agents for this event")
-    agent_message: Optional[str] = Field(default=None, description="String message to send to agents")
+    agent_messages: Optional[list[str]] = Field(default=None, description="List of messages to send to agents (one invocation per message)")
     response_body: Optional[Dict[str, Any]] = Field(default=None, description="Custom HTTP response body (when invoke_agent=False)")
     registration: Optional[Dict[str, Any]] = Field(default=None, description="Registration data (required when invoke_agent=True)")
     
     def model_post_init(self, __context) -> None:
         """Validate that required fields are provided based on invoke_agent."""
-        if self.invoke_agent and not self.agent_message:
-            raise ValueError("agent_message is required when invoke_agent=True")
+        if self.invoke_agent and not self.agent_messages:
+            raise ValueError("agent_messages is required when invoke_agent=True")
         if self.invoke_agent and not self.registration:
             raise ValueError("registration is required when invoke_agent=True")
         if not self.invoke_agent and not self.response_body:

{langchain_trigger_server-0.1.14 → langchain_trigger_server-0.1.16}/langchain_triggers/database/interface.py

@@ -67,6 +67,16 @@ class TriggerDatabaseInterface(ABC):
         """Find trigger registration by matching resource data."""
         pass
     
+    @abstractmethod
+    async def find_user_registration_by_resource(
+        self, 
+        user_id: str,
+        template_id: str, 
+        resource_data: Dict[str, Any]
+    ) -> Optional[Dict[str, Any]]:
+        """Find trigger registration by matching resource data for a specific user."""
+        pass
+    
     @abstractmethod
     async def get_all_registrations(self, template_id: str) -> List[Dict[str, Any]]:
         """Get all registrations for a specific trigger template."""

{langchain_trigger_server-0.1.14 → langchain_trigger_server-0.1.16}/langchain_triggers/database/supabase.py

@@ -250,6 +250,33 @@ class SupabaseTriggerDatabase(TriggerDatabaseInterface):
             logger.error(f"Error finding registration by resource: {e}")
             return None
     
+    async def find_user_registration_by_resource(
+        self, 
+        user_id: str,
+        template_id: str, 
+        resource_data: Dict[str, Any]
+    ) -> Optional[Dict[str, Any]]:
+        """Find trigger registration by matching resource data for a specific user."""
+        try:
+            # Build query to match against trigger_registrations with template_id and user_id filter
+            query = self.client.table("trigger_registrations").select(
+                "*, trigger_templates(id, name, description)"
+            ).eq("trigger_templates.id", template_id).eq("user_id", user_id)
+            
+            # Add resource field matches
+            for field, value in resource_data.items():
+                query = query.eq(f"resource->>{field}", value)
+            
+            response = query.execute()
+            
+            if response.data:
+                return response.data[0]  # Return first match
+            return None
+            
+        except Exception as e:
+            logger.error(f"Error finding user registration by resource: {e}")
+            return None
+    
     async def get_all_registrations(self, template_id: str) -> List[Dict[str, Any]]:
         """Get all registrations for a specific trigger template."""
         try:

{langchain_trigger_server-0.1.14 → langchain_trigger_server-0.1.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "langchain-trigger-server"
-version = "0.1.14"
+version = "0.1.16"
 description = "Generic event-driven triggers framework"
 readme = "README.md"
 requires-python = ">=3.9"