hestia-earth-models 0.54.2__py3-none-any.whl → 0.55.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of hestia-earth-models might be problematic. Click here for more details.

Files changed (91) hide show
  1. hestia_earth/models/cycle/completeness/{other.py → seed.py} +5 -5
  2. hestia_earth/models/cycle/completeness/{soilAmendments.py → soilAmendment.py} +4 -4
  3. hestia_earth/models/cycle/product/economicValueShare.py +2 -2
  4. hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py +1 -1
  5. hestia_earth/models/geospatialDatabase/drainageClass.py +2 -2
  6. hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py +3 -1
  7. hestia_earth/models/ipcc2019/organicCarbonPerHa.py +14 -15
  8. hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py +1 -1
  9. hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthHumanToxicityCancerogenic.py +1 -1
  10. hestia_earth/models/lcImpactAllEffects100Years/damageToHumanHealthHumanToxicityNonCancerogenic.py +1 -1
  11. hestia_earth/models/lcImpactAllEffects100Years/damageToMarineEcosystemsMarineEcotoxicity.py +1 -1
  12. hestia_earth/models/lcImpactAllEffects100Years/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py +1 -1
  13. hestia_earth/models/lcImpactAllEffectsInfinite/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py +1 -1
  14. hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthHumanToxicityCancerogenic.py +1 -1
  15. hestia_earth/models/lcImpactAllEffectsInfinite/damageToHumanHealthHumanToxicityNonCancerogenic.py +1 -1
  16. hestia_earth/models/lcImpactAllEffectsInfinite/damageToMarineEcosystemsMarineEcotoxicity.py +1 -1
  17. hestia_earth/models/lcImpactAllEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py +1 -1
  18. hestia_earth/models/lcImpactCertainEffects100Years/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py +1 -1
  19. hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthHumanToxicityCancerogenic.py +1 -1
  20. hestia_earth/models/lcImpactCertainEffects100Years/damageToHumanHealthHumanToxicityNonCancerogenic.py +1 -1
  21. hestia_earth/models/lcImpactCertainEffects100Years/damageToMarineEcosystemsMarineEcotoxicity.py +1 -1
  22. hestia_earth/models/lcImpactCertainEffects100Years/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py +1 -1
  23. hestia_earth/models/lcImpactCertainEffectsInfinite/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py +1 -1
  24. hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthHumanToxicityCancerogenic.py +1 -1
  25. hestia_earth/models/lcImpactCertainEffectsInfinite/damageToHumanHealthHumanToxicityNonCancerogenic.py +1 -1
  26. hestia_earth/models/lcImpactCertainEffectsInfinite/damageToMarineEcosystemsMarineEcotoxicity.py +1 -1
  27. hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py +1 -1
  28. hestia_earth/models/mocking/search-results.json +76 -64
  29. hestia_earth/models/pooreNemecek2018/excretaKgN.py +2 -2
  30. hestia_earth/models/pooreNemecek2018/excretaKgVs.py +2 -2
  31. hestia_earth/models/pooreNemecek2018/no3ToGroundwaterCropResidueDecomposition.py +1 -1
  32. hestia_earth/models/pooreNemecek2018/no3ToGroundwaterExcreta.py +1 -1
  33. hestia_earth/models/pooreNemecek2018/no3ToGroundwaterInorganicFertiliser.py +1 -1
  34. hestia_earth/models/pooreNemecek2018/no3ToGroundwaterOrganicFertiliser.py +1 -1
  35. hestia_earth/models/pooreNemecek2018/no3ToGroundwaterSoilFlux.py +1 -1
  36. hestia_earth/models/recipe2016Egalitarian/ecosystemDamageOzoneFormation.py +1 -1
  37. hestia_earth/models/recipe2016Egalitarian/freshwaterAquaticEcotoxicityPotential14Dcbeq.py +1 -1
  38. hestia_earth/models/recipe2016Egalitarian/humanCarcinogenicToxicity.py +1 -1
  39. hestia_earth/models/recipe2016Egalitarian/humanDamageOzoneFormation.py +1 -1
  40. hestia_earth/models/recipe2016Egalitarian/humanNonCarcinogenicToxicity.py +1 -1
  41. hestia_earth/models/recipe2016Egalitarian/marineAquaticEcotoxicityPotential14Dcbeq.py +1 -1
  42. hestia_earth/models/recipe2016Egalitarian/terrestrialEcotoxicityPotential14Dcbeq.py +1 -1
  43. hestia_earth/models/recipe2016Hierarchist/ecosystemDamageOzoneFormation.py +1 -1
  44. hestia_earth/models/recipe2016Hierarchist/freshwaterAquaticEcotoxicityPotential14Dcbeq.py +1 -1
  45. hestia_earth/models/recipe2016Hierarchist/humanCarcinogenicToxicity.py +1 -1
  46. hestia_earth/models/recipe2016Hierarchist/humanDamageOzoneFormation.py +1 -1
  47. hestia_earth/models/recipe2016Hierarchist/humanNonCarcinogenicToxicity.py +1 -1
  48. hestia_earth/models/recipe2016Hierarchist/marineAquaticEcotoxicityPotential14Dcbeq.py +1 -1
  49. hestia_earth/models/recipe2016Hierarchist/terrestrialEcotoxicityPotential14Dcbeq.py +1 -1
  50. hestia_earth/models/recipe2016Individualist/ecosystemDamageOzoneFormation.py +1 -1
  51. hestia_earth/models/recipe2016Individualist/freshwaterAquaticEcotoxicityPotential14Dcbeq.py +1 -1
  52. hestia_earth/models/recipe2016Individualist/humanCarcinogenicToxicity.py +1 -1
  53. hestia_earth/models/recipe2016Individualist/humanDamageOzoneFormation.py +1 -1
  54. hestia_earth/models/recipe2016Individualist/humanNonCarcinogenicToxicity.py +1 -1
  55. hestia_earth/models/recipe2016Individualist/marineAquaticEcotoxicityPotential14Dcbeq.py +1 -1
  56. hestia_earth/models/recipe2016Individualist/terrestrialEcotoxicityPotential14Dcbeq.py +1 -1
  57. hestia_earth/models/schmidt2007/utils.py +1 -1
  58. hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py +1 -1
  59. hestia_earth/models/stehfestBouwman2006/n2OToAirCropResidueDecompositionDirect.py +1 -1
  60. hestia_earth/models/stehfestBouwman2006/n2OToAirExcretaDirect.py +1 -1
  61. hestia_earth/models/stehfestBouwman2006/n2OToAirInorganicFertiliserDirect.py +1 -1
  62. hestia_earth/models/stehfestBouwman2006/n2OToAirOrganicFertiliserDirect.py +1 -1
  63. hestia_earth/models/stehfestBouwman2006/n2OToAirSoilFlux.py +1 -1
  64. hestia_earth/models/stehfestBouwman2006/noxToAirCropResidueDecomposition.py +1 -1
  65. hestia_earth/models/stehfestBouwman2006/noxToAirExcreta.py +1 -1
  66. hestia_earth/models/stehfestBouwman2006/noxToAirInorganicFertiliser.py +1 -1
  67. hestia_earth/models/stehfestBouwman2006/noxToAirOrganicFertiliser.py +1 -1
  68. hestia_earth/models/stehfestBouwman2006/noxToAirSoilFlux.py +1 -1
  69. hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirCropResidueDecomposition.py +1 -1
  70. hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirExcreta.py +1 -1
  71. hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirInorganicFertiliser.py +1 -1
  72. hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirOrganicFertiliser.py +1 -1
  73. hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirSoilFlux.py +1 -1
  74. hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py +1 -1
  75. hestia_earth/models/utils/cycle.py +3 -3
  76. hestia_earth/models/utils/measurement.py +1 -1
  77. hestia_earth/models/utils/pesticideAI.py +2 -2
  78. hestia_earth/models/utils/product.py +2 -0
  79. hestia_earth/models/version.py +1 -1
  80. {hestia_earth_models-0.54.2.dist-info → hestia_earth_models-0.55.0.dist-info}/METADATA +2 -2
  81. {hestia_earth_models-0.54.2.dist-info → hestia_earth_models-0.55.0.dist-info}/RECORD +91 -91
  82. tests/models/cycle/completeness/{test_other.py → test_seed.py} +1 -1
  83. tests/models/cycle/completeness/{test_soilAmendments.py → test_soilAmendment.py} +1 -1
  84. tests/models/cycle/product/test_economicValueShare.py +2 -2
  85. tests/models/ipcc2019/test_organicCarbonPerHa.py +32 -4
  86. tests/models/pooreNemecek2018/test_excretaKgN.py +2 -2
  87. tests/models/pooreNemecek2018/test_excretaKgVs.py +2 -2
  88. tests/models/utils/test_source.py +1 -1
  89. {hestia_earth_models-0.54.2.dist-info → hestia_earth_models-0.55.0.dist-info}/LICENSE +0 -0
  90. {hestia_earth_models-0.54.2.dist-info → hestia_earth_models-0.55.0.dist-info}/WHEEL +0 -0
  91. {hestia_earth_models-0.54.2.dist-info → hestia_earth_models-0.55.0.dist-info}/top_level.txt +0 -0
hestia_earth/models/recipe2016Individualist/freshwaterAquaticEcotoxicityPotential14Dcbeq.py CHANGED
@@ -6,7 +6,7 @@ REQUIREMENTS = {
6
6
  "ImpactAssessment": {
7
7
  "cycle": {
8
8
  "@type": "Cycle",
9
- "completeness.pesticidesAntibiotics": "True",
9
+ "completeness.pesticideVeterinaryDrug": "True",
10
10
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
11
11
  }
12
12
  }
hestia_earth/models/recipe2016Individualist/humanCarcinogenicToxicity.py CHANGED
@@ -6,7 +6,7 @@ REQUIREMENTS = {
6
6
  "ImpactAssessment": {
7
7
  "cycle": {
8
8
  "@type": "Cycle",
9
- "completeness.pesticidesAntibiotics": "True",
9
+ "completeness.pesticideVeterinaryDrug": "True",
10
10
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
11
11
  }
12
12
  }
hestia_earth/models/recipe2016Individualist/humanDamageOzoneFormation.py CHANGED
@@ -10,7 +10,7 @@ REQUIREMENTS = {
10
10
  "emissionsResourceUse": [{"@type": "Indicator", "value": "", "term.termType": "emission"}],
11
11
  "cycle": {
12
12
  "@type": "Cycle",
13
- "completeness.pesticidesAntibiotics": "True",
13
+ "completeness.pesticideVeterinaryDrug": "True",
14
14
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
15
15
  }
16
16
  }
hestia_earth/models/recipe2016Individualist/humanNonCarcinogenicToxicity.py CHANGED
@@ -6,7 +6,7 @@ REQUIREMENTS = {
6
6
  "ImpactAssessment": {
7
7
  "cycle": {
8
8
  "@type": "Cycle",
9
- "completeness.pesticidesAntibiotics": "True",
9
+ "completeness.pesticideVeterinaryDrug": "True",
10
10
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
11
11
  }
12
12
  }
hestia_earth/models/recipe2016Individualist/marineAquaticEcotoxicityPotential14Dcbeq.py CHANGED
@@ -6,7 +6,7 @@ REQUIREMENTS = {
6
6
  "ImpactAssessment": {
7
7
  "cycle": {
8
8
  "@type": "Cycle",
9
- "completeness.pesticidesAntibiotics": "True",
9
+ "completeness.pesticideVeterinaryDrug": "True",
10
10
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
11
11
  }
12
12
  }
hestia_earth/models/recipe2016Individualist/terrestrialEcotoxicityPotential14Dcbeq.py CHANGED
@@ -6,7 +6,7 @@ REQUIREMENTS = {
6
6
  "ImpactAssessment": {
7
7
  "cycle": {
8
8
  "@type": "Cycle",
9
- "completeness.pesticidesAntibiotics": "True",
9
+ "completeness.pesticideVeterinaryDrug": "True",
10
10
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
11
11
  }
12
12
  }
hestia_earth/models/schmidt2007/utils.py CHANGED
@@ -11,6 +11,6 @@ def get_waste_values(term_id: str, cycle: dict, lookup_col: str):
11
11
  values = non_empty_list(map(factor_value(None, term_id, f"{TermTermType.WASTE.value}.csv", lookup_col), products))
12
12
  return [0] if all([
13
13
  len(values) == 0,
14
- _is_term_type_complete(cycle, {'termType': 'waste'}),
14
+ _is_term_type_complete(cycle, {'termType': TermTermType.WASTE.value}),
15
15
  cycle.get('@type', cycle.get('type')) == NodeType.CYCLE.value # ignore adding 0 value for Transformation
16
16
  ]) else values
hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py CHANGED
@@ -107,7 +107,7 @@ def _should_run(site: dict, area_size: float = None):
107
107
 
108
108
  should_run = all([
109
109
  not has_cache,
110
- contains_coordinates or area_size <= MAX_AREA_SIZE,
110
+ contains_coordinates or (area_size is not None and area_size <= MAX_AREA_SIZE),
111
111
  contains_geospatial_data
112
112
  ])
113
113
  return should_run, area_size
hestia_earth/models/stehfestBouwman2006/n2OToAirCropResidueDecompositionDirect.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/n2OToAirExcretaDirect.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/n2OToAirInorganicFertiliserDirect.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/n2OToAirOrganicFertiliserDirect.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/n2OToAirSoilFlux.py CHANGED
@@ -16,7 +16,7 @@ from . import MODEL
16
16
 
17
17
  REQUIREMENTS = {
18
18
  "Cycle": {
19
- "completeness.products": "",
19
+ "completeness.product": "",
20
20
  "completeness.cropResidue": "True",
21
21
  "completeness.fertiliser": "",
22
22
  "products": [{
hestia_earth/models/stehfestBouwman2006/noxToAirCropResidueDecomposition.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/noxToAirExcreta.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/noxToAirInorganicFertiliser.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/noxToAirOrganicFertiliser.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006/noxToAirSoilFlux.py CHANGED
@@ -14,7 +14,7 @@ from . import MODEL
14
14
 
15
15
  REQUIREMENTS = {
16
16
  "Cycle": {
17
- "completeness.products": "",
17
+ "completeness.product": "",
18
18
  "completeness.cropResidue": "True",
19
19
  "completeness.fertiliser": "",
20
20
  "products": [{
hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirCropResidueDecomposition.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirExcreta.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirInorganicFertiliser.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirOrganicFertiliser.py CHANGED
@@ -7,7 +7,7 @@ from . import MODEL
7
7
 
8
8
  REQUIREMENTS = {
9
9
  "Cycle": {
10
- "completeness.products": "",
10
+ "completeness.product": "",
11
11
  "completeness.cropResidue": "True",
12
12
  "completeness.fertiliser": "",
13
13
  "products": [{
hestia_earth/models/stehfestBouwman2006GisImplementation/noxToAirSoilFlux.py CHANGED
@@ -12,7 +12,7 @@ from . import MODEL
12
12
 
13
13
  REQUIREMENTS = {
14
14
  "Cycle": {
15
- "completeness.products": "",
15
+ "completeness.product": "",
16
16
  "completeness.cropResidue": "True",
17
17
  "completeness.fertiliser": "",
18
18
  "products": [{
hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py CHANGED
@@ -6,7 +6,7 @@ REQUIREMENTS = {
6
6
  "ImpactAssessment": {
7
7
  "cycle": {
8
8
  "@type": "Cycle",
9
- "completeness.pesticidesAntibiotics": "True",
9
+ "completeness.pesticideVeterinaryDrug": "True",
10
10
  "inputs": [{"@type": "Input", "value": "", "term.termType": "pesticideAI"}]
11
11
  }
12
12
  }
hestia_earth/models/utils/cycle.py CHANGED
@@ -77,7 +77,7 @@ def get_crop_residue_on_field_N_total(cycle: dict) -> float:
77
77
  blg_residue_nitrogen(products),
78
78
  discarded_residue_on_field_nitrogen_content(products)
79
79
  ])
80
- return total if _is_term_type_complete(cycle, {'termType': 'cropResidue'}) else 0
80
+ return total if _is_term_type_complete(cycle, {'termType': TermTermType.CROPRESIDUE.value}) else 0
81
81
 
82
82
 
83
83
  CROP_RESIDUE_DECOMPOSITION_PRODUCT_IDS = [
@@ -115,7 +115,7 @@ def get_excreta_N_total(cycle: dict) -> float:
115
115
 
116
116
  The result is the sum of every excreta specified in `kg N` as an `Input` or a `Product`.
117
117
 
118
- Note: in the event where `completeness.products` is set to `True` and there are no excreta inputs or products,
118
+ Note: in the event where `completeness.product` is set to `True` and there are no excreta inputs or products,
119
119
  `0` will be returned.
120
120
 
121
121
  Parameters
@@ -131,7 +131,7 @@ def get_excreta_N_total(cycle: dict) -> float:
131
131
  inputs = filter_list_term_type(cycle.get('inputs', []), TermTermType.EXCRETA)
132
132
  products = filter_list_term_type(cycle.get('products', []), TermTermType.EXCRETA)
133
133
  values = get_N_total(inputs) + get_N_total(products)
134
- return 0 if len(values) == 0 and _is_term_type_complete(cycle, {'termType': 'products'}) else list_sum(values)
134
+ return 0 if len(values) == 0 and _is_term_type_complete(cycle, {'termType': 'product'}) else list_sum(values)
135
135
 
136
136
 
137
137
  def get_organic_fertiliser_N_total(cycle: dict) -> float:
hestia_earth/models/utils/measurement.py CHANGED
@@ -184,7 +184,7 @@ def most_relevant_measurement_value_by_depth_and_date(
184
184
  filtered_measurements = [m for m in measurements if m.get('term', {}).get('@id') == term_id]
185
185
 
186
186
  if len(filtered_measurements) == 0:
187
- return default
187
+ return default, None
188
188
 
189
189
  grouped_measurements = group_measurements_by_depth(filtered_measurements, False)
190
190
 
hestia_earth/models/utils/pesticideAI.py CHANGED
@@ -8,7 +8,7 @@ from .cycle import impact_lookup_value as cycle_lookup_value
8
8
 
9
9
  def impact_lookup_value(model: str, term_id: str, impact_assessment: dict, lookup_col: str):
10
10
  cycle = impact_assessment.get('cycle', {})
11
- pesticides_complete = cycle.get('completeness', {}).get('pesticidesAntibiotics', False)
11
+ pesticides_complete = cycle.get('completeness', {}).get('pesticideVeterinaryDrug', False)
12
12
  product = get_product(impact_assessment)
13
13
  pesticides = filter_list_term_type(cycle.get('inputs', []), TermTermType.PESTICIDEAI)
14
14
  has_pesticides_inputs = len(pesticides) > 0
@@ -16,7 +16,7 @@ def impact_lookup_value(model: str, term_id: str, impact_assessment: dict, looku
16
16
  product, cycle_lookup_value(model, term_id, pesticides, lookup_col, False), model=model, term_id=term_id
17
17
  )
18
18
  logRequirements(impact_assessment, model=model, term=term_id,
19
- term_type_pesticidesAntibiotics_complete=pesticides_complete,
19
+ term_type_pesticideVeterinaryDrug_complete=pesticides_complete,
20
20
  has_pesticides_inputs=has_pesticides_inputs)
21
21
 
22
22
  should_run = any([
hestia_earth/models/utils/product.py CHANGED
@@ -47,6 +47,8 @@ def _match_el(source: dict, dest: dict, fields: list):
47
47
 
48
48
  def find_by_product(node: dict, product: dict, list_key: str = 'products'):
49
49
  keys = UNIQUENESS_FIELDS.get(node.get('type', node.get('@type')), {}).get(list_key, ['term.@id'])
50
+ # ignore properties
51
+ keys = [k for k in keys if not k.startswith('properties.')]
50
52
  products = node.get(list_key, [])
51
53
  return next((p for p in products if _match_el(p, product, keys)), None)
52
54
 
hestia_earth/models/version.py CHANGED
@@ -1 +1 @@
1
- VERSION = '0.54.2'
1
+ VERSION = '0.55.0'
{hestia_earth_models-0.54.2.dist-info → hestia_earth_models-0.55.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: hestia-earth-models
3
- Version: 0.54.2
3
+ Version: 0.55.0
4
4
  Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
5
5
  Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
6
6
  Author: Hestia Team
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
11
11
  Classifier: Programming Language :: Python :: 3.6
12
12
  Description-Content-Type: text/markdown
13
13
  License-File: LICENSE
14
- Requires-Dist: hestia-earth.schema ==24.*
14
+ Requires-Dist: hestia-earth.schema ==25.*
15
15
  Requires-Dist: hestia-earth.utils >=0.11.12
16
16
  Requires-Dist: python-dateutil >=2.8.1
17
17
  Requires-Dist: CurrencyConverter ==0.16.8