hestia-earth-models 0.73.0__py3-none-any.whl → 0.73.2__py3-none-any.whl

hestia_earth/models/hestia/excretaKgMass.py

@@ -3,7 +3,7 @@ from hestia_earth.utils.model import filter_list_term_type, find_term_match
 from hestia_earth.utils.tools import non_empty_list, list_sum
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
-from hestia_earth.models.utils import get_kg_term_id, get_kg_N_term_id, get_kg_VS_term_id
+from hestia_earth.models.utils import get_kg_term_id, get_kg_N_term_id, get_kg_VS_term_id, _filter_list_term_unit
 from hestia_earth.models.utils.term import download_term
 from hestia_earth.models.utils.constant import Units
 from hestia_earth.models.utils.product import _new_product, convert_product_to_unit
@@ -31,12 +31,12 @@ RETURNS = {
 MODEL_KEY = 'excretaKgMass'
 
 UNITS = [
-    Units.KG_N.value,
-    Units.KG_VS.value
+    Units.KG_N,
+    Units.KG_VS
 ]
 
 
-def _product(value: float, term_id: str):
+def _product(term_id: str, value: float = None):
     product = _new_product(term_id, value, MODEL)
     return product
 
@@ -80,17 +80,15 @@ def _run_product(cycle: dict, product_term_id: str):
     # use existing product if exist, else create new one
     existing_product = find_term_match(cycle.get('products', []), product_term_id)
 
-    return (existing_product | _product(value, product_term_id)) if value else None
+    return (existing_product | _product(product_term_id, value)) if value else _product(product_term_id)
 
 
 def _should_run(cycle: dict):
     node_type = cycle.get('type', cycle.get('@type'))
     excreta_products = filter_list_term_type(cycle.get('products', []), TermTermType.EXCRETA)
     kg_term_ids = list(set([
-        get_kg_term_id(p.get('term', {}).get('@id')) for p in excreta_products if all([
-            p.get('term', {}).get('units') in UNITS,
-            p.get('value', [])
-        ])
+        get_kg_term_id(p.get('term', {}).get('@id'))
+        for p in _filter_list_term_unit(excreta_products, UNITS)
     ]))
     gap_fill_term_ids = [
         term_id for term_id in kg_term_ids if not find_term_match(excreta_products, term_id).get('value', [])

hestia_earth/models/hestia/seed_emissions.py

@@ -14,7 +14,7 @@ from hestia_earth.models.utils.site import valid_site_type
 from hestia_earth.models.utils.cycle import cycle_end_year
 from hestia_earth.models.utils.crop import get_crop_grouping_faostat_production, get_landCover_term_id
 from hestia_earth.models.utils.completeness import _is_term_type_complete
-from hestia_earth.models.utils.blank_node import get_lookup_value
+from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.lookup import get_region_lookup_value
 from . import MODEL
 

hestia_earth/models/hestia/stockingDensityAnimalHousingAverage.py

@@ -3,7 +3,7 @@ from hestia_earth.utils.model import filter_list_term_type
 
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils import weighted_average
-from hestia_earth.models.utils.blank_node import get_lookup_value
+from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.practice import _new_practice
 from . import MODEL
 

hestia_earth/models/hestia/waterSalinity.py

@@ -5,7 +5,7 @@ from hestia_earth.utils.tools import safe_parse_float
 from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.site import related_cycles
-from hestia_earth.models.utils.blank_node import get_lookup_value
+from hestia_earth.models.utils.term import get_lookup_value
 from . import MODEL
 
 REQUIREMENTS = {

hestia_earth/models/ipcc2019/aboveGroundBiomass.py

@@ -3,20 +3,18 @@ from functools import reduce
 from numpy import average, copy, random, vstack
 from numpy.typing import NDArray
 from typing import Optional, Union
-
 from hestia_earth.schema import (
     MeasurementMethodClassification,
     MeasurementStatsDefinition,
     SiteSiteType
 )
-
 from hestia_earth.utils.tools import non_empty_list
+from hestia_earth.utils.stats import gen_seed
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.log import log_as_table, logRequirements, logShouldRun
 from hestia_earth.models.utils import pairwise
-from hestia_earth.models.utils.array_builders import gen_seed
 from hestia_earth.models.utils.blank_node import group_nodes_by_year
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.measurement import _new_measurement

hestia_earth/models/ipcc2019/belowGroundBiomass.py

@@ -3,20 +3,18 @@ from functools import reduce
 from numpy import average, copy, random, vstack
 from numpy.typing import NDArray
 from typing import Optional, Union
-
 from hestia_earth.schema import (
     MeasurementMethodClassification,
     MeasurementStatsDefinition,
     SiteSiteType
 )
-
 from hestia_earth.utils.tools import non_empty_list
+from hestia_earth.utils.stats import gen_seed
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.log import log_as_table, logRequirements, logShouldRun
 from hestia_earth.models.utils import pairwise
-from hestia_earth.models.utils.array_builders import gen_seed
 from hestia_earth.models.utils.blank_node import group_nodes_by_year
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.source import get_source
 from hestia_earth.models.utils.measurement import _new_measurement

hestia_earth/models/ipcc2019/biomass_utils.py

@@ -9,7 +9,7 @@ from hestia_earth.schema import TermTermType
 from hestia_earth.utils.blank_node import get_node_value
 from hestia_earth.utils.model import filter_list_term_type
 
-from hestia_earth.models.utils.array_builders import repeat_single, truncated_normal_1d
+from hestia_earth.utils.stats import repeat_single, truncated_normal_1d
 from hestia_earth.models.utils.blank_node import node_term_match, validate_start_date_end_date
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_ecoClimateZone_lookup_grouped_value
 from hestia_earth.models.utils.term import get_cover_crop_property_terms, get_lookup_value

hestia_earth/models/ipcc2019/ch4ToAirAquacultureSystems.py

@@ -3,7 +3,7 @@ from hestia_earth.utils.model import find_term_match
 from hestia_earth.utils.tools import safe_parse_float, non_empty_list
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.blank_node import get_lookup_value
+from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.emission import _new_emission
 from . import MODEL
 

hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py

@@ -1,15 +1,14 @@
 import numpy as np
 import numpy.typing as npt
 from typing import Callable, Union
-
 from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
-
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.array_builders import (
+from hestia_earth.utils.stats import (
     discrete_uniform_1d, gen_seed, normal_1d, repeat_single, triangular_1d
 )
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
+
 from hestia_earth.models.utils.cycle import land_occupation_per_ha
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.measurement import most_relevant_measurement_value

hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py

@@ -2,7 +2,6 @@
 Utilities for calculating CO2 emissions based on changes in carbon stocks (e.g., `organicCarbonPerHa`,
 `aboveGroundBiomass` and `belowGroundBiomass`).
 """
-
 from datetime import datetime, timedelta
 from enum import Enum
 from functools import reduce
@@ -11,22 +10,21 @@ from numpy import array, random, mean
 from numpy.typing import NDArray
 from pydash.objects import merge
 from typing import Any, Callable, NamedTuple, Optional, Union
-
 from hestia_earth.schema import (
     EmissionMethodTier, EmissionStatsDefinition, MeasurementMethodClassification
 )
 from hestia_earth.utils.date import diff_in_days, YEAR
 from hestia_earth.utils.tools import flatten, non_empty_list, safe_parse_date
+from hestia_earth.utils.stats import correlated_normal_2d, gen_seed
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.log import log_as_table
 from hestia_earth.models.utils import pairwise
-from hestia_earth.models.utils.array_builders import correlated_normal_2d, gen_seed
 from hestia_earth.models.utils.blank_node import (
     _gapfill_datestr, _get_datestr_format, DatestrGapfillMode, DatestrFormat, group_nodes_by_year, node_term_match,
     split_node_by_dates
 )
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.emission import min_emission_method_tier
 from hestia_earth.models.utils.measurement import (
     group_measurements_by_method_classification, min_measurement_method_classification,

hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py

@@ -1,13 +1,12 @@
 import numpy as np
 import numpy.typing as npt
 from typing import Callable, Union
-
 from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.utils.stats import gen_seed, repeat_single, truncated_normal_1d
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.log import logRequirements, logShouldRun
-from hestia_earth.models.utils.array_builders import gen_seed, repeat_single, truncated_normal_1d
 from hestia_earth.models.utils.cycle import land_occupation_per_ha
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.measurement import most_relevant_measurement_value

hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.emission import _new_emission
-from hestia_earth.models.utils.blank_node import get_lookup_value
+from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.cropResidue import get_crop_residue_burnt_value
 from . import MODEL
 

hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -4,15 +4,14 @@ from itertools import product
 import numpy as np
 import numpy.typing as npt
 from typing import Any, Callable, Literal, Optional, TypedDict, Union
-
 from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, SiteSiteType
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import safe_parse_float
+from hestia_earth.utils.stats import gen_seed, repeat_single, truncated_normal_1d
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.log import debugMissingLookup, log_as_table, logRequirements, logShouldRun
-from hestia_earth.models.utils.array_builders import gen_seed, repeat_single, truncated_normal_1d
 from hestia_earth.models.utils.blank_node import group_nodes_by_year
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.lookup import get_region_lookup_value

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py

@@ -4,20 +4,19 @@ from numpy import empty_like, random, vstack
 from numpy.typing import NDArray
 from pydash.objects import merge
 from typing import Callable, Literal, Optional, Union
-
 from hestia_earth.schema import MeasurementMethodClassification, SiteSiteType, TermTermType
 from hestia_earth.utils.blank_node import get_node_value
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import non_empty_list
+from hestia_earth.utils.stats import gen_seed
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.utils import split_on_condition
-from hestia_earth.models.utils.array_builders import gen_seed
 from hestia_earth.models.utils.blank_node import (
     cumulative_nodes_match, cumulative_nodes_lookup_match, cumulative_nodes_term_match, group_by_term,
     node_lookup_match, node_term_match, group_nodes_by_year, validate_start_date_end_date
 )
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.property import get_node_property
 from hestia_earth.models.utils.term import get_residue_removed_or_burnt_terms, get_upland_rice_land_cover_terms

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py

@@ -3,23 +3,22 @@ from numpy import array, empty, exp, minimum, random, where, vstack
 from numpy.typing import NDArray
 from pydash.objects import merge
 from typing import Any, Callable, Union
-
 from hestia_earth.schema import (
     CycleFunctionalUnit, MeasurementMethodClassification, SiteSiteType, TermTermType
 )
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import flatten, list_sum, non_empty_list
 from hestia_earth.utils.blank_node import get_node_value
-
-from hestia_earth.models.utils.array_builders import (
+from hestia_earth.utils.stats import (
     avg_run_in_columnwise, gen_seed, grouped_avg, repeat_1d_array_as_columns
 )
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
+
 from hestia_earth.models.utils.blank_node import (
     cumulative_nodes_lookup_match, cumulative_nodes_term_match, group_nodes_by_year, group_nodes_by_year_and_month,
     GroupNodesByYearMode, node_lookup_match, node_term_match
 )
 from hestia_earth.models.utils.cycle import check_cycle_site_ids_identical
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.property import get_node_property
 from hestia_earth.models.utils.site import related_cycles

hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py

@@ -2,14 +2,13 @@ from enum import Enum
 from numpy import inf
 from numpy.typing import NDArray
 from typing import NamedTuple, Optional
-
 from hestia_earth.schema import MeasurementStatsDefinition, SiteSiteType
+from hestia_earth.utils.stats import calc_z_critical
 
-from hestia_earth.models.utils.array_builders import (
+from hestia_earth.utils.stats import (
     repeat_single, truncated_normal_1d
 )
 from hestia_earth.models.utils.blank_node import cumulative_nodes_term_match, node_term_match
-from hestia_earth.models.utils.stats import calc_z_critical
 from hestia_earth.models.utils.term import get_cover_crop_property_terms, get_irrigated_terms
 
 STATS_DEFINITION = MeasurementStatsDefinition.SIMULATED.value