Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/aws_durable_execution_sdk_python/lambda_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
logger = logging.getLogger(__name__)


def _is_in_var_dir(module_file: str = __file__) -> bool:
"""Return True if this SDK is installed under /var/lang/.

Lambda bundled Python runtimes install packages at
/var/lang/lib/pythonX.Y/site-packages/.
"""
return module_file.startswith("/var/lang/")


# region model
class OperationAction(Enum):
START = "START"
Expand Down Expand Up @@ -1061,7 +1070,7 @@ def initialize_client(cls) -> LambdaClient:
config=Config(
connect_timeout=5,
read_timeout=50,
user_agent_extra=f"aws-durable-execution-sdk-python/{__version__}",
user_agent_extra=f"aws-durable-execution-sdk-python/{__version__}{'-bundled' if _is_in_var_dir() else ''}",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like -runtime might be more accurate (since it's bundled in the runtime)

),
)
return cls(client=cls._cached_boto_client)
Expand Down
71 changes: 71 additions & 0 deletions tests/lambda_service_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
TimestampConverter,
WaitDetails,
WaitOptions,
_is_in_var_dir,
)


Expand Down Expand Up @@ -2047,6 +2048,76 @@ def test_lambda_client_initialize_client_no_endpoint(
assert isinstance(client, LambdaClient)


@patch(
"aws_durable_execution_sdk_python.lambda_service._is_in_var_dir",
return_value=True,
)
@patch("boto3.client")
def test_lambda_client_user_agent_runtime_bundled(
mock_boto_client, _mock_is_in_var_dir, reset_lambda_client_cache
):
"""user_agent_extra includes -bundled when SDK is in /var/lang/."""
mock_client = Mock()
mock_boto_client.return_value = mock_client

client = LambdaClient.initialize_client()

call_args = mock_boto_client.call_args
config = call_args[1]["config"]
assert (
config.user_agent_extra
== f"aws-durable-execution-sdk-python/{__version__}-bundled"
)
assert isinstance(client, LambdaClient)


@patch(
"aws_durable_execution_sdk_python.lambda_service._is_in_var_dir",
return_value=False,
)
@patch("boto3.client")
def test_lambda_client_user_agent_not_runtime_bundled(
mock_boto_client, _mock_is_in_var_dir, reset_lambda_client_cache
):
"""user_agent_extra omits -bundled when SDK is not in /var/lang."""
mock_client = Mock()
mock_boto_client.return_value = mock_client

client = LambdaClient.initialize_client()

call_args = mock_boto_client.call_args
config = call_args[1]["config"]
assert config.user_agent_extra == f"aws-durable-execution-sdk-python/{__version__}"
assert isinstance(client, LambdaClient)


@pytest.mark.parametrize(
"path,expected",
[
# Lambda bundled runtime site-packages
(
"/var/lang/lib/python3.13/site-packages/aws_durable_execution_sdk_python/lambda_service.py",
True,
),
(
"/var/lang/lib/python3.12/site-packages/aws_durable_execution_sdk_python/lambda_service.py",
True,
),
# Customer deployment package
("/var/task/aws_durable_execution_sdk_python/lambda_service.py", False),
# Lambda Layer
("/opt/python/aws_durable_execution_sdk_python/lambda_service.py", False),
# Trailing-slash guard: /var/langsurprise must not match
("/var/langsurprise/lib/python3.13/site-packages/x.py", False),
# Local dev
("/Users/me/project/.venv/lib/python3.12/site-packages/x.py", False),
("", False),
],
)
def test_is_in_var_dir(path, expected):
assert _is_in_var_dir(path) is expected


def test_lambda_client_checkpoint_with_non_none_client_token():
"""Test LambdaClient.checkpoint with non-None client_token."""
mock_client = Mock()
Expand Down
Loading