Fix if/elif logic, add more descriptive pyproject.toml.

- Combine if/elif structure in visualization.py.
- Add more descriptive ipython dependency into pyproject.toml.
- Add test for two_visualization_output if decomposition is missing.
- Correct import order.
Closes #46, Closes #47

Author: justushelo

pyproject.toml

@@ -41,8 +41,8 @@ dashboard = [
     "cryptography",
 ]
 
-ipython = [
-    "ipython"
+display = [
+    "ipython>=9.1"
 ]
 
 test = [

src/simdec/__init__.py

@@ -1,8 +1,8 @@
 """SimDec main namespace."""
 from simdec.decomposition import *
+from simdec.heterogeneity_indices import *
 from simdec.sensitivity_indices import *
 from simdec.visualization import *
-from simdec.heterogeneity_indices import *
 
 __all__ = [
     "sensitivity_indices",

src/simdec/visualization.py

@@ -203,29 +203,29 @@ def visualization(
         raise ValueError("'kind' can only be 'histogram' or 'boxplot'")
 
     if print_legend:
-        if not HAS_IPYTHON:
-            warnings.warn(
-                "print_legend=True requires ipython to be installed. "
-                "Install it with: pip install simdec[ipython]",
-                stacklevel=2,
-            )
-        elif decomposition is None:
+        if not HAS_IPYTHON or decomposition is None:
+            missing_requirements = []
+            if not HAS_IPYTHON:
+                missing_requirements.append(
+                    "ipython needs to be installed. "
+                    "Install it with: pip install simdec[display]"
+                )
+            if decomposition is None:
+                missing_requirements.append("the decomposition parameter")
             warnings.warn(
-                "print_legend=True requires the decomposition parameter. Table skipped.",
+                f"print_legend=True requires {' and '.join(missing_requirements)}. Table skipped.",
                 stacklevel=2,
             )
         else:
-            try:
-                _, styler = tableau(
-                    var_names=decomposition.var_names,
-                    statistic=decomposition.statistic,
-                    states=decomposition.states,
-                    bins=decomposition.bins,
-                    palette=palette,
-                )
-                display(styler)
-            except ImportError:
-                pass
+            _, styler = tableau(
+                var_names=decomposition.var_names,
+                statistic=decomposition.statistic,
+                states=decomposition.states,
+                bins=decomposition.bins,
+                palette=palette,
+            )
+            display(styler)
+
     return ax
 
 
@@ -334,29 +334,29 @@ def two_output_visualization(
     fig.subplots_adjust(wspace=-0.015, hspace=0)
 
     if print_legend:
-        if not HAS_IPYTHON:
-            warnings.warn(
-                "print_legend=True requires ipython to be installed. "
-                "Install it with: pip install simdec[ipython]",
-                stacklevel=2,
-            )
-        elif decomposition is None:
+        if not HAS_IPYTHON or decomposition is None:
+            missing_requirements = []
+            if not HAS_IPYTHON:
+                missing_requirements.append(
+                    "ipython needs to be installed. "
+                    "Install it with: pip install simdec[display]"
+                )
+            if decomposition is None:
+                missing_requirements.append("the decomposition parameter")
             warnings.warn(
-                "print_legend=True requires the decomposition parameter. Table skipped.",
+                f"print_legend=True requires {' and '.join(missing_requirements)}. Table skipped.",
                 stacklevel=2,
             )
         else:
-            try:
-                _, styler = tableau(
-                    var_names=decomposition.var_names,
-                    statistic=decomposition.statistic,
-                    states=decomposition.states,
-                    bins=decomposition.bins,
-                    palette=palette,
-                )
-                display(styler)
-            except ImportError:
-                pass
+            _, styler = tableau(
+                var_names=decomposition.var_names,
+                statistic=decomposition.statistic,
+                states=decomposition.states,
+                bins=decomposition.bins,
+                palette=palette,
+            )
+            display(styler)
+
     return fig, axs
 
 

tests/test_visualization.py

@@ -1,8 +1,10 @@
-import pytest
 import pathlib
+import pytest
+
+import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-import matplotlib.pyplot as plt
+
 import simdec as sd
 
 
@@ -132,3 +134,15 @@ def test_visualization_missing_decomposition_warning():
 
     with pytest.warns(UserWarning, match="requires the decomposition parameter"):
         sd.visualization(bins=bins, palette=pal, print_legend=True, decomposition=None)
+
+
+def test_two_output_visualization_missing_decomposition_warning():
+    """Verify that omitting the decomposition object triggers a warning in two_output."""
+    bins = pd.DataFrame({"s1": [1, 2]})
+    bins2 = pd.DataFrame({"s1": [5, 6]})
+    pal = [[1, 0, 0, 1]]
+
+    with pytest.warns(UserWarning, match="requires the decomposition parameter"):
+        sd.two_output_visualization(
+            bins=bins, bins2=bins2, palette=pal, print_legend=True, decomposition=None
+        )