Skip to content

Conversation

@girum-air
Copy link
Contributor

No description provided.

@girum-air girum-air requested a review from rhunwicks August 26, 2025 06:39
@girum-air girum-air self-assigned this Aug 26, 2025
for model_name, instances in livelihood_activity_valid_instances.items()
if model_name != "WealthGroup"
},
**wild_foods_valid_instances,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@girum-air why is this required? Doesn't the code below on line 345 add the wild_foods_valid_instances?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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"] = []

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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] += instances

That way, if we ever have to add additional models in the future it will still work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, agreed. Pushed the updates

Copy link
Contributor

@rhunwicks rhunwicks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@girum-air I think we should avoid hard-coding the model names.

@rhunwicks rhunwicks merged commit cb7db2e into main Sep 3, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants