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

ripple_down_rules/__init__.py

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

ripple_down_rules/datastructures/callable_expression.py

@@ -161,7 +161,7 @@ class CallableExpression(SubclassJSONSerializer):
             else:
                 raise ValueError("Either user_input or conclusion must be provided.")
         except Exception as e:
-            raise ValueError(f"Error during evaluation: {e}")
+            raise ValueError(f"Error during evaluation: {e}, user_input: {self.user_input}")
 
     def combine_with(self, other: 'CallableExpression') -> 'CallableExpression':
         """

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:
             break
     return conclusions
 

ripple_down_rules/rdr.py

@@ -244,6 +244,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
                  expert: Optional[Expert] = None,
                  update_existing_rules: bool = True,
                  scenario: Optional[Callable] = None,
+                 ask_now: Callable = lambda _: True,
                  **kwargs) \
             -> Union[CallableExpression, Dict[str, CallableExpression]]:
         """
@@ -255,6 +256,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         :param update_existing_rules: Whether to update the existing same conclusion type rules that already gave
         some conclusions with the type required by the case query.
         :param scenario: The scenario at which the case was created, this is used to recreate the case if needed.
+        :ask_now: Whether to ask the expert for refinements or alternatives.
         :return: The category that the case belongs to.
         """
         if case_query is None:
@@ -271,7 +273,8 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         if case_query.target is None:
             case_query_cp = copy(case_query)
             conclusions = self.classify(case_query_cp.case, modify_case=True, case_query=case_query_cp)
-            if self.should_i_ask_the_expert_for_a_target(conclusions, case_query_cp, update_existing_rules):
+            if (self.should_i_ask_the_expert_for_a_target(conclusions, case_query_cp, update_existing_rules)
+                    and ask_now(case_query_cp.case)):
                 expert.ask_for_conclusion(case_query_cp)
                 case_query.target = case_query_cp.target
             if case_query.target is None:

ripple_down_rules/rdr_decorators.py

@@ -33,7 +33,7 @@ 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, Any], bool] = lambda _,n: True,
                  fitting_decorator: Optional[Callable] = None):
         """
         :param models_dir: The directory to save/load the RDR models.
@@ -94,13 +94,12 @@ class RDRDecorator:
                                                                 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):
+            if self.fit and not self.use_generated_classifier and self.ask_now(case_dict, self.rdr.classify(case)):
                 output = fit()
             else:
                 if self.use_generated_classifier:

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

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

@@ -1,13 +1,13 @@
-ripple_down_rules/__init__.py,sha256=HFiQNi2SqhUFClhVWHplxqW2PHHMj-43eIFUOxkn4as,100
+ripple_down_rules/__init__.py,sha256=bHNnB4r5WRrjFPnOG4ulZdsLVSJHg3xarT5y9_woJ1A,100
 ripple_down_rules/experts.py,sha256=4-dMIVeMzFXCLYl_XBG_P7_Xs4sZih9-vZxCIPri6dA,12958
-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=cqfLaIDIyCjlR3tsIgOWJDdDsDk1nA1Atx-vlKFaIxY,10646
+ripple_down_rules/helpers.py,sha256=X-pYuCsmuNraUFcIL450AsaOdGvGjotNPgSx8yu3NMg,4525
+ripple_down_rules/rdr.py,sha256=I6NRZuXR_1lyWOHkN34HiLA-7dg-OLWEnHodKVjYTQI,56331
+ripple_down_rules/rdr_decorators.py,sha256=SZ2ivGtT_2xuoGlTE9PtjqdC02AqZXkLh-MhgBBPcfw,10632
 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
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
-ripple_down_rules/datastructures/callable_expression.py,sha256=YHlEYc9Ye_4gYAqqj_TyCB363WpZ8lXH2LLRl1CCGe8,12934
+ripple_down_rules/datastructures/callable_expression.py,sha256=pslqv9igc7d6s1TCKdJSfIdU98_L1BPKNmfLVlGdGHs,12965
 ripple_down_rules/datastructures/case.py,sha256=PJ7_-AdxYic6BO5z816piFODj6nU5J6Jt1YzTFH-dds,15510
 ripple_down_rules/datastructures/dataclasses.py,sha256=D-nrVEW_27njmDGkyiHRnq5lmqEdO8RHKnLb1mdnwrA,11054
 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=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.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,,
+ripple_down_rules-0.6.13.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.6.13.dist-info/METADATA,sha256=paDmKM4LPfXdduNun6UH8pEn7XgdnWHuyY_Xi4bpDt8,48214
+ripple_down_rules-0.6.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.6.13.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.6.13.dist-info/RECORD,,