ripple-down-rules 0.5.93__py3-none-any.whl → 0.5.95__py3-none-any.whl

ripple_down_rules/__init__.py

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

ripple_down_rules/helpers.py

@@ -36,7 +36,7 @@ def general_rdr_classify(classifiers_dict: Dict[str, Union[ModuleType, RippleDow
         new_conclusions = {}
         for attribute_name, rdr in classifiers_dict.items():
             pred_atts = rdr.classify(case_cp, case_query=case_query)
-            if pred_atts is None:
+            if pred_atts is None and type(None) not in rdr.conclusion_type:
                 continue
             if rdr.mutually_exclusive:
                 if attribute_name not in conclusions or \

ripple_down_rules/rdr.py

@@ -139,13 +139,15 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         model_dir = os.path.join(load_dir, model_name)
         json_file = os.path.join(model_dir, cls.metadata_folder, model_name)
         rdr = cls.from_json_file(json_file)
+        rdr.save_dir = load_dir
+        rdr.model_name = model_name
         try:
             rdr.update_from_python(model_dir, package_name=package_name)
+            rdr.to_json_file(json_file)
         except (FileNotFoundError, ValueError) as e:
             logger.warning(f"Could not load the python file for the model {model_name} from {model_dir}. "
                            f"Make sure the file exists and is valid.")
-        rdr.save_dir = load_dir
-        rdr.model_name = model_name
+            rdr.save(save_dir=load_dir, model_name=model_name, package_name=package_name)
         return rdr
 
     @abstractmethod
@@ -296,7 +298,7 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         :param update_existing: Whether to update rules that gave the required type of conclusions.
         :return: True if the rdr should ask the expert, False otherwise.
         """
-        if conclusions is None:
+        if conclusions is None and type(None) not in case_query.core_attribute_type:
             return True
         elif is_iterable(conclusions) and len(conclusions) == 0:
             return True
@@ -571,8 +573,9 @@ class RDRWithCodeWriter(RippleDownRules, ABC):
         :return: The type of the conclusion of the RDR classifier.
         """
         all_types = []
-        for rule in [self.start_rule] + list(self.start_rule.descendants):
-            all_types.extend(list(rule.conclusion.conclusion_type))
+        if self.start_rule is not None:
+            for rule in [self.start_rule] + list(self.start_rule.descendants):
+                all_types.extend(list(rule.conclusion.conclusion_type))
         return tuple(set(all_types))
 
     @property

ripple_down_rules/rdr_decorators.py

@@ -120,7 +120,7 @@ class RDRDecorator:
         func_args_type_hints = get_type_hints(func)
         output_name = list(func_output.keys())[0]
         func_args_type_hints.update({output_name: Union[tuple(output_type)]})
-        return CaseQuery(case, output_name, Union[tuple(output_type)],
+        return CaseQuery(case, output_name, tuple(output_type),
                          mutual_exclusive, scope=scope,
                          is_function=True, function_args_type_hints=func_args_type_hints)
 

ripple_down_rules/user_interface/ipython_custom_shell.py

@@ -128,7 +128,7 @@ class IPythonShell:
                 break
             except Exception as e:
                 logging.error(e)
-                print(f"{Fore.RED}ERROR::{e}{Style.RESET_ALL}")
+                print(f"{Fore.RED}ERROR:: {e}{Style.RESET_ALL}")
 
     def update_user_input_from_code_lines(self):
         """

ripple_down_rules/utils.py

@@ -85,30 +85,6 @@ def are_results_subclass_of_types(result_types: List[Any], types_: List[Type]) -
     return True
 
 
-def _get_imports_from_types(types: List[Type]) -> List[str]:
-    """
-    Get the import statements for a list of types.
-
-    :param types: The types to get the import statements for.
-    :return: The import statements as a string.
-    """
-    imports = map(get_import_from_type, types)
-    return list({i for i in imports if i is not None})
-
-
-def get_import_from_type(type_: Type) -> Optional[str]:
-    """
-    Get the import statement for a given type.
-
-    :param type_: The type to get the import statement for.
-    :return: The import statement as a string.
-    """
-    if hasattr(type_, "__module__") and hasattr(type_, "__name__"):
-        if type_.__module__ == "builtins":
-            return
-        return f"from {type_.__module__} import {type_.__name__}"
-
-
 def get_imports_from_scope(scope: Dict[str, Any]) -> List[str]:
     """
     Get the imports from the given scope.
@@ -116,12 +92,7 @@ def get_imports_from_scope(scope: Dict[str, Any]) -> List[str]:
     :param scope: The scope to get the imports from.
     :return: The imports as a string.
     """
-    imports = []
-    for k, v in scope.items():
-        if not hasattr(v, "__module__") or not hasattr(v, "__name__") or v.__module__ is None:
-            continue
-        imports.append(f"from {v.__module__} import {v.__name__}")
-    return imports
+    return get_imports_from_types(list(scope.values()))
 
 
 def extract_imports(file_path: Optional[str] = None, tree: Optional[ast.AST] = None,
@@ -861,16 +832,18 @@ def get_relative_import(target_file_path, imported_module_path: Optional[str] =
     :return: A relative import path as a string.
     """
     # Convert to absolute paths
-    target_path = Path(target_file_path).resolve()
-    if package_name is not None:
-        target_path = Path(get_path_starting_from_latest_encounter_of(str(target_path), package_name))
     if module is not None:
         imported_module_path = sys.modules[module].__file__
     if imported_module_path is None:
         raise ValueError("Either imported_module_path or module must be provided")
+    target_path = Path(target_file_path).resolve()
+    imported_file_name = Path(imported_module_path).name
+    target_file_name = Path(target_file_path).name
+    if package_name is not None:
+        target_path = Path(get_path_starting_from_latest_encounter_of(str(target_path), package_name, [target_file_name]))
     imported_path = Path(imported_module_path).resolve()
     if package_name is not None:
-        imported_path = Path(get_path_starting_from_latest_encounter_of(str(imported_path), package_name))
+        imported_path = Path(get_path_starting_from_latest_encounter_of(str(imported_path), package_name, [imported_file_name]))
 
     # Compute relative path from target to imported module
     rel_path = os.path.relpath(imported_path.parent, target_path.parent)
@@ -879,28 +852,40 @@ def get_relative_import(target_file_path, imported_module_path: Optional[str] =
     rel_parts = [part.replace('..', '.') for part in Path(rel_path).parts]
     rel_parts = rel_parts if rel_parts else ['']
     dot_parts = [part for part in rel_parts if part == '.']
-    non_dot_parts = [part for part in rel_parts if part != '.']
-
+    non_dot_parts = [part for part in rel_parts if part != '.'] + [imported_path.stem]
 
-    # Join the parts and add the module name
-    joined_parts = "".join(dot_parts) + ".".join(non_dot_parts) + f".{imported_path.stem}"
-    joined_parts = f".{joined_parts}" if not joined_parts.startswith(".") else joined_parts
+    # Join the parts
+    joined_parts = "." + "".join(dot_parts) + ".".join(non_dot_parts)
 
     return joined_parts
 
 
-def get_path_starting_from_latest_encounter_of(path: str, package_name: str) -> Optional[str]:
+def get_path_starting_from_latest_encounter_of(path: str, package_name: str, should_contain: List[str]) -> str:
     """
     Get the path starting from the package name.
 
     :param path: The full path to the file.
     :param package_name: The name of the package to start from.
-    :return: The path starting from the package name or None if not found.
-    """
-    if package_name in path:
-        idx = path.rfind(package_name)
-        return path[idx:]
-    return None
+    :param should_contain: The names of the files or directorys to look for.
+    :return: The path starting from the package name that contains all the names in should_contain, otherwise raise an error.
+    :raise ValueError: If the path does not contain all the names in should_contain.
+    """
+    path_parts = path.split(os.path.sep)
+    if package_name not in path_parts:
+        raise ValueError(f"Could not find {package_name} in {path}")
+    idx = path_parts.index(package_name)
+    prev_idx = idx
+    while all(sc in path_parts[idx:] for sc in should_contain):
+        prev_idx = idx
+        try:
+            idx = path_parts.index(package_name, idx + 1)
+        except ValueError:
+            break
+    if all(sc in path_parts[idx:] for sc in should_contain):
+        path_parts = path_parts[prev_idx:]
+        return os.path.join(*path_parts)
+    else:
+        raise ValueError(f"Could not find {should_contain} in {path}")
 
 
 def get_imports_from_types(type_objs: Iterable[Type],
@@ -937,6 +922,8 @@ def get_imports_from_types(type_objs: Iterable[Type],
                 or module in sys.builtin_module_names or module in excluded_modules or "<" in module \
                     or name in exclueded_names:
                 continue
+            if module == "typing":
+                module = "typing_extensions"
             module_to_types[module].append(name)
         except AttributeError:
             continue

{ripple_down_rules-0.5.93.dist-info → ripple_down_rules-0.5.95.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
-ripple_down_rules/__init__.py,sha256=EtqjIUaQCKbMnjx_7lOMLEVv28R1aj1oXfdOI0j_TNY,100
+ripple_down_rules/__init__.py,sha256=2YbCMVId4Rq_iPakA2uby2d6kRHClQ90FEJIWdgjG3c,100
 ripple_down_rules/experts.py,sha256=4-dMIVeMzFXCLYl_XBG_P7_Xs4sZih9-vZxCIPri6dA,12958
-ripple_down_rules/helpers.py,sha256=v4oE7C5PfQUVJfSUs1FfLHEwrJXEHJLn4vJhJMvyCR8,4453
-ripple_down_rules/rdr.py,sha256=C6bvlq6MsKa2Mym1wW6JUMj705aCaoihTP279TM6eT0,55218
-ripple_down_rules/rdr_decorators.py,sha256=pj7SwswB9UVdv4-c8pzcOsGTG0Elt7JEG6k65fsnOdk,9202
+ripple_down_rules/helpers.py,sha256=sY8nFbYdLOO6EG5UQugCCxjSjcCQsDUCPgawfQA4Ui8,4495
+ripple_down_rules/rdr.py,sha256=weOkaB2Z8PdudKJfSSdkCPYjk2o4Woduupg-_gHh2vU,55449
+ripple_down_rules/rdr_decorators.py,sha256=riAFmL8jc1rw9dFkNbT023CfB5FbmOWHNiVKO2bAXsE,9195
 ripple_down_rules/rules.py,sha256=iVevv6iZ-6L2IPI0ZYbBjxBymXEQMmJGRFhiKUS-NmA,20352
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
-ripple_down_rules/utils.py,sha256=3O6EZllEv3ixVsehIM0qHqGBCyI_Aju2h02XKNzGuYc,61970
+ripple_down_rules/utils.py,sha256=IDVcKd4YGGvFzO1KaGIEk9u8xh13MrpsFM97VmvTfyw,61881
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=f3wUPTrLa1INO-1qfgVz87ryrCABronfyq0_JKWoZCs,12800
 ripple_down_rules/datastructures/case.py,sha256=PJ7_-AdxYic6BO5z816piFODj6nU5J6Jt1YzTFH-dds,15510
@@ -13,12 +13,12 @@ ripple_down_rules/datastructures/dataclasses.py,sha256=qoTFHV8Hi-X8VtfC9VdvH4tif
 ripple_down_rules/datastructures/enums.py,sha256=ce7tqS0otfSTNAOwsnXlhsvIn4iW_Y_N3TNebF3YoZs,5700
 ripple_down_rules/user_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ripple_down_rules/user_interface/gui.py,sha256=_lgZAUXxxaBUFQJAHjA5TBPp6XEvJ62t-kSN8sPsocE,27379
-ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=6v99tlNcfRyZpnPxq3FfqgFgxbJ5zkA2jVAXamTH1C0,6575
+ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=yp-F8YRWGhj1PLB33HE6vJkdYWFN5Zn2244S2DUWRTM,6576
 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.5.93.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.5.93.dist-info/METADATA,sha256=Dw4u_tSLdXa_okdhdVhFmbU26uCWEzg3z3WVAIFAShM,48214
-ripple_down_rules-0.5.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.5.93.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.5.93.dist-info/RECORD,,
+ripple_down_rules-0.5.95.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.5.95.dist-info/METADATA,sha256=5sPvCDBc_3yV4wBp5f6YRDtQkmNrd1-d_Ce7ijm6NZ0,48214
+ripple_down_rules-0.5.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.5.95.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.5.95.dist-info/RECORD,,