ripple-down-rules 0.6.45__py3-none-any.whl → 0.6.47__py3-none-any.whl

ripple_down_rules/__init__.py

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

ripple_down_rules/failures.py

@@ -0,0 +1,4 @@
+
+
+class RDRLoadError(Exception):
+    pass

ripple_down_rules/rdr.py

@@ -15,6 +15,7 @@ from types import NoneType, ModuleType
 
 from ripple_down_rules.datastructures.dataclasses import CaseFactoryMetaData
 from . import logger
+from .failures import RDRLoadError
 
 try:
     from matplotlib import pyplot as plt
@@ -217,17 +218,16 @@ class RippleDownRules(SubclassJSONSerializer, ABC):
         if os.path.exists(json_file + ".json"):
             rdr = cls.from_json_file(json_file)
         try:
-            acronym = cls.get_acronym().lower()
-            python_file_name = get_file_that_ends_with(model_dir, f"_{acronym}.py")
-            python_file_path = os.path.join(model_dir, python_file_name)
             if rdr is None:
-                rdr = cls.from_python(model_dir, parent_package_name=package_name, python_file_path=python_file_path)
+                rdr = cls.from_python(model_dir, parent_package_name=package_name)
             else:
                 rdr.update_from_python(model_dir, package_name=package_name)
             rdr.to_json_file(json_file)
         except (FileNotFoundError, ValueError, SyntaxError, ModuleNotFoundError) 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.")
+            if rdr is None:
+                raise RDRLoadError(f"Could not load the rdr model {model_name} from {model_dir}, error is {e}")
             rdr.save(save_dir=load_dir, model_name=model_name, package_name=package_name)
         rdr.save_dir = load_dir
         rdr.model_name = model_name

ripple_down_rules/rdr_decorators.py

@@ -213,9 +213,7 @@ class RDRDecorator:
         """
         self.rdr = None
         if self.model_name is not None:
-            model_path = os.path.join(self.rdr_models_dir, self.model_name + f"/rdr_metadata/{self.model_name}.json")
-            if os.path.exists(os.path.join(self.rdr_models_dir, model_path)):
-                self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name, package_name=self.package_name)
+            self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name, package_name=self.package_name)
         if self.rdr is None:
             self.rdr = GeneralRDR(save_dir=self.rdr_models_dir, model_name=self.model_name)
 

ripple_down_rules/utils.py

@@ -177,6 +177,11 @@ def extract_imports(file_path: Optional[str] = None, tree: Optional[ast.AST] = N
                 try:
                     if node.level > 0:  # Handle relative imports
                         package_name = get_import_path_from_path(Path(os.path.join(file_path, *['..'] * node.level)).resolve())
+                    if package_name is not None and node.level > 0:  # Handle relative imports
+                        module_rel_path = Path(os.path.join(file_path, *['..'] * node.level, module_name)).resolve()
+                        idx = str(module_rel_path).rfind(package_name)
+                        if idx != -1:
+                            module_name = str(module_rel_path)[idx:].replace(os.path.sep, '.')
                     try:
                         module = importlib.import_module(module_name, package=package_name)
                     except ModuleNotFoundError:

{ripple_down_rules-0.6.45.dist-info → ripple_down_rules-0.6.47.dist-info}/METADATA

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

@@ -1,11 +1,12 @@
-ripple_down_rules/__init__.py,sha256=Z5fiv4M_TwRxBMIvhX3FBYkZZinOcnuaS0BLy7iHusI,99
+ripple_down_rules/__init__.py,sha256=eA36n1YXRokHKFHwQGjTQGszPb5BH0eP82R866uCMOA,99
 ripple_down_rules/experts.py,sha256=KXwWCmDrCffu9HW3yNewqWc1e5rnPI5Rnc981w_5M7U,17896
+ripple_down_rules/failures.py,sha256=ZPypPwKjyVcJkY9YG6p538ld8ZzpdW6CrC1RmJi44Ek,42
 ripple_down_rules/helpers.py,sha256=X1psHOqrb4_xYN4ssQNB8S9aRKKsqgihAyWJurN0dqk,5499
-ripple_down_rules/rdr.py,sha256=FgM2Fww2NEn0AyRLR8Nw6OBSj9R5ke13l4veqtm0Hww,83293
-ripple_down_rules/rdr_decorators.py,sha256=xoBGsIJMkJYUdsrsEaPZqoAsGuXkuVZAKCoP-xD2Iv8,11668
+ripple_down_rules/rdr.py,sha256=pG7Sn3WeKVrCwoBuroO31_d9R2vVSCw6BfbtYU1H6wE,83228
+ripple_down_rules/rdr_decorators.py,sha256=ehK9YFYCh21fnbuzOX000yBwVDXL-QqYuEfKoWNYyDU,11468
 ripple_down_rules/rules.py,sha256=L4Ws-x3g5ljE0GrDt4LAib2qtR1C1_Ra4cRcIB-IQDI,28702
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
-ripple_down_rules/utils.py,sha256=ODmLlSqqSppzsAwsM0udKJVh__ERv4T8fl3WVmrKaVY,80336
+ripple_down_rules/utils.py,sha256=5UL4h-m5Q4l7RyCYqmUmDDxUAkFqPYpFa3QldDYoJUE,80752
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=rzMrpD5oztaCRlt3hQ2B_xZ09cSuJNkYOCePndfQJRA,13684
 ripple_down_rules/datastructures/case.py,sha256=dfLnrjsHIVF2bgbz-4ID7OdQvw68V71btCeTK372P-g,15667
@@ -17,8 +18,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=RLdPqPxx-a0Sh74U
 ripple_down_rules/user_interface/object_diagram.py,sha256=FEa2HaYR9QmTE6NsOwBvZ0jqmu3DKyg6mig2VE5ZP4Y,4956
 ripple_down_rules/user_interface/prompt.py,sha256=WPbw_8_-8SpF2ISyRZRuFwPKBEuGC4HaX3lbCPFHhh8,10314
 ripple_down_rules/user_interface/template_file_creator.py,sha256=uSbosZS15MOR3Nv7M3MrFuoiKXyP4cBId-EK3I6stHM,13660
-ripple_down_rules-0.6.45.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.6.45.dist-info/METADATA,sha256=Mn4UYgmCtgMHMUl4tLOV9mJnSrawWHnbaKm_EbUylNM,48294
-ripple_down_rules-0.6.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.6.45.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.6.45.dist-info/RECORD,,
+ripple_down_rules-0.6.47.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.6.47.dist-info/METADATA,sha256=8kqMXzC6_vZ_vwdXOWFaV4L9AIhKIMJ3D9o8e6r5ur4,48294
+ripple_down_rules-0.6.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.6.47.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.6.47.dist-info/RECORD,,