ripple-down-rules 0.6.30__tar.gz → 0.6.40__tar.gz

{ripple_down_rules-0.6.30 → ripple_down_rules-0.6.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.6.30
+Version: 0.6.40
 Summary: Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning.
 Author-email: Abdelrhman Bassiouny <abassiou@uni-bremen.de>
 License:                     GNU GENERAL PUBLIC LICENSE

ripple_down_rules-0.6.40/src/ripple_down_rules/__init__.py

@@ -0,0 +1,5 @@
+__version__ = "0.6.40"
+
+import logging
+logger = logging.Logger("rdr")
+logger.setLevel(logging.INFO)

{ripple_down_rules-0.6.30 → ripple_down_rules-0.6.40}/src/ripple_down_rules/datastructures/callable_expression.py

@@ -129,6 +129,9 @@ class CallableExpression(SubclassJSONSerializer):
             else:
                 conclusion_type = (conclusion_type,)
         self.conclusion_type = conclusion_type
+        self.expected_types: Set[Type] = set(conclusion_type) if conclusion_type is not None else set()
+        if not mutually_exclusive:
+            self.expected_types.update({list, set})
         self.scope: Optional[Dict[str, Any]] = scope if scope is not None else {}
         self.scope = get_used_scope(self.user_input, self.scope)
         self.expression_tree: AST = expression_tree if expression_tree else parse_string_to_expression(self.user_input)
@@ -158,7 +161,7 @@ class CallableExpression(SubclassJSONSerializer):
                         raise ValueError(f"Mutually exclusive types cannot be lists or sets, got {type(output)}")
                     output_types = {type(o) for o in make_list(output)}
                     output_types.add(type(output))
-                    if not are_results_subclass_of_types(output_types, self.conclusion_type):
+                    if not are_results_subclass_of_types(output_types, self.expected_types):
                         raise ValueError(f"Not all result types {output_types} are subclasses of expected types"
                                          f" {self.conclusion_type}")
                 return output