diff --git a/polyviz/choro.py b/polyviz/choro.py index db245c3..54bacd0 100644 --- a/polyviz/choro.py +++ b/polyviz/choro.py @@ -19,6 +19,9 @@ from bw2data.backends import Activity as BW25Activity except ImportError: BW25Activity = None + +valid_types = tuple(filter(None, (PeeweeActivity, BW25Activity))) + def choro( @@ -47,7 +50,7 @@ def choro( assert isinstance(method, tuple), "`method` should be a tuple." assert isinstance( - activity, (PeeweeActivity, BW25Activity) + activity, valid_types ), "`activity` should be a brightway2 activity." # fetch unit of method diff --git a/polyviz/treemap.py b/polyviz/treemap.py index 3f80ade..9e5b9d7 100644 --- a/polyviz/treemap.py +++ b/polyviz/treemap.py @@ -20,6 +20,8 @@ except ImportError: BW25Activity = None +valid_types = tuple(filter(None, (PeeweeActivity, BW25Activity))) + def treemap( activity: Union[PeeweeActivity, BW25Activity], @@ -47,7 +49,7 @@ def treemap( assert isinstance(method, tuple), "`method` should be a tuple." assert isinstance( - activity, (PeeweeActivity, BW25Activity) + activity, valid_types ), "`activity` should be a brightway2 activity." # fetch unit of method diff --git a/polyviz/utils.py b/polyviz/utils.py index bc8b346..abc13fa 100644 --- a/polyviz/utils.py +++ b/polyviz/utils.py @@ -24,6 +24,8 @@ except ImportError: BW25Activity = None +valid_types = tuple(filter(None, (PeeweeActivity, BW25Activity))) + def calculate_supply_chain( activity: Union[PeeweeActivity, BW25Activity], @@ -41,7 +43,7 @@ def calculate_supply_chain( """ assert isinstance( - activity, (PeeweeActivity, BW25Activity) + activity, valid_types ), "`activity` should be a brightway2 activity." amount = -1 if identify_waste_process(activity) else 1 @@ -76,7 +78,7 @@ def calculate_lcia_score( :return: LCIA score, C matrix, and reverse dictionary """ assert isinstance( - activity, (PeeweeActivity, BW25Activity) + activity, valid_types ), "`activity` should be a brightway2 activity." print("Calculating LCIA score...") @@ -117,7 +119,7 @@ def identify_waste_process(activity: Union[PeeweeActivity, BW25Activity]) -> boo def get_geo_distribution_of_impacts_for_choro_graph( - activity: (PeeweeActivity, BW25Activity), + activity: Union[PeeweeActivity, BW25Activity], method: tuple, cutoff: float = 0.0001, ) -> pd.DataFrame: diff --git a/polyviz/violin.py b/polyviz/violin.py index 78a7570..2c72785 100644 --- a/polyviz/violin.py +++ b/polyviz/violin.py @@ -21,6 +21,8 @@ except ImportError: BW25Activity = None +valid_types = tuple(filter(None, (PeeweeActivity, BW25Activity))) + def violin( activities: list, @@ -45,7 +47,7 @@ def violin( for act in activities: assert isinstance( - act, Union[PeeweeActivity, BW25Activity] + act, valid_types ), "`activity` should be a brightway2 activity." def make_name(activities):