Rename error type and shorten pre-defined import policy name

Author: VegetarianOrc

temporalio/worker/workflow_sandbox/__init__.py

@@ -55,16 +55,16 @@
 #   * https://github.com/GrahamDumpleton/wrapt/issues/130
 
 from ._restrictions import (
-    DisallowedUnintentionalPassthroughError,
     RestrictedWorkflowAccessError,
     SandboxMatcher,
     SandboxRestrictions,
+    UnintentionalPassthroughError,
 )
 from ._runner import SandboxedWorkflowRunner
 
 __all__ = [
     "RestrictedWorkflowAccessError",
-    "DisallowedUnintentionalPassthroughError",
+    "UnintentionalPassthroughError",
     "SandboxedWorkflowRunner",
     "SandboxMatcher",
     "SandboxRestrictions",

temporalio/worker/workflow_sandbox/_importer.py

@@ -38,11 +38,11 @@
 import temporalio.workflow
 
 from ._restrictions import (
-    DisallowedUnintentionalPassthroughError,
     RestrictedModule,
     RestrictedWorkflowAccessError,
     RestrictionContext,
     SandboxRestrictions,
+    UnintentionalPassthroughError,
 )
 
 logger = logging.getLogger(__name__)
@@ -315,7 +315,7 @@ def _maybe_passthrough_module(self, name: str) -> Optional[types.ModuleType]:
             if self._is_import_notification_policy_applied(
                 temporalio.workflow.SandboxImportNotificationPolicy.RAISE_ON_UNINTENTIONAL_PASSTHROUGH
             ):
-                raise DisallowedUnintentionalPassthroughError(name)
+                raise UnintentionalPassthroughError(name)
 
             if self._is_import_notification_policy_applied(
                 temporalio.workflow.SandboxImportNotificationPolicy.WARN_ON_UNINTENTIONAL_PASSTHROUGH

temporalio/worker/workflow_sandbox/_restrictions.py

@@ -83,7 +83,7 @@ def default_message(qualified_name: str) -> str:
 
 
 # TODO(amazzeo): is NondeterminisimError appropriate as a subclass?
-class DisallowedUnintentionalPassthroughError(temporalio.workflow.NondeterminismError):
+class UnintentionalPassthroughError(temporalio.workflow.NondeterminismError):
     """Error that occurs when a workflow unintentionally passes an import to the sandbox when
     the import notification policy includes :py:attr:`temporalio.workflow.SandboxImportNotificationPolicy.RAISE_ON_NON_PASSTHROUGH`.
 
@@ -94,16 +94,16 @@ class DisallowedUnintentionalPassthroughError(temporalio.workflow.Nondeterminism
     def __init__(
         self, qualified_name: str, *, override_message: Optional[str] = None
     ) -> None:
-        """Create a disallowed unintentional passthrough error."""
+        """Create an unintentional passthrough error."""
         super().__init__(
             override_message
-            or DisallowedUnintentionalPassthroughError.default_message(qualified_name)
+            or UnintentionalPassthroughError.default_message(qualified_name)
         )
         self.qualified_name = qualified_name
 
     @staticmethod
     def default_message(qualified_name: str) -> str:
-        """Get default message for disallowed unintentional passthrough."""
+        """Get default message for unintentional passthrough."""
         return f"Module {qualified_name} was not intentionally passed through to the sandbox."
 
 
@@ -156,7 +156,7 @@ class methods (including __init__, etc). The check compares the against the
     Equivalent to :py:attr:`temporalio.workflow.SandboxImportNotificationPolicy.WARN_ON_DYNAMIC_IMPORT` | :py:attr:`temporalio.workflow.SandboxImportNotificationPolicy.WARN_ON_UNINTENTIONAL_PASSTHROUGH` 
     """
 
-    import_notification_policy_disallow_unintentional_passthrough: ClassVar[
+    import_notification_policy_require_explicit_passthrough: ClassVar[
         temporalio.workflow.SandboxImportNotificationPolicy
     ]
     """
@@ -574,7 +574,7 @@ def with_child_unrestricted(self, *child_path: str) -> SandboxMatcher:
     temporalio.workflow.SandboxImportNotificationPolicy.WARN_ON_DYNAMIC_IMPORT
     | temporalio.workflow.SandboxImportNotificationPolicy.WARN_ON_UNINTENTIONAL_PASSTHROUGH
 )
-SandboxRestrictions.import_notification_policy_disallow_unintentional_passthrough = (
+SandboxRestrictions.import_notification_policy_require_explicit_passthrough = (
     temporalio.workflow.SandboxImportNotificationPolicy.WARN_ON_DYNAMIC_IMPORT
     | temporalio.workflow.SandboxImportNotificationPolicy.RAISE_ON_UNINTENTIONAL_PASSTHROUGH
 )

tests/worker/workflow_sandbox/test_runner.py

@@ -25,11 +25,11 @@
     WorkflowInterceptorClassInput,
 )
 from temporalio.worker.workflow_sandbox import (
-    DisallowedUnintentionalPassthroughError,
     RestrictedWorkflowAccessError,
     SandboxedWorkflowRunner,
     SandboxMatcher,
     SandboxRestrictions,
+    UnintentionalPassthroughError,
 )
 from tests.helpers import assert_eq_eventually
 from tests.worker.workflow_sandbox.testmodules import stateful_module
@@ -516,9 +516,9 @@ class LazyImportWorkflow:
     async def run(self) -> None:
         try:
             import tests.worker.workflow_sandbox.testmodules.lazy_module  # noqa: F401
-        except DisallowedUnintentionalPassthroughError as err:
+        except UnintentionalPassthroughError as err:
             raise ApplicationError(
-                str(err), type="DisallowedUnintentionalPassthroughError"
+                str(err), type="UnintentionalPassthroughError"
             ) from err
 
 
@@ -587,7 +587,7 @@ async def test_workflow_sandbox_import_all_warnings(client: Client):
 async def test_workflow_sandbox_import_errors(client: Client):
     restrictions = dataclasses.replace(
         SandboxRestrictions.default,
-        import_notification_policy=SandboxRestrictions.import_notification_policy_disallow_unintentional_passthrough,
+        import_notification_policy=SandboxRestrictions.import_notification_policy_require_explicit_passthrough,
         # passthrough this test module to avoid a ton of noisy warnings
         passthrough_modules=SandboxRestrictions.passthrough_modules_default
         | {"tests.worker.workflow_sandbox.test_runner"},
@@ -608,7 +608,7 @@ async def test_workflow_sandbox_import_errors(client: Client):
                 )
 
             assert isinstance(err.value.cause, ApplicationError)
-            assert err.value.cause.type == "DisallowedUnintentionalPassthroughError"
+            assert err.value.cause.type == "UnintentionalPassthroughError"
             assert (
                 "Module tests.worker.workflow_sandbox.testmodules.lazy_module was not intentionally passed through to the sandbox."
                 == err.value.cause.message