ripple-down-rules 0.6.45__tar.gz → 0.6.47__tar.gz

{ripple_down_rules-0.6.45 → ripple_down_rules-0.6.47}/PKG-INFO

@@ -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.47/src/ripple_down_rules/__init__.py

@@ -0,0 +1,5 @@
+__version__ = "0.6.47"
+
+import logging
+logger = logging.Logger("rdr")
+logger.setLevel(logging.INFO)

ripple_down_rules-0.6.47/src/ripple_down_rules/failures.py

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

{ripple_down_rules-0.6.45 → ripple_down_rules-0.6.47}/src/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-0.6.45 → ripple_down_rules-0.6.47}/src/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-0.6.45 → ripple_down_rules-0.6.47}/src/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 → ripple_down_rules-0.6.47}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -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 → ripple_down_rules-0.6.47}/src/ripple_down_rules.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ results/relational_scrdr_classify.png
 scripts/live_dot_server_client.py
 src/ripple_down_rules/__init__.py
 src/ripple_down_rules/experts.py
+src/ripple_down_rules/failures.py
 src/ripple_down_rules/helpers.py
 src/ripple_down_rules/rdr.py
 src/ripple_down_rules/rdr_decorators.py
@@ -152,7 +153,6 @@ test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robo
 test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr.py
 test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs.py
 test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_rdr.py
-test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/rdr_metadata/datasets_physical_object_select_objects_that_are_parts_of_robot.json
 test/test_user_interface/__init__.py
 test/test_user_interface/test_ipython.py
 test/test_user_interface/test_ipython_copilot.py

ripple_down_rules-0.6.47/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_output__scrdr_defs.py

@@ -0,0 +1,19 @@
+from ...datasets import PhysicalObject, Robot
+from types import NoneType
+from typing_extensions import Dict, Optional, Union
+
+
+def conditions_226969243620390858682731042391766665817(case) -> bool:
+                        def conditions_for_physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:
+                            """Get conditions on whether it's possible to conclude a value for PhysicalObject_is_a_robot.output_  of type ."""
+                            return True
+                        return conditions_for_physical_object_is_a_robot(**case)
+
+
+def conclusion_226969243620390858682731042391766665817(case) -> bool:
+                        def physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:
+                            """Get possible value(s) for PhysicalObject_is_a_robot.output_  of type ."""
+                            return isinstance(self_, Robot)
+                        return physical_object_is_a_robot(**case)
+
+

{ripple_down_rules-0.6.45 → ripple_down_rules-0.6.47}/test/test_results/datasets_physical_object_is_a_robot/rdr_metadata/datasets_physical_object_is_a_robot.json

@@ -7,7 +7,7 @@
                 "_type": "ripple_down_rules.rules.SingleClassRule",
                 "conditions": {
                     "_type": "ripple_down_rules.datastructures.callable_expression.CallableExpression",
-                    "user_input": "def _get_value(case):\n        def conditions_for_physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:\n            \"\"\"Get conditions on whether it's possible to conclude a value for PhysicalObject_is_a_robot.output_  of type .\"\"\"\n            return True\n        return conditions_for_physical_object_is_a_robot(**case)\n    ",
+                    "user_input": "def _get_value(case):\n                        def conditions_for_physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:\n                            \"\"\"Get conditions on whether it's possible to conclude a value for PhysicalObject_is_a_robot.output_  of type .\"\"\"\n                            return True\n                        return conditions_for_physical_object_is_a_robot(**case)\n    ",
                     "conclusion_type": [
                         "builtins.bool"
                     ],
@@ -22,7 +22,7 @@
                 },
                 "conclusion": {
                     "_type": "ripple_down_rules.datastructures.callable_expression.CallableExpression",
-                    "user_input": "def _get_value(case):\n        def physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:\n            \"\"\"Get possible value(s) for PhysicalObject_is_a_robot.output_  of type .\"\"\"\n            return isinstance(self_, Robot)\n        return physical_object_is_a_robot(**case)\n    ",
+                    "user_input": "def _get_value(case):\n                        def physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:\n                            \"\"\"Get possible value(s) for PhysicalObject_is_a_robot.output_  of type .\"\"\"\n                            return isinstance(self_, Robot)\n                        return physical_object_is_a_robot(**case)\n    ",
                     "conclusion_type": [
                         "builtins.bool"
                     ],

ripple_down_rules-0.6.47/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs.py

@@ -0,0 +1,19 @@
+from typing_extensions import Dict, List, Set, Union
+from ...datasets import PhysicalObject, Robot
+
+
+def conditions_164855806603893754507167918997373216146(case) -> bool:
+                            def conditions_for_physical_object_select_objects_that_are_parts_of_robot(self_: PhysicalObject, objects: List[PhysicalObject], robot: Robot, output_: PhysicalObject) -> bool:
+                                """Get conditions on whether it's possible to conclude a value for PhysicalObject_select_objects_that_are_parts_of_robot.output_  of type PhysicalObject."""
+                                return robot is not None
+                            return conditions_for_physical_object_select_objects_that_are_parts_of_robot(**case)
+
+
+def conclusion_164855806603893754507167918997373216146(case) -> List[PhysicalObject]:
+                            def physical_object_select_objects_that_are_parts_of_robot(self_: PhysicalObject, objects: List[PhysicalObject], robot: Robot, output_: PhysicalObject) -> List[PhysicalObject]:
+                                """Get possible value(s) for PhysicalObject_select_objects_that_are_parts_of_robot.output_  of type PhysicalObject."""
+                                robot_parts = [obj for obj in objects if obj in robot.parts]
+                                return robot_parts
+                            return physical_object_select_objects_that_are_parts_of_robot(**case)
+
+

ripple_down_rules-0.6.45/src/ripple_down_rules/__init__.py

@@ -1,5 +0,0 @@
-__version__ = "0.6.45"
-
-import logging
-logger = logging.Logger("rdr")
-logger.setLevel(logging.INFO)

ripple_down_rules-0.6.45/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_output__scrdr_defs.py

@@ -1,19 +0,0 @@
-from types import NoneType
-from typing_extensions import Dict, Optional, Union
-from ...datasets import PhysicalObject, Robot
-
-
-def conditions_226969243620390858682731042391766665817(case) -> bool:
-        def conditions_for_physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:
-            """Get conditions on whether it's possible to conclude a value for PhysicalObject_is_a_robot.output_  of type ."""
-            return True
-        return conditions_for_physical_object_is_a_robot(**case)
-
-
-def conclusion_226969243620390858682731042391766665817(case) -> bool:
-        def physical_object_is_a_robot(self_: PhysicalObject, output_: bool) -> bool:
-            """Get possible value(s) for PhysicalObject_is_a_robot.output_  of type ."""
-            return isinstance(self_, Robot)
-        return physical_object_is_a_robot(**case)
-
-

ripple_down_rules-0.6.45/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs.py

@@ -1,19 +0,0 @@
-from ...datasets import PhysicalObject, Robot
-from typing_extensions import Dict, List, Set, Union
-
-
-def conditions_164855806603893754507167918997373216146(case) -> bool:
-        def conditions_for_physical_object_select_objects_that_are_parts_of_robot(self_: PhysicalObject, objects: List[PhysicalObject], robot: Robot, output_: PhysicalObject) -> bool:
-            """Get conditions on whether it's possible to conclude a value for PhysicalObject_select_objects_that_are_parts_of_robot.output_  of type PhysicalObject."""
-            return robot is not None
-        return conditions_for_physical_object_select_objects_that_are_parts_of_robot(**case)
-
-
-def conclusion_164855806603893754507167918997373216146(case) -> List[PhysicalObject]:
-        def physical_object_select_objects_that_are_parts_of_robot(self_: PhysicalObject, objects: List[PhysicalObject], robot: Robot, output_: PhysicalObject) -> List[PhysicalObject]:
-            """Get possible value(s) for PhysicalObject_select_objects_that_are_parts_of_robot.output_  of type PhysicalObject."""
-            robot_parts = [obj for obj in objects if obj in robot.parts]
-            return robot_parts
-        return physical_object_select_objects_that_are_parts_of_robot(**case)
-
-

ripple_down_rules-0.6.45/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/rdr_metadata/datasets_physical_object_select_objects_that_are_parts_of_robot.json

@@ -1,59 +0,0 @@
-{
-    "_type": "ripple_down_rules.rdr.GeneralRDR",
-    "start_rules": {
-        "output_": {
-            "_type": "ripple_down_rules.rdr.MultiClassRDR",
-            "start_rule": {
-                "_type": "ripple_down_rules.rules.MultiClassTopRule",
-                "conditions": {
-                    "_type": "ripple_down_rules.datastructures.callable_expression.CallableExpression",
-                    "user_input": "def _get_value(case):\n        def conditions_for_physical_object_select_objects_that_are_parts_of_robot(self_: PhysicalObject, objects: List[PhysicalObject], robot: Robot, output_: PhysicalObject) -> bool:\n            \"\"\"Get conditions on whether it's possible to conclude a value for PhysicalObject_select_objects_that_are_parts_of_robot.output_  of type PhysicalObject.\"\"\"\n            return robot is not None\n        return conditions_for_physical_object_select_objects_that_are_parts_of_robot(**case)\n    ",
-                    "conclusion_type": [
-                        "builtins.bool"
-                    ],
-                    "scope": {
-                        "PhysicalObject": "test.datasets.PhysicalObject",
-                        "Robot": "test.datasets.Robot",
-                        "List": "typing.List"
-                    },
-                    "conclusion": {
-                        "_type": "builtins.NoneType",
-                        "value": null
-                    },
-                    "mutually_exclusive": true
-                },
-                "conclusion": {
-                    "_type": "ripple_down_rules.datastructures.callable_expression.CallableExpression",
-                    "user_input": "def _get_value(case):\n        def physical_object_select_objects_that_are_parts_of_robot(self_: PhysicalObject, objects: List[PhysicalObject], robot: Robot, output_: PhysicalObject) -> List[PhysicalObject]:\n            \"\"\"Get possible value(s) for PhysicalObject_select_objects_that_are_parts_of_robot.output_  of type PhysicalObject.\"\"\"\n            robot_parts = [obj for obj in objects if obj in robot.parts]\n            return robot_parts\n        return physical_object_select_objects_that_are_parts_of_robot(**case)\n    ",
-                    "conclusion_type": [
-                        "test.datasets.PhysicalObject"
-                    ],
-                    "scope": {
-                        "PhysicalObject": "test.datasets.PhysicalObject",
-                        "Robot": "test.datasets.Robot",
-                        "List": "typing.List"
-                    },
-                    "conclusion": {
-                        "_type": "builtins.NoneType",
-                        "value": null
-                    },
-                    "mutually_exclusive": false
-                },
-                "parent": null,
-                "conclusion_name": "output_",
-                "weight": "",
-                "uid": "164855806603893754507167918997373216146",
-                "refinement": null,
-                "alternative": null
-            },
-            "generated_python_file_name": "physical_object_select_objects_that_are_parts_of_robot_output__mcrdr",
-            "name": "output_",
-            "case_type": "typing.Dict",
-            "case_name": "PhysicalObject_select_objects_that_are_parts_of_robot"
-        }
-    },
-    "generated_python_file_name": "physical_object_select_objects_that_are_parts_of_robot_rdr",
-    "name": "output_",
-    "case_type": "typing.Dict",
-    "case_name": "PhysicalObject_select_objects_that_are_parts_of_robot"
-}

{ripple_down_rules-0.6.45 → ripple_down_rules-0.6.47}/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_rdr.py

@@ -1,6 +1,6 @@
 from typing_extensions import Any, Dict
-from ripple_down_rules.datastructures.case import Case, create_case
 from ripple_down_rules.helpers import general_rdr_classify
+from ripple_down_rules.datastructures.case import Case, create_case
 from . import physical_object_is_a_robot_output__scrdr as output__classifier
 
 name = 'output_'

{ripple_down_rules-0.6.45 → ripple_down_rules-0.6.47}/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_output__mcrdr.py

@@ -1,7 +1,7 @@
-from ripple_down_rules.helpers import get_an_updated_case_copy
 from ripple_down_rules.datastructures.case import Case, create_case
 from typing_extensions import Optional, Set
 from ripple_down_rules.utils import make_set
+from ripple_down_rules.helpers import get_an_updated_case_copy
 from .physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs import *
 
 

{ripple_down_rules-0.6.45 → ripple_down_rules-0.6.47}/test/test_results/datasets_physical_object_select_objects_that_are_parts_of_robot/physical_object_select_objects_that_are_parts_of_robot_rdr.py

@@ -1,6 +1,6 @@
 from typing_extensions import Any, Dict
-from ripple_down_rules.datastructures.case import Case, create_case
 from ripple_down_rules.helpers import general_rdr_classify
+from ripple_down_rules.datastructures.case import Case, create_case
 from . import physical_object_select_objects_that_are_parts_of_robot_output__mcrdr as output__classifier
 
 name = 'output_'