Merge pull request #59 from worldbank/fix-analysis-processing

Fix issue with analysis node not executing

Author: timlinux

geest/core/json_tree_item.py

@@ -614,6 +614,24 @@ def getDescendantDimensions(self, include_completed=True, include_disabled=False
             )
         return dimensions
 
+    def getDescendantAnalyses(self, include_completed=True):
+        """Return the top level analysis item or None if it is completed and include_completed is False.
+
+        Will also return None if self is not the top level node
+
+        :param include_completed: If True, include dimensions that are completed.
+        :param include_disabled: If True, include dimensions that are disabled.
+        result_file
+        """
+
+        analyses = []
+        if self.isAnalysis():
+            if self.getStatus() != "Completed successfully" or include_completed:
+                analyses.append(self)
+        for child in self.childItems:
+            analyses.extend(child.getDescendantAnalyses(include_completed))
+        return analyses
+
     def getFactorIndicatorGuids(self):
         """Return the list of indicators under this factor."""
         guids = []

geest/gui/panels/tree_panel.py

@@ -1284,7 +1284,10 @@ def run_item(self, item, shift_pressed):
         dimensions = item.getDescendantDimensions(
             include_completed=not self.run_only_incomplete
         )
-
+        # Fix for issue #50 - we need to run the analysis last
+        analyses = item.getDescendantAnalyses(
+            include_completed=not self.run_only_incomplete
+        )
         self.overall_progress_bar.setVisible(True)
         self.workflow_progress_bar.setVisible(True)
         self.help_button.setVisible(False)
@@ -1299,7 +1302,9 @@ def run_item(self, item, shift_pressed):
             self.queue_workflow_task(factor, factor.role)
         for dimension in dimensions:
             self.queue_workflow_task(dimension, dimension.role)
-
+        # Fix for issue #50 - we need to run the analysis last
+        for analysis in analyses:
+            self.queue_workflow_task(analysis, analysis.role)
         # Commented out see issue #50 - causes double execution of indicator
         # self.queue_workflow_task(item, item.role)
         self.items_to_run = len(indicators) + len(factors) + len(dimensions) + 1

shell.nix

@@ -45,6 +45,8 @@ in pkgs.mkShell rec {
     pythonPackages.numpy
     pythonPackages.gdal
     pythonPackages.pip
+    pythonPackages.toml
+    pythonPackages.typer
     pythonPackages.pyqtwebengine
     pinnedPkgs.vim
     pinnedPkgs.pre-commit