langchain-trigger-server 0.1.15__tar.gz → 0.1.17__tar.gz

{langchain_trigger_server-0.1.15 → langchain_trigger_server-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-trigger-server
-Version: 0.1.15
+Version: 0.1.17
 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.15 → langchain_trigger_server-0.1.17}/langchain_triggers/app.py

@@ -72,6 +72,9 @@ class TriggerServer:
         self,
         auth_handler: Callable,
     ):
+        # Configure uvicorn logging to use consistent formatting
+        self._configure_uvicorn_logging()
+        
         self.app = FastAPI(
             title="Triggers Server",
             description="Event-driven triggers framework",
@@ -123,6 +126,31 @@ class TriggerServer:
         async def shutdown_event():
             await self.cron_manager.shutdown()
     
+    def _configure_uvicorn_logging(self) -> None:
+        """Configure uvicorn loggers to use consistent formatting for production deployments."""
+        formatter = logging.Formatter("%(levelname)s: %(name)s - %(message)s")
+        
+        # Configure uvicorn access logger
+        uvicorn_access_logger = logging.getLogger("uvicorn.access")
+        uvicorn_access_logger.handlers.clear()
+        access_handler = logging.StreamHandler()
+        access_handler.setFormatter(formatter)
+        uvicorn_access_logger.addHandler(access_handler)
+        
+        # Configure uvicorn error logger  
+        uvicorn_error_logger = logging.getLogger("uvicorn.error")
+        uvicorn_error_logger.handlers.clear()
+        error_handler = logging.StreamHandler()
+        error_handler.setFormatter(formatter)
+        uvicorn_error_logger.addHandler(error_handler)
+        
+        # Configure uvicorn main logger
+        uvicorn_logger = logging.getLogger("uvicorn")
+        uvicorn_logger.handlers.clear()
+        main_handler = logging.StreamHandler()
+        main_handler.setFormatter(formatter)
+        uvicorn_logger.addHandler(main_handler)
+    
     def add_trigger(self, trigger: TriggerTemplate) -> None:
         """Add a trigger template to the app."""
         # Check for duplicate IDs
@@ -255,18 +283,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')}"
                     )
                 
                 

{langchain_trigger_server-0.1.15 → langchain_trigger_server-0.1.17}/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.15 → langchain_trigger_server-0.1.17}/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.15 → langchain_trigger_server-0.1.17}/pyproject.toml

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