Merge pull request #8463 from OpenMined/output-policy-fix

Output policy error handling fix
OpenMined · Feb 7, 2024 · d10873f · d10873f
2 parents 2431411 + b181ffd
commit d10873f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/syft/src/syft/service/code/user_code.py b/packages/syft/src/syft/service/code/user_code.py
@@ -462,6 +462,10 @@ def input_policy(self) -> Optional[InputPolicy]:
             print(f"Failed to deserialize custom input policy state. {e}")
             return None
 
+    @property
+    def output_policy_approved(self):
+        return self.status.approved
+
     @property
     def output_policy(self) -> Optional[OutputPolicy]:
         if not self.status.approved:

diff --git a/packages/syft/src/syft/service/code/user_code_service.py b/packages/syft/src/syft/service/code/user_code_service.py
@@ -311,7 +311,7 @@ def is_execution_allowed(self, code, context, output_policy):
         # Check if the user has permission to execute the code.
         elif not (has_code_permission := self.has_code_permission(code, context)):
             return has_code_permission
-        elif code.output_policy is None:
+        elif not code.output_policy_approved:
             return SyftError("Output policy not approved", code)
         elif not output_policy.valid:
             return output_policy.valid
@@ -399,9 +399,9 @@ def _call(
                     code=code, context=context, output_policy=output_policy
                 )
                 if not can_execute:
-                    if output_policy is None:
+                    if not code.output_policy_approved:
                         return Err(
-                            "UserCodeStatus.DENIED: Function has no output policy"
+                            "Execution denied: Your code is waiting for approval"
                         )
                     if not (is_valid := output_policy.valid):
                         if (

diff --git a/packages/syft/tests/syft/request/request_code_accept_deny_test.py b/packages/syft/tests/syft/request/request_code_accept_deny_test.py
@@ -205,4 +205,4 @@ def simple_function(data):
 
     result = ds_client.code.simple_function(data=action_obj)
     assert isinstance(result, SyftError)
-    assert "UserCodeStatus.DENIED" in result.message
+    assert "Execution denied" in result.message