ripple-down-rules 0.6.50__py3-none-any.whl → 0.6.52__py3-none-any.whl

ripple_down_rules/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.50"
+__version__ = "0.6.52"
 
 import logging
 import sys

ripple_down_rules/datastructures/callable_expression.py

@@ -130,8 +130,10 @@ class CallableExpression(SubclassJSONSerializer):
                 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})
+        if list in self.expected_types:
+            self.expected_types.remove(list)
+        if set in self.expected_types:
+            self.expected_types.add(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)
@@ -149,6 +151,8 @@ class CallableExpression(SubclassJSONSerializer):
 
     def __call__(self, case: Any, **kwargs) -> Any:
         try:
+            # if not self.mutually_exclusive:
+            #     self.expected_types.update({list, set})
             if self.user_input is not None:
                 if not isinstance(case, Case):
                     case = create_case(case, max_recursion_idx=3)
@@ -160,7 +164,6 @@ class CallableExpression(SubclassJSONSerializer):
                     if self.mutually_exclusive and issubclass(type(output), (list, set)):
                         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.expected_types):
                         raise ValueError(f"Not all result types {output_types} are subclasses of expected types"
                                          f" {self.conclusion_type}")

ripple_down_rules/rdr_decorators.py

@@ -102,8 +102,7 @@ class RDRDecorator:
     """
     This is used to refer to the output value of the decorated function, this is used as part of the case as input to 
     the rdr model, but is never used in the rule logic to prevent cycles from happening. The correct way to use the 
-    output of an rdr in the rules logic is in the case when mutually exclusive is False, or through refinements of 
-    existing rules when mutually exclusive is True, which happens automatically by the rdr prompting for refinements.
+    output of an rdr is through refinement rules which happens automatically by the rdr prompting for refinements.
     """
     _not_none_output_found: bool = field(init=False, default=False)
     """

{ripple_down_rules-0.6.50.dist-info → ripple_down_rules-0.6.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.6.50
+Version: 0.6.52
 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.50.dist-info → ripple_down_rules-0.6.52.dist-info}/RECORD

@@ -1,14 +1,14 @@
-ripple_down_rules/__init__.py,sha256=6EQLRCLTgXJBkkqQ-9rcFfDRgNFPMVqlW-ofOWDjfAY,375
+ripple_down_rules/__init__.py,sha256=GH4Ku_L8c0eUJ_iMXuftu5szxDlmbFtZCU6pBHMvtm4,375
 ripple_down_rules/experts.py,sha256=KXwWCmDrCffu9HW3yNewqWc1e5rnPI5Rnc981w_5M7U,17896
 ripple_down_rules/failures.py,sha256=ZPypPwKjyVcJkY9YG6p538ld8ZzpdW6CrC1RmJi44Ek,42
 ripple_down_rules/helpers.py,sha256=sVU1Q7HPbMh57X8zDYP6vj1maDoaVAvnXHpUYIbr_As,5715
 ripple_down_rules/rdr.py,sha256=M7CEjHIegJWiDZtn-B8Qf9CpMvplAkrFX3HiiyGQC7M,84292
-ripple_down_rules/rdr_decorators.py,sha256=H3ONvgTSgL5LS_Nv_hKAYY2nkqvn7KZ1zmIzIDi07dA,11870
+ripple_down_rules/rdr_decorators.py,sha256=mu7pZM6tqjkjoKg1m4f5yXhaRL8RiZu75ABaU275qTY,11751
 ripple_down_rules/rules.py,sha256=L4Ws-x3g5ljE0GrDt4LAib2qtR1C1_Ra4cRcIB-IQDI,28702
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
 ripple_down_rules/utils.py,sha256=5UL4h-m5Q4l7RyCYqmUmDDxUAkFqPYpFa3QldDYoJUE,80752
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
-ripple_down_rules/datastructures/callable_expression.py,sha256=rzMrpD5oztaCRlt3hQ2B_xZ09cSuJNkYOCePndfQJRA,13684
+ripple_down_rules/datastructures/callable_expression.py,sha256=Eq8_9wlFIZex3Y3htwg-AKu-B7053f0Qk6dvMo1Nlts,13815
 ripple_down_rules/datastructures/case.py,sha256=dfLnrjsHIVF2bgbz-4ID7OdQvw68V71btCeTK372P-g,15667
 ripple_down_rules/datastructures/dataclasses.py,sha256=3vX52WrAHgVyw0LUSgSBOVFaQNTSxU8hQpdr7cW-tSg,13278
 ripple_down_rules/datastructures/enums.py,sha256=CvcROl8fE7A6uTbMfs2lLpyxwS_ZFtFcQlBDDKFfoHc,6059
@@ -18,8 +18,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=GQf5Je5szkPH17g4
 ripple_down_rules/user_interface/object_diagram.py,sha256=FEa2HaYR9QmTE6NsOwBvZ0jqmu3DKyg6mig2VE5ZP4Y,4956
 ripple_down_rules/user_interface/prompt.py,sha256=WPbw_8_-8SpF2ISyRZRuFwPKBEuGC4HaX3lbCPFHhh8,10314
 ripple_down_rules/user_interface/template_file_creator.py,sha256=uSbosZS15MOR3Nv7M3MrFuoiKXyP4cBId-EK3I6stHM,13660
-ripple_down_rules-0.6.50.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.6.50.dist-info/METADATA,sha256=LVOjG94lFcXLJD80mILahLyK1sYrsHEsDogeKg-PBSU,48294
-ripple_down_rules-0.6.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.6.50.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.6.50.dist-info/RECORD,,
+ripple_down_rules-0.6.52.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.6.52.dist-info/METADATA,sha256=BF5LsZwZ4dTyKXFs0zjAjWfh9Kvzj5wdfIbJXgEenVU,48294
+ripple_down_rules-0.6.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.6.52.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.6.52.dist-info/RECORD,,