ripple-down-rules 0.6.21__py3-none-any.whl → 0.6.23__py3-none-any.whl

ripple_down_rules/__init__.py

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

ripple_down_rules/rdr.py

@@ -92,7 +92,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         self.start_rule = start_rule
         self.fig: Optional[Figure] = None
         self.viewer: Optional[RDRCaseViewer] = viewer
-        if viewer is None:
+        if viewer is None and RDRCaseViewer is not None:
             if len(RDRCaseViewer.instances) > 0:
                 self.viewer = RDRCaseViewer.instances[0]
                 logger.error("No viewer was provided, but there is already an existing viewer. "
@@ -108,11 +108,14 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         if value is not None:
             value.set_save_function(self.save)
 
-    def render_evaluated_rule_tree(self, filename: str) -> None:
-        evaluated_rules = self.get_evaluated_rule_tree()
-        if evaluated_rules is not None and len(evaluated_rules) > 0:
-            render_tree(evaluated_rules[0], use_dot_exporter=True, filename=filename,
-                        only_nodes=evaluated_rules)
+    def render_evaluated_rule_tree(self, filename: str, show_full_tree: bool = False) -> None:
+        if show_full_tree:
+            render_tree(self.start_rule, use_dot_exporter=True, filename=filename)
+        else:
+            evaluated_rules = self.get_evaluated_rule_tree()
+            if evaluated_rules is not None and len(evaluated_rules) > 0:
+                render_tree(evaluated_rules[0], use_dot_exporter=True, filename=filename,
+                            only_nodes=evaluated_rules)
 
     def get_evaluated_rule_tree(self) -> List[Rule]:
         """

ripple_down_rules/rdr_decorators.py

@@ -120,7 +120,7 @@ class RDRDecorator:
                     if self.generate_dot_file:
                         eval_rule_tree = self.rdr.get_evaluated_rule_tree()
                         if not self.not_none_output_found or (eval_rule_tree and len(eval_rule_tree) > 1):
-                            self.rdr.render_evaluated_rule_tree(self.rdr_models_dir + f'/{self.model_name}')
+                            self.rdr.render_evaluated_rule_tree(self.rdr_models_dir + f'/{self.model_name}', show_full_tree=True)
                         if eval_rule_tree and len(eval_rule_tree) > 1:
                             self.not_none_output_found = True
 
@@ -181,7 +181,7 @@ class RDRDecorator:
         return Case(dict, id(case_dict), case_name, case_dict, **case_dict), case_dict
 
     def initialize_rdr_model_name_and_load(self, func: Callable) -> None:
-        self.viewer = RDRCaseViewer.instances[0] if len(RDRCaseViewer.instances) > 0 else self.viewer
+        self.viewer = RDRCaseViewer.instances[0] if RDRCaseViewer is not None and len(RDRCaseViewer.instances) > 0 else self.viewer
         model_file_name = get_func_rdr_model_name(func, include_file_name=True)
         self.model_name = str_to_snake_case(model_file_name)
         self.load()

ripple_down_rules/rules.py

@@ -60,6 +60,16 @@ class Rule(NodeMixin, SubclassJSONSerializer, ABC):
         self.evaluated: bool = False
         self._user_defined_name: Optional[str] = None
 
+    @property
+    def color(self) -> str:
+        if self.evaluated:
+            if self.fired:
+                return "green"
+            else:
+                return "red"
+        else:
+            return "white"
+
     @property
     def user_defined_name(self) -> Optional[str]:
         """

ripple_down_rules/utils.py

@@ -1934,7 +1934,7 @@ def render_tree(root: Node, use_dot_exporter: bool = False,
                                  include_nodes=only_nodes,
                                  nodenamefunc=unique_node_names,
                                  edgeattrfunc=edge_attr_setter,
-                                 nodeattrfunc=lambda node: f'style=filled, fillcolor={"green" if node.fired else "red"}'
+                                 nodeattrfunc=lambda node: f'style=filled, fillcolor={node.color}'
                                  )
         de.to_dotfile(f"{filename}{'.dot'}")
         # de.to_picture(f"{filename}{'.png'}")

{ripple_down_rules-0.6.21.dist-info → ripple_down_rules-0.6.23.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
-ripple_down_rules/__init__.py,sha256=FE7egOk8_N_vJLm9yZ7ZIh8wz0opNbBXT1V2le4qaog,100
+ripple_down_rules/__init__.py,sha256=Y8dJbmLSU5jLm9E0jiReo5eIcp03jmLvx6sNfRfi49M,100
 ripple_down_rules/experts.py,sha256=4-dMIVeMzFXCLYl_XBG_P7_Xs4sZih9-vZxCIPri6dA,12958
 ripple_down_rules/helpers.py,sha256=RUdfiSWMZjGwCxuCy44TcEJf2UNAFlPJusgHzuAs6qI,4583
-ripple_down_rules/rdr.py,sha256=nUPapnkz9cESaeDDZ8iYdrzmED59nIbZWB19a-lYYr4,57603
-ripple_down_rules/rdr_decorators.py,sha256=QafdWzfbjE-xYe2SyIDr7oRqq32WjKYBC2LrG2I3iy0,11758
-ripple_down_rules/rules.py,sha256=ULIHRbVfKd2L3zzPnssmaeqInWHifPvwwa16MyzakPc,23548
+ripple_down_rules/rdr.py,sha256=sibe0amvb2MuVFRGjADgel6a-K0bp8fpJQRLnRuYW-k,57803
+ripple_down_rules/rdr_decorators.py,sha256=0xVM-yRZJ6BrpyMfQNBuFUKT_-me6tbd4UTgG5Exx2g,11809
+ripple_down_rules/rules.py,sha256=2d2Fgo5urVvUoIJWdRyaojcFBj_lfhLZaBVrXwb5KLA,23764
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
-ripple_down_rules/utils.py,sha256=Pwvi51zXE2zZN1RYmsX4xUxPMHs3lXIYirPrUyOiwpk,73341
+ripple_down_rules/utils.py,sha256=VM8vrshOJIqXAY48dghu86KSGpYQoGGDMEiq3GrLXsQ,73319
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=ysK-4JmZ4oSUTJC7zpo_o77g4ONxPDEcIpSWggsnx3c,13320
 ripple_down_rules/datastructures/case.py,sha256=PJ7_-AdxYic6BO5z816piFODj6nU5J6Jt1YzTFH-dds,15510
@@ -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.21.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.6.21.dist-info/METADATA,sha256=Ir6V_9HK_ELD1EdVwrzu7noYUDY21VwIMC1SP0708UA,48294
-ripple_down_rules-0.6.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.6.21.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.6.21.dist-info/RECORD,,
+ripple_down_rules-0.6.23.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.6.23.dist-info/METADATA,sha256=5B9P3h5EyJEZvyuj7CtFVNeJxQOg8kjG7pQJfoVlAqs,48294
+ripple_down_rules-0.6.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.6.23.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.6.23.dist-info/RECORD,,