ripple-down-rules 0.4.84__tar.gz → 0.4.85__tar.gz

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.84
+Version: 0.4.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
@@ -691,19 +691,20 @@ Requires-Dist: ipython
 Requires-Dist: requests
 Requires-Dist: colorama
 Requires-Dist: pygments
+Requires-Dist: sqlalchemy
+Requires-Dist: pandas
 Provides-Extra: gui
 Requires-Dist: pyqt6; extra == "gui"
 Requires-Dist: qtconsole; extra == "gui"
-Provides-Extra: visualization
-Requires-Dist: matplotlib; extra == "visualization"
-Requires-Dist: networkx; extra == "visualization"
+Provides-Extra: viz
+Requires-Dist: matplotlib; extra == "viz"
+Requires-Dist: networkx; extra == "viz"
 Provides-Extra: dev
 Requires-Dist: pyqt6; extra == "dev"
 Requires-Dist: qtconsole; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: networkx; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
-Requires-Dist: sqlalchemy; extra == "dev"
 Requires-Dist: ucimlrepo>=0.0.7; extra == "dev"
 Requires-Dist: pdbpp; extra == "dev"
 Dynamic: license-file

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/pyproject.toml

@@ -29,7 +29,7 @@ gui = [
     "pyqt6",
     "qtconsole",
 ]
-visualization = [
+viz = [
     "matplotlib",
     "networkx",
 ]
@@ -39,6 +39,5 @@ dev = [
     "matplotlib",
     "networkx",
     "pytest",
-    "sqlalchemy",
     "ucimlrepo>=0.0.7",
     "pdbpp"]

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/requirements-dev.txt

@@ -1,7 +1,6 @@
 -r requirements.txt
 -r requirements-gui.txt
 -r requirements-viz.txt
-sqlalchemy
 ucimlrepo>=0.0.7
 pdbpp
 pytest

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/requirements.txt

@@ -7,4 +7,6 @@ tabulate
 ipython
 requests
 colorama
-pygments
+pygments
+sqlalchemy
+pandas

ripple_down_rules-0.4.85/src/ripple_down_rules/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.85"

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/src/ripple_down_rules/datastructures/case.py

@@ -7,7 +7,7 @@ from enum import Enum
 
 from pandas import DataFrame
 from sqlalchemy import MetaData
-from sqlalchemy.orm import DeclarativeBase as SQLTable, MappedColumn as SQLColumn, registry
+from sqlalchemy.orm import DeclarativeBase as SQLTable, registry
 from typing_extensions import Any, Optional, Dict, Type, Set, Hashable, Union, List, TYPE_CHECKING
 
 from ..utils import make_set, row_to_dict, table_rows_as_str, get_value_type_from_type_hint, SubclassJSONSerializer, \

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/src/ripple_down_rules/user_interface/gui.py

@@ -473,8 +473,7 @@ class RDRCaseViewer(QMainWindow):
         self.close()
 
     def _edit(self):
-        self.template_file_creator = TemplateFileCreator(self.ipython_console.kernel.shell,
-                                                         self.case_query, self.prompt_for, self.code_to_modify,
+        self.template_file_creator = TemplateFileCreator(self.case_query, self.prompt_for, self.code_to_modify,
                                                          self.print)
         self.template_file_creator.edit()
 

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/src/ripple_down_rules/user_interface/ipython_custom_shell.py

@@ -20,7 +20,7 @@ class MyMagics(Magics):
                  prompt_for: Optional[PromptFor] = None,
                  case_query: Optional[CaseQuery] = None):
         super().__init__(shell)
-        self.rule_editor = TemplateFileCreator(shell, case_query, prompt_for=prompt_for, code_to_modify=code_to_modify)
+        self.rule_editor = TemplateFileCreator(case_query, prompt_for=prompt_for, code_to_modify=code_to_modify)
         self.all_code_lines: Optional[List[str]] = None
 
     @line_magic

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/src/ripple_down_rules/user_interface/template_file_creator.py

@@ -8,7 +8,6 @@ from functools import cached_property
 from textwrap import indent, dedent
 
 from colorama import Fore, Style
-from ipykernel.inprocess.ipkernel import InProcessInteractiveShell
 from typing_extensions import Optional, Type, List, Callable, Tuple, Dict
 
 from ..datastructures.case import Case
@@ -73,10 +72,9 @@ class TemplateFileCreator:
     The list of all code lines in the function in the temporary file.
     """
 
-    def __init__(self, shell: InProcessInteractiveShell, case_query: CaseQuery, prompt_for: PromptFor,
+    def __init__(self, case_query: CaseQuery, prompt_for: PromptFor,
                  code_to_modify: Optional[str] = None, print_func: Callable[[str], None] = print):
         self.print_func = print_func
-        self.shell = shell
         self.code_to_modify = code_to_modify
         self.prompt_for = prompt_for
         self.case_query = case_query

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/src/ripple_down_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ripple_down_rules
-Version: 0.4.84
+Version: 0.4.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
@@ -691,19 +691,20 @@ Requires-Dist: ipython
 Requires-Dist: requests
 Requires-Dist: colorama
 Requires-Dist: pygments
+Requires-Dist: sqlalchemy
+Requires-Dist: pandas
 Provides-Extra: gui
 Requires-Dist: pyqt6; extra == "gui"
 Requires-Dist: qtconsole; extra == "gui"
-Provides-Extra: visualization
-Requires-Dist: matplotlib; extra == "visualization"
-Requires-Dist: networkx; extra == "visualization"
+Provides-Extra: viz
+Requires-Dist: matplotlib; extra == "viz"
+Requires-Dist: networkx; extra == "viz"
 Provides-Extra: dev
 Requires-Dist: pyqt6; extra == "dev"
 Requires-Dist: qtconsole; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: networkx; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
-Requires-Dist: sqlalchemy; extra == "dev"
 Requires-Dist: ucimlrepo>=0.0.7; extra == "dev"
 Requires-Dist: pdbpp; extra == "dev"
 Dynamic: license-file

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/src/ripple_down_rules.egg-info/requires.txt

@@ -8,6 +8,8 @@ ipython
 requests
 colorama
 pygments
+sqlalchemy
+pandas
 
 [dev]
 pyqt6
@@ -15,7 +17,6 @@ qtconsole
 matplotlib
 networkx
 pytest
-sqlalchemy
 ucimlrepo>=0.0.7
 pdbpp
 
@@ -23,6 +24,6 @@ pdbpp
 pyqt6
 qtconsole
 
-[visualization]
+[viz]
 matplotlib
 networkx

{ripple_down_rules-0.4.84 → ripple_down_rules-0.4.85}/test/test_rdr.py

@@ -2,7 +2,7 @@ import os
 import sys
 from unittest import TestCase
 
-from typing_extensions import List
+from typing_extensions import List, Optional
 
 from ripple_down_rules.datasets import Habitat, Species
 from ripple_down_rules.datasets import load_zoo_dataset
@@ -10,12 +10,16 @@ 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.user_interface.gui import RDRCaseViewer
 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 PyQt6.QtWidgets import QApplication
+try:
+    from PyQt6.QtWidgets import QApplication
+    from ripple_down_rules.user_interface.gui import RDRCaseViewer
+except ImportError as e:
+    RDRCaseViewer = None
+    QApplication = None
 
 
 class TestRDR(TestCase):
@@ -26,8 +30,8 @@ class TestRDR(TestCase):
     expert_answers_dir: str = "./test_expert_answers"
     generated_rdrs_dir: str = "./test_generated_rdrs"
     cache_file: str = f"{test_results_dir}/zoo_dataset.pkl"
-    app: QApplication
-    viewer: RDRCaseViewer
+    app: Optional[QApplication] = None
+    viewer: Optional[RDRCaseViewer] = None
 
     @classmethod
     def setUpClass(cls):
@@ -38,8 +42,9 @@ class TestRDR(TestCase):
         for test_dir in [cls.test_results_dir, cls.expert_answers_dir, cls.generated_rdrs_dir]:
             if not os.path.exists(test_dir):
                 os.makedirs(test_dir)
-        cls.app = QApplication(sys.argv)
-        cls.viewer = RDRCaseViewer()
+        if RDRCaseViewer is not None:
+            cls.app = QApplication(sys.argv)
+            cls.viewer = RDRCaseViewer()
 
     def test_classify_scrdr(self):
         use_loaded_answers = True

ripple_down_rules-0.4.84/src/ripple_down_rules/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.84"