ripple-down-rules 0.5.81__py3-none-any.whl → 0.5.83__py3-none-any.whl

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/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/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/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.dist-info → ripple_down_rules-0.5.83.dist-info}/METADATA

@@ -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.dist-info → ripple_down_rules-0.5.83.dist-info}/RECORD

@@ -1,11 +1,11 @@
-ripple_down_rules/__init__.py,sha256=Hf2qy117DtlfEhbMoyreqc3k02Y_tLUwlxP1IJySXWA,100
+ripple_down_rules/__init__.py,sha256=xixYpXbV9gGErJuj1TxFPGGMaaFTOvzOpHpkn65VVoU,100
 ripple_down_rules/experts.py,sha256=bwozulI1rv0uyaMZQqEgapDO-s8wvW0D6Jqxmvu5fik,12610
 ripple_down_rules/helpers.py,sha256=v4oE7C5PfQUVJfSUs1FfLHEwrJXEHJLn4vJhJMvyCR8,4453
-ripple_down_rules/rdr.py,sha256=2gh_kRmsR58pLqY4OvhjOgHSIYIcST7tI7jjVQ8yhD4,55214
-ripple_down_rules/rdr_decorators.py,sha256=0sk7izDB53lTKSB9fm33vQahmY_05FyCOWljyQOMB0U,9072
+ripple_down_rules/rdr.py,sha256=C6bvlq6MsKa2Mym1wW6JUMj705aCaoihTP279TM6eT0,55218
+ripple_down_rules/rdr_decorators.py,sha256=amXUjgc-rfYxPKFW16Xm8Z9vfaaslNl5OvDOg9fKaTg,9447
 ripple_down_rules/rules.py,sha256=iVevv6iZ-6L2IPI0ZYbBjxBymXEQMmJGRFhiKUS-NmA,20352
 ripple_down_rules/start-code-server.sh,sha256=otClk7VmDgBOX2TS_cjws6K0UwvgAUJhoA0ugkPCLqQ,949
-ripple_down_rules/utils.py,sha256=mObBszTruGrRvD4MgD8tS1AnMtoyKrPl4RCciinhzY4,60132
+ripple_down_rules/utils.py,sha256=ikzlXjgBWM95dgL-idzeWcYyZs2IAwgA5BXMNRoKE2w,60144
 ripple_down_rules/datastructures/__init__.py,sha256=V2aNgf5C96Y5-IGghra3n9uiefpoIm_QdT7cc_C8cxQ,111
 ripple_down_rules/datastructures/callable_expression.py,sha256=f3wUPTrLa1INO-1qfgVz87ryrCABronfyq0_JKWoZCs,12800
 ripple_down_rules/datastructures/case.py,sha256=1zSaXUljaH6z3SgMGzYPoDyjotNam791KpYgvxuMh90,15463
@@ -17,8 +17,8 @@ ripple_down_rules/user_interface/ipython_custom_shell.py,sha256=Jrf7NxOdlrwGXH0X
 ripple_down_rules/user_interface/object_diagram.py,sha256=FEa2HaYR9QmTE6NsOwBvZ0jqmu3DKyg6mig2VE5ZP4Y,4956
 ripple_down_rules/user_interface/prompt.py,sha256=AkkltdDIaioN43lkRKDPKSjJcmdSSGZDMYz7AL7X9lE,8082
 ripple_down_rules/user_interface/template_file_creator.py,sha256=xWUt-RHRqrvoMo74o-bMLo8xNxil68wgbOZAMADZp2A,13570
-ripple_down_rules-0.5.81.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-ripple_down_rules-0.5.81.dist-info/METADATA,sha256=P3JwR4h_dcxZ9w-S7DSflG8BS9NZvW-IrCNF1-H3-dA,48214
-ripple_down_rules-0.5.81.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ripple_down_rules-0.5.81.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
-ripple_down_rules-0.5.81.dist-info/RECORD,,
+ripple_down_rules-0.5.83.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+ripple_down_rules-0.5.83.dist-info/METADATA,sha256=PGZ_KSayeTFDv3fTPBln3u3AzWwilfHgRdkHz5i-dv8,48214
+ripple_down_rules-0.5.83.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ripple_down_rules-0.5.83.dist-info/top_level.txt,sha256=VeoLhEhyK46M1OHwoPbCQLI1EifLjChqGzhQ6WEUqeM,18
+ripple_down_rules-0.5.83.dist-info/RECORD,,