ripple-down-rules 0.5.94__tar.gz → 0.5.95__tar.gz

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.94
+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.94 → ripple_down_rules-0.5.95}/src/ripple_down_rules/__init__.py

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

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/src/ripple_down_rules/utils.py

@@ -851,15 +851,11 @@ def get_relative_import(target_file_path, imported_module_path: Optional[str] =
     # Convert path to Python import format
     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 != '.']
+    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 = "." + "".join(rel_parts)
-    joined_parts += imported_path.stem if joined_parts.endswith(".") else 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
 
@@ -926,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.94 → ripple_down_rules-0.5.95}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.94
+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.94 → ripple_down_rules-0.5.95}/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_output__scrdr_defs.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing_extensions import Dict
 from ...datasets import PhysicalObject, Robot
 
 

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_rdr.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing_extensions import Any, Dict
 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

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/test/test_results/datasets_physical_object_is_a_robot/rdr_metadata/datasets_physical_object_is_a_robot.json

@@ -12,9 +12,9 @@
                         "builtins.bool"
                     ],
                     "scope": {
-                        "Dict": "typing.Dict",
                         "PhysicalObject": "test.datasets.PhysicalObject",
-                        "Robot": "test.datasets.Robot"
+                        "Robot": "test.datasets.Robot",
+                        "Dict": "typing.Dict"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",
@@ -29,9 +29,9 @@
                         "builtins.bool"
                     ],
                     "scope": {
-                        "Dict": "typing.Dict",
                         "PhysicalObject": "test.datasets.PhysicalObject",
-                        "Robot": "test.datasets.Robot"
+                        "Robot": "test.datasets.Robot",
+                        "Dict": "typing.Dict"
                     },
                     "conclusion": {
                         "_type": "builtins.NoneType",

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/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,11 +1,11 @@
-from ripple_down_rules.utils import make_set
-from typing import Set, Union
+from typing_extensions import Set, Union
 from ripple_down_rules.datastructures.case import Case, create_case
+from ripple_down_rules.utils import make_set
 from .physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs import *
 
 
 attribute_name = 'output_'
-conclusion_type = (set, PhysicalObject, list,)
+conclusion_type = (set, list, PhysicalObject,)
 mutually_exclusive = False
 
 

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/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,5 +1,5 @@
-from typing import Dict, List, Union
 from ...datasets import PhysicalObject, Robot
+from typing_extensions import Dict, List, Union
 
 
 def conditions_164855806603893754507167918997373216146(case):

{ripple_down_rules-0.5.94 → ripple_down_rules-0.5.95}/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,4 +1,4 @@
-from typing import Any, Dict
+from typing_extensions import Any, Dict
 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