Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions pipelines/assets/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,7 @@ def consolidated_fixture(
consolidated_instances[model_name] = []
consolidated_instances[model_name] += instances

fixture, metadata = get_fixture_from_instances(consolidated_instances)

return Output(
fixture,
metadata=metadata,
)
return get_fixture_from_instances(consolidated_instances)


@asset(partitions_def=bss_files_partitions_def)
Expand All @@ -403,7 +398,8 @@ def uploaded_baselines(
Downstream assets apply corrections to the original file and then process
the contents to create Communities, Wealth Groups, Livelihood Strategies, etc.
"""
fixture, metadata = get_fixture_from_instances(baseline_instances)
output = get_fixture_from_instances(baseline_instances)
fixture = output.value
metadata = import_fixture(fixture)

# Add the file objects `bss` and `profile_report` FileFields to the model instances
Expand All @@ -416,7 +412,7 @@ def uploaded_baselines(

return Output(
None,
metadata=metadata,
metadata=metadata.metadata,
)


Expand Down
6 changes: 1 addition & 5 deletions pipelines/assets/wealth_characteristic.py
Original file line number Diff line number Diff line change
Expand Up @@ -543,11 +543,7 @@ def wealth_characteristic_fixture(
"""
Django fixture for the Livelihood Activities from a BSS.
"""
fixture, metadata = get_fixture_from_instances(wealth_characteristic_valid_instances)
return Output(
fixture,
metadata=metadata,
)
return get_fixture_from_instances(wealth_characteristic_valid_instances)


@asset(partitions_def=bss_instances_partitions_def)
Expand Down