ripple-down-rules 0.5.52__py3-none-any.whl → 0.5.54__py3-none-any.whl

ripple_down_rules/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.5.52"
+__version__ = "0.5.54"
 
 import logging
 logger = logging.Logger("rdr")

ripple_down_rules/datastructures/callable_expression.py

@@ -93,7 +93,6 @@ class CallableExpression(SubclassJSONSerializer):
     A callable that is constructed from a string statement written by an expert.
     """
     encapsulating_function_name: str = "_get_value"
-    encapsulating_function: str = f"def {encapsulating_function_name}(case):"
 
     def __init__(self, user_input: Optional[str] = None,
                  conclusion_type: Optional[Tuple[Type]] = None,
@@ -117,7 +116,7 @@ class CallableExpression(SubclassJSONSerializer):
         if user_input is None:
             user_input = build_user_input_from_conclusion(conclusion)
         self.conclusion: Optional[Any] = conclusion
-        self._user_input: str = encapsulate_user_input(user_input, self.encapsulating_function)
+        self._user_input: str = encapsulate_user_input(user_input, self.get_encapsulating_function())
         if conclusion_type is not None:
             if is_iterable(conclusion_type):
                 conclusion_type = tuple(conclusion_type)
@@ -132,6 +131,13 @@ class CallableExpression(SubclassJSONSerializer):
         self.visitor.visit(self.expression_tree)
         self.mutually_exclusive: bool = mutually_exclusive
 
+    @classmethod
+    def get_encapsulating_function(cls, postfix: str = '') -> str:
+        """
+        Get the encapsulating function that is used to wrap the user input.
+        """
+        return f"def {cls.encapsulating_function_name}{postfix}(case):"
+
     def __call__(self, case: Any, **kwargs) -> Any:
         try:
             if self.user_input is not None:
@@ -161,8 +167,8 @@ class CallableExpression(SubclassJSONSerializer):
         """
         Combine this callable expression with another callable expression using the 'and' operator.
         """
-        cond1_user_input = self.user_input.replace(self.encapsulating_function, "def _cond1(case):")
-        cond2_user_input = other.user_input.replace(self.encapsulating_function, "def _cond2(case):")
+        cond1_user_input = self.user_input.replace(self.get_encapsulating_function(), "def _cond1(case):")
+        cond2_user_input = other.user_input.replace(self.get_encapsulating_function(), "def _cond2(case):")
         new_user_input = (f"{cond1_user_input}\n"
                           f"{cond2_user_input}\n"
                           f"return _cond1(case) and _cond2(case)")
@@ -175,7 +181,7 @@ class CallableExpression(SubclassJSONSerializer):
         new_function_body = extract_function_source(file_path, [function_name])[function_name]
         if new_function_body is None:
             return
-        self.user_input = self.encapsulating_function + '\n' + new_function_body
+        self.user_input = self.get_encapsulating_function() + '\n' + new_function_body
 
     def write_to_python_file(self, file_path: str, append: bool = False):
         """
@@ -208,7 +214,7 @@ class CallableExpression(SubclassJSONSerializer):
         Set the user input.
         """
         if value is not None:
-            self._user_input = encapsulate_user_input(value, self.encapsulating_function)
+            self._user_input = encapsulate_user_input(value, self.get_encapsulating_function())
             self.scope = get_used_scope(self.user_input, self.scope)
             self.expression_tree = parse_string_to_expression(self.user_input)
             self.code = compile_expression_to_code(self.expression_tree)
@@ -286,8 +292,8 @@ def parse_string_to_expression(expression_str: str) -> AST:
     :param expression_str: The string which will be parsed.
     :return: The parsed expression.
     """
-    if not expression_str.startswith(CallableExpression.encapsulating_function):
-        expression_str = encapsulate_user_input(expression_str, CallableExpression.encapsulating_function)
+    if not expression_str.startswith(CallableExpression.get_encapsulating_function()):
+        expression_str = encapsulate_user_input(expression_str, CallableExpression.get_encapsulating_function())
     mode = 'exec' if expression_str.startswith('def') else 'eval'
     tree = ast.parse(expression_str, mode=mode)
     logging.debug(f"AST parsed successfully: {ast.dump(tree)}")

ripple_down_rules/experts.py

@@ -147,7 +147,7 @@ class Expert(ABC):
                     imports = ''
                 if func_source is not None:
                     uid = uuid.uuid4().hex
-                    func_source = encapsulate_user_input(func_source, CallableExpression.encapsulating_function + f'_{uid}')
+                    func_source = encapsulate_user_input(func_source, CallableExpression.get_encapsulating_function(f'_{uid}'))
                 else:
                     func_source = 'pass  # No user input provided for this case.\n'
                 f.write(imports + func_source + '\n' + '\n\n\n\'===New Answer===\'\n\n\n')
@@ -194,6 +194,7 @@ class Expert(ABC):
             answer = answer.strip('\n').strip()
             if 'def ' not in answer and 'pass' in answer:
                 self.all_expert_answers.append(({}, None))
+                continue
             scope = extract_imports(tree=ast.parse(answer))
             function_source = all_function_sources[i].replace(all_function_sources_names[i],
                                                               CallableExpression.encapsulating_function_name)
@@ -240,6 +241,7 @@ class Human(Expert):
             except IndexError:
                 self.use_loaded_answers = False
         if user_input is not None:
+            case_query.scope.update(loaded_scope)
             condition = CallableExpression(user_input, bool, scope=case_query.scope)
         else:
             user_input, condition = self.user_prompt.prompt_user_for_expression(case_query, PromptFor.Conditions)
@@ -265,6 +267,7 @@ class Human(Expert):
             try:
                 loaded_scope, expert_input = self.all_expert_answers.pop(0)
                 if expert_input is not None:
+                    case_query.scope.update(loaded_scope)
                     expression = CallableExpression(expert_input, case_query.attribute_type,
                                                     scope=case_query.scope,
                                                     mutually_exclusive=case_query.mutually_exclusive)

{ripple_down_rules-0.5.52.dist-info → ripple_down_rules-0.5.54.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-ripple_down_rules/__init__.py,sha256=c5dourcbxl1MfXZdSnw6p6YPXW4B22bVUBfH-VZUj74,100
-ripple_down_rules/experts.py,sha256=rPRJU2py5wCopZADVWOP3Vzp077KL6ArDlkxUQ0Mh6w,12130
+ripple_down_rules/__init__.py,sha256=mzIshJxvvzvb07mJJq9BA3f-iThLZ1syaNYjbttiz8g,100
+ripple_down_rules/experts.py,sha256=8p5tFOWuQWgp9gt-6Yr6MFFphOTmpI9IJ3iepUyy3FY,12266
 ripple_down_rules/helpers.py,sha256=TvTJU0BA3dPcAyzvZFvAu7jZqsp8Lu0HAAwvuizlGjg,2018
 ripple_down_rules/rdr.py,sha256=FJYuRXgpUYSSK1pYrp2yeXb_ZZ2xjPED31tzxofokL4,48865
 ripple_down_rules/rdr_decorators.py,sha256=pYCKLgMKgQ6x_252WQtF2t4ZNjWPBxnaWtJ6TpGdcc0,7820
@@ -7,7 +7,7 @@ ripple_down_rules/rules.py,sha256=TPNVMqW9T-_46BS4WemrspLg5uG8kP6tsPvWWBAzJxg,17
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
 ripple_down_rules/utils.py,sha256=4xQ5gmIeMsY-mA9g-4cedKt2WJq4oZAMs5XEKeplWPM,51127
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
-ripple_down_rules/datastructures/callable_expression.py,sha256=D2KD1RdShzxYZPAERgywZ5ZPE4ar8WmMtXINqvYo_Tc,12497
+ripple_down_rules/datastructures/callable_expression.py,sha256=w6Gpo1o-xnFvTaPrzJ2w7VgCjSr1xqp8LQG0jAl-mfc,12718
 ripple_down_rules/datastructures/case.py,sha256=r8kjL9xP_wk84ThXusspgPMrAoed2bGQmKi54fzhmH8,15258
 ripple_down_rules/datastructures/dataclasses.py,sha256=PuD-7zWqWT2p4FnGvnihHvZlZKg9A1ctnFgVYf2cs-8,8554
 ripple_down_rules/datastructures/enums.py,sha256=ce7tqS0otfSTNAOwsnXlhsvIn4iW_Y_N3TNebF3YoZs,5700
@@ -17,8 +17,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=24MIFwqnAhC6ofOb
 ripple_down_rules/user_interface/object_diagram.py,sha256=tsB6iuLNEbHxp5lR2WjyejjWbnAX_nHF9xS8jNPOQVk,4548
 ripple_down_rules/user_interface/prompt.py,sha256=AkkltdDIaioN43lkRKDPKSjJcmdSSGZDMYz7AL7X9lE,8082
 ripple_down_rules/user_interface/template_file_creator.py,sha256=FGtLfYBfr4310c7Dfa9b2qiOWLNzHk1q3kdhD70Ilg4,13804
-ripple_down_rules-0.5.52.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.5.52.dist-info/METADATA,sha256=fZJoxSTLWQBlIcFyM-dRKXD2fHCmASm93tioiQZVbH0,48189
-ripple_down_rules-0.5.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.5.52.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.5.52.dist-info/RECORD,,
+ripple_down_rules-0.5.54.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.5.54.dist-info/METADATA,sha256=Enz4rrNXQ3GZeyz4T0Pbai-ZS4tJu2y9OH_hVfKKIiQ,48189
+ripple_down_rules-0.5.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.5.54.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.5.54.dist-info/RECORD,,