ripple-down-rules 0.5.59__py3-none-any.whl → 0.5.60__py3-none-any.whl

ripple_down_rules/__init__.py

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

ripple_down_rules/datastructures/callable_expression.py

@@ -259,7 +259,8 @@ class CallableExpression(SubclassJSONSerializer):
                 "conclusion_type": [get_full_class_name(t) for t in self.conclusion_type]
                 if self.conclusion_type is not None else None,
                 "scope": {k: get_full_class_name(v) for k, v in self.scope.items()
-                          if hasattr(v, '__module__') and hasattr(v, '__name__')},
+                          if hasattr(v, '__module__') and hasattr(v, '__name__')
+                          and v.__module__ is not None and v.__name__ is not None},
                 "conclusion": conclusion_to_json(self.conclusion),
                 "mutually_exclusive": self.mutually_exclusive,
                 }

ripple_down_rules/rdr.py

@@ -78,7 +78,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
     """
 
     def __init__(self, start_rule: Optional[Rule] = None, viewer: Optional[RDRCaseViewer] = None,
-                 save_dir: Optional[str] = None, ask_always: bool = True, model_name: Optional[str] = None):
+                 save_dir: Optional[str] = None, ask_always: bool = False, model_name: Optional[str] = None):
         """
         :param start_rule: The starting rule for the classifier.
         :param viewer: The viewer gui to use for the classifier. If None, no viewer is used.
@@ -241,12 +241,18 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         self.case_type = case_query.case_type if self.case_type is None else self.case_type
         self.case_name = case_query.case_name if self.case_name is None else self.case_name
 
-        expert = expert or Human(answers_save_path=self.save_dir + '/expert_answers' if self.save_dir else None)
+        expert = expert or Human(viewer=self.viewer,
+                                 answers_save_path=self.save_dir + '/expert_answers'
+                                 if self.save_dir else None)
 
         if case_query.target is None:
             case_query_cp = copy(case_query)
             conclusions = self.classify(case_query_cp.case, modify_case=True)
-            if self.ask_always or conclusions is None or is_iterable(conclusions) and len(conclusions) == 0:
+            if (self.ask_always or conclusions is None
+                or is_iterable(conclusions) and len(conclusions) == 0
+                or (isinstance(conclusions, dict) and (case_query_cp.attribute_name not in conclusions
+                    or not any(type(c) in case_query_cp.core_attribute_type
+                               for c in make_list(conclusions[case_query_cp.attribute_name]))))):
                 expert.ask_for_conclusion(case_query_cp)
                 case_query.target = case_query_cp.target
             if case_query.target is None:
@@ -646,12 +652,12 @@ class MultiClassRDR(RDRWithCodeWriter):
     """
 
     def __init__(self, start_rule: Optional[MultiClassTopRule] = None,
-                 mode: MCRDRMode = MCRDRMode.StopOnly):
+                 mode: MCRDRMode = MCRDRMode.StopOnly, **kwargs):
         """
         :param start_rule: The starting rules for the classifier.
         :param mode: The mode of the classifier, either StopOnly or StopPlusRule, or StopPlusRuleCombined.
         """
-        super(MultiClassRDR, self).__init__(start_rule)
+        super(MultiClassRDR, self).__init__(start_rule, **kwargs)
         self.mode: MCRDRMode = mode
 
     def classify(self, case: Union[Case, SQLTable], modify_case: bool = False) -> Set[Any]:

ripple_down_rules/rdr_decorators.py

@@ -24,7 +24,6 @@ class RDRDecorator:
     def __init__(self, models_dir: str,
                  output_type: Tuple[Type],
                  mutual_exclusive: bool,
-                 python_dir: Optional[str] = None,
                  output_name: str = "output_",
                  fit: bool = True,
                  expert: Optional[Expert] = None):
@@ -32,7 +31,6 @@ class RDRDecorator:
         :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.
         :param mutual_exclusive: If True, the output types are mutually exclusive.
-        :param python_dir: The directory to save the RDR model as a python file.
          If None, the RDR model will not be saved as a python file.
         :param output_name: The name of the output. This is used to create the RDR model.
         :param fit: If True, the function will be in fit mode. This means that the RDR will prompt the user for the
@@ -47,7 +45,6 @@ class RDRDecorator:
         self.output_type = output_type
         self.parsed_output_type: List[Type] = []
         self.mutual_exclusive = mutual_exclusive
-        self.rdr_python_path: Optional[str] = python_dir
         self.output_name = output_name
         self.fit: bool = fit
         self.expert: Optional[Expert] = expert
@@ -64,8 +61,6 @@ class RDRDecorator:
                 self.initialize_rdr_model_name_and_load(func)
 
             if self.fit:
-                expert_answers_path = os.path.join(self.rdr_models_dir, self.model_name, "expert_answers")
-                self.expert = self.expert or Human(answers_save_path=expert_answers_path)
                 case_query = self.create_case_query_from_method(func, self.parsed_output_type,
                                                                 self.mutual_exclusive, self.output_name,
                                                                 *args, **kwargs)
@@ -148,9 +143,12 @@ class RDRDecorator:
         """
         Load the RDR model from the specified directory.
         """
-        if self.model_name is not None and os.path.exists(os.path.join(self.rdr_models_dir, self.model_name)):
-            self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name)
-        else:
+        self.rdr = None
+        if self.model_name is not None:
+            model_path = os.path.join(self.rdr_models_dir, self.model_name + f"/rdr_metadata/{self.model_name}.json")
+            if os.path.exists(os.path.join(self.rdr_models_dir, model_path)):
+                self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name)
+        if self.rdr is None:
             self.rdr = GeneralRDR(save_dir=self.rdr_models_dir, model_name=self.model_name)
 
     def update_from_python(self):

{ripple_down_rules-0.5.59.dist-info → ripple_down_rules-0.5.60.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
-ripple_down_rules/__init__.py,sha256=B7Eu1dTZ_vwgcvPoR4pAqnxwQQ6bT8WDK-ftMsFm3IE,100
+ripple_down_rules/__init__.py,sha256=YMDb4SUKV8_gECB2R7_aVOk5ycxEUZZOLksjGvCzCgU,100
 ripple_down_rules/experts.py,sha256=8p5tFOWuQWgp9gt-6Yr6MFFphOTmpI9IJ3iepUyy3FY,12266
 ripple_down_rules/helpers.py,sha256=TvTJU0BA3dPcAyzvZFvAu7jZqsp8Lu0HAAwvuizlGjg,2018
-ripple_down_rules/rdr.py,sha256=oArXOfPichP9U-w2NqZtsdiDPO0_JQy9I8ZaCB9rpA8,48880
-ripple_down_rules/rdr_decorators.py,sha256=pYCKLgMKgQ6x_252WQtF2t4ZNjWPBxnaWtJ6TpGdcc0,7820
+ripple_down_rules/rdr.py,sha256=4iobla4XmMwAOQsn_JZaZe2tWU0aMMvqgzP5WavIagI,49280
+ripple_down_rules/rdr_decorators.py,sha256=bmn4h4a7xujTVxu-ofECe71cM_6iiqZhLVFosEItid4,7602
 ripple_down_rules/rules.py,sha256=TPNVMqW9T-_46BS4WemrspLg5uG8kP6tsPvWWBAzJxg,17515
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
 ripple_down_rules/utils.py,sha256=N5Rgz7wb9oKrVLZiJG2P-irnsjhy7VR3Vqyggf4Mq7I,51564
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
-ripple_down_rules/datastructures/callable_expression.py,sha256=w6Gpo1o-xnFvTaPrzJ2w7VgCjSr1xqp8LQG0jAl-mfc,12718
+ripple_down_rules/datastructures/callable_expression.py,sha256=f3wUPTrLa1INO-1qfgVz87ryrCABronfyq0_JKWoZCs,12800
 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.59.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.5.59.dist-info/METADATA,sha256=H-f6jFY9wnjFtKoYkhPf5dNyQU1k3egp0v8PSNraBEo,48189
-ripple_down_rules-0.5.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.5.59.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.5.59.dist-info/RECORD,,
+ripple_down_rules-0.5.60.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.5.60.dist-info/METADATA,sha256=bS8oBSP7DZJP-wgtpRQWPDRQJ_0bf8nlFZkA_LpbBRE,48189
+ripple_down_rules-0.5.60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.5.60.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.5.60.dist-info/RECORD,,