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

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

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

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

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/src/ripple_down_rules/rdr.py

@@ -1147,12 +1147,16 @@ class GeneralRDR(RippleDownRules):
         is required in case of relative imports in the generated python file.
         :return: The imports needed for the generated python file.
         """
+        all_types = set()
+        # add type hints
+        all_types.update({Dict, Any})
+        # import rdr type
+        all_types.add(general_rdr_classify)
+        # add case type
+        all_types.update({Case, create_case, self.case_type})
         # get the imports from the types
-        imports = get_imports_from_types([self.case_type], target_file_path=file_path, package_name=package_name)
+        imports = get_imports_from_types(all_types, target_file_path=file_path, package_name=package_name)
         # add rdr python generated functions.
-        imports.append("from typing import Dict, Any")
-        imports.append("from ripple_down_rules.datastructures.case import Case, create_case")
-        imports.append("from ripple_down_rules.helpers import general_rdr_classify")
         for rdr_key, rdr in self.start_rules_dict.items():
             imports.append(
                 f"from . import {rdr.generated_python_file_name} as {self.rdr_key_to_function_name(rdr_key)}")

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/src/ripple_down_rules/rdr_decorators.py

@@ -31,7 +31,8 @@ class RDRDecorator:
                  expert: Optional[Expert] = None,
                  ask_always: bool = False,
                  update_existing_rules: bool = True,
-                 viewer: Optional[RDRCaseViewer] = None):
+                 viewer: Optional[RDRCaseViewer] = None,
+                 package_name: Optional[str] = None):
         """
         :param models_dir: The directory to save/load the RDR models.
         :param output_type: The type of the output. This is used to create the RDR model.
@@ -46,6 +47,8 @@ class RDRDecorator:
         :param ask_always: If True, the function will ask the user for a target if it doesn't exist.
         :param update_existing_rules: If True, the function will update the existing RDR rules
          even if they gave an output.
+        :param viewer: The viewer to use for the RDR model. If None, no viewer will be used.
+        :param package_name: The package name to use for relative imports in the RDR model.
         :return: A decorator to use a GeneralRDR as a classifier that monitors and modifies the function's output.
         """
         self.rdr_models_dir = models_dir
@@ -59,6 +62,7 @@ class RDRDecorator:
         self.ask_always = ask_always
         self.update_existing_rules = update_existing_rules
         self.viewer = viewer
+        self.package_name = package_name
         self.load()
 
     def decorator(self, func: Callable) -> Callable:
@@ -166,7 +170,7 @@ class RDRDecorator:
         """
         Save the RDR model to the specified directory.
         """
-        self.rdr.save(self.rdr_models_dir)
+        self.rdr.save(self.rdr_models_dir, package_name=self.package_name)
 
     def load(self):
         """
@@ -176,7 +180,7 @@ class RDRDecorator:
         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)
+                self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name, package_name=self.package_name)
                 self.rdr.set_viewer(self.viewer)
         if self.rdr is None:
             self.rdr = GeneralRDR(save_dir=self.rdr_models_dir, model_name=self.model_name,
@@ -186,4 +190,4 @@ class RDRDecorator:
         """
         Update the RDR model from a python file.
         """
-        self.rdr.update_from_python(self.rdr_models_dir, self.model_name)
+        self.rdr.update_from_python(self.rdr_models_dir, self.model_name, package_name=self.package_name)

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

@@ -798,10 +798,11 @@ def get_import_path_from_path(path: str) -> Optional[str]:
     :return: The Python import path.
     """
     package_name = os.path.abspath(path)
-    formated_package_name = package_name.strip('./').replace('/', '.')
+    packages = package_name.split(os.path.sep)
+    # formated_package_name = package_name.replace('/', '.')
     parent_package_idx = 0
-    packages = formated_package_name.split('.')
-    for i, possible_pacakge in enumerate(reversed(packages)):
+    # packages = formated_package_name.split('.')
+    for i in range(len(packages)):
         if i == 0:
             current_path = package_name
         else:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.81
+Version: 0.5.83
 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.81 → ripple_down_rules-0.5.83}/test/conf/world/handles_and_containers.py

@@ -1,13 +1,12 @@
 # ===================== Possible World Configurations ========================
 from dataclasses import dataclass, field
 
-from jedi.inference.gradual.typing import Callable
-from typing_extensions import List
+from typing_extensions import List, Callable
 
-from conf.world.base_config import WorldConf, BodyConf, Connection, FixedConnectionConf, PrismaticConnectionConf, \
+from .base_config import WorldConf, BodyConf, Connection, FixedConnectionConf, PrismaticConnectionConf, \
     ContainerConf, HandleConf
 
-from factories.world.handles_and_containers import create_world_with_handles_and_containers
+from ...factories.world.handles_and_containers import create_world_with_handles_and_containers
 
 
 @dataclass

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/conftest.py

@@ -11,8 +11,8 @@ except ImportError as e:
     QApplication = None
     RDRCaseViewer = None
 
-from conf.world.handles_and_containers import HandlesAndContainersWorld
-from datasets import *
+from .conf.world.handles_and_containers import HandlesAndContainersWorld
+from .datasets import *
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.experts import Human
 from ripple_down_rules.helpers import is_matching

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/datasets.py

@@ -132,11 +132,13 @@ class PhysicalObject:
     """
     The directory where the RDR serialized JSON files are stored.
     """
-    _is_a_robot_rdr: RDRDecorator = RDRDecorator(_rdr_json_dir, (bool,), True)
+    _is_a_robot_rdr: RDRDecorator = RDRDecorator(_rdr_json_dir, (bool,), True,
+                                                 package_name="test")
     """
     The RDR decorator that is used to determine if the object is a robot or not.
     """
-    _select_parts_rdr: RDRDecorator = RDRDecorator(_rdr_json_dir, (Self,), False)
+    _select_parts_rdr: RDRDecorator = RDRDecorator(_rdr_json_dir, (Self,), False,
+                                                   package_name="test")
     """
     The RDR decorator that is used to determine if the object is a robot or not.
     """

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/factories/world/handles_and_containers.py

@@ -1,5 +1,5 @@
-from datasets import World, Handle, Container, FixedConnection, PrismaticConnection
-from conf.world.base_config import WorldConf, HandleConf, ContainerConf, FixedConnectionConf, PrismaticConnectionConf
+from ...datasets import World, Handle, Container, FixedConnection, PrismaticConnection
+from ...conf.world.base_config import WorldConf, HandleConf, ContainerConf, FixedConnectionConf, PrismaticConnectionConf
 
 
 def create_world_with_handles_and_containers(world_conf: WorldConf) -> World:

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_helpers/helpers.py

@@ -3,7 +3,7 @@ import os
 
 from typing_extensions import List, Any, Tuple, Type, Callable, Optional
 
-from datasets import Species, Habitat, load_zoo_cases
+from ..datasets import Species, Habitat, load_zoo_cases
 from ripple_down_rules.datastructures.case import Case
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.datastructures.enums import Category

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_json_serialization.py

@@ -3,11 +3,11 @@ from unittest import TestCase
 
 from typing_extensions import List
 
-from datasets import load_zoo_dataset
+from .datasets import load_zoo_dataset
 from ripple_down_rules.datastructures.dataclasses import Case
 from ripple_down_rules.rdr import SingleClassRDR, MultiClassRDR, GeneralRDR
 from ripple_down_rules.utils import make_set, flatten_list, serialize_dataclass, deserialize_dataclass
-from test_helpers.helpers import get_fit_mcrdr, get_fit_scrdr, get_fit_grdr
+from .test_helpers.helpers import get_fit_mcrdr, get_fit_scrdr, get_fit_grdr
 
 
 @dataclass

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_object_diagram.py

@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from datasets import load_zoo_dataset, Species
+from .datasets import load_zoo_dataset, Species
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.user_interface.object_diagram import generate_object_graph
 

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_rdr.py

@@ -4,15 +4,15 @@ from unittest import TestCase
 
 from typing_extensions import List, Optional
 
-from datasets import Habitat, Species, load_zoo_cases
-from datasets import load_zoo_dataset
+from .datasets import Habitat, Species, load_zoo_cases
+from .datasets import load_zoo_dataset
 from ripple_down_rules.datastructures.case import Case
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.datastructures.enums import MCRDRMode
 from ripple_down_rules.experts import Human
 from ripple_down_rules.rdr import SingleClassRDR, MultiClassRDR, GeneralRDR, RDRWithCodeWriter
 from ripple_down_rules.utils import render_tree, make_set, extract_function_source
-from test_helpers.helpers import get_fit_scrdr, get_fit_mcrdr, get_fit_grdr
+from .test_helpers.helpers import get_fit_scrdr, get_fit_mcrdr, get_fit_grdr
 
 try:
     from PyQt6.QtWidgets import QApplication

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_rdr_alchemy.py

@@ -7,12 +7,12 @@ from sqlalchemy.orm import MappedColumn as Column
 from typing_extensions import List, Sequence
 import pandas as pd
 
-from datasets import Base, MappedAnimal, Species, get_dataset, Habitat, HabitatTable
+from .datasets import Base, MappedAnimal, Species, get_dataset, Habitat, HabitatTable
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.experts import Human
 from ripple_down_rules.rdr import SingleClassRDR, MultiClassRDR, GeneralRDR
 from ripple_down_rules.utils import make_set
-from test_helpers.helpers import get_fit_scrdr
+from .test_helpers.helpers import get_fit_scrdr
 
 
 class TestAlchemyRDR(TestCase):

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_rdr_decorators.py

@@ -1,5 +1,5 @@
 import unittest
-from datasets import PhysicalObject, Part, Robot
+from .datasets import PhysicalObject, Part, Robot
 
 
 class RDRDecoratorsTestCase(unittest.TestCase):

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_rdr_world/conftest.py

@@ -12,8 +12,8 @@ except ImportError as e:
     QApplication = None
     RDRCaseViewer = None
 
-from conf.world.handles_and_containers import HandlesAndContainersWorld
-from datasets import *
+from ..conf.world.handles_and_containers import HandlesAndContainersWorld
+from ..datasets import *
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.experts import Human
 from ripple_down_rules.helpers import is_matching

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_rdr_world/test_rdr_world.py

@@ -9,7 +9,7 @@ except ImportError as e:
     QApplication = None
     RDRCaseViewer = None
 
-from datasets import *
+from ..datasets import *
 from ripple_down_rules.helpers import is_matching
 from ripple_down_rules.rdr import GeneralRDR
 

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_relational_rdr.py

@@ -5,7 +5,7 @@ from unittest import TestCase
 
 from typing_extensions import List, Any
 
-from datasets import Robot, Part, PhysicalObject
+from .datasets import Robot, Part, PhysicalObject
 from ripple_down_rules.datastructures.case import CaseAttribute
 from ripple_down_rules.datastructures.dataclasses import CaseQuery, CallableExpression
 from ripple_down_rules.experts import Human

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_output__scrdr_defs.py

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

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_results/datasets_physical_object_is_a_robot/physical_object_is_a_robot_rdr.py

@@ -1,7 +1,6 @@
-from typing import Dict
-from typing import Dict, Any
 from ripple_down_rules.datastructures.case import Case, create_case
 from ripple_down_rules.helpers import general_rdr_classify
+from typing import Any, Dict
 from . import physical_object_is_a_robot_output__scrdr as output__classifier
 
 classifiers_dict = dict()

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_results/datasets_physical_object_is_a_robot/rdr_metadata/datasets_physical_object_is_a_robot.json

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

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/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,4 +1,4 @@
-from datasets import PhysicalObject, Robot
+from ...datasets import PhysicalObject, Robot
 from typing import Dict, List, Union
 
 

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/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,7 +1,6 @@
-from typing import Dict
-from typing import Dict, Any
 from ripple_down_rules.datastructures.case import Case, create_case
 from ripple_down_rules.helpers import general_rdr_classify
+from typing import Any, Dict
 from . import physical_object_select_objects_that_are_parts_of_robot_output__mcrdr as output__classifier
 
 classifiers_dict = dict()

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/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

@@ -12,8 +12,8 @@
                         "builtins.bool"
                     ],
                     "scope": {
-                        "PhysicalObject": "datasets.PhysicalObject",
-                        "Robot": "datasets.Robot",
+                        "PhysicalObject": "test.datasets.PhysicalObject",
+                        "Robot": "test.datasets.Robot",
                         "Dict": "typing.Dict",
                         "List": "typing.List",
                         "Union": "typing.Union"
@@ -28,13 +28,13 @@
                     "_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": [
-                        "datasets.PhysicalObject",
+                        "test.datasets.PhysicalObject",
                         "builtins.set",
                         "builtins.list"
                     ],
                     "scope": {
-                        "PhysicalObject": "datasets.PhysicalObject",
-                        "Robot": "datasets.Robot",
+                        "PhysicalObject": "test.datasets.PhysicalObject",
+                        "Robot": "test.datasets.Robot",
                         "Dict": "typing.Dict",
                         "List": "typing.List",
                         "Union": "typing.Union"

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_sql_model.py

@@ -2,7 +2,7 @@ import unittest
 
 from sqlalchemy import select
 
-from datasets import *
+from .datasets import *
 
 
 class TestDDL(unittest.TestCase):

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_template_file_creator.py

@@ -8,8 +8,8 @@ from ripple_down_rules.datastructures.enums import PromptFor
 from ripple_down_rules.rdr_decorators import RDRDecorator
 from ripple_down_rules.user_interface.template_file_creator import TemplateFileCreator
 from ripple_down_rules.utils import make_set
-from datasets import World, Handle, Container
-from datasets import Part, PhysicalObject, Robot
+from .datasets import World, Handle, Container
+from .datasets import Part, PhysicalObject, Robot
 
 
 
@@ -73,7 +73,7 @@ def test_rdr_decorator_func_name():
 def test_load():
     # Test the load function
     world = World()
-    imports = "from datasets import World\n\n\n"
+    imports = "from test.datasets import World\n\n\n"
     func_code = "def test_func(case):\n    return case"
     source_code = f"{imports}{func_code}\n"
     source_code = dedent(source_code)

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_user_interface/test_prompt.py

@@ -3,7 +3,7 @@ from unittest import TestCase, skip
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.datastructures.enums import PromptFor
 from ripple_down_rules.user_interface.prompt import UserPrompt
-from datasets import World, Handle, Container, FixedConnection, PrismaticConnection
+from ..datasets import World, Handle, Container, FixedConnection, PrismaticConnection
 
 
 class TestPrompt(TestCase):

{ripple_down_rules-0.5.81 → ripple_down_rules-0.5.83}/test/test_user_interface/test_qt_gui_inline.py

@@ -11,11 +11,11 @@ except ImportError as e:
     style = None
 from typing_extensions import List
 
-from datasets import load_zoo_dataset, Species
+from ..datasets import load_zoo_dataset, Species
 from ripple_down_rules.datastructures.case import Case
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
-from test_helpers.helpers import get_fit_grdr
-from test_object_diagram import Person, Address
+from ..test_helpers.helpers import get_fit_grdr
+from ..test_object_diagram import Person, Address
 
 
 @unittest.skipIf(QApplication is None, "GUI tests need PyQt6,"

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

@@ -64,11 +64,11 @@ class UtilsTestCase(TestCase):
         assert rel_import == expected_import
 
     def test_get_imports_from_types(self):
-        from datasets import World, Species
+        from .datasets import World, Species
 
         imports = get_imports_from_types([World, Species])
 
-        assert imports == ["from datasets import Species, World"]
+        assert imports == ["from test.datasets import Species, World"]
 
         from ripple_down_rules.rdr import GeneralRDR