debugged 'xor' arg attribute

Author: tclose

pydra/engine/specs.py

@@ -504,17 +504,14 @@ def _rule_violations(self) -> list[str]:
             # Collect alternative fields associated with this field.
             if field.xor:
                 mutually_exclusive = {name: self[name] for name in field.xor}
-                are_set = [
-                    f"{n}={v!r}" for n, v in mutually_exclusive.items() if is_set(v)
-                ]
+                are_set = [f"{n}={v!r}" for n, v in mutually_exclusive.items() if v]
                 if len(are_set) > 1:
                     errors.append(
-                        f"Mutually exclusive fields {field.xor} are set together: "
-                        + ", ".join(are_set)
+                        f"Mutually exclusive fields ({', '.join(are_set)}) are set together"
                     )
-                elif field.mandatory and not are_set:
+                elif not are_set:
                     errors.append(
-                        f"At least one of the mutually exclusive fields {field.xor} "
+                        f"At least one of the mutually exclusive fields ({', '.join(field.xor)}) "
                         f"should be set"
                     )
 

pydra/engine/tests/test_shelltask_inputspec.py

@@ -1453,16 +1453,19 @@ class Outputs(ShellOutputs):
 @shell.define
 class SimpleXor(ShellDef["SimpleTaskXor.Outputs"]):
 
-    input_1: str = shell.arg(
+    input_1: str | None = shell.arg(
+        default=None,
         help="help",
         xor=("input_1", "input_2", "input_3"),
     )
-    input_2: bool = shell.arg(
+    input_2: bool | None = shell.arg(
+        default=None,
         help="help",
         argstr="--i2",
         xor=("input_1", "input_2", "input_3"),
     )
-    input_3: bool = shell.arg(
+    input_3: bool | None = shell.arg(
+        default=None,
         help="help",
         xor=("input_1", "input_2", "input_3"),
     )
@@ -1478,29 +1481,24 @@ def test_task_inputs_mandatory_with_xOR_one_mandatory_is_OK():
     """input definition with mandatory inputs"""
     simple_xor = SimpleXor()
     simple_xor.input_1 = "Input1"
-    simple_xor.input_2 = attrs.NOTHING
     simple_xor._check_rules()
 
 
 def test_task_inputs_mandatory_with_xOR_one_mandatory_out_3_is_OK():
     """input definition with mandatory inputs"""
     simple_xor = SimpleXor()
-    simple_xor.input_1 = attrs.NOTHING
-    simple_xor.input_2 = attrs.NOTHING
     simple_xor.input_3 = True
     simple_xor._check_rules()
 
 
 def test_task_inputs_mandatory_with_xOR_zero_mandatory_raises_error():
     """input definition with mandatory inputs"""
     simple_xor = SimpleXor()
-    simple_xor.input_1 = attrs.NOTHING
-    simple_xor.input_2 = attrs.NOTHING
-    with pytest.raises(Exception) as excinfo:
+    simple_xor.input_2 = False
+    with pytest.raises(
+        ValueError, match="At least one of the mutually exclusive fields"
+    ):
         simple_xor._check_rules()
-    assert "input_1 is mandatory" in str(excinfo.value)
-    assert "no alternative provided by ['input_2', 'input_3']" in str(excinfo.value)
-    assert excinfo.type is AttributeError
 
 
 def test_task_inputs_mandatory_with_xOR_two_mandatories_raises_error():
@@ -1509,10 +1507,10 @@ def test_task_inputs_mandatory_with_xOR_two_mandatories_raises_error():
     simple_xor.input_1 = "Input1"
     simple_xor.input_2 = True
 
-    with pytest.raises(Exception) as excinfo:
+    with pytest.raises(
+        ValueError, match="Mutually exclusive fields .* are set together"
+    ):
         simple_xor._check_rules()
-    assert "input_1 is mutually exclusive with ['input_2']" in str(excinfo.value)
-    assert excinfo.type is AttributeError
 
 
 def test_task_inputs_mandatory_with_xOR_3_mandatories_raises_error():
@@ -1522,9 +1520,8 @@ def test_task_inputs_mandatory_with_xOR_3_mandatories_raises_error():
     simple_xor.input_2 = True
     simple_xor.input_3 = False
 
-    with pytest.raises(Exception) as excinfo:
+    with pytest.raises(
+        ValueError,
+        match=r".*Mutually exclusive fields \(input_1='Input1', input_2=True\) are set together",
+    ):
         simple_xor._check_rules()
-    assert "input_1 is mutually exclusive with ['input_2', 'input_3']" in str(
-        excinfo.value
-    )
-    assert excinfo.type is AttributeError