for sequential attributions, use index to infer skipping of steps rat…

…her than re-assigning `data_format` which leads to mismatch between FB tybe and data_format and causes errors in subsequent steps
USEPA · Sep 8, 2023 · e7b51a2 · e7b51a2 · bl-young · Sep 8, 2023
1 parent efa8513
commit e7b51a2
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/flowsa/flowby.py b/flowsa/flowby.py
@@ -646,7 +646,7 @@ def attribute_flows_to_sectors(
         if isinstance(attribute_config, dict):
             attribute_config = [attribute_config]
 
-        for step_config in attribute_config:
+        for index, step_config in enumerate(attribute_config):
             validate = True
             grouped: 'FB' = (
                 self
@@ -657,7 +657,9 @@ def attribute_flows_to_sectors(
             if len(grouped) == 0:
                 log.warning(f'No data remaining in {self.full_name}.')
                 return self
-            if self.config['data_format'] in ['FBA', 'FBS_outside_flowsa']:
+            if index > 0:
+                fb = grouped.copy()
+            elif self.config['data_format'] in ['FBA', 'FBS_outside_flowsa']:
                 fb: 'FlowByActivity' = (
                     grouped
                     .map_to_sectors(external_config_path=external_config_path)
@@ -793,10 +795,6 @@ def attribute_flows_to_sectors(
                                'descendants'], errors='ignore')
                 .drop(columns=step_config.get('drop_columns', []))
             )
-            # reset datatype to FBS because otherwise when we loop through
-            # to the next attribution method, the FBA will be re-cleaned and
-            # have additional sector columns appended
-            self.config.update({'data_format': 'FBS'})
 
         return self