s3 client for r2 storage code duplication removed. and also removed librarytrigger

Author: laurin

sebs/cloudflare/cloudflare.py

@@ -514,11 +514,7 @@ def cached_function(self, function: Function):
         Args:
             function: The cached function
         """
-        from sebs.cloudflare.triggers import LibraryTrigger, HTTPTrigger
-
-        for trigger in function.triggers(Trigger.TriggerType.LIBRARY):
-            trigger.logging_handlers = self.logging_handlers
-            cast(LibraryTrigger, trigger).deployment_client = self
+        from sebs.cloudflare.triggers import HTTPTrigger
 
         for trigger in function.triggers(Trigger.TriggerType.HTTP):
             trigger.logging_handlers = self.logging_handlers
@@ -779,15 +775,11 @@ def create_trigger(
         Returns:
             The created trigger
         """
-        from sebs.cloudflare.triggers import LibraryTrigger, HTTPTrigger
+        from sebs.cloudflare.triggers import HTTPTrigger
 
         worker = cast(CloudflareWorker, function)
 
-        if trigger_type == Trigger.TriggerType.LIBRARY:
-            trigger = LibraryTrigger(worker.name, self)
-            trigger.logging_handlers = self.logging_handlers
-            return trigger
-        elif trigger_type == Trigger.TriggerType.HTTP:
+        if trigger_type == Trigger.TriggerType.HTTP:
             account_id = worker.account_id or self.config.credentials.account_id
             worker_url = self._build_workers_dev_url(worker.name, account_id)
             trigger = HTTPTrigger(worker.name, worker_url)

sebs/cloudflare/function.py

@@ -40,7 +40,7 @@ def serialize(self) -> dict:
     @staticmethod
     def deserialize(cached_config: dict) -> "CloudflareWorker":
         from sebs.faas.function import Trigger
-        from sebs.cloudflare.triggers import LibraryTrigger, HTTPTrigger
+        from sebs.cloudflare.triggers import HTTPTrigger
 
         cfg = FunctionConfig.deserialize(cached_config["config"])
         ret = CloudflareWorker(
@@ -54,14 +54,7 @@ def deserialize(cached_config: dict) -> "CloudflareWorker":
         )
 
         for trigger in cached_config["triggers"]:
-            mapping = {
-                LibraryTrigger.typename(): LibraryTrigger,
-                HTTPTrigger.typename(): HTTPTrigger
-            }
-            trigger_type = cast(
-                Trigger,
-                mapping.get(trigger["type"]),
-            )
+            trigger_type = HTTPTrigger if trigger["type"] == HTTPTrigger.typename() else None
             assert trigger_type, "Unknown trigger type {}".format(trigger["type"])
             ret.add_trigger(trigger_type.deserialize(trigger))
 

sebs/cloudflare/r2.py

@@ -35,6 +35,7 @@ def __init__(
     ):
         super().__init__(region, cache_client, resources, replace_existing)
         self._credentials = credentials
+        self._s3_client = None
 
     def _get_auth_headers(self) -> dict[str, str]:
         """Get authentication headers for Cloudflare API requests."""
@@ -52,6 +53,46 @@ def _get_auth_headers(self) -> dict[str, str]:
         else:
             raise RuntimeError("Invalid Cloudflare credentials configuration")
 
+    def _get_s3_client(self):
+        """
+        Get or initialize the S3-compatible client for R2 operations.
+        
+        :return: boto3 S3 client or None if credentials not available
+        """
+        if self._s3_client is not None:
+            return self._s3_client
+        
+        # Check if we have S3-compatible credentials
+        if not self._credentials.r2_access_key_id or not self._credentials.r2_secret_access_key:
+            self.logging.warning(
+                "R2 S3-compatible API credentials not configured. "
+                "Set CLOUDFLARE_R2_ACCESS_KEY_ID and CLOUDFLARE_R2_SECRET_ACCESS_KEY environment variables."
+            )
+            return None
+        
+        try:
+            import boto3
+            from botocore.config import Config
+            
+            account_id = self._credentials.account_id
+            
+            self._s3_client = boto3.client(
+                's3',
+                endpoint_url=f'https://{account_id}.r2.cloudflarestorage.com',
+                aws_access_key_id=self._credentials.r2_access_key_id,
+                aws_secret_access_key=self._credentials.r2_secret_access_key,
+                config=Config(signature_version='s3v4'),
+                region_name='auto'
+            )
+            
+            return self._s3_client
+            
+        except ImportError:
+            self.logging.warning(
+                "boto3 not available. Install with: pip install boto3"
+            )
+            return None
+
     def correct_name(self, name: str) -> str:
         return name
 
@@ -142,33 +183,12 @@ def upload(self, bucket_name: str, filepath: str, key: str):
         :param filepath: local source filepath
         :param key: R2 destination key/path
         """
+        s3_client = self._get_s3_client()
+        if s3_client is None:
+            self.logging.warning(f"Cannot upload {filepath} to R2 - S3 client not available")
+            return
+        
         try:
-            import boto3
-            from botocore.config import Config
-            
-            account_id = self._credentials.account_id
-            
-            # R2 uses S3-compatible API, but requires special configuration
-            # The endpoint is: https://<account_id>.r2.cloudflarestorage.com
-            # You need to create R2 API tokens in the Cloudflare dashboard
-            
-            # Check if we have S3-compatible credentials
-            if not self._credentials.r2_access_key_id or not self._credentials.r2_secret_access_key:
-                self.logging.warning(
-                    "R2 upload requires S3-compatible API credentials (r2_access_key_id, r2_secret_access_key). "
-                    "File upload skipped. Set CLOUDFLARE_R2_ACCESS_KEY_ID and CLOUDFLARE_R2_SECRET_ACCESS_KEY."
-                )
-                return
-            
-            s3_client = boto3.client(
-                's3',
-                endpoint_url=f'https://{account_id}.r2.cloudflarestorage.com',
-                aws_access_key_id=self._credentials.r2_access_key_id,
-                aws_secret_access_key=self._credentials.r2_secret_access_key,
-                config=Config(signature_version='s3v4'),
-                region_name='auto'
-            )
-            
             with open(filepath, 'rb') as f:
                 s3_client.put_object(
                     Bucket=bucket_name,
@@ -178,11 +198,6 @@ def upload(self, bucket_name: str, filepath: str, key: str):
 
             self.logging.debug(f"Uploaded {filepath} to R2 bucket {bucket_name} as {key}")
 
-        except ImportError:
-            self.logging.warning(
-                "boto3 not available. Install with: pip install boto3. "
-                "File upload to R2 skipped."
-            )
         except Exception as e:
             self.logging.warning(f"Failed to upload {filepath} to R2: {e}")
 
@@ -194,28 +209,12 @@ def upload_bytes(self, bucket_name: str, key: str, data: bytes):
         :param key: R2 destination key/path
         :param data: bytes to upload
         """
+        s3_client = self._get_s3_client()
+        if s3_client is None:
+            self.logging.warning(f"Cannot upload bytes to R2 - S3 client not available")
+            return
+        
         try:
-            import boto3
-            from botocore.config import Config
-            
-            account_id = self._credentials.account_id
-            
-            if not self._credentials.r2_access_key_id or not self._credentials.r2_secret_access_key:
-                self.logging.warning(
-                    "R2 upload requires S3-compatible API credentials (r2_access_key_id, r2_secret_access_key). "
-                    "Upload skipped. Set CLOUDFLARE_R2_ACCESS_KEY_ID and CLOUDFLARE_R2_SECRET_ACCESS_KEY environment variables."
-                )
-                return
-            
-            s3_client = boto3.client(
-                's3',
-                endpoint_url=f'https://{account_id}.r2.cloudflarestorage.com',
-                aws_access_key_id=self._credentials.r2_access_key_id,
-                aws_secret_access_key=self._credentials.r2_secret_access_key,
-                config=Config(signature_version='s3v4'),
-                region_name='auto'
-            )
-            
             s3_client.put_object(
                 Bucket=bucket_name,
                 Key=key,
@@ -224,10 +223,6 @@ def upload_bytes(self, bucket_name: str, key: str, data: bytes):
 
             self.logging.debug(f"Uploaded {len(data)} bytes to R2 bucket {bucket_name} as {key}")
 
-        except ImportError:
-            self.logging.warning(
-                "boto3 not available. Install with: pip install boto3"
-            )
         except Exception as e:
             self.logging.warning(f"Failed to upload bytes to R2: {e}")
 
@@ -246,27 +241,12 @@ def list_bucket(self, bucket_name: str, prefix: str = "") -> List[str]:
         :param prefix: optional prefix filter
         :return: list of files in a given bucket
         """
-        # Use S3-compatible API with R2 credentials
-        if not self._credentials.r2_access_key_id or not self._credentials.r2_secret_access_key:
-            self.logging.warning(f"R2 S3 credentials not configured, cannot list bucket {bucket_name}")
+        s3_client = self._get_s3_client()
+        if s3_client is None:
+            self.logging.warning(f"Cannot list R2 bucket {bucket_name} - S3 client not available")
             return []
 
         try:
-            import boto3
-            from botocore.config import Config
-            
-            account_id = self._credentials.account_id
-            r2_endpoint = f"https://{account_id}.r2.cloudflarestorage.com"
-            
-            s3_client = boto3.client(
-                's3',
-                endpoint_url=r2_endpoint,
-                aws_access_key_id=self._credentials.r2_access_key_id,
-                aws_secret_access_key=self._credentials.r2_secret_access_key,
-                config=Config(signature_version='s3v4'),
-                region_name='auto'
-            )
-            
             # List objects with optional prefix
             paginator = s3_client.get_paginator('list_objects_v2')
             page_iterator = paginator.paginate(Bucket=bucket_name, Prefix=prefix)

sebs/cloudflare/triggers.py

@@ -4,59 +4,6 @@
 from sebs.faas.function import Trigger, ExecutionResult
 
 
-class LibraryTrigger(Trigger):
-    """
-    Library trigger for Cloudflare Workers.
-    Allows invoking workers programmatically via the Cloudflare API.
-    """
-    
-    def __init__(self, worker_name: str, deployment_client=None):
-        super().__init__()
-        self.worker_name = worker_name
-        self.deployment_client = deployment_client
-
-    @staticmethod
-    def typename() -> str:
-        return "Cloudflare.LibraryTrigger"
-
-    @staticmethod
-    def trigger_type() -> Trigger.TriggerType:
-        return Trigger.TriggerType.LIBRARY
-
-    def sync_invoke(self, payload: dict) -> ExecutionResult:
-        """
-        Synchronously invoke a Cloudflare Worker.
-        
-        Args:
-            payload: The payload to send to the worker
-            
-        Returns:
-            ExecutionResult with performance metrics
-        """
-        # This will be implemented when we have the deployment client
-        raise NotImplementedError("Cloudflare Worker invocation not yet implemented")
-
-    def async_invoke(self, payload: dict) -> concurrent.futures.Future:
-        """
-        Asynchronously invoke a Cloudflare Worker.
-        Not typically supported for Cloudflare Workers.
-        """
-        raise NotImplementedError("Cloudflare Workers do not support async invocation")
-
-    def serialize(self) -> dict:
-        """Serialize the LibraryTrigger."""
-        return {
-            "type": self.typename(),
-            "worker_name": self.worker_name,
-        }
-
-    @staticmethod
-    def deserialize(cached_config: dict) -> "LibraryTrigger":
-        """Deserialize a LibraryTrigger from cached config."""
-        from sebs.cloudflare.triggers import LibraryTrigger
-        return LibraryTrigger(cached_config["worker_name"])
-
-
 class HTTPTrigger(Trigger):
     """
     HTTP trigger for Cloudflare Workers.