ripple-down-rules 0.5.87__tar.gz → 0.5.88__tar.gz

{ripple_down_rules-0.5.87 → ripple_down_rules-0.5.88}/PKG-INFO

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

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

{ripple_down_rules-0.5.87 → ripple_down_rules-0.5.88}/src/ripple_down_rules/user_interface/prompt.py

@@ -20,12 +20,15 @@ from ..datastructures.dataclasses import CaseQuery
 from ..datastructures.enums import PromptFor
 from .ipython_custom_shell import IPythonShell
 from ..utils import make_list
+from threading import Lock
 
 
 class UserPrompt:
     """
     A class to handle user prompts for the RDR.
     """
+    shell_lock: Lock = Lock()  # To ensure that only one thread can access the shell at a time
+
     def __init__(self, viewer: Optional[RDRCaseViewer] = None):
         """
         Initialize the UserPrompt class.
@@ -143,17 +146,7 @@ class UserPrompt:
         """
         while True:
             if user_input is None:
-                if self.viewer is None:
-                    shell = IPythonShell() if shell is None else shell
-                    shell.run()
-                    user_input = shell.user_input
-                else:
-                    app = QApplication.instance()
-                    if app is None:
-                        raise RuntimeError("QApplication instance is None. Please run the application first.")
-                    self.viewer.show()
-                    app.exec()
-                    user_input = self.viewer.user_input
+                user_input = self.start_shell_and_get_user_input(shell=shell)
                 if user_input is None or user_input == 'exit':
                     return user_input, None
                 self.print_func(f"{Fore.GREEN}Captured User input: {Style.RESET_ALL}")
@@ -166,3 +159,24 @@ class UserPrompt:
                 logging.error(msg)
                 self.print_func(f"{Fore.RED}{msg}{Style.RESET_ALL}")
                 user_input = None
+
+    def start_shell_and_get_user_input(self, shell: Optional[IPythonShell] = None) -> Optional[str]:
+        """
+        Start the shell and get user input.
+
+        :param shell: The Ipython shell to use for prompting the user.
+        :return: The user input.
+        """
+        with self.shell_lock:
+            if self.viewer is None:
+                shell = IPythonShell() if shell is None else shell
+                shell.run()
+                user_input = shell.user_input
+            else:
+                app = QApplication.instance()
+                if app is None:
+                    raise RuntimeError("QApplication instance is None. Please run the application first.")
+                self.viewer.show()
+                app.exec()
+                user_input = self.viewer.user_input
+            return user_input

{ripple_down_rules-0.5.87 → ripple_down_rules-0.5.88}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.5.87
+Version: 0.5.88
 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.87 → ripple_down_rules-0.5.88}/test/test_rdr.py

@@ -69,7 +69,7 @@ class TestRDR(TestCase):
         scrdr, _ = get_fit_scrdr(self.all_cases, self.targets, draw_tree=False,
                                  expert_answers_dir=self.expert_answers_dir,
                                  expert_answers_file="scrdr_expert_answers_fit",
-                                 load_answers=True,
+                                 load_answers=False,
                                  scenario=self.test_fit_scrdr)
         # render_tree(scrdr.start_rule, use_dot_exporter=True,
         #             filename=self.test_results_dir + f"/scrdr")

{ripple_down_rules-0.5.87 → ripple_down_rules-0.5.88}/test/test_rdr_helpers_rdrs.py

@@ -10,7 +10,7 @@ from ripple_down_rules.utils import is_iterable, make_list
 save_dir = join(dirname(__file__), '..', 'src', 'ripple_down_rules')
 # viewer = RDRCaseViewer(save_dir=save_dir)
 viewer = None
-rdr_decorator: RDRDecorator = RDRDecorator(save_dir, (bool,), True, ask_always=True,
+rdr_decorator: RDRDecorator = RDRDecorator(save_dir, (bool,), True,
                                            fit=False,
                                            viewer=viewer)
 
@@ -18,7 +18,6 @@ rdr_decorator: RDRDecorator = RDRDecorator(save_dir, (bool,), True, ask_always=T
 @rdr_decorator.decorator
 def should_i_ask_the_expert_for_a_target(conclusions: Union[Any, Dict[str, Any]],
                                          case_query: CaseQuery,
-                                         ask_always: bool,
                                          update_existing: bool) -> bool:
     """
     Determine if the rdr should ask the expert for the target of a given case query.
@@ -29,9 +28,7 @@ def should_i_ask_the_expert_for_a_target(conclusions: Union[Any, Dict[str, Any]]
     :param update_existing: Whether to update rules that gave the required type of conclusions.
     :return: True if the rdr should ask the expert, False otherwise.
     """
-    if ask_always:
-        return True
-    elif conclusions is None:
+    if conclusions is None:
         return True
     elif is_iterable(conclusions) and len(conclusions) == 0:
         return True