fix: explicitly copy the outputs of grouped DAGs

Unlike the standard DAGs, grouped DAGs are executed in an isolated context and the output files and folders should be copied to the main folder explicitly.
pollination · Jul 30, 2024 · 1711c9f · 1711c9f
1 parent de942c0
commit 1711c9f
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 9 deletions.
diff --git a/pollination/utci_comfort_map/_comfort.py b/pollination/utci_comfort_map/_comfort.py
@@ -1,4 +1,4 @@
-from pollination_dsl.dag import Inputs, GroupedDAG, task
+from pollination_dsl.dag import Inputs, GroupedDAG, task, Outputs
 from dataclasses import dataclass
 from typing import Dict, List
 
@@ -260,3 +260,7 @@ def compute_tcp(
             {'from': Tcp()._outputs.hsp, 'to': 'metrics/HSP/{{self.name}}.csv'},
             {'from': Tcp()._outputs.csp, 'to': 'metrics/CSP/{{self.name}}.csv'}
         ]
+
+    results_folder = Outputs.folder(source='results')
+    conditions = Outputs.folder(source='conditions')
+    metrics = Outputs.folder(source='metrics')
diff --git a/pollination/utci_comfort_map/_dynshade.py b/pollination/utci_comfort_map/_dynshade.py
@@ -83,4 +83,9 @@ def run_radiance_shade_contrib(
         sun_modifiers=sun_modifiers,
         sun_up_hours=sun_up_hours
     ) -> List[Dict]:
-        pass
+        return [
+            {
+                'from': ShadeContribEntryPoint()._outputs.shd_trans,
+                'to': 'radiance/shortwave/shd_trans/final'
+            }
+        ]
diff --git a/pollination/utci_comfort_map/_radiance.py b/pollination/utci_comfort_map/_radiance.py
@@ -1,4 +1,4 @@
-from pollination_dsl.dag import Inputs, GroupedDAG, task
+from pollination_dsl.dag import Inputs, GroupedDAG, task, Outputs
 from dataclasses import dataclass
 
 from pollination.honeybee_radiance.grid import MirrorGrid, RadiantEnclosureInfo
@@ -208,3 +208,9 @@ def ground_reflected_sky(
                 'to': 'shortwave/results/reflected/{{self.name}}.ill'
             }
         ]
+
+
+    enclosures = Outputs.folder(source='enclosures')
+    shortwave_results = Outputs.folder(source='shortwave/results')
+    shortwave_grids = Outputs.folder(source='shortwave/grids')
+    longwave_view_factors = Outputs.folder(source='longwave/view_factors')
diff --git a/pollination/utci_comfort_map/_shdcontrib.py b/pollination/utci_comfort_map/_shdcontrib.py
@@ -1,4 +1,4 @@
-from pollination_dsl.dag import Inputs, GroupedDAG, task
+from pollination_dsl.dag import Inputs, GroupedDAG, task, Outputs
 from dataclasses import dataclass
 
 from pollination.honeybee_radiance.contrib import DaylightContribution
@@ -175,3 +175,5 @@ def ground_reflected_sky_shade_group(
                 'to': 'shd_trans/final/{{self.grid}}/{{self.group}}/reflected.ill'
             }
         ]
+
+    shd_trans = Outputs.folder(source='shd_trans/final')
diff --git a/pollination/utci_comfort_map/entry.py b/pollination/utci_comfort_map/entry.py
@@ -227,7 +227,24 @@ def run_radiance_simulation(
         sun_modifiers=prepare_folder._outputs.shortwave_resources,
         view_factor_modifiers=prepare_folder._outputs.longwave_resources,
     ) -> List[Dict]:
-        pass
+        return [
+            {
+                'from': RadianceMappingEntryPoint()._outputs.enclosures,
+                'to': 'radiance/enclosures'
+            },
+            {
+                'from': RadianceMappingEntryPoint()._outputs.shortwave_results,
+                'to': 'radiance/shortwave/results'
+            },
+            {
+                'from': RadianceMappingEntryPoint()._outputs.shortwave_grids,
+                'to': 'radiance/shortwave/grids'
+            },
+            {
+                'from': RadianceMappingEntryPoint()._outputs.longwave_view_factors,
+                'to': 'radiance/longwave/view_factors'
+            }
+        ]
 
     @task(
         template=DynamicShadeContribEntryPoint,
@@ -236,12 +253,13 @@ def run_radiance_simulation(
         sub_folder='radiance',
         sub_paths={
             'octree_file': 'dynamic_shades/{{item.default}}',
-            'octree_file_with_suns': 'dynamic_shades({{item.sun}}',
+            'octree_file_with_suns': 'dynamic_shades/{{item.sun}}',
             'sky_dome': 'sky.dome',
             'sky_matrix': 'sky.mtx',
             'sky_matrix_direct': 'sky_direct.mtx',
             'sun_modifiers': 'suns.mod',
-            'sun_up_hours': 'sun-up-hours.txt'
+            'sun_up_hours': 'sun-up-hours.txt',
+            'sensor_grids': '_split_info.json'
         }
     )
     def run_radiance_dynamic_shade_contribution(
@@ -251,7 +269,7 @@ def run_radiance_dynamic_shade_contribution(
         octree_file_with_suns=prepare_folder._outputs.shortwave_resources,
         group_name='{{item.identifier}}',
         sensor_grid_folder='radiance/shortwave/grids',
-        sensor_grids=prepare_folder._outputs.sensor_grids,
+        sensor_grids=prepare_folder._outputs.sensor_grids_folder,
         sky_dome=prepare_folder._outputs.shortwave_resources,
         sky_matrix=prepare_folder._outputs.shortwave_resources,
         sky_matrix_direct=prepare_folder._outputs.shortwave_resources,
@@ -304,7 +322,20 @@ def run_comfort_map(
         solarcal_par=solarcal_parameters,
         comfort_parameters=comfort_parameters
     ) -> List[Dict]:
-        pass
+        return [
+            {
+                'from': ComfortMappingEntryPoint()._outputs.results_folder,
+                'to': 'initial_results/results'
+            },
+            {
+                'from': ComfortMappingEntryPoint()._outputs.conditions,
+                'to': 'initial_results/conditions'
+            },
+            {
+                'from': ComfortMappingEntryPoint()._outputs.metrics,
+                'to': 'initial_results/metrics'
+            }
+        ]
 
     @task(template=MergeFolderDataPostProcess, needs=[run_comfort_map])
     def restructure_temperature_results(