ripple-down-rules 0.5.83__tar.gz → 0.5.85__tar.gz

{ripple_down_rules-0.5.83 → ripple_down_rules-0.5.85}/PKG-INFO

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

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

{ripple_down_rules-0.5.83 → ripple_down_rules-0.5.85}/src/ripple_down_rules/utils.py

@@ -850,22 +850,27 @@ def get_function_representation(func: Callable) -> str:
 
 
 def get_relative_import(target_file_path, imported_module_path: Optional[str] = None,
-                        module: Optional[str] = None) -> str:
+                        module: Optional[str] = None, package_name: Optional[str] = None) -> str:
     """
     Get a relative import path from the target file to the imported module.
 
     :param target_file_path: The file path of the target file.
     :param imported_module_path: The file path of the module being imported.
     :param module: The module name, if available.
+    :param package_name: The name of the root package where the module is located.
     :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(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_path = Path(imported_module_path).resolve()
+    if package_name is not None:
+        imported_path = Path(get_path_starting_from(str(imported_path), package_name))
 
     # Compute relative path from target to imported module
     rel_path = os.path.relpath(imported_path.parent, target_path.parent)
@@ -881,6 +886,20 @@ def get_relative_import(target_file_path, imported_module_path: Optional[str] =
     return joined_parts
 
 
+def get_path_starting_from(path: str, package_name: str) -> Optional[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.index(package_name)
+        return path[idx:]
+    return None
+
+
 def get_imports_from_types(type_objs: Iterable[Type],
                            target_file_path: Optional[str] = None,
                            package_name: Optional[str] = None) -> List[str]:
@@ -923,7 +942,7 @@ def get_imports_from_types(type_objs: Iterable[Type],
         joined = ", ".join(sorted(set(names)))
         import_path = module
         if (target_file_path is not None) and (package_name is not None) and (package_name in module):
-            import_path = get_relative_import(target_file_path, module=module)
+            import_path = get_relative_import(target_file_path, module=module, package_name=package_name)
         lines.append(f"from {import_path} import {joined}")
     if other_imports:
         lines.extend(other_imports)

{ripple_down_rules-0.5.83 → ripple_down_rules-0.5.85}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.83
+Version: 0.5.85
 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.83 → ripple_down_rules-0.5.85}/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

@@ -5,7 +5,7 @@ from .physical_object_select_objects_that_are_parts_of_robot_output__mcrdr_defs
 
 
 attribute_name = 'output_'
-conclusion_type = (set, PhysicalObject, list,)
+conclusion_type = (PhysicalObject, set, list,)
 mutually_exclusive = False
 
 

{ripple_down_rules-0.5.83 → ripple_down_rules-0.5.85}/test/test_utils.py

@@ -1,4 +1,5 @@
 import os
+import sys
 from os.path import dirname
 from unittest import TestCase
 
@@ -72,7 +73,7 @@ class UtilsTestCase(TestCase):
 
         from ripple_down_rules.rdr import GeneralRDR
 
-        package_dir = f"{dirname(__file__)}/../src/ripple_down_rules"
+        package_dir = dirname(sys.modules["ripple_down_rules"].__file__)
         target_file = os.path.join(package_dir, "datastructures", "case.py")
         imports = get_imports_from_types([GeneralRDR], target_file, "ripple_down_rules")
         assert imports == ["from ..rdr import GeneralRDR"]