fix: pass debug manager to api for exporting packages

Author: lachlangrose

loopstructural/gui/map2loop_tools/basal_contacts_widget.py

@@ -3,8 +3,8 @@
 import os
 
 from PyQt5.QtWidgets import QMessageBox, QWidget
-from qgis.PyQt import uic
 from qgis.core import QgsProject, QgsVectorFileWriter
+from qgis.PyQt import uic
 
 from ...main.helpers import ColumnMatcher, get_layer_names
 from ...main.m2l_api import extract_basal_contacts
@@ -109,9 +109,7 @@ def _serialize_params_for_logging(self, params, context_label: str):
         serialized = {}
         for key, value in params.items():
             if hasattr(value, "source") or hasattr(value, "id"):
-                serialized[key] = self._serialize_layer(
-                    value, f"{context_label}_{key}"
-                )
+                serialized[key] = self._serialize_layer(value, f"{context_label}_{key}")
             else:
                 serialized[key] = value
         return serialized
@@ -121,9 +119,7 @@ def _log_params(self, context_label: str):
             try:
                 self._debug.log_params(
                     context_label=context_label,
-                    params=self._serialize_params_for_logging(
-                        self.get_parameters(), context_label
-                    ),
+                    params=self._serialize_params_for_logging(self.get_parameters(), context_label),
                 )
             except Exception:
                 pass
@@ -210,6 +206,7 @@ def _run_extractor(self):
                     message=f"[map2loop] Basal contacts extraction failed: {err}",
                     log_level=2,
                 )
+                raise err
             QMessageBox.critical(self, "Error", f"An error occurred: {err}")
 
     def get_parameters(self):
@@ -270,6 +267,8 @@ def _extract_contacts(self):
         all_contacts = self.allContactsCheckBox.isChecked()
         if all_contacts:
             stratigraphic_order = list({g[unit_name_field] for g in geology.getFeatures()})
+            self.data_manager.logger(f"Extracting all contacts for units: {stratigraphic_order}")
+
         result = extract_basal_contacts(
             geology=geology,
             stratigraphic_order=stratigraphic_order,
@@ -278,13 +277,14 @@ def _extract_contacts(self):
             unit_name_field=unit_name_field,
             all_contacts=all_contacts,
             updater=lambda message: QMessageBox.information(self, "Extraction Progress", message),
+            debug_manager=self._debug,
         )
-
+        self.data_manager.logger(f'All contacts extracted: {all_contacts}')
         contact_type = "basal contacts"
         if result:
-            if all_contacts:
+            if all_contacts and result['all_contacts'].empty is False:
                 addGeoDataFrameToproject(result['all_contacts'], "All contacts")
                 contact_type = "all contacts and basal contacts"
-            else:
+            elif not all_contacts and result['basal_contacts'].empty is False:
                 addGeoDataFrameToproject(result['basal_contacts'], "Basal contacts")
         return result, contact_type

loopstructural/gui/map2loop_tools/sorter_widget.py

@@ -3,9 +3,8 @@
 import os
 
 from PyQt5.QtWidgets import QMessageBox, QWidget
-from qgis.core import QgsRasterLayer
+from qgis.core import QgsProject, QgsRasterLayer, QgsVectorFileWriter
 from qgis.PyQt import uic
-from qgis.core import QgsProject, QgsVectorFileWriter
 
 from loopstructural.main.helpers import get_layer_names
 from loopstructural.main.m2l_api import PARAMETERS_DICTIONARY, SORTER_LIST
@@ -123,9 +122,7 @@ def _serialize_params_for_logging(self, params, context_label: str):
         serialized = {}
         for key, value in params.items():
             if hasattr(value, "source") or hasattr(value, "id"):
-                serialized[key] = self._serialize_layer(
-                    value, f"{context_label}_{key}"
-                )
+                serialized[key] = self._serialize_layer(value, f"{context_label}_{key}")
             else:
                 serialized[key] = value
         return serialized
@@ -135,9 +132,7 @@ def _log_params(self, context_label: str):
             try:
                 self._debug.log_params(
                     context_label=context_label,
-                    params=self._serialize_params_for_logging(
-                        self.get_parameters(), context_label
-                    ),
+                    params=self._serialize_params_for_logging(self.get_parameters(), context_label),
                 )
             except Exception:
                 pass
@@ -362,7 +357,10 @@ def _run_sorter(self):
                 ]
                 kwargs['dtm'] = self.dtmLayerComboBox.currentLayer()
 
-            result = sort_stratigraphic_column(**kwargs)
+            result = sort_stratigraphic_column(
+                **kwargs,
+                debug_manager=self._debug,
+            )
             if self._debug and self._debug.is_debug():
                 try:
                     payload = "\n".join(result) if result else ""

loopstructural/gui/map2loop_tools/thickness_calculator_widget.py

@@ -3,8 +3,8 @@
 import os
 
 from PyQt5.QtWidgets import QLabel, QMessageBox, QWidget
-from qgis.PyQt import uic
 from qgis.core import QgsProject, QgsVectorFileWriter
+from qgis.PyQt import uic
 
 from loopstructural.toolbelt.preferences import PlgOptionsManager
 
@@ -115,9 +115,7 @@ def _serialize_params_for_logging(self, params, context_label: str):
         serialized = {}
         for key, value in params.items():
             if hasattr(value, "source") or hasattr(value, "id"):
-                serialized[key] = self._serialize_layer(
-                    value, f"{context_label}_{key}"
-                )
+                serialized[key] = self._serialize_layer(value, f"{context_label}_{key}")
             else:
                 serialized[key] = value
         return serialized
@@ -290,12 +288,13 @@ def _run_calculator(self):
                 if strati_order:
                     kwargs['stratigraphic_order'] = strati_order
 
-            result = calculate_thickness(**kwargs)
+            result = calculate_thickness(
+                **kwargs,
+                debug_manager=self._debug,
+            )
             if self._debug and self._debug.is_debug():
                 try:
-                    self._debug.save_debug_file(
-                        "thickness_result.txt", str(result).encode("utf-8")
-                    )
+                    self._debug.save_debug_file("thickness_result.txt", str(result).encode("utf-8"))
                 except Exception as err:
                     self._debug.plugin.log(
                         message=f"[map2loop] Failed to save thickness debug output: {err}",

loopstructural/main/debug/template.txt

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+import pickle
+from pathlib import Path
+
+base = Path(__file__).parent
+with open(base / '{runner_name}_m2l_object.pkl', 'rb') as fh:
+    m2l_object = pickle.load(fh)
+with open(base / '{runner_name}_parameters.pkl', 'rb') as fh:
+    params = pickle.load(fh)
+m2l_object(**params)