ripple-down-rules 0.5.96__py3-none-any.whl → 0.5.97__py3-none-any.whl

ripple_down_rules/__init__.py

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

ripple_down_rules/rdr.py

@@ -676,12 +676,12 @@ class SingleClassRDR(RDRWithCodeWriter):
         :param case_query: The case query containing the case and the target category to compare the case with.
         """
         pred = self.evaluate(case)
-        conclusion = pred.conclusion(case) if pred is not None else None
+        conclusion = pred.conclusion(case) if pred is not None else self.default_conclusion
         if pred is not None and pred.fired and case_query is not None:
             if pred.corner_case_metadata is None and conclusion is not None \
                     and type(conclusion) in case_query.core_attribute_type:
                 pred.corner_case_metadata = CaseFactoryMetaData.from_case_query(case_query)
-        return conclusion if pred is not None and pred.fired else self.default_conclusion
+        return conclusion
 
     def evaluate(self, case: Case) -> SingleClassRule:
         """

ripple_down_rules/rdr_decorators.py

@@ -31,7 +31,8 @@ class RDRDecorator:
                  expert: Optional[Expert] = None,
                  update_existing_rules: bool = True,
                  viewer: Optional[RDRCaseViewer] = None,
-                 package_name: Optional[str] = None):
+                 package_name: Optional[str] = None,
+                 use_generated_classifier: bool = False):
         """
         :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.
@@ -47,6 +48,7 @@ class RDRDecorator:
          even if they gave an output.
         :param viewer: The viewer to use for the RDR model. If None, no viewer will be used.
         :param package_name: The package name to use for relative imports in the RDR model.
+        :param use_generated_classifier: If True, the function will use the generated classifier instead of the RDR model.
         :return: A decorator to use a GeneralRDR as a classifier that monitors and modifies the function's output.
         """
         self.rdr_models_dir = models_dir
@@ -60,6 +62,8 @@ class RDRDecorator:
         self.update_existing_rules = update_existing_rules
         self.viewer = viewer
         self.package_name = package_name
+        self.use_generated_classifier = use_generated_classifier
+        self.generated_classifier: Optional[Callable] = None
         self.load()
 
     def decorator(self, func: Callable) -> Callable:
@@ -67,17 +71,17 @@ class RDRDecorator:
         @wraps(func)
         def wrapper(*args, **kwargs) -> Optional[Any]:
 
-            if len(self.parsed_output_type) == 0:
-                self.parsed_output_type = self.parse_output_type(func, self.output_type, *args)
             if self.model_name is None:
                 self.initialize_rdr_model_name_and_load(func)
-            if self.expert is None:
-                self.expert = Human(viewer=self.viewer,
-                                    answers_save_path=self.rdr_models_dir + f'/{self.model_name}/expert_answers')
 
             func_output = {self.output_name: func(*args, **kwargs)}
 
             if self.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:
+                    self.expert = Human(viewer=self.viewer,
+                                        answers_save_path=self.rdr_models_dir + f'/{self.model_name}/expert_answers')
                 case_query = self.create_case_query_from_method(func, func_output,
                                                                 self.parsed_output_type,
                                                                 self.mutual_exclusive,
@@ -87,7 +91,13 @@ class RDRDecorator:
                                            viewer=self.viewer)
             else:
                 case, case_dict = self.create_case_from_method(func, func_output, *args, **kwargs)
-                output = self.rdr.classify(case)
+                if self.use_generated_classifier:
+                    if self.generated_classifier is None:
+                        model_path = os.path.join(self.rdr_models_dir, self.model_name)
+                        self.generated_classifier = self.rdr.get_rdr_classifier_from_python_file(model_path)
+                    output = self.generated_classifier(case)
+                else:
+                    output = self.rdr.classify(case)
 
             if self.output_name in output:
                 return output[self.output_name]

{ripple_down_rules-0.5.96.dist-info → ripple_down_rules-0.5.97.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
-ripple_down_rules/__init__.py,sha256=Vzq2IW363zvjMh2-NN_nmo2dJIZaUhzlFSMP3GpB8i0,100
+ripple_down_rules/__init__.py,sha256=S8_aIL6wZaWbPQRl_qf9q65NR3nW8mnLIrjc-Tqvvaw,100
 ripple_down_rules/experts.py,sha256=4-dMIVeMzFXCLYl_XBG_P7_Xs4sZih9-vZxCIPri6dA,12958
 ripple_down_rules/helpers.py,sha256=sY8nFbYdLOO6EG5UQugCCxjSjcCQsDUCPgawfQA4Ui8,4495
-ripple_down_rules/rdr.py,sha256=JqNPCUHDJ9xBg8pReYAMas9hlC_BBRZdqtl1cO2NMmU,56177
-ripple_down_rules/rdr_decorators.py,sha256=riAFmL8jc1rw9dFkNbT023CfB5FbmOWHNiVKO2bAXsE,9195
+ripple_down_rules/rdr.py,sha256=CPSjSmdzUN5meBakr9T6B-ZT1KmLjRAJ6JIL3UIRzyI,56132
+ripple_down_rules/rdr_decorators.py,sha256=JWJn2MAKJG1YbLLWUZMzYfS3t1mEOAi21S8NUY7hy0Q,9913
 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.5.96.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.5.96.dist-info/METADATA,sha256=k8TDjtJGrXRcD7pOO6fxVD2kqEJf4Em7_ro1h55jjZ0,48214
-ripple_down_rules-0.5.96.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.5.96.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.5.96.dist-info/RECORD,,
+ripple_down_rules-0.5.97.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.5.97.dist-info/METADATA,sha256=ATXJ3z-nJQQ3aB9aFaEnEfXLJ7njVA1Kh1s40tJPBV0,48214
+ripple_down_rules-0.5.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.5.97.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.5.97.dist-info/RECORD,,