try except to handle pwm chips keep changing, fix export

Author: CamDavidsonPilon

pioreactor/actions/leader/export_experiment_data.py

@@ -185,7 +185,7 @@ def export_experiment_data(
 
             _partition_by_unit = dataset.has_unit and (partition_by_unit or dataset.always_partition_by_unit)
             _partition_by_experiment = dataset.has_experiment and partition_by_experiment
-            filenames: list[str] = []
+            path_to_files: list[Path] = []
             placeholders: dict[str, str] = {}
 
             order_by_col = dataset.default_order_by
@@ -243,15 +243,17 @@ def export_experiment_data(
                     )
 
                     if rows_partition not in parition_to_writer_map:
+                        # create a new csv writer for this partition since it doesn't exist yet
                         filename = f"{dataset_name}-" + "-".join(rows_partition) + f"-{time}.csv"
                         filename = filename.replace(" ", "_")
-                        filenames.append(filename)
-                        path_to_file = Path(Path(output).parent / filename)
+                        path_to_file = Path(output).parent / filename
                         parition_to_writer_map[rows_partition] = csv.writer(
                             stack.enter_context(open(path_to_file, "w")), delimiter=","
                         )
                         parition_to_writer_map[rows_partition].writerow(headers)
 
+                        path_to_files.append(path_to_file)
+
                     parition_to_writer_map[rows_partition].writerow(row)
 
                     if count % 10_000 == 0:
@@ -262,10 +264,9 @@ def export_experiment_data(
                 logger.warning(f"No data present in {dataset_name}. Check database?")
 
             zf.mkdir(dataset_name)
-            for filename in filenames:
-                path_to_file = Path(output, filename)
+            for path_to_file in path_to_files:
                 zf.write(path_to_file, arcname=f"{dataset_name}/{filename}")
-                Path(path_to_file).unlink()
+                path_to_file.unlink()
 
     logger.info("Finished export.")
     return

pioreactor/utils/pwm.py

@@ -19,7 +19,6 @@
 from pioreactor.types import GpioPin
 from pioreactor.utils import clamp
 from pioreactor.utils import local_intermittent_storage
-from pioreactor.version import rpi_version_info
 from pioreactor.whoami import get_assigned_experiment_name
 from pioreactor.whoami import get_unit_name
 from pioreactor.whoami import is_testing_env
@@ -29,6 +28,7 @@
     from pioreactor.utils.mock import MockHardwarePWM as HardwarePWM
 else:
     from rpi_hardware_pwm import HardwarePWM  # type: ignore
+    from rpi_hardware_pwm import HardwarePWMException  # type: ignore
 
 
 class HardwarePWMOutputDevice(HardwarePWM):
@@ -41,10 +41,12 @@ def __init__(self, pin: GpioPin, frequency: float = 100) -> None:
 
         pwm_channel = self.HARDWARE_PWM_CHANNELS[pin]
 
-        if rpi_version_info.startswith("Raspberry Pi 5"):
+        try:
+            super().__init__(
+                pwm_channel, hz=frequency
+            )  # default is chip=0 for all except RPi5 on Kernel 6.6 (which is 2)
+        except HardwarePWMException:
             super().__init__(pwm_channel, hz=frequency, chip=2)
-        else:
-            super().__init__(pwm_channel, hz=frequency)  # default is chip=0
 
     def start(self, initial_dc: pt.FloatBetween0and100) -> None:
         self._started = True