Skip to content

Commit c653960

Browse files
committed
Refactor assets to relax data completeness constraint - see HEA-572
Refactor the pipeline so that we can generate and import a fixture for each worksheet (WB, Data, Data2, Data3) within a BSS, instead of needing to consolidate to a single fixture first. We retain the consolidated_fixture and imported_baseline assets and eventually we should disable the standalone imports.
1 parent 1177234 commit c653960

File tree

7 files changed

+499
-243
lines changed

7 files changed

+499
-243
lines changed

pipelines/__init__.py

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,50 @@
1010
)
1111
from .assets.baseline import baseline_instances, community_instances
1212
from .assets.fixtures import (
13-
consolidated_fixtures,
14-
consolidated_instances,
15-
imported_baselines,
13+
consolidated_fixture,
14+
imported_baseline,
1615
imported_communities,
1716
uploaded_baselines,
18-
validated_instances,
1917
)
2018
from .assets.livelihood_activity import (
2119
all_livelihood_activity_labels_dataframe,
20+
imported_livelihood_activities,
2221
livelihood_activity_dataframe,
22+
livelihood_activity_fixture,
2323
livelihood_activity_instances,
2424
livelihood_activity_label_dataframe,
25+
livelihood_activity_valid_instances,
2526
summary_livelihood_activity_labels_dataframe,
2627
)
2728
from .assets.other_cash_income import (
2829
all_other_cash_income_labels_dataframe,
30+
imported_other_cash_income_activities,
2931
other_cash_income_dataframe,
32+
other_cash_income_fixture,
3033
other_cash_income_instances,
3134
other_cash_income_label_dataframe,
35+
other_cash_income_valid_instances,
3236
summary_other_cash_income_labels_dataframe,
3337
)
3438
from .assets.wealth_characteristic import (
3539
all_wealth_characteristic_labels_dataframe,
40+
imported_wealth_characteristics,
3641
summary_wealth_characteristic_labels_dataframe,
3742
wealth_characteristic_dataframe,
43+
wealth_characteristic_fixture,
3844
wealth_characteristic_instances,
3945
wealth_characteristic_label_dataframe,
46+
wealth_characteristic_valid_instances,
4047
)
4148
from .assets.wild_foods import (
4249
all_wild_foods_labels_dataframe,
50+
imported_wild_foods_activities,
4351
summary_wild_foods_labels_dataframe,
4452
wild_foods_dataframe,
53+
wild_foods_fixture,
4554
wild_foods_instances,
4655
wild_foods_label_dataframe,
56+
wild_foods_valid_instances,
4757
)
4858
from .jobs.fixtures import (
4959
extract_dataframes,
@@ -76,27 +86,37 @@
7686
all_livelihood_activity_labels_dataframe,
7787
summary_livelihood_activity_labels_dataframe,
7888
livelihood_activity_instances,
89+
livelihood_activity_valid_instances,
90+
livelihood_activity_fixture,
91+
imported_livelihood_activities,
7992
other_cash_income_dataframe,
8093
other_cash_income_label_dataframe,
8194
all_other_cash_income_labels_dataframe,
8295
summary_other_cash_income_labels_dataframe,
8396
other_cash_income_instances,
97+
other_cash_income_valid_instances,
98+
other_cash_income_fixture,
99+
imported_other_cash_income_activities,
84100
wild_foods_dataframe,
85101
wild_foods_label_dataframe,
86102
all_wild_foods_labels_dataframe,
87103
summary_wild_foods_labels_dataframe,
88104
wild_foods_instances,
105+
wild_foods_valid_instances,
106+
wild_foods_fixture,
107+
imported_wild_foods_activities,
89108
wealth_characteristic_dataframe,
90109
wealth_characteristic_label_dataframe,
91110
all_wealth_characteristic_labels_dataframe,
92111
wealth_characteristic_instances,
112+
wealth_characteristic_valid_instances,
113+
wealth_characteristic_fixture,
114+
imported_wealth_characteristics,
93115
summary_wealth_characteristic_labels_dataframe,
94-
consolidated_instances,
95-
validated_instances,
96-
consolidated_fixtures,
116+
consolidated_fixture,
97117
uploaded_baselines,
98118
imported_communities,
99-
imported_baselines,
119+
imported_baseline,
100120
],
101121
jobs=[
102122
update_metadata,

0 commit comments

Comments
 (0)