ripple-down-rules 0.6.1__py3-none-any.whl → 0.6.11__py3-none-any.whl

ripple_down_rules/__init__.py

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

ripple_down_rules/helpers.py

@@ -55,7 +55,7 @@ def general_rdr_classify(classifiers_dict: Dict[str, Union[ModuleType, RippleDow
             if attribute_name in new_conclusions:
                 temp_case_query = CaseQuery(case_cp, attribute_name, rdr.conclusion_type, rdr.mutually_exclusive)
                 update_case(temp_case_query, new_conclusions)
-        if len(new_conclusions) == 0 or (len(classifiers_dict) == 1 and all(rdr.mutually_exclusive for rdr in classifiers_dict.values())):
+        if len(new_conclusions) == 0: #or (len(classifiers_dict) == 1 and all(rdr.mutually_exclusive for rdr in classifiers_dict.values())):
             break
     return conclusions
 

ripple_down_rules/rdr_decorators.py

@@ -33,7 +33,8 @@ class RDRDecorator:
                  viewer: Optional[RDRCaseViewer] = None,
                  package_name: Optional[str] = None,
                  use_generated_classifier: bool = False,
-                 ask_now: Callable[[Any], bool] = lambda _: True):
+                 ask_now: Callable[[Any], bool] = lambda _: True,
+                 fitting_decorator: Optional[Callable] = None):
         """
         :param models_dir: The directory to save/load the RDR models.
         :param output_type: The type of the output. This is used to create the RDR model.
@@ -66,6 +67,7 @@ class RDRDecorator:
         self.use_generated_classifier = use_generated_classifier
         self.generated_classifier: Optional[Callable] = None
         self.ask_now = ask_now
+        self.fitting_decorator = fitting_decorator
         self.load()
 
     def decorator(self, func: Callable) -> Callable:
@@ -79,8 +81,9 @@ class RDRDecorator:
             func_output = {self.output_name: func(*args, **kwargs)}
 
             case, case_dict = self.create_case_from_method(func, func_output, *args, **kwargs)
-            
-            if self.fit and not self.use_generated_classifier and self.ask_now(case_dict):
+
+            @self.fitting_decorator
+            def fit():
                 if len(self.parsed_output_type) == 0:
                     self.parsed_output_type = self.parse_output_type(func, self.output_type, *args)
                 if self.expert is None:
@@ -89,10 +92,16 @@ class RDRDecorator:
                 case_query = self.create_case_query_from_method(func, func_output,
                                                                 self.parsed_output_type,
                                                                 self.mutual_exclusive,
+                                                                case, case_dict,
                                                                 *args, **kwargs)
+                # import pdb; pdb.set_trace()
                 output = self.rdr.fit_case(case_query, expert=self.expert,
                                            update_existing_rules=self.update_existing_rules,
                                            viewer=self.viewer)
+                return output
+            
+            if self.fit and not self.use_generated_classifier and self.ask_now(case_dict):
+                output = fit()
             else:
                 if self.use_generated_classifier:
                     if self.generated_classifier is None:
@@ -114,6 +123,8 @@ class RDRDecorator:
                                       func_output: Dict[str, Any],
                                       output_type: Sequence[Type],
                                       mutual_exclusive: bool,
+                                      case: Optional[Case] = None,
+                                      case_dict: Optional[Dict[str, Any]] = None,
                                       *args, **kwargs) -> CaseQuery:
         """
         Create a CaseQuery from the function and its arguments.
@@ -127,7 +138,8 @@ class RDRDecorator:
         :return: A CaseQuery object representing the case.
         """
         output_type = make_set(output_type)
-        case, case_dict = RDRDecorator.create_case_from_method(func, func_output, *args, **kwargs)
+        if case is None or case_dict is None:
+            case, case_dict = RDRDecorator.create_case_from_method(func, func_output, *args, **kwargs)
         scope = func.__globals__
         scope.update(case_dict)
         func_args_type_hints = get_type_hints(func)

{ripple_down_rules-0.6.1.dist-info → ripple_down_rules-0.6.11.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
-ripple_down_rules/__init__.py,sha256=B8pB51s_DLQLsz-ddWBpBxmHt45Fr_FCoKmP-nvXKJ4,99
+ripple_down_rules/__init__.py,sha256=HFiQNi2SqhUFClhVWHplxqW2PHHMj-43eIFUOxkn4as,100
 ripple_down_rules/experts.py,sha256=4-dMIVeMzFXCLYl_XBG_P7_Xs4sZih9-vZxCIPri6dA,12958
-ripple_down_rules/helpers.py,sha256=OVjQm57hm4yUkGrmQB0w3GmuILdYP9yCiJ4QrwfZPeo,4596
+ripple_down_rules/helpers.py,sha256=6njZZoxOa5MH47wky4w2llrGYFK_llfny7NQZCEejxU,4598
 ripple_down_rules/rdr.py,sha256=G0UWETaXddDOaNWTqfxPWkCSDiWkMEU_aBUWcsnJUN0,56147
-ripple_down_rules/rdr_decorators.py,sha256=0GpWuAOPLYc8WFc5SN8PgHRLNgcHw8dNMmeIbaB8Los,10085
+ripple_down_rules/rdr_decorators.py,sha256=cqfLaIDIyCjlR3tsIgOWJDdDsDk1nA1Atx-vlKFaIxY,10646
 ripple_down_rules/rules.py,sha256=Dk4yGCy5oV10mOv5rRLcmtIu9J60WBPol9b7ELFn6fY,21522
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
 ripple_down_rules/utils.py,sha256=vFoz5HcRgkf7_s-zdWSg54xI9PCMcdDzcdFGdas7KBA,62350
@@ -17,8 +17,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=yp-F8YRWGhj1PLB3
 ripple_down_rules/user_interface/object_diagram.py,sha256=FEa2HaYR9QmTE6NsOwBvZ0jqmu3DKyg6mig2VE5ZP4Y,4956
 ripple_down_rules/user_interface/prompt.py,sha256=JceEUGYsd0lIvd-v2y3D3swoo96_C0lxfp3CxM7Vfts,8900
 ripple_down_rules/user_interface/template_file_creator.py,sha256=kwBbFLyN6Yx2NTIHPSwOoytWgbJDYhgrUOVFw_jkDQ4,13522
-ripple_down_rules-0.6.1.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.6.1.dist-info/METADATA,sha256=ykWY4i5avTIJHNvn3E8_8E398isJFxzzACRL-x_G5Fs,48213
-ripple_down_rules-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.6.1.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.6.1.dist-info/RECORD,,
+ripple_down_rules-0.6.11.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.6.11.dist-info/METADATA,sha256=1pKWXY6fCKqe6fFgW_3fTrqh-hI2rODPa53cnU4K1RQ,48214
+ripple_down_rules-0.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.6.11.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.6.11.dist-info/RECORD,,