ripple-down-rules 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

ripple_down_rules/datastructures/callable_expression.py

@@ -9,7 +9,8 @@ from typing_extensions import Type, Optional, Any, List, Union, Tuple, Dict, Set
 
 from .case import create_case, Case
 from ..utils import SubclassJSONSerializer, get_full_class_name, get_type_from_string, conclusion_to_json, is_iterable, \
-    build_user_input_from_conclusion, encapsulate_user_input, extract_function_source
+    build_user_input_from_conclusion, encapsulate_user_input, extract_function_source, are_results_subclass_of_types, \
+    make_list
 
 
 class VariableVisitor(ast.NodeVisitor):
@@ -133,15 +134,16 @@ class CallableExpression(SubclassJSONSerializer):
                 if output is None:
                     output = scope['_get_value'](case)
                 if self.conclusion_type is not None:
-                    if is_iterable(output) and not isinstance(output, self.conclusion_type):
-                        assert isinstance(list(output)[0], self.conclusion_type), (f"Expected output type {self.conclusion_type},"
-                                                                                 f" got {type(output)}")
-                    else:
-                        assert isinstance(output, self.conclusion_type), (f"Expected output type {self.conclusion_type},"
-                                                                          f" 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):
+                        raise ValueError(f"Not all result types {output_types} are subclasses of expected types"
+                                         f" {self.conclusion_type}")
                 return output
-            else:
+            elif self.conclusion is not None:
                 return self.conclusion
+            else:
+                raise ValueError("Either user_input or conclusion must be provided.")
         except Exception as e:
             raise ValueError(f"Error during evaluation: {e}")
 

ripple_down_rules/datastructures/dataclasses.py

@@ -83,6 +83,13 @@ class CaseQuery:
             raise ValueError("The case must be a Case or SQLTable object.")
         self._case = value
 
+    @property
+    def core_attribute_type(self) -> Tuple[Type]:
+        """
+        :return: The core type of the attribute.
+        """
+        return (t for t in self.attribute_type if t not in (set, list))
+
     @property
     def attribute_type(self) -> Tuple[Type]:
         """

ripple_down_rules/prompt.py

@@ -10,14 +10,15 @@ from textwrap import indent, dedent
 from IPython.core.magic import register_line_magic, line_magic, Magics, magics_class
 from IPython.terminal.embed import InteractiveShellEmbed
 from traitlets.config import Config
-from typing_extensions import List, Optional, Tuple, Dict, Type, Union
+from typing_extensions import List, Optional, Tuple, Dict, Type, Union, Any
 
 from .datastructures.enums import PromptFor
 from .datastructures.case import Case
 from .datastructures.callable_expression import CallableExpression, parse_string_to_expression
 from .datastructures.dataclasses import CaseQuery
 from .utils import extract_dependencies, contains_return_statement, make_set, get_imports_from_scope, make_list, \
-    get_import_from_type, get_imports_from_types, is_iterable, extract_function_source, encapsulate_user_input
+    get_import_from_type, get_imports_from_types, is_iterable, extract_function_source, encapsulate_user_input, \
+    are_results_subclass_of_types
 
 
 @magics_class
@@ -259,7 +260,6 @@ class IPythonShell:
             if len(self.all_code_lines) == 1 and self.all_code_lines[0].strip() == '':
                 self.user_input = None
             else:
-                import pdb; pdb.set_trace()
                 self.user_input = '\n'.join(self.all_code_lines)
                 self.user_input = encapsulate_user_input(self.user_input, self.shell.my_magics.function_signature,
                                                          self.func_doc)
@@ -278,6 +278,7 @@ def prompt_user_for_expression(case_query: CaseQuery, prompt_for: PromptFor, pro
     :return: A callable expression that takes a case and executes user expression on it.
     """
     prev_user_input: Optional[str] = None
+    callable_expression: Optional[CallableExpression] = None
     while True:
         user_input, expression_tree = prompt_user_about_case(case_query, prompt_for, prompt_str,
                                                              code_to_modify=prev_user_input)
@@ -294,9 +295,8 @@ def prompt_user_for_expression(case_query: CaseQuery, prompt_for: PromptFor, pro
                                                  scope=case_query.scope)
         try:
             result = callable_expression(case_query.case)
-            result = make_list(result)
-            if len(result) == 0:
-                print(f"The given expression gave an empty result for case {case_query.name}, please modify")
+            if len(make_list(result)) == 0:
+                print(f"The given expression gave an empty result for case {case_query.name}. Please modify!")
                 continue
             break
         except Exception as e:

ripple_down_rules/utils.py

@@ -36,6 +36,20 @@ import ast
 matplotlib.use("Qt5Agg")  # or "Qt5Agg", depending on availability
 
 
+def are_results_subclass_of_types(result_types: List[Any], types_: List[Type]) -> bool:
+    """
+    Check if all results are subclasses of the given types.
+
+    :param result_types: The list of result types to check.
+    :param types_: The list of types to check against.
+    :return: True if all results are subclasses of the given types, False otherwise.
+    """
+    for rt in result_types:
+        if not any(issubclass(rt, t) for t in types_):
+            return False
+    return True
+
+
 def get_imports_from_types(types: List[Type]) -> List[str]:
     """
     Get the import statements for a list of types.

{ripple_down_rules-0.2.0.dist-info → ripple_down_rules-0.2.2.dist-info}/METADATA

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

@@ -3,18 +3,18 @@ ripple_down_rules/datasets.py,sha256=mjJh1GLD_5qMgHaukdDWSGphXS9k_BPEF001ZXPchr8
 ripple_down_rules/experts.py,sha256=JGVvSNiWhm4FpRpg76f98tl8Ii_C7x_aWD9FxD-JDLQ,6130
 ripple_down_rules/failures.py,sha256=E6ajDUsw3Blom8eVLbA7d_Qnov2conhtZ0UmpQ9ZtSE,302
 ripple_down_rules/helpers.py,sha256=TvTJU0BA3dPcAyzvZFvAu7jZqsp8Lu0HAAwvuizlGjg,2018
-ripple_down_rules/prompt.py,sha256=sab5yqSJaMGgqfOsXybzZhbKx2vyU0h5dfcSqsQuY7E,16118
+ripple_down_rules/prompt.py,sha256=ReXnZ6OraFPqK5kDfAqH8d4SRPYiQ5d4ESk0js_MM9c,16150
 ripple_down_rules/rdr.py,sha256=vxNZckp6sLAUD92JQgfCzhBhg9CXfMZ_7W4VgrIUFjU,43366
 ripple_down_rules/rdr_decorators.py,sha256=8SclpceI3EtrsbuukWJu8HGLh7Q1ZCgYGLX-RPlG-w0,2018
 ripple_down_rules/rules.py,sha256=QQy7NBG6mKiowxVG_LjQJBxLTDW2hMyx5zAgwUxdCMM,17183
-ripple_down_rules/utils.py,sha256=Q5VWgisHCFxEA06Y0ImSfu7cozVJCHTCDYGWbDJNlgA,43516
+ripple_down_rules/utils.py,sha256=EdVdIf93TAqbxRTzbf_1422FjenRSI4MI_Ecp3e10z8,44007
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
-ripple_down_rules/datastructures/callable_expression.py,sha256=1hwRjS8-csfZ0HSlhLLOBCcvKJ8W3_N1qHayFLNhl3k,10908
+ripple_down_rules/datastructures/callable_expression.py,sha256=qVo8baEI_seeg6V23wmsctYdWj_tJJEOTkHeUc04Wvw,10912
 ripple_down_rules/datastructures/case.py,sha256=nJDKOjyhGLx4gt0sHxJNxBLdy9X2SLcDn89_SmKzwoc,14035
-ripple_down_rules/datastructures/dataclasses.py,sha256=TAOAeEvh0BeTis3rEHu8rpCeqNNhU0vK3to0JaBwTio,5961
+ripple_down_rules/datastructures/dataclasses.py,sha256=BUr0T0CCh98sdsW2CVAXGk2oWqfemM7w1t91QKvg_KU,6171
 ripple_down_rules/datastructures/enums.py,sha256=hlE6LAa1jUafnG_6UazvaPDfhC1ClI7hKvD89zOyAO8,4661
-ripple_down_rules-0.2.0.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.2.0.dist-info/METADATA,sha256=FZV_PqD3Yc6Qw1YCPAZowkycnAa6OzdcyMlpT7w8AS4,42575
-ripple_down_rules-0.2.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-ripple_down_rules-0.2.0.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.2.0.dist-info/RECORD,,
+ripple_down_rules-0.2.2.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.2.2.dist-info/METADATA,sha256=cwyxHt0ta-asbPBoOblSxWbw7-ASen5e4ZJ--SAmGM0,42575
+ripple_down_rules-0.2.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+ripple_down_rules-0.2.2.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.2.2.dist-info/RECORD,,