Add missing wild_foods_valid_instances in the consolidated_instances …#145
Conversation
…of consolidated_fixture asset see HEA-677
| for model_name, instances in livelihood_activity_valid_instances.items() | ||
| if model_name != "WealthGroup" | ||
| }, | ||
| **wild_foods_valid_instances, |
There was a problem hiding this comment.
@girum-air why is this required? Doesn't the code below on line 345 add the wild_foods_valid_instances?
There was a problem hiding this comment.
@rhunwicks the keys Fishing and WildFoodGathering weren't in the consolidated_instances at the line and that raises key error - Key error 'Fishing' in consolidated_fixture asset when trying to append it using += We might either need the keys added with empty list to initialize, I think that is better and updated it
| # Add the keys: `Fishing` and `WildFoodGathering` | ||
| consolidated_instances["Fishing"] = [] | ||
| consolidated_instances["WildFoodGathering"] = [] | ||
|
|
There was a problem hiding this comment.
Would this be better as:
# Add the wild foods and other cash income instances, if they are present
for model_name, instances in {**other_cash_income_valid_instances, **wild_foods_valid_instances}.items():
if instances and model_name != "WealthGroup":
if model_name not in consolidated_instances:
consolidated_instances[model_name] = []
consolidated_instances[model_name] += instancesThat way, if we ever have to add additional models in the future it will still work.
There was a problem hiding this comment.
Ok, agreed. Pushed the updates
rhunwicks
left a comment
There was a problem hiding this comment.
@girum-air I think we should avoid hard-coding the model names.
No description provided.