fix: fix imports when non-default subsections are specified

edvart/report_sections/bivariate_analysis.py

@@ -113,6 +113,11 @@ def __init__(
             self.subsections_to_show = self._DEFAULT_SUBSECTIONS_TO_SHOW
         else:
             self.subsections_to_show = subsections
+        self.subsections_to_show_with_low_verbosity = [
+            sub
+            for sub in self.subsections_to_show
+            if self.subsection_verbosities[sub] == Verbosity.LOW
+        ]
 
         if (columns_x is None) != (columns_y is None):
             raise ValueError("Either both or neither of columns_x, columns_y must be specified.")
@@ -170,15 +175,10 @@ def add_cells(self, cells: List[Dict[str, Any]], df: pd.DataFrame) -> None:
         cells.append(section_header)
         if self.verbosity == Verbosity.LOW:
             code = "show_bivariate_analysis(df=df"
-            subsections_to_show_with_low_verbosity = [
-                sub
-                for sub in self.subsections_to_show
-                if self.subsection_verbosities[sub] == Verbosity.LOW
-            ]
-            if subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
+            if self.subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
                 arg_subsections_names = [
                     f"BivariateAnalysis.BivariateAnalysisSubsection.{str(sub)}"
-                    for sub in subsections_to_show_with_low_verbosity
+                    for sub in self.subsections_to_show_with_low_verbosity
                 ]
 
                 code += f", subsections={arg_subsections_names}".replace("'", "")
@@ -212,6 +212,8 @@ def required_imports(self) -> List[str]:
             return super().required_imports()
 
         imports = {"from edvart.report_sections.bivariate_analysis import show_bivariate_analysis"}
+        if self.subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
+            imports.add("from edvart.report_sections.bivariate_analysis import BivariateAnalysis")
         for subsec in self.subsections:
             if subsec.verbosity > Verbosity.LOW:
                 imports.update(subsec.required_imports())

edvart/report_sections/dataset_overview.py

@@ -113,6 +113,12 @@ def __init__(
         else:
             self.subsections_to_show = subsections
 
+        self.subsections_to_show_with_low_verbosity = [
+            sub
+            for sub in self.subsections_to_show
+            if self.subsection_verbosities[sub] == Verbosity.LOW
+        ]
+
         # Construct objects that implement subsections
         enum_to_implementation = {
             subsec.QuickInfo: QuickInfo(verbosity_quick_info, columns),
@@ -146,6 +152,9 @@ def required_imports(self) -> List[str]:
         """
         if self.verbosity == Verbosity.LOW:
             imports = {"from edvart.report_sections.dataset_overview import show_overview"}
+            if self.subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
+                imports.add("from edvart.report_sections.dataset_overview import Overview")
+
             for subsec in self.subsections:
                 if subsec.verbosity > Verbosity.LOW:
                     imports.update(subsec.required_imports())
@@ -170,15 +179,10 @@ def add_cells(self, cells: List[Dict[str, Any]], df: pd.DataFrame) -> None:
 
         if self.verbosity == Verbosity.LOW:
             code = "show_overview(df=df"
-            subsections_to_show_with_low_verbosity = [
-                sub
-                for sub in self.subsections_to_show
-                if self.subsection_verbosities[sub] == Verbosity.LOW
-            ]
-            if subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
+            if self.subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
                 arg_subsections_names = [
                     f"Overview.OverviewSubsection.{str(sub)}"
-                    for sub in subsections_to_show_with_low_verbosity
+                    for sub in self.subsections_to_show_with_low_verbosity
                 ]
                 code += f", subsections={arg_subsections_names}".replace("'", "")
             if self.columns is not None:

edvart/report_sections/multivariate_analysis.py

@@ -109,6 +109,12 @@ def __init__(
         else:
             self.subsections_to_show = subsections
 
+        self.subsections_to_show_with_low_verbosity = [
+            sub
+            for sub in self.subsections_to_show
+            if self.subsection_verbosities[sub] == Verbosity.LOW
+        ]
+
         enum_to_implementation = {
             subsec.PCA: PCA(verbosity_pca, columns, color_col=color_col),
             subsec.ParallelCoordinates: ParallelCoordinates(
@@ -146,6 +152,10 @@ def required_imports(self) -> List[str]:
                 "from edvart.report_sections.multivariate_analysis import"
                 " show_multivariate_analysis"
             }
+            if self.subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
+                imports.add(
+                    "from edvart.report_sections.multivariate_analysis import MultivariateAnalysis"
+                )
             for subsec in self.subsections:
                 if subsec.verbosity > Verbosity.LOW:
                     imports.update(subsec.required_imports())
@@ -169,15 +179,10 @@ def add_cells(self, cells: List[Dict[str, Any]], df: pd.DataFrame) -> None:
         cells.append(section_header)
         if self.verbosity == Verbosity.LOW:
             code = "show_multivariate_analysis(df=df"
-            subsections_to_show_with_low_verbosity = [
-                sub
-                for sub in self.subsections_to_show
-                if self.subsection_verbosities[sub] == Verbosity.LOW
-            ]
-            if subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
+            if self.subsections_to_show_with_low_verbosity != self._DEFAULT_SUBSECTIONS_TO_SHOW:
                 arg_subsections_names = [
                     f"MultivariateAnalysis.MultivariateAnalysisSubsection.{str(sub)}"
-                    for sub in subsections_to_show_with_low_verbosity
+                    for sub in self.subsections_to_show_with_low_verbosity
                 ]
                 code += f", subsections={arg_subsections_names}".replace("'", "")
             if self.columns is not None:

edvart/report_sections/timeseries_analysis/timeseries_analysis.py

@@ -163,6 +163,12 @@ def __init__(
         else:
             self.subsections_to_show = subsections
 
+        self.subsections_to_show_with_low_verbosity = [
+            sub
+            for sub in self.subsections_to_show
+            if self.subsection_verbosities[sub] == Verbosity.LOW
+        ]
+
         subsections_implementations = [
             enum_to_implementation[sub] for sub in self.subsections_to_show
         ]
@@ -191,20 +197,16 @@ def add_cells(self, cells: List[Dict[str, Any]], df: pd.DataFrame) -> None:
         if self.verbosity == Verbosity.LOW:
             subsec = TimeseriesAnalysis.TimeseriesAnalysisSubsection
             code = "show_timeseries_analysis(df=df"
-            subsections_to_show_with_low_verbosity = [
-                sub
-                for sub in self.subsections_to_show
-                if self.subsection_verbosities[sub] == Verbosity.LOW
-            ]
-            if subsections_to_show_with_low_verbosity != self.default_subsections_to_show:
+            if self.subsections_to_show_with_low_verbosity != self.default_subsections_to_show:
                 arg_subsections_names = [
                     f"TimeseriesAnalysis.TimeseriesAnalysisSubsection.{str(sub)}"
-                    for sub in subsections_to_show_with_low_verbosity
+                    for sub in self.subsections_to_show_with_low_verbosity
                 ]
                 code += f", subsections={arg_subsections_names}".replace("'", "")
-            stft_included = subsec.ShortTimeFT in subsections_to_show_with_low_verbosity
+            stft_included = subsec.ShortTimeFT in self.subsections_to_show_with_low_verbosity
             include_sampling_rate = self.sampling_rate is not None and (
-                stft_included or subsec.FourierTransform in subsections_to_show_with_low_verbosity
+                stft_included
+                or subsec.FourierTransform in self.subsections_to_show_with_low_verbosity
             )
             if include_sampling_rate:
                 code += f", sampling_rate={self.sampling_rate}"
@@ -236,6 +238,11 @@ def required_imports(self) -> List[str]:
                 "from edvart.report_sections.timeseries_analysis.timeseries_analysis"
                 " import show_timeseries_analysis"
             }
+            if self.subsections_to_show_with_low_verbosity != self.default_subsections_to_show:
+                imports.add(
+                    "from edvart.report_sections.timeseries_analysis.timeseries_analysis"
+                    " import TimeseriesAnalysis"
+                )
             for sub in self.subsections:
                 if sub.verbosity > Verbosity.LOW:
                     imports.update(sub.required_imports())

tests/test_bivariate_analysis.py

@@ -396,7 +396,8 @@ def test_imports_verbosity_low_different_subsection_verbosities():
     exported_imports = bivariate_section.required_imports()
 
     expected_imports = {
-        "from edvart.report_sections.bivariate_analysis import show_bivariate_analysis"
+        "from edvart.report_sections.bivariate_analysis import show_bivariate_analysis",
+        "from edvart.report_sections.bivariate_analysis import BivariateAnalysis",
     }
     for s in bivariate_section.subsections:
         if s.verbosity > Verbosity.LOW:

tests/test_multivariate_analysis.py

@@ -426,7 +426,8 @@ def test_imports_verbosity_low_different_subsection_verbosities():
     exported_imports = multivariate_section.required_imports()
 
     expected_imports = {
-        "from edvart.report_sections.multivariate_analysis import show_multivariate_analysis"
+        "from edvart.report_sections.multivariate_analysis import show_multivariate_analysis",
+        "from edvart.report_sections.multivariate_analysis import MultivariateAnalysis",
     }
     for s in multivariate_section.subsections:
         if s.verbosity > Verbosity.LOW:

tests/test_overview_section.py

@@ -353,7 +353,10 @@ def test_imports_verbosity_low_different_subsection_verbosities():
 
     exported_imports = overview_section.required_imports()
 
-    expected_imports = {"from edvart.report_sections.dataset_overview import show_overview"}
+    expected_imports = {
+        "from edvart.report_sections.dataset_overview import show_overview",
+        "from edvart.report_sections.dataset_overview import Overview",
+    }
     for s in overview_section.subsections:
         if s.verbosity > Verbosity.LOW:
             expected_imports.update(s.required_imports())

tests/test_timeseries_analysis.py

@@ -464,6 +464,7 @@ def test_imports_verbosity_low_different_subsection_verbosities():
 
     expected_imports = {
         "from edvart.report_sections.timeseries_analysis.timeseries_analysis import show_timeseries_analysis",
+        "from edvart.report_sections.timeseries_analysis.timeseries_analysis import TimeseriesAnalysis",
     }
     for s in ts_section.subsections:
         if s.verbosity > Verbosity.LOW: