remotion-lambda 4.0.347__tar.gz → 4.0.351__tar.gz

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotion_lambda
-Version: 4.0.347
+Version: 4.0.351
 Summary: Remotion Lambda client
 Home-page: https://github.com/remotion-dev/remotion/tree/main/packages/lambda-python
 Author: Jonny Burger

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/remotion_lambda/remotionclient.py

@@ -1,10 +1,11 @@
 # pylint: disable=too-few-public-methods, missing-module-docstring, broad-exception-caught
+import logging
 from dataclasses import asdict
 import random
 import json
 import hashlib
 from math import ceil
-from typing import Optional, Union
+from typing import Optional, Union, List
 from enum import Enum
 import boto3
 from botocore.exceptions import ClientError
@@ -22,17 +23,23 @@ from .models import (
 )
 
 
+logger = logging.getLogger(__name__)
+
+BUCKET_NAME_PREFIX = 'remotionlambda-'
+REGION_US_EAST = 'us-east-1'
+
+
 class RemotionClient:
     """A client for interacting with the Remotion service."""
 
     # pylint: disable=too-many-arguments
     def __init__(
         self,
-        region,
-        serve_url,
-        function_name,
-        access_key=None,
-        secret_key=None,
+        region: str,
+        serve_url: str,
+        function_name: str,
+        access_key: Optional[str] = None,
+        secret_key: Optional[str] = None,
         force_path_style=False,
     ):
         """
@@ -67,7 +74,7 @@ class RemotionClient:
         # Use the same logic as JS SDK: prefix + region without dashes + random hash
         region_no_dashes = self.region.replace('-', '')
         random_suffix = self._generate_random_hash()
-        return f"remotionlambda-{region_no_dashes}-{random_suffix}"
+        return f"{BUCKET_NAME_PREFIX}{region_no_dashes}-{random_suffix}"
 
     def _input_props_key(self, hash_value):
         """Generate S3 key for input props."""
@@ -75,47 +82,56 @@ class RemotionClient:
 
     def _create_s3_client(self):
         """Create S3 client with appropriate credentials."""
-        config = None
+        kwargs = {'region_name': self.region}
+
         if self.force_path_style:
-            config = Config(s3={'addressing_style': 'path'})
+            kwargs['config'] = Config(s3={'addressing_style': 'path'})
 
         if self.access_key and self.secret_key:
-            return boto3.client(
-                's3',
-                aws_access_key_id=self.access_key,
-                aws_secret_access_key=self.secret_key,
-                region_name=self.region,
-                config=config,
+            kwargs.update(
+                {
+                    'aws_access_key_id': self.access_key,
+                    'aws_secret_access_key': self.secret_key,
+                }
             )
-        return boto3.client('s3', region_name=self.region, config=config)
 
-    def _get_remotion_buckets(self):
-        """Get existing Remotion buckets in the region."""
+        return boto3.client('s3', **kwargs)
+
+    def _get_remotion_buckets(self) -> List[str]:
         s3_client = self._create_s3_client()
+
         try:
             response = s3_client.list_buckets()
-            buckets = []
-            for bucket in response['Buckets']:
-                bucket_name = bucket['Name']
-                if bucket_name.startswith('remotionlambda-'):
-                    # Check if bucket is in the correct region
-                    try:
-                        bucket_region = s3_client.get_bucket_location(
-                            Bucket=bucket_name
-                        )
-                        location = bucket_region.get('LocationConstraint')
-                        # us-east-1 returns None for LocationConstraint
-                        if location == self.region or (
-                            location is None and self.region == 'us-east-1'
-                        ):
-                            buckets.append(bucket_name)
-                    except ClientError:
-                        # Ignore buckets we can't access
-                        continue
-            return buckets
-        except ClientError:
+        except ClientError as e:
+            logger.warning("Could not list S3 buckets: %s", e)
             return []
 
+        remotion_buckets = []
+
+        for bucket in response.get('Buckets', []):
+            bucket_name = bucket['Name']
+
+            if not bucket_name.startswith(BUCKET_NAME_PREFIX):
+                continue
+
+            if self._is_bucket_in_current_region(s3_client, bucket_name):
+                remotion_buckets.append(bucket_name)
+
+        return remotion_buckets
+
+    def _is_bucket_in_current_region(self, s3_client, bucket_name: str) -> bool:
+        try:
+            bucket_region = s3_client.get_bucket_location(Bucket=bucket_name)
+            location = bucket_region.get('LocationConstraint')
+
+            # us-east-1 returns None for LocationConstraint
+            return location == self.region or (
+                location is None and self.region == REGION_US_EAST
+            )
+        except ClientError:
+            # Ignore buckets we can't access (permission issues, etc.)
+            return False
+
     def _get_or_create_bucket(self):
         """Get existing bucket or create a new one following JS SDK logic."""
         buckets = self._get_remotion_buckets()
@@ -136,7 +152,7 @@ class RemotionClient:
         s3_client = self._create_s3_client()
 
         try:
-            if self.region == 'us-east-1':
+            if self.region == REGION_US_EAST:
                 s3_client.create_bucket(Bucket=bucket_name)
             else:
                 s3_client.create_bucket(
@@ -173,10 +189,11 @@ class RemotionClient:
 
         if payload_size > max_size:
             # Log warning similar to JavaScript implementation
-            print(
-                f"Warning: The props are over {round(max_size / 1000)}KB "
-                f"({ceil(payload_size / 1024)}KB) in size. Uploading them to S3 to "
-                f"circumvent AWS Lambda payload size, which may lead to slowdown."
+            logger.warning(
+                "Warning: The props are over %sKB (%sKB) in size. Uploading them to S3 to "
+                "circumvent AWS Lambda payload size, which may lead to slowdown.",
+                round(max_size / 1000),
+                ceil(payload_size / 1024),
             )
             return True
         return False

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/remotion_lambda/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=missing-module-docstring, missing-final-newline
-VERSION = "4.0.347"
+VERSION = "4.0.351"

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/remotion_lambda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotion-lambda
-Version: 4.0.347
+Version: 4.0.351
 Summary: Remotion Lambda client
 Home-page: https://github.com/remotion-dev/remotion/tree/main/packages/lambda-python
 Author: Jonny Burger

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/remotion_lambda.egg-info/SOURCES.txt

@@ -11,7 +11,10 @@ remotion_lambda.egg-info/dependency_links.txt
 remotion_lambda.egg-info/requires.txt
 remotion_lambda.egg-info/top_level.txt
 tests/__init__.py
+tests/conftest.py
+tests/constants.py
 tests/test_get_render_progress_client.py
 tests/test_large_payload_compression.py
+tests/test_remotion_client.py
 tests/test_render_client_render_media.py
 tests/test_render_client_render_still.py

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/tests/__init__.py

@@ -1,7 +1,6 @@
 import os
 import sys
+
 PROJECT_PATH = os.getcwd()
-SOURCE_PATH = os.path.join(
-    PROJECT_PATH, "src"
-)
+SOURCE_PATH = os.path.join(PROJECT_PATH, "src")
 sys.path.append(SOURCE_PATH)

remotion_lambda-4.0.351/tests/conftest.py

@@ -0,0 +1,33 @@
+import pytest
+from remotion_lambda.remotionclient import RemotionClient
+from tests.constants import (
+    TEST_FUNCTION_NAME,
+    TEST_REGION,
+    TEST_SERVE_URL,
+    TEST_AWS_ACCESS_KEY,
+    TEST_AWS_SECRET_KEY,
+)
+from unittest.mock import Mock
+
+
+@pytest.fixture
+def remotion_client():
+    return RemotionClient(
+        region=TEST_REGION, serve_url=TEST_SERVE_URL, function_name=TEST_FUNCTION_NAME
+    )
+
+
+@pytest.fixture
+def remotion_client_with_creds():
+    return RemotionClient(
+        region=TEST_REGION,
+        serve_url=TEST_SERVE_URL,
+        function_name=TEST_FUNCTION_NAME,
+        access_key=TEST_AWS_ACCESS_KEY,
+        secret_key=TEST_AWS_SECRET_KEY,
+    )
+
+
+@pytest.fixture
+def mock_s3_client():
+    return Mock()

remotion_lambda-4.0.351/tests/constants.py

@@ -0,0 +1,5 @@
+TEST_REGION = "us-east-1"
+TEST_SERVE_URL = "https://example.com"
+TEST_FUNCTION_NAME = "remotion-render"
+TEST_AWS_SECRET_KEY = "test-secret-key"
+TEST_AWS_ACCESS_KEY = "test-access-key"

remotion_lambda-4.0.351/tests/test_get_render_progress_client.py

@@ -0,0 +1,23 @@
+from unittest import TestCase
+
+from remotion_lambda.remotionclient import RemotionClient, CustomCredentials
+
+
+class TestRemotionClient(TestCase):
+    def test_remotionprogress_construct_request(self):
+        client = RemotionClient(
+            region="us-east-1", serve_url="testbed", function_name="remotion-render"
+        )
+
+        print(
+            client.construct_render_progress_request(
+                render_id="abcdef",
+                bucket_name="remotion-render",
+                s3_output_provider=CustomCredentials(
+                    endpoint="https://s3.us-east-1.amazonaws.com",
+                    access_key_id="accessKeyId",
+                    secret_access_key="secretAccessKey",
+                    region="us-east-1",
+                ),
+            )
+        )

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/tests/test_large_payload_compression.py

@@ -5,106 +5,111 @@ from remotion_lambda.remotionclient import RemotionClient
 
 
 class TestLargePayloadCompression(unittest.TestCase):
-    
+
     def setUp(self):
         self.client = RemotionClient(
-            region="us-east-1",
-            serve_url="testbed",
-            function_name="remotion-render"
+            region="us-east-1", serve_url="testbed", function_name="remotion-render"
         )
-    
+
     def test_small_payload_uses_payload_format(self):
         """Test that small payloads use the payload format."""
         small_props = {'message': 'small'}
         result = self.client._serialize_input_props(small_props, 'video-or-audio')
-        
+
         self.assertEqual(result['type'], 'payload')
         self.assertIn('payload', result)
         self.assertNotIn('hash', result)
         self.assertNotIn('bucketName', result)
-    
+
     @patch('remotion_lambda.remotionclient.RemotionClient._upload_to_s3')
     @patch('remotion_lambda.remotionclient.RemotionClient._get_or_create_bucket')
     def test_large_payload_uses_bucket_format(self, mock_get_bucket, mock_upload):
         """Test that large payloads use the bucket-url format."""
         mock_get_bucket.return_value = 'remotionlambda-useast1-testbucket'
-        
+
         # Create a large payload that exceeds the limit for video-or-audio (200KB - margin)
         large_data = 'x' * 200000  # 200KB of data
         large_props = {'data': large_data}
-        
+
         result = self.client._serialize_input_props(large_props, 'video-or-audio')
-        
+
         self.assertEqual(result['type'], 'bucket-url')
         self.assertIn('hash', result)
         self.assertIn('bucketName', result)
         self.assertEqual(result['bucketName'], 'remotionlambda-useast1-testbucket')
-        
+
         # Verify S3 upload was called
         mock_upload.assert_called_once()
-        
+
     def test_needs_upload_logic(self):
         """Test the logic for determining when upload is needed."""
         # Small payload should not need upload
         self.assertFalse(self.client._needs_upload(1000, 'video-or-audio'))
         self.assertFalse(self.client._needs_upload(1000, 'still'))
-        
+
         # Large payload for video should need upload
         self.assertTrue(self.client._needs_upload(200000, 'video-or-audio'))
-        
+
         # Large payload for still should need upload (over 5MB)
         self.assertTrue(self.client._needs_upload(5000000, 'still'))
-        
+
         # Medium payload for still should not need upload
         self.assertFalse(self.client._needs_upload(1000000, 'still'))
-    
+
     def test_hash_generation(self):
         """Test that hash generation is consistent."""
         payload = '{"test": "data"}'
         hash1 = self.client._generate_hash(payload)
         hash2 = self.client._generate_hash(payload)
-        
+
         self.assertEqual(hash1, hash2)
         self.assertIsInstance(hash1, str)
         self.assertEqual(len(hash1), 64)  # SHA256 hex string length
-    
+
     def test_input_props_key_generation(self):
         """Test S3 key generation for input props."""
         hash_value = 'test123'
         key = self.client._input_props_key(hash_value)
         self.assertEqual(key, 'input-props/test123.json')
-    
+
     def test_bucket_name_generation(self):
         """Test bucket name generation following JS SDK conventions."""
         bucket_name = self.client._make_bucket_name()
-        
+
         # Should start with remotionlambda- prefix
         self.assertTrue(bucket_name.startswith('remotionlambda-'))
-        
+
         # Should contain region without dashes
         expected_region = self.client.region.replace('-', '')
         self.assertIn(expected_region, bucket_name)
-        
+
         # Should be in format: remotionlambda-{region-no-dashes}-{random-hash}
         parts = bucket_name.split('-')
         self.assertEqual(len(parts), 3)  # remotionlambda, region, hash
         self.assertEqual(parts[0], 'remotionlambda')
         self.assertEqual(parts[1], expected_region)
         self.assertEqual(len(parts[2]), 10)  # random hash should be 10 chars
-    
+
     @patch('remotion_lambda.remotionclient.RemotionClient._get_remotion_buckets')
-    def test_get_or_create_bucket_with_multiple_buckets_raises_error(self, mock_get_buckets):
+    def test_get_or_create_bucket_with_multiple_buckets_raises_error(
+        self, mock_get_buckets
+    ):
         """Test that multiple buckets raises the correct error."""
-        mock_get_buckets.return_value = ['remotionlambda-useast1-abc123', 'remotionlambda-useast1-def456']
-        
+        mock_get_buckets.return_value = [
+            'remotionlambda-useast1-abc123',
+            'remotionlambda-useast1-def456',
+        ]
+
         with self.assertRaises(ValueError) as context:
             self.client._get_or_create_bucket()
-        
+
         error_message = str(context.exception)
         self.assertIn('multiple buckets', error_message)
         self.assertIn('remotionlambda-', error_message)
-        self.assertIn('https://remotion.dev/docs/lambda/multiple-buckets', error_message)
+        self.assertIn(
+            'https://remotion.dev/docs/lambda/multiple-buckets', error_message
+        )
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

remotion_lambda-4.0.351/tests/test_remotion_client.py

@@ -0,0 +1,176 @@
+from tests.conftest import remotion_client, mock_s3_client, remotion_client_with_creds
+from remotion_lambda.remotionclient import RemotionClient
+import pytest
+from tests.constants import (
+    TEST_FUNCTION_NAME,
+    TEST_REGION,
+    TEST_SERVE_URL,
+    TEST_AWS_SECRET_KEY,
+    TEST_AWS_ACCESS_KEY,
+)
+from unittest.mock import patch, Mock
+from botocore.config import Config
+
+
+def test_bucket_name_format(remotion_client: RemotionClient):
+    bucket_name = remotion_client._make_bucket_name()
+    assert bucket_name.startswith("remotionlambda-useast1-")
+
+
+def test_client_config(remotion_client: RemotionClient):
+    assert remotion_client.function_name == TEST_FUNCTION_NAME
+    assert remotion_client.region == TEST_REGION
+    assert remotion_client.serve_url == TEST_SERVE_URL
+    assert not remotion_client.access_key
+    assert not remotion_client.secret_key
+    assert not remotion_client.force_path_style
+
+
+def test_client_config_with_creds(remotion_client_with_creds: RemotionClient):
+    remotion_client = remotion_client_with_creds
+    assert remotion_client.function_name == TEST_FUNCTION_NAME
+    assert remotion_client.region == TEST_REGION
+    assert remotion_client.serve_url == TEST_SERVE_URL
+    assert remotion_client.access_key == TEST_AWS_ACCESS_KEY
+    assert remotion_client.secret_key == TEST_AWS_SECRET_KEY
+    assert not remotion_client.force_path_style
+
+
+@pytest.mark.parametrize(
+    "hash_value,expected",
+    [
+        ("a1b2c3", "input-props/a1b2c3.json"),
+        (
+            "very_long_hash_value_123456789",
+            "input-props/very_long_hash_value_123456789.json",
+        ),
+    ],
+)
+def test_input_props_key_multiple_values(remotion_client, hash_value, expected):
+    result = remotion_client._input_props_key(hash_value)
+    assert result == expected
+
+
+def test_generate_hash_basic_string(remotion_client: RemotionClient):
+    payload = "test payload"
+    result = remotion_client._generate_hash(payload)
+
+    assert len(result) == 64
+    assert all(c in '0123456789abcdef' for c in result)
+
+
+@patch('boto3.client')
+def test_create_s3_client_default(
+    mock_boto_client, mock_s3_client, remotion_client: RemotionClient
+):
+    mock_boto_client.return_value = mock_s3_client
+    result = remotion_client._create_s3_client()
+
+    mock_boto_client.assert_called_once_with('s3', region_name=TEST_REGION)
+    assert result == mock_s3_client
+
+
+@patch('boto3.client')
+def test_create_s3_client_partial_creds(mock_boto_client, mock_s3_client):
+    remotion_client = RemotionClient(
+        region=TEST_REGION,
+        serve_url=TEST_SERVE_URL,
+        function_name=TEST_FUNCTION_NAME,
+        secret_key=TEST_AWS_SECRET_KEY,
+    )
+
+    mock_boto_client.return_value = mock_s3_client
+    result = remotion_client._create_s3_client()
+
+    mock_boto_client.assert_called_once_with('s3', region_name=TEST_REGION)
+    assert result == mock_s3_client
+
+
+@patch('boto3.client')
+def test_create_s3_client_creds(
+    mock_boto_client, mock_s3_client, remotion_client_with_creds
+):
+    mock_boto_client.return_value = mock_s3_client
+    result = remotion_client_with_creds._create_s3_client()
+
+    mock_boto_client.assert_called_once_with(
+        's3',
+        region_name=TEST_REGION,
+        aws_access_key_id=TEST_AWS_ACCESS_KEY,
+        aws_secret_access_key=TEST_AWS_SECRET_KEY,
+    )
+    assert result == mock_s3_client
+
+
+@patch('boto3.client')
+def test_create_s3_client_with_path_style(mock_boto_client, mock_s3_client):
+    remotion_client = RemotionClient(
+        region=TEST_REGION,
+        serve_url=TEST_SERVE_URL,
+        function_name=TEST_FUNCTION_NAME,
+        force_path_style=True,
+    )
+    mock_boto_client.return_value = mock_s3_client
+    result = remotion_client._create_s3_client()
+
+    mock_boto_client.assert_called_once()
+
+    call_args = mock_boto_client.call_args
+    assert 'config' in call_args[1]
+    config = call_args[1]['config']
+    assert isinstance(config, Config)
+    assert config.s3['addressing_style'] == 'path'
+    assert result == mock_s3_client
+
+
+@patch.object(RemotionClient, '_create_s3_client')
+def test_get_remotion_buckets_empty_response(
+    mock_create_client, mock_s3_client, remotion_client
+):
+    mock_s3_client.list_buckets.return_value = {'Buckets': []}
+    mock_create_client.return_value = mock_s3_client
+
+    result = remotion_client._get_remotion_buckets()
+
+    assert result == []
+    mock_s3_client.list_buckets.assert_called_once()
+
+
+@patch.object(RemotionClient, '_create_s3_client')
+def test_get_remotion_buckets_no_remotion_buckets(
+    mock_create_client, mock_s3_client, remotion_client
+):
+    mock_s3_client.list_buckets.return_value = {
+        'Buckets': [
+            {'Name': 'my-app-bucket'},
+            {'Name': 'some-other-bucket'},
+            {'Name': 'user-data-bucket'},
+        ]
+    }
+    mock_create_client.return_value = mock_s3_client
+
+    result = remotion_client._get_remotion_buckets()
+
+    assert result == []
+    mock_s3_client.list_buckets.assert_called_once()
+    mock_s3_client.get_bucket_location.assert_not_called()
+
+
+@patch.object(RemotionClient, '_create_s3_client')
+def test_get_remotion_buckets_single_match_us_east_1(
+    mock_create_client, mock_s3_client, remotion_client
+):
+    test_bucket_name = 'remotionlambda-useast1-abc123'
+    mock_s3_client.list_buckets.return_value = {
+        'Buckets': [
+            {'Name': test_bucket_name},
+            {'Name': 'other-bucket'},
+        ]
+    }
+    mock_s3_client.get_bucket_location.return_value = {'LocationConstraint': None}
+    mock_create_client.return_value = mock_s3_client
+
+    result = remotion_client._get_remotion_buckets()
+
+    assert result == [test_bucket_name]
+    mock_s3_client.get_bucket_location.assert_called_once_with(Bucket=test_bucket_name)

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/tests/test_render_client_render_media.py

@@ -6,24 +6,24 @@ from remotion_lambda.remotionclient import RemotionClient
 
 class TestRemotionClient(TestCase):
     def test_remotion_construct_request(self):
-        client = RemotionClient(region="us-east-1",
-                                serve_url="testbed",
-                                function_name="remotion-render")
+        client = RemotionClient(
+            region="us-east-1", serve_url="testbed", function_name="remotion-render"
+        )
         render_params = RenderMediaParams(
             composition="react-svg",
-            input_props={
-                'hi': 'there'
-            },
-            metadata={
-                "Author": "Lunar"
-            },
+            input_props={'hi': 'there'},
+            metadata={"Author": "Lunar"},
             download_behavior=ShouldDownload(type="download", fileName="hi"),
             webhook=Webhook(
-                url="https://example.com", secret="abc", customData=dict(hi="there"))
+                url="https://example.com", secret="abc", customData=dict(hi="there")
+            ),
         )
 
         self.assertEqual(client.region, "us-east-1")
         self.assertIsNotNone(render_params)
         self.assertIsNotNone(render_params.input_props)
-        print(client.construct_render_request(
-            render_params=render_params, render_type="video-or-audio"))
+        print(
+            client.construct_render_request(
+                render_params=render_params, render_type="video-or-audio"
+            )
+        )

{remotion_lambda-4.0.347 → remotion_lambda-4.0.351}/tests/test_render_client_render_still.py

@@ -6,18 +6,19 @@ from remotion_lambda.remotionclient import RemotionClient
 
 class TestRemotionClient(TestCase):
     def test_remotion_construct_request(self):
-        client = RemotionClient(region="us-east-1",
-                                serve_url="testbed",
-                                function_name="remotion-render")
+        client = RemotionClient(
+            region="us-east-1", serve_url="testbed", function_name="remotion-render"
+        )
         render_still_params = RenderStillParams(
             composition="still-helloworld",
-            input_props={
-                'message': 'Hello from props!'
-            },
+            input_props={'message': 'Hello from props!'},
         )
 
         self.assertEqual(client.region, "us-east-1")
         self.assertIsNotNone(render_still_params)
         self.assertIsNotNone(render_still_params.input_props)
-        print(client.construct_render_request(
-            render_params=render_still_params, render_type='still'))
+        print(
+            client.construct_render_request(
+                render_params=render_still_params, render_type='still'
+            )
+        )

remotion_lambda-4.0.347/tests/test_get_render_progress_client.py

@@ -1,22 +0,0 @@
-from unittest import TestCase
-
-from remotion_lambda.remotionclient import RemotionClient, CustomCredentials
-
-
-class TestRemotionClient(TestCase):
-    def test_remotionprogress_construct_request(self):
-        client = RemotionClient(region="us-east-1",
-                                serve_url="testbed",
-                                function_name="remotion-render")
-
-        print(client.construct_render_progress_request(
-            render_id="abcdef",
-            bucket_name="remotion-render",
-            s3_output_provider=CustomCredentials(
-                endpoint="https://s3.us-east-1.amazonaws.com",
-                access_key_id="accessKeyId",
-                secret_access_key="secretAccessKey",
-                region="us-east-1"
-            )
-        )
-        )