ripple-down-rules 0.4.4__tar.gz → 0.4.7__tar.gz

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.4
+Version: 0.4.7
 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
@@ -677,12 +677,26 @@ License:                     GNU GENERAL PUBLIC LICENSE
         the library.  If this is what you want to do, use the GNU Lesser General
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
-Project-URL: Homepage, https://github.com/AbdelrhmanBassiouny/ripple_down_rules
 Keywords: robotics,knowledge,reasoning,representation
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: anytree>=2.8.0
+Requires-Dist: pandas>=2.0.3
+Requires-Dist: networkx>=3.1
+Requires-Dist: ordered_set>=4
+Requires-Dist: pygraphviz>=1.7
+Requires-Dist: ucimlrepo>=0.0.7
+Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: matplotlib>=3.7.5
+Requires-Dist: sqlalchemy
+Requires-Dist: pyqt6
+Requires-Dist: qtconsole
+Requires-Dist: graphviz
+Requires-Dist: tabulate
+Requires-Dist: ipython
+Requires-Dist: requests
+Requires-Dist: colorama
 Dynamic: license-file
 
 # Ripple Down Rules (RDR)

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ripple_down_rules"
-version = "0.4.4"
+version = "0.4.7"
 description = "Implements the various versions of Ripple Down Rules (RDR) for knowledge representation and reasoning."
 readme = "README.md"
 authors = [{ name = "Abdelrhman Bassiouny", email = "abassiou@uni-bremen.de" }]
@@ -15,8 +15,21 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 keywords = ["robotics", "knowledge", "reasoning", "representation"]
-dependencies = []
-requires-python = ">=3.10"
-
-[project.urls]
-Homepage = "https://github.com/AbdelrhmanBassiouny/ripple_down_rules"
+dependencies = [
+    "anytree>=2.8.0",
+    "pandas>=2.0.3",
+    "networkx>=3.1",
+    "ordered_set>=4",
+    "pygraphviz>=1.7",
+    "ucimlrepo>=0.0.7",
+    "typing-extensions>=4.12.2",
+    "matplotlib>=3.7.5",
+    "sqlalchemy",
+    "pyqt6",
+    "qtconsole",
+    "graphviz",
+    "tabulate",
+    "ipython",
+    "requests",
+    "colorama",
+]

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/src/ripple_down_rules/user_interface/prompt.py

@@ -134,14 +134,14 @@ class UserPrompt:
         """
         while True:
             if user_input is None:
-                if QApplication.instance() 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:
-                        app = QApplication([])
+                        raise RuntimeError("QApplication instance is None. Please run the application first.")
                     self.viewer.show()
                     app.exec()
                     user_input = self.viewer.user_input

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/src/ripple_down_rules/user_interface/template_file_creator.py

@@ -79,7 +79,7 @@ class TemplateFileCreator:
         self.case_query = case_query
         self.output_type = self.get_output_type()
         self.user_edit_line = 0
-        self.func_name: str = self.get_func_name()
+        self.func_name: str = self.get_func_name(self.prompt_for, self.case_query)
         self.func_doc: str = self.get_func_doc()
         self.function_signature: str = self.get_function_signature()
         self.editor: Optional[Editor] = detect_available_editor()
@@ -146,7 +146,7 @@ class TemplateFileCreator:
 
     def get_function_signature(self) -> str:
         if self.func_name is None:
-            self.func_name = self.get_func_name()
+            self.func_name = self.get_func_name(self.prompt_for, self.case_query)
         output_type_hint = self.get_output_type_hint()
         func_args = self.get_func_args()
         return f"def {self.func_name}({func_args}){output_type_hint}:"
@@ -238,15 +238,19 @@ class TemplateFileCreator:
         else:
             return f"Get possible value(s) for {self.case_query.name}"
 
-    def get_func_name(self) -> Optional[str]:
+    @staticmethod
+    def get_func_name(prompt_for, case_query) -> Optional[str]:
         func_name = ""
-        if self.prompt_for == PromptFor.Conditions:
-            func_name = f"{self.prompt_for.value.lower()}_for_"
-        case_name = self.case_query.name.replace(".", "_")
-        if self.case_query.is_function:
+        if prompt_for == PromptFor.Conditions:
+            func_name = f"{prompt_for.value.lower()}_for_"
+        case_name = case_query.name.replace(".", "_")
+        if case_query.is_function:
             # convert any CamelCase word into snake_case by adding _ before each capital letter
-            case_name = case_name.replace(f"_{self.case_query.attribute_name}", "")
+            case_name = case_name.replace(f"_{case_query.attribute_name}", "")
         func_name += case_name
+        attr_types = [t for t in case_query.core_attribute_type if t.__module__ != "builtins" and t is not None
+                      and t is not type(None)]
+        func_name += f"_of_type_{'_or_'.join(map(lambda c: c.__name__, attr_types))}"
         return str_to_snake_case(func_name)
 
     @cached_property

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/src/ripple_down_rules/utils.py

@@ -14,6 +14,7 @@ from collections import UserDict
 from copy import deepcopy, copy
 from dataclasses import is_dataclass, fields
 from enum import Enum
+from textwrap import dedent
 from types import NoneType
 
 import matplotlib
@@ -168,7 +169,7 @@ def extract_function_source(file_path: str,
             if not include_signature:
                 func_lines = func_lines[1:]
             line_numbers.append((node.lineno, node.end_lineno))
-            functions_source[node.name] = "\n".join(func_lines) if join_lines else func_lines
+            functions_source[node.name] = dedent("\n".join(func_lines)) if join_lines else func_lines
             if len(functions_source) == len(function_names):
                 break
     if len(functions_source) != len(function_names):

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.4
+Version: 0.4.7
 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
@@ -677,12 +677,26 @@ License:                     GNU GENERAL PUBLIC LICENSE
         the library.  If this is what you want to do, use the GNU Lesser General
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
-Project-URL: Homepage, https://github.com/AbdelrhmanBassiouny/ripple_down_rules
 Keywords: robotics,knowledge,reasoning,representation
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: anytree>=2.8.0
+Requires-Dist: pandas>=2.0.3
+Requires-Dist: networkx>=3.1
+Requires-Dist: ordered_set>=4
+Requires-Dist: pygraphviz>=1.7
+Requires-Dist: ucimlrepo>=0.0.7
+Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: matplotlib>=3.7.5
+Requires-Dist: sqlalchemy
+Requires-Dist: pyqt6
+Requires-Dist: qtconsole
+Requires-Dist: graphviz
+Requires-Dist: tabulate
+Requires-Dist: ipython
+Requires-Dist: requests
+Requires-Dist: colorama
 Dynamic: license-file
 
 # Ripple Down Rules (RDR)

{ripple_down_rules-0.4.4 → ripple_down_rules-0.4.7}/src/ripple_down_rules.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ src/ripple_down_rules/utils.py
 src/ripple_down_rules.egg-info/PKG-INFO
 src/ripple_down_rules.egg-info/SOURCES.txt
 src/ripple_down_rules.egg-info/dependency_links.txt
+src/ripple_down_rules.egg-info/requires.txt
 src/ripple_down_rules.egg-info/top_level.txt
 src/ripple_down_rules/datastructures/__init__.py
 src/ripple_down_rules/datastructures/callable_expression.py
@@ -35,4 +36,5 @@ test/test_rdr_world.py
 test/test_relational_rdr.py
 test/test_relational_rdr_alchemy.py
 test/test_sql_model.py
+test/test_template_file_creator.py
 test/test_utils.py

ripple_down_rules-0.4.7/src/ripple_down_rules.egg-info/requires.txt

@@ -0,0 +1,16 @@
+anytree>=2.8.0
+pandas>=2.0.3
+networkx>=3.1
+ordered_set>=4
+pygraphviz>=1.7
+ucimlrepo>=0.0.7
+typing-extensions>=4.12.2
+matplotlib>=3.7.5
+sqlalchemy
+pyqt6
+qtconsole
+graphviz
+tabulate
+ipython
+requests
+colorama

ripple_down_rules-0.4.7/test/test_template_file_creator.py

@@ -0,0 +1,42 @@
+from unittest import TestCase
+
+from ripple_down_rules.datastructures.dataclasses import CaseQuery
+from ripple_down_rules.datastructures.enums import PromptFor
+from ripple_down_rules.user_interface.template_file_creator import TemplateFileCreator
+from test_rdr_world import World, Handle, Container
+
+
+class TestTemplateFileCreator(TestCase):
+
+    def test_func_name_with_one_type(self):
+        # Test the function name
+        world = World()
+        case_query: CaseQuery = CaseQuery(world, "views", (Handle,), False)
+
+        func_name = TemplateFileCreator.get_func_name(PromptFor.Conclusion, case_query)
+        self.assertEqual(func_name, "world_views_of_type_handle")
+
+        func_name = TemplateFileCreator.get_func_name(PromptFor.Conditions, case_query)
+        self.assertEqual(func_name, "conditions_for_world_views_of_type_handle")
+
+    def test_func_name_with_two_type(self):
+        # Test the function name
+        world = World()
+        case_query: CaseQuery = CaseQuery(world, "views", (Handle, Container), False)
+
+        func_name = TemplateFileCreator.get_func_name(PromptFor.Conclusion, case_query)
+        self.assertEqual(func_name, "world_views_of_type_handle_or_container")
+
+        func_name = TemplateFileCreator.get_func_name(PromptFor.Conditions, case_query)
+        self.assertEqual(func_name, "conditions_for_world_views_of_type_handle_or_container")
+
+    def test_func_name_with_not_needed_types(self):
+        # Test the function name
+        world = World()
+        case_query: CaseQuery = CaseQuery(world, "views", (Handle, list, bool, type(None)), False)
+
+        func_name = TemplateFileCreator.get_func_name(PromptFor.Conclusion, case_query)
+        self.assertEqual(func_name, "world_views_of_type_handle")
+
+        func_name = TemplateFileCreator.get_func_name(PromptFor.Conditions, case_query)
+        self.assertEqual(func_name, "conditions_for_world_views_of_type_handle")