Make tenant_id explicit instead of inherited

- Remove UNSET sentinel and automatic tenant_id inheritance
- Change InvokeConfig.tenant_id to default to None
- Remove with_tenant_id_if_unset() method
- Update DurableContext.invoke() to not auto-populate tenant_id
- Add tests verifying tenant_id is correctly passed to checkpoints
- Add tests for explicit tenant_id, None, and default behavior
- Simplify existing tests to match new explicit behavior

Users must now explicitly set tenant_id in InvokeConfig if needed.

Author: FullyTyped

src/aws_durable_execution_sdk_python/config.py

@@ -27,14 +27,6 @@
 Numeric = int | float  # deliberately leaving off complex
 
 
-class _UnsetType:
-    def __repr__(self):
-        return "<UNSET>"
-
-
-UNSET = _UnsetType()
-
-
 @dataclass(frozen=True)
 class Duration:
     """Represents a duration stored as total seconds."""
@@ -392,30 +384,13 @@ class InvokeConfig(Generic[P, R]):
     timeout: Duration = field(default_factory=Duration)
     serdes_payload: SerDes[P] | None = None
     serdes_result: SerDes[R] | None = None
-    # we want to distinguish between deliberate use of None
-    # and simply not setting the value.
-    # We use the sentinel to indicate that the user has not set
-    # the field, so that we can fall back to the fallback behaviour.
-    # The reason we want to accept None as a valid input is that we want to
-    # allow deliberate invocation without a tenant if the users desire.
-    # However, we should also, by default, accept a sane input — which is using
-    # the same tenant id as the current invocation
-    tenant_id: str | None = field(default=UNSET)  # type: ignore
+    tenant_id: str | None = None
 
     @property
     def timeout_seconds(self) -> int:
         """Get timeout in seconds."""
         return self.timeout.to_seconds()
 
-    def with_tenant_id_if_unset(self, tenant_id: str | None) -> InvokeConfig:
-        if self.tenant_id is UNSET:
-            return InvokeConfig(
-                timeout=self.timeout,
-                serdes_payload=self.serdes_payload,
-                serdes_result=self.serdes_result,
-                tenant_id=tenant_id,
-            )
-        return self
 
 
 @dataclass(frozen=True)

src/aws_durable_execution_sdk_python/context.py

@@ -303,29 +303,9 @@ def invoke(
             name: Optional name for the operation
             config: Optional configuration for the invoke operation
 
-        Notes:
-            config: InvokeConfig contains a tenant_id.
-            In the event that the tenant is not set, we will default to
-            using the same tenant as the current invocation.
-
-            In the event that the tenant is set for this invocation, we will
-            respect it, and propagate it.
-            
-            In the event that the tenant is not set for this invocation, we
-            will not impose a tenant.
-            
-            At the same time, we allow setting up tenant to None, or a key,
-            so that an isolated function can call a non-isolated function,
-            and vice versa.
-
         Returns:
             The result of the invoked function
         """
-
-        if config is None:
-            config = InvokeConfig()
-        config = config.with_tenant_id_if_unset(self.tenant_id)
-
         return invoke_handler(
             function_name=function_name,
             payload=payload,

src/aws_durable_execution_sdk_python/operation/invoke.py

@@ -40,7 +40,6 @@ def invoke_handler(
 
     if not config:
         config = InvokeConfig[P, R]()
-    config = config.with_tenant_id_if_unset(None)
     tenant_id = config.tenant_id
 
     # Check if we have existing step data

tests/config_test.py

@@ -4,7 +4,6 @@
 from unittest.mock import Mock
 
 from aws_durable_execution_sdk_python.config import (
-    UNSET,
     BatchedInput,
     CallbackConfig,
     CheckpointMode,
@@ -279,16 +278,10 @@ def test_step_future_without_name():
         assert result == 42
 
 
-def test_unset_type():
-    """Test UNSET sentinel value."""
-    assert str(UNSET) == "<UNSET>"
-    assert repr(UNSET) == "<UNSET>"
-
-
 def test_invoke_config_defaults():
     """Test InvokeConfig defaults."""
     config = InvokeConfig()
-    assert config.tenant_id is UNSET
+    assert config.tenant_id is None
     assert config.timeout_seconds == 0
 
 
@@ -297,30 +290,3 @@ def test_invoke_config_with_tenant_id():
     config = InvokeConfig(tenant_id="test-tenant")
     assert config.tenant_id == "test-tenant"
 
-
-def test_invoke_config_with_tenant_id_if_unset_when_unset():
-    """Test with_tenant_id_if_unset when tenant_id is UNSET."""
-    config = InvokeConfig()
-    new_config = config.with_tenant_id_if_unset("new-tenant")
-
-    assert config.tenant_id is UNSET  # Original unchanged
-    assert new_config.tenant_id == "new-tenant"
-    assert new_config.timeout == config.timeout
-
-
-def test_invoke_config_with_tenant_id_if_unset_when_set():
-    """Test with_tenant_id_if_unset when tenant_id is already set."""
-    config = InvokeConfig(tenant_id="existing-tenant")
-    new_config = config.with_tenant_id_if_unset("new-tenant")
-
-    assert new_config is config  # Same object returned
-    assert new_config.tenant_id == "existing-tenant"
-
-
-def test_invoke_config_with_tenant_id_if_unset_with_none():
-    """Test with_tenant_id_if_unset with None value."""
-    config = InvokeConfig()
-    new_config = config.with_tenant_id_if_unset(None)
-
-    assert config.tenant_id is UNSET  # Original unchanged
-    assert new_config.tenant_id is None

tests/context_test.py

@@ -512,31 +512,16 @@ def test_step_with_original_name(mock_handler):
 
 
 # region invoke
-@pytest.mark.parametrize(
-    ("lambda_tenant_id", "expected_tenant_id"),
-    [
-        (None, None),
-        ("test-tenant", "test-tenant"),
-    ],
-)
 @patch("aws_durable_execution_sdk_python.context.invoke_handler")
-def test_invoke_basic(mock_handler, lambda_tenant_id, expected_tenant_id):
-    """Test invoke with basic parameters and tenant_id inheritance."""
+def test_invoke_basic(mock_handler):
+    """Test invoke with basic parameters."""
     mock_handler.return_value = "invoke_result"
     mock_state = Mock(spec=ExecutionState)
     mock_state.durable_execution_arn = (
         "arn:aws:durable:us-east-1:123456789012:execution/test"
     )
 
-    # Create mock lambda context with tenant_id
-    mock_lambda_context = Mock()
-    if lambda_tenant_id:
-        mock_lambda_context.tenant_id = lambda_tenant_id
-    else:
-        # Remove tenant_id attribute entirely when None
-        del mock_lambda_context.tenant_id
-
-    context = DurableContext(state=mock_state, lambda_context=mock_lambda_context)
+    context = DurableContext(state=mock_state)
     operation_ids = operation_id_sequence()
     expected_operation_id = next(operation_ids)
 
@@ -549,7 +534,7 @@ def test_invoke_basic(mock_handler, lambda_tenant_id, expected_tenant_id):
         payload="test_payload",
         state=mock_state,
         operation_identifier=OperationIdentifier(expected_operation_id, None, None),
-        config=InvokeConfig(tenant_id=expected_tenant_id),
+        config=None,
     )
 
 
@@ -576,15 +561,12 @@ def test_invoke_with_name_and_config(mock_handler):
     expected_id = next(seq)  # 6th
 
     assert result == "configured_result"
-    expected_config = InvokeConfig[str, str](
-        timeout=Duration.from_seconds(30), tenant_id=None
-    )
     mock_handler.assert_called_once_with(
         function_name="test_function",
         payload={"key": "value"},
         state=mock_state,
         operation_identifier=OperationIdentifier(expected_id, None, "named_invoke"),
-        config=expected_config,
+        config=config,
     )
 
 
@@ -611,7 +593,7 @@ def test_invoke_with_parent_id(mock_handler):
         payload=None,
         state=mock_state,
         operation_identifier=OperationIdentifier(expected_id, "parent123", None),
-        config=InvokeConfig(tenant_id=None),
+        config=None,
     )
 
 
@@ -667,7 +649,7 @@ def test_invoke_with_none_payload(mock_handler):
         payload=None,
         state=mock_state,
         operation_identifier=OperationIdentifier(expected_id, None, None),
-        config=InvokeConfig(tenant_id=None),
+        config=None,
     )
 
 
@@ -701,20 +683,14 @@ def test_invoke_with_custom_serdes(mock_handler):
     expected_id = next(seq)
 
     assert result == {"transformed": "data"}
-    expected_config = InvokeConfig[dict, dict](
-        serdes_payload=payload_serdes,
-        serdes_result=result_serdes,
-        timeout=Duration.from_minutes(1),
-        tenant_id=None,
-    )
     mock_handler.assert_called_once_with(
         function_name="test_function",
         payload={"original": "data"},
         state=mock_state,
         operation_identifier=OperationIdentifier(
             expected_id, None, "custom_serdes_invoke"
         ),
-        config=expected_config,
+        config=config,
     )
 
 
@@ -1022,45 +998,6 @@ def test_run_in_child_context_resolves_name_from_callable(mock_handler):
     assert call_args[1]["operation_identifier"].name == "original_function_name"
 
 
-@pytest.mark.parametrize(
-    ("parent_tenant_id", "expected_tenant_id"),
-    [
-        (None, None),
-        ("parent-tenant", "parent-tenant"),
-    ],
-)
-def test_run_in_child_context_inherits_tenant_id(parent_tenant_id, expected_tenant_id):
-    """Test that child context inherits tenant_id from parent."""
-    mock_state = Mock(spec=ExecutionState)
-    mock_state.durable_execution_arn = (
-        "arn:aws:durable:us-east-1:123456789012:execution/test"
-    )
-
-    # Create mock lambda context with tenant_id
-    mock_lambda_context = Mock()
-    if parent_tenant_id:
-        mock_lambda_context.tenant_id = parent_tenant_id
-    else:
-        del mock_lambda_context.tenant_id
-
-    parent_context = DurableContext(
-        state=mock_state, lambda_context=mock_lambda_context
-    )
-
-    def check_child_tenant_id(child_context):
-        # Verify child context has same tenant_id as parent
-        assert child_context.tenant_id == expected_tenant_id
-        return "result"
-
-    with patch(
-        "aws_durable_execution_sdk_python.context.child_handler"
-    ) as mock_handler:
-        # Make child_handler execute the function with a child context
-        mock_handler.side_effect = lambda func, **kwargs: func()
-
-        parent_context.run_in_child_context(check_child_tenant_id, "test_child")
-
-
 # endregion run_in_child_context
 
 
@@ -1745,3 +1682,43 @@ def test_operation_id_generation_unique():
 
     for i in range(len(ids) - 1):
         assert ids[i] != ids[i + 1]
+
+
+@patch("aws_durable_execution_sdk_python.context.invoke_handler")
+def test_invoke_with_explicit_tenant_id(mock_handler):
+    """Test invoke with explicit tenant_id in config."""
+    mock_handler.return_value = "result"
+    mock_state = Mock(spec=ExecutionState)
+    mock_state.durable_execution_arn = (
+        "arn:aws:durable:us-east-1:123456789012:execution/test"
+    )
+
+    config = InvokeConfig(tenant_id="explicit-tenant")
+    context = DurableContext(state=mock_state)
+
+    result = context.invoke("test_function", "payload", config=config)
+
+    assert result == "result"
+    call_args = mock_handler.call_args[1]
+    assert call_args["config"].tenant_id == "explicit-tenant"
+
+
+@patch("aws_durable_execution_sdk_python.context.invoke_handler")
+def test_invoke_without_tenant_id_defaults_to_none(mock_handler):
+    """Test invoke without tenant_id defaults to None."""
+    mock_handler.return_value = "result"
+    mock_state = Mock(spec=ExecutionState)
+    mock_state.durable_execution_arn = (
+        "arn:aws:durable:us-east-1:123456789012:execution/test"
+    )
+
+    context = DurableContext(state=mock_state)
+
+    result = context.invoke("test_function", "payload")
+
+    assert result == "result"
+    # Config should be None when not provided
+    call_args = mock_handler.call_args[1]
+    assert call_args["config"] is None
+
+