ripple-down-rules 0.4.81__py3-none-any.whl → 0.4.83__py3-none-any.whl

ripple_down_rules/rdr.py

@@ -22,7 +22,7 @@ from .rules import Rule, SingleClassRule, MultiClassTopRule, MultiClassStopRule
 from .user_interface.gui import RDRCaseViewer
 from .utils import draw_tree, make_set, copy_case, \
     SubclassJSONSerializer, make_list, get_type_from_string, \
-    is_conflicting, update_case, get_imports_from_scope, extract_function_source, extract_imports
+    is_conflicting, update_case, get_imports_from_scope, extract_function_source, extract_imports, get_full_class_name
 
 
 class RippleDownRules(SubclassJSONSerializer, ABC):
@@ -45,6 +45,10 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
     """
     The name of the classifier.
     """
+    case_type: Optional[Type] = None
+    """
+    The type of the case (input) to the RDR classifier.
+    """
 
     def __init__(self, start_rule: Optional[Rule] = None, viewer: Optional[RDRCaseViewer] = None):
         """
@@ -143,6 +147,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         if case_query is None:
             raise ValueError("The case query cannot be None.")
         self.name = case_query.attribute_name if self.name is None else self.name
+        self.case_type = case_query.case_type if self.case_type is None else self.case_type
         if case_query.target is None:
             case_query_cp = copy(case_query)
             self.classify(case_query_cp.case, modify_case=True)
@@ -367,16 +372,6 @@ class RDRWithCodeWriter(RippleDownRules, ABC):
         else:
             return "SCRDR"
 
-    @property
-    def case_type(self) -> Type:
-        """
-        :return: The type of the case (input) to the RDR classifier.
-        """
-        if isinstance(self.start_rule.corner_case, Case):
-            return self.start_rule.corner_case._obj_type
-        else:
-            return type(self.start_rule.corner_case)
-
     @property
     def conclusion_type(self) -> Tuple[Type]:
         """
@@ -396,7 +391,7 @@ class RDRWithCodeWriter(RippleDownRules, ABC):
 
     def _to_json(self) -> Dict[str, Any]:
         return {"start_rule": self.start_rule.to_json(),  "generated_python_file_name": self.generated_python_file_name,
-                "name": self.name}
+                "name": self.name, "case_type": get_full_class_name(self.case_type) if self.case_type is not None else None}
 
     @classmethod
     def _from_json(cls, data: Dict[str, Any]) -> Self:
@@ -409,6 +404,8 @@ class RDRWithCodeWriter(RippleDownRules, ABC):
             new_rdr.generated_python_file_name = data["generated_python_file_name"]
         if "name" in data:
             new_rdr.name = data["name"]
+        if "case_type" in data:
+            new_rdr.case_type = get_type_from_string(data["case_type"])
         return new_rdr
 
     @staticmethod
@@ -882,7 +879,8 @@ class GeneralRDR(RippleDownRules):
     def _to_json(self) -> Dict[str, Any]:
         return {"start_rules": {name: rdr.to_json() for name, rdr in self.start_rules_dict.items()}
                 , "generated_python_file_name": self.generated_python_file_name,
-                "name": self.name}
+                "name": self.name,
+                "case_type": get_full_class_name(self.case_type) if self.case_type is not None else None}
 
     @classmethod
     def _from_json(cls, data: Dict[str, Any]) -> GeneralRDR:
@@ -897,6 +895,8 @@ class GeneralRDR(RippleDownRules):
             new_rdr.generated_python_file_name = data["generated_python_file_name"]
         if "name" in data:
             new_rdr.name = data["name"]
+        if "case_type" in data:
+            new_rdr.case_type = get_type_from_string(data["case_type"])
         return new_rdr
 
     def update_from_python_file(self, package_dir: str) -> None:
@@ -930,18 +930,6 @@ class GeneralRDR(RippleDownRules):
                     f"{' ' * 4}    case = create_case(case, max_recursion_idx=3)\n""")
             f.write(f"{' ' * 4}return GeneralRDR._classify(classifiers_dict, case)\n")
 
-    @property
-    def case_type(self) -> Optional[Type]:
-        """
-        :return: The type of the case (input) to the RDR classifier.
-        """
-        if self.start_rule is None or self.start_rule.corner_case is None:
-            return None
-        if isinstance(self.start_rule.corner_case, Case):
-            return self.start_rule.corner_case._obj_type
-        else:
-            return type(self.start_rule.corner_case)
-
     def get_rdr_classifier_from_python_file(self, file_path: str) -> Callable[[Any], Any]:
         """
         :param file_path: The path to the file that contains the RDR classifier function.

ripple_down_rules/user_interface/prompt.py

@@ -2,7 +2,11 @@ import ast
 import logging
 from _ast import AST
 
-from PyQt6.QtWidgets import QApplication
+try:
+    from PyQt6.QtWidgets import QApplication
+except ImportError:
+    QApplication = None
+
 from colorama import Fore, Style
 from pygments import highlight
 from pygments.formatters.terminal import TerminalFormatter
@@ -11,7 +15,7 @@ from typing_extensions import Optional, Tuple
 
 from ..datastructures.callable_expression import CallableExpression, parse_string_to_expression
 from ..datastructures.dataclasses import CaseQuery
-from ..datastructures.enums import PromptFor, InteractionMode
+from ..datastructures.enums import PromptFor
 from .gui import RDRCaseViewer
 from .ipython_custom_shell import IPythonShell
 from ..utils import make_list
@@ -90,7 +94,7 @@ class UserPrompt:
                 prompt_str = f"Give conditions on when can the rule be evaluated for:"
         case_query.scope.update({'case': case_query.case})
         shell = None
-        if QApplication.instance() is None:
+        if self.viewer is None:
             prompt_str = self.construct_prompt_str_for_shell(case_query, prompt_for, prompt_str)
             shell = IPythonShell(header=prompt_str, prompt_for=prompt_for, case_query=case_query,
                                  code_to_modify=code_to_modify)

ripple_down_rules/utils.py

@@ -891,8 +891,8 @@ class SubclassJSONSerializer:
         if not filename.endswith(".json"):
             filename += ".json"
         with open(filename, "r") as f:
-            scrdr_json = json.load(f)
-        deserialized_obj = cls.from_json(scrdr_json)
+            rdr_json = json.load(f)
+        deserialized_obj = cls.from_json(rdr_json)
         cls.data_class_refs.clear()
         return deserialized_obj
 

{ripple_down_rules-0.4.81.dist-info → ripple_down_rules-0.4.83.dist-info}/METADATA

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

@@ -3,10 +3,10 @@ ripple_down_rules/datasets.py,sha256=fJbZ7V-UUYTu5XVVpFinTbuzN3YePCnUB01L3AyZVM8
 ripple_down_rules/experts.py,sha256=dEZKv58sdicDByj0T0bu0q6coIBMce6o4t9gJICQy1k,6556
 ripple_down_rules/failures.py,sha256=E6ajDUsw3Blom8eVLbA7d_Qnov2conhtZ0UmpQ9ZtSE,302
 ripple_down_rules/helpers.py,sha256=TvTJU0BA3dPcAyzvZFvAu7jZqsp8Lu0HAAwvuizlGjg,2018
-ripple_down_rules/rdr.py,sha256=jxMvkyQ_2jdyxa5aKmvGRHvD-IJBKjsyOpxvvJbFLPE,45518
+ripple_down_rules/rdr.py,sha256=HpvRpg_cenoJGzYeF_5xlYriWOb0xKQjpbeDyHJNeRg,45389
 ripple_down_rules/rdr_decorators.py,sha256=VdmE0JrE8j89b6Af1R1tLZiKfy3h1VCvhAUefN_FLLQ,6753
 ripple_down_rules/rules.py,sha256=7NB8qWW7XEB45tmJRYsKJqBG8DN3v02fzAFYmOkX8ow,17458
-ripple_down_rules/utils.py,sha256=I3QttwfI3q5JkwWgTPqCmY1G7EGDQWR3yDZPX5OAwBs,49379
+ripple_down_rules/utils.py,sha256=5dpkujZDj6vjOpl4dCrhAF30xFABwSCleFrioVxgjs8,49375
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=jA7424_mWPbOoPICW3eLMX0-ypxnsW6gOqxrJ7JpDbE,11610
 ripple_down_rules/datastructures/case.py,sha256=oC8OSdhXvHE-Zx1IIQlad-fsKzQQqr6MZBW24c-dbeU,15191
@@ -16,10 +16,10 @@ ripple_down_rules/user_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 ripple_down_rules/user_interface/gui.py,sha256=mzkyFs0Z7iS22WpPnCwT7HVQYkB72fy8EifXTTYLEf4,27917
 ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=XS3URpfoGCYA__fKOo2AmJ7wQerp7UXKdhdDKiL5gDY,6537
 ripple_down_rules/user_interface/object_diagram.py,sha256=84JlEH0nQmtGmP8Su5iRX3ZfqByYHbVwd0BQYYPuckY,4436
-ripple_down_rules/user_interface/prompt.py,sha256=97s5mhmsqrFTQkfmHssYFko0SPLBDxesHoLumqZO0FA,8028
+ripple_down_rules/user_interface/prompt.py,sha256=9QViZOL8kfwSKXb6A_Fr9hkGGgKg12tdFOizvAN0N-4,8053
 ripple_down_rules/user_interface/template_file_creator.py,sha256=-0L0jGW1VTrL0aer67mIdjFr3gKjXKA6zRZ5IXbY5vY,13959
-ripple_down_rules-0.4.81.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.4.81.dist-info/METADATA,sha256=M5ZHi5jmF3gsqEkVreXX3HEHqhPRPmrXcFHzdXzIVkM,43218
-ripple_down_rules-0.4.81.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-ripple_down_rules-0.4.81.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.4.81.dist-info/RECORD,,
+ripple_down_rules-0.4.83.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.4.83.dist-info/METADATA,sha256=GE3bwcxMmoJd2cOUoGOTD2w3DnQiJzsF6xR64aUuEEo,43218
+ripple_down_rules-0.4.83.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+ripple_down_rules-0.4.83.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.4.83.dist-info/RECORD,,