ripple-down-rules 0.4.8__tar.gz → 0.4.82__tar.gz

{ripple_down_rules-0.4.8 → ripple_down_rules-0.4.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.8
+Version: 0.4.82
 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.8 → ripple_down_rules-0.4.82}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ripple_down_rules"
-version = "0.4.8"
+version = "0.4.82"
 description = "Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning."
 readme = "README.md"
 authors = [{ name = "Abdelrhman Bassiouny", email = "abassiou@uni-bremen.de" }]

{ripple_down_rules-0.4.8 → ripple_down_rules-0.4.82}/src/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-0.4.8 → ripple_down_rules-0.4.82}/src/ripple_down_rules/user_interface/template_file_creator.py

@@ -263,8 +263,9 @@ class TemplateFileCreator:
             # convert any CamelCase word into snake_case by adding _ before each capital letter
             case_name = case_name.replace(f"_{case_query.attribute_name}", "")
         func_name += case_name
-        func_name += f"_of_type_{'_or_'.join(map(lambda c: c.__name__,
-                                                 TemplateFileCreator.get_core_attribute_types(case_query)))}"
+        attribute_types = TemplateFileCreator.get_core_attribute_types(case_query)
+        attribute_type_names = [t.__name__ for t in attribute_types]
+        func_name += f"_of_type_{'_or_'.join(attribute_type_names)}"
         return str_to_snake_case(func_name)
 
     @cached_property

{ripple_down_rules-0.4.8 → ripple_down_rules-0.4.82}/src/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.8 → ripple_down_rules-0.4.82}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.8
+Version: 0.4.82
 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