hestia-earth-models 0.44.4__py3-none-any.whl → 0.44.6__py3-none-any.whl

hestia_earth/models/mocking/mock_search.py

@@ -10,7 +10,7 @@ IGNORE_FUNC = ['get_lookup_value', 'get_table_value']
 
 def _map_results(results):
     # returning the whole term
-    return results if isinstance(results, dict) else (
+    return [results] if isinstance(results, dict) else (
         {'@type': 'Term', '@id': results} if isinstance(results, str) else
         list(map(_map_results, results)) if isinstance(results, list) else
         None

hestia_earth/models/mocking/search-results.json

@@ -34,18 +34,6 @@
         "@type": "Term",
         "@id": "dichlorodifluoromethaneToAirInputsProduction"
       },
-      {
-        "@type": "Term",
-        "@id": "bromochlorodifluoromethaneToAirInputsProduction"
-      },
-      {
-        "@type": "Term",
-        "@id": "co2ToAirUreaHydrolysis"
-      },
-      {
-        "@type": "Term",
-        "@id": "noToAirExcreta"
-      },
       {
         "@type": "Term",
         "@id": "nh3ToAirCropResidueDecomposition"
@@ -60,23 +48,23 @@
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterInorganicFertiliser"
+        "@id": "n2OToAirWasteTreatmentIndirect"
       },
       {
         "@type": "Term",
-        "@id": "noToAirInorganicFertiliser"
+        "@id": "n2ToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterExcreta"
+        "@id": "noToAirInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirWasteTreatmentIndirect"
+        "@id": "nh4ToGroundwaterExcreta"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirWasteTreatment"
+        "@id": "bromochlorodifluoromethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
@@ -92,71 +80,67 @@
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirSilageStorage"
-      },
-      {
-        "@type": "Term",
-        "@id": "n2OToAirCropResidueBurningIndirect"
+        "@id": "noToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirOrganicSoilCultivation"
+        "@id": "no3ToGroundwaterInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "nToSurfaceWaterAquacultureSystems"
+        "@id": "co2ToAirUreaHydrolysis"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirExcreta"
+        "@id": "n2OToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirAnimalHousing"
+        "@id": "nmvocToAirSilageStorage"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirInorganicFertiliser"
+        "@id": "n2OToAirCropResidueBurningIndirect"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirExcretaDirect"
+        "@id": "nh4ToGroundwaterInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirWasteTreatment"
+        "@id": "ch4ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "noToAirWasteTreatment"
+        "@id": "nmvocToAirAnimalHousing"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirFuelCombustionDirect"
+        "@id": "nh3ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterSoilFlux"
+        "@id": "po43ToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirInputsProduction"
+        "@id": "noxToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirOrganicFertiliser"
+        "@id": "pToSurfaceWaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "pm25ToAirAnimalHousing"
+        "@id": "noToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "pToGroundwaterSoilFlux"
+        "@id": "nh3ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirCropResidueDecompositionDirect"
+        "@id": "pm25ToAirAnimalHousing"
       },
       {
         "@type": "Term",
@@ -174,10 +158,6 @@
         "@type": "Term",
         "@id": "co2ToAirSoilFlux"
       },
-      {
-        "@type": "Term",
-        "@id": "n2OToAirInputsProduction"
-      },
       {
         "@type": "Term",
         "@id": "nh4ToGroundwaterOrganicFertiliser"
@@ -188,171 +168,167 @@
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterInorganicFertiliser"
-      },
-      {
-        "@type": "Term",
-        "@id": "noxToAirFuelCombustion"
+        "@id": "noxToAirOrganicSoilCultivation"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirFuelCombustion"
+        "@id": "nToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirExcreta"
+        "@id": "noxToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirFuelCombustion"
+        "@id": "n2ToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterInputsProduction"
+        "@id": "nmvocToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirCropResidueDecomposition"
+        "@id": "noxToAirInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "noToAirSoilFlux"
+        "@id": "n2OToAirExcretaDirect"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToSurfaceWaterAquacultureSystems"
+        "@id": "ch4ToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "nToSurfaceWaterInputsProduction"
+        "@id": "noToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterCropResidueDecomposition"
+        "@id": "n2OToAirFuelCombustionDirect"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterSoilFlux"
+        "@id": "n2ToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilCultivationDirect"
+        "@id": "pToGroundwaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirBackgroundSoilFluxDirect"
+        "@id": "n2OToAirCropResidueDecompositionDirect"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirFuelCombustion"
+        "@id": "co2ToAirNaturalVegetationBurning"
       },
       {
         "@type": "Term",
-        "@id": "pm10ToAirFuelCombustion"
+        "@id": "noToAirCropResidueBurning"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirCropResidueBurning"
+        "@id": "bod5ToWaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "nErosionSoilFlux"
+        "@id": "n2OToAirCropResidueBurningDirect"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirSoilFlux"
+        "@id": "co2ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirOrganicSoilBurning"
+        "@id": "pToDrainageWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterWasteTreatment"
+        "@id": "n2OToAirOrganicSoilBurningDirect"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirSoilCarbonStockChange"
+        "@id": "noxToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "noToAirOrganicFertiliser"
+        "@id": "ch4ToAirOrganicSoilBurning"
       },
       {
         "@type": "Term",
-        "@id": "no3ToSurfaceWaterIndustrialProcesses"
+        "@id": "po43ToGroundwaterOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirSoilFlux"
+        "@id": "n2OToAirWasteTreatmentDirect"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirAquacultureSystems"
+        "@id": "pErosionInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirAquacultureSystemsDirect"
+        "@id": "nh4ToGroundwaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirAquacultureSystems"
+        "@id": "nh4ToGroundwaterCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirSoilFlux"
+        "@id": "nh3ToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirNaturalVegetationBurning"
+        "@id": "nErosionInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "1112TetrafluoroethaneToAirInputsProduction"
+        "@id": "nh3ToAirInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterExcreta"
+        "@id": "pToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirOrganicFertiliser"
+        "@id": "co2ToAirBelowGroundBiomassStockChange"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilBurningIndirect"
+        "@id": "nh3ToAirAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirNaturalVegetationBurning"
+        "@id": "n2OToAirFuelCombustionIndirect"
       },
       {
         "@type": "Term",
-        "@id": "chlorodifluoromethaneToAirInputsProduction"
+        "@id": "nmvocToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilCultivationIndirect"
+        "@id": "nh3ToAirCropResidueBurning"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterWasteTreatment"
+        "@id": "co2ToAirOrganicSoilBurning"
       },
       {
         "@type": "Term",
-        "@id": "so2ToAirFuelCombustion"
+        "@id": "codToWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirExcreta"
+        "@id": "po43ToGroundwaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirNaturalVegetationBurning"
+        "@id": "noToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "noToAirCropResidueBurning"
+        "@id": "co2ToAirLimeHydrolysis"
       },
       {
         "@type": "Term",
@@ -380,7 +356,15 @@
       },
       {
         "@type": "Term",
-        "@id": "pToDrainageWaterInputsProduction"
+        "@id": "n2OToAirAquacultureSystemsIndirect"
+      },
+      {
+        "@type": "Term",
+        "@id": "po43ToSurfaceWaterOrganicFertiliser"
+      },
+      {
+        "@type": "Term",
+        "@id": "n2OToAirOrganicFertiliserIndirect"
       },
       {
         "@type": "Term",
@@ -404,175 +388,183 @@
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirOrganicSoilBurning"
+        "@id": "ch4ToAirCropResidueBurning"
       },
       {
         "@type": "Term",
-        "@id": "po43ToGroundwaterOrganicFertiliser"
+        "@id": "ch4ToAirNaturalVegetationBurning"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirWasteTreatmentDirect"
+        "@id": "ch4ToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "pErosionInputsProduction"
+        "@id": "nh3ToAirNaturalVegetationBurning"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirCropResidueBurning"
+        "@id": "n2OToAirOrganicSoilCultivationDirect"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirNaturalVegetationBurning"
+        "@id": "1112TetrafluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nErosionInputsProduction"
+        "@id": "no3ToGroundwaterExcreta"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirInorganicFertiliser"
+        "@id": "n2OToAirOrganicSoilBurningIndirect"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirCropResidueBurning"
+        "@id": "nmvocToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirOrganicSoilBurning"
+        "@id": "pm10ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirBelowGroundBiomassStockChange"
+        "@id": "noxToAirCropResidueBurning"
       },
       {
         "@type": "Term",
-        "@id": "po43ToGroundwaterSoilFlux"
+        "@id": "nh3ToAirOrganicSoilBurning"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirAquacultureSystems"
+        "@id": "noToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirLimeHydrolysis"
+        "@id": "no3ToSurfaceWaterIndustrialProcesses"
       },
       {
         "@type": "Term",
-        "@id": "bod5ToWaterIndustrialProcesses"
+        "@id": "chlorodifluoromethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirAquacultureSystemsIndirect"
+        "@id": "n2OToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirCropResidueBurningDirect"
+        "@id": "n2OToAirAquacultureSystemsDirect"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirInputsProduction"
+        "@id": "n2OToAirOrganicSoilCultivationIndirect"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterOrganicFertiliser"
+        "@id": "nh4ToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicFertiliserIndirect"
+        "@id": "nToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicSoilBurningDirect"
+        "@id": "no3ToGroundwaterCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirWasteTreatment"
+        "@id": "no3ToGroundwaterSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterInputsProduction"
+        "@id": "n2OToAirBackgroundSoilFluxDirect"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirFuelCombustionIndirect"
+        "@id": "noxToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirInputsProduction"
+        "@id": "noxToAirNaturalVegetationBurning"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterCropResidueDecomposition"
+        "@id": "nErosionSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirExcreta"
+        "@id": "n2ToAirSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "codToWaterInputsProduction"
+        "@id": "no3ToGroundwaterWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterInputsProduction"
+        "@id": "co2ToAirSoilCarbonStockChange"
       },
       {
         "@type": "Term",
-        "@id": "noToAirCropResidueDecomposition"
+        "@id": "n2ToAirAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirCropResidueDecomposition"
+        "@id": "nh4ToGroundwaterWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirWasteTreatment"
+        "@id": "so2ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirFuelCombustion"
+        "@id": "ch4ToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "pErosionSoilFlux"
+        "@id": "noxToAirAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "nmvocToAirSilageFeeding"
+        "@id": "n2ToAirCropResidueDecomposition"
       },
       {
         "@type": "Term",
-        "@id": "po43ToSurfaceWaterAquacultureSystems"
+        "@id": "nmvocToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToGroundwaterSoilFlux"
+        "@id": "pToGroundwaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirNaturalVegetationBurningIndirect"
+        "@id": "ch4ToAirEntericFermentation"
       },
       {
         "@type": "Term",
-        "@id": "nh4ToSurfaceWaterInputsProduction"
+        "@id": "nh3ToAirWasteTreatment"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirInputsProductionNonFossil"
+        "@id": "no3ToGroundwaterOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirInorganicFertiliserDirect"
+        "@id": "n2OToAirDiminishingSoilCarbonStocksDirect"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirInputsProductionFossil"
+        "@id": "no3ToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "n2ToAirInorganicFertiliser"
+        "@id": "n2OToAirOrganicFertiliserDirect"
+      },
+      {
+        "@type": "Term",
+        "@id": "no3ToGroundwaterInputsProduction"
+      },
+      {
+        "@type": "Term",
+        "@id": "noxToAirOrganicSoilBurning"
       },
       {
         "@type": "Term",
@@ -588,19 +580,23 @@
       },
       {
         "@type": "Term",
-        "@id": "co2ToAirOrganicSoilCultivation"
+        "@id": "pToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirOrganicFertiliser"
+        "@id": "co2ToAirFuelCombustion"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirExcretaIndirect"
+        "@id": "pErosionSoilFlux"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirExcreta"
+        "@id": "nmvocToAirSilageFeeding"
+      },
+      {
+        "@type": "Term",
+        "@id": "ch4ToAirFloodedRice"
       },
       {
         "@type": "Term",
@@ -608,63 +604,67 @@
       },
       {
         "@type": "Term",
-        "@id": "pToGroundwaterInputsProduction"
+        "@id": "hexaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirEntericFermentation"
+        "@id": "nh4ToSurfaceWaterInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "nh3ToAirWasteTreatment"
+        "@id": "ch4ToAirInputsProductionNonFossil"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterOrganicFertiliser"
+        "@id": "pm10ToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "hexaneToAirInputsProduction"
+        "@id": "n2OToAirInorganicFertiliserDirect"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirDiminishingSoilCarbonStocksDirect"
+        "@id": "ch4ToAirInputsProductionFossil"
       },
       {
         "@type": "Term",
-        "@id": "no3ToSurfaceWaterInputsProduction"
+        "@id": "n2ToAirInorganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "pm10ToAirInputsProduction"
+        "@id": "co2ToAirOrganicSoilCultivation"
       },
       {
         "@type": "Term",
-        "@id": "n2OToAirOrganicFertiliserDirect"
+        "@id": "112TrichlorotrifluoroethaneToAirInputsProduction"
       },
       {
         "@type": "Term",
-        "@id": "no3ToGroundwaterInputsProduction"
+        "@id": "nh3ToAirOrganicFertiliser"
       },
       {
         "@type": "Term",
-        "@id": "noxToAirOrganicSoilBurning"
+        "@id": "pm10ToAirAnimalHousing"
       },
       {
         "@type": "Term",
-        "@id": "112TrichlorotrifluoroethaneToAirInputsProduction"
+        "@id": "n2OToAirExcretaIndirect"
       },
       {
         "@type": "Term",
-        "@id": "pToSurfaceWaterAquacultureSystems"
+        "@id": "noxToAirExcreta"
       },
       {
         "@type": "Term",
-        "@id": "pm10ToAirAnimalHousing"
+        "@id": "po43ToSurfaceWaterAquacultureSystems"
       },
       {
         "@type": "Term",
-        "@id": "ch4ToAirFloodedRice"
+        "@id": "nh4ToGroundwaterSoilFlux"
+      },
+      {
+        "@type": "Term",
+        "@id": "n2OToAirNaturalVegetationBurningIndirect"
       }
     ]
   },
@@ -689,7 +689,7 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "residueRemoved"
+        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
@@ -697,19 +697,19 @@
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
+        "@id": "residueRemoved"
       },
       {
         "@type": "Term",
-        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
+        "@id": "residueBurntBeforeAllowingForCombustionFactor"
       },
       {
         "@type": "Term",
-        "@id": "residueBurntBeforeAllowingForCombustionFactor"
+        "@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
       },
       {
         "@type": "Term",
-        "@id": "residueBurnt"
+        "@id": "residueLeftOnField"
       },
       {
         "@type": "Term",
@@ -717,7 +717,7 @@
       },
       {
         "@type": "Term",
-        "@id": "residueLeftOnField"
+        "@id": "residueBurnt"
       }
     ]
   },
@@ -733,43 +733,43 @@
       },
       {
         "@type": "Term",
-        "@id": "discardedCropIncorporated"
+        "@id": "discardedCropLeftOnField"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueRemoved"
+        "@id": "discardedCropTotal"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropLeftOnField"
+        "@id": "discardedCropIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropTotal"
+        "@id": "aboveGroundCropResidueRemoved"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueIncorporated"
+        "@id": "discardedCropRemoved"
       },
       {
         "@type": "Term",
-        "@id": "discardedCropRemoved"
+        "@id": "aboveGroundCropResidueTotal"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueTotal"
+        "@id": "aboveGroundCropResidueIncorporated"
       },
       {
         "@type": "Term",
-        "@id": "belowGroundCropResidue"
+        "@id": "aboveGroundCropResidueBurnt"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueLeftOnField"
+        "@id": "belowGroundCropResidue"
       },
       {
         "@type": "Term",
-        "@id": "aboveGroundCropResidueBurnt"
+        "@id": "aboveGroundCropResidueLeftOnField"
       }
     ]
   },
@@ -802,7 +802,7 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "digestibleEnergyPoultry"
+        "@id": "digestibleEnergyRuminants"
       },
       {
         "@type": "Term",
@@ -818,15 +818,15 @@
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyOtherAnimals"
+        "@id": "digestibleEnergyPoultry"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyRuminants"
+        "@id": "digestibleEnergyAquaticSpecies"
       },
       {
         "@type": "Term",
-        "@id": "digestibleEnergyAquaticSpecies"
+        "@id": "digestibleEnergyOtherAnimals"
       }
     ]
   },
@@ -859,7 +859,7 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "energyDigestibilityPoultry"
+        "@id": "energyDigestibilityPigs"
       },
       {
         "@type": "Term",
@@ -875,20 +875,20 @@
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityPigs"
+        "@id": "energyDigestibilityPoultry"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityOtherAnimals"
+        "@id": "energyDigestibilityAquaticSpecies"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityAquaticSpecies"
+        "@id": "energyDigestibilityOtherAnimals"
       }
     ]
   },
   {
-    "name": "get_excreta_terms",
+    "name": "get_excreta_N_terms",
     "query": {
       "termType.keyword": "excreta",
       "units.keyword": "kg N"
@@ -968,18 +968,101 @@
       }
     ]
   },
+  {
+    "name": "get_excreta_VS_terms",
+    "query": {
+      "termType.keyword": "excreta",
+      "units.keyword": "kg VS"
+    },
+    "results": [
+      {
+        "@type": "Term",
+        "@id": "excretaSolidFishCrustaceansKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaDairyCattleKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaGeeseKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaLiquidFishCrustaceansKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaCamelsKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaDucksKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaPigsKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaMixturesKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaPoultryKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaBeefCattleFeedlotFedKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "processedExcretaKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaBuffaloKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaTurkeysKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaSheepAndGoatsKgVs"
+      },
+      {
+        "@type": "Term",
+        "@id": "excretaHorsesMulesAndAssesKgVs"
+      }
+    ]
+  },
   {
     "name": "get_generic_crop",
     "query": {
       "termType.keyword": "crop",
       "name": "Generic crop seed"
     },
-    "results": {
-      "@type": "Term",
-      "name": "Generic crop, seed",
-      "@id": "genericCropSeed",
-      "_score": 26.331272
-    }
+    "results": [
+      {
+        "@type": "Term",
+        "name": "Generic crop, seed",
+        "@id": "genericCropSeed",
+        "_score": 26.331272
+      }
+    ]
   },
   {
     "name": "get_irrigation_terms",

hestia_earth/models/pooreNemecek2018/excretaKgN.py

@@ -21,7 +21,7 @@ from hestia_earth.models.utils.term import get_lookup_value
 from hestia_earth.models.utils.property import _get_nitrogen_content
 from hestia_earth.models.utils.product import _new_product, animal_produced
 from hestia_earth.models.utils.input import get_feed_nitrogen
-from hestia_earth.models.utils.term import get_excreta_terms
+from hestia_earth.models.utils.term import get_excreta_N_terms
 from . import MODEL
 
 REQUIREMENTS = {
@@ -81,7 +81,7 @@ def _run(term_id: str, mass_balance_items: list, alternate_items: list):
 
 
 def _no_excreta_term(products: list):
-    term_ids = get_excreta_terms()
+    term_ids = get_excreta_N_terms()
     return all([not find_term_match(products, term) for term in term_ids])
 
 

hestia_earth/models/pooreNemecek2018/excretaKgVs.py

@@ -15,12 +15,11 @@ from hestia_earth.utils.tools import list_sum, safe_parse_float
 
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.term import get_lookup_value
-from hestia_earth.models.utils.constant import Units
 from hestia_earth.models.utils.property import get_node_property
 from hestia_earth.models.utils.product import _new_product
 from hestia_earth.models.utils.input import get_feed_carbon
 from hestia_earth.models.utils.measurement import most_relevant_measurement_value
-from hestia_earth.models.utils.term import get_excreta_terms
+from hestia_earth.models.utils.term import get_excreta_VS_terms
 from . import MODEL
 from .excretaKgN import _get_excreta_n_term
 
@@ -117,7 +116,7 @@ def _get_excreta_vs_term(product: dict):
 
 
 def _no_excreta_term(products: list):
-    term_ids = get_excreta_terms(Units.KG_VS)
+    term_ids = get_excreta_VS_terms()
     return all([not find_term_match(products, term) for term in term_ids])
 
 

hestia_earth/models/utils/term.py

@@ -142,7 +142,7 @@ def get_urea_terms():
     return list(map(lambda n: n['@id'], terms))
 
 
-def get_excreta_terms(units: Units = Units.KG_N):
+def get_excreta_N_terms():
     """
     Find all `excreta` terms in `kg N` from the Glossary:
     https://hestia.earth/glossary?termType=excreta
@@ -154,7 +154,24 @@ def get_excreta_terms(units: Units = Units.KG_N):
     """
     terms = find_node(SchemaType.TERM, {
         'termType.keyword': TermTermType.EXCRETA.value,
-        'units.keyword': units.value
+        'units.keyword': Units.KG_N.value
+    }, limit=LIMIT)
+    return list(map(lambda n: n['@id'], terms))
+
+
+def get_excreta_VS_terms():
+    """
+    Find all `excreta` terms in `kg Vs` from the Glossary:
+    https://hestia.earth/glossary?termType=excreta
+
+    Returns
+    -------
+    list
+        List of matching term `@id` as `str`.
+    """
+    terms = find_node(SchemaType.TERM, {
+        'termType.keyword': TermTermType.EXCRETA.value,
+        'units.keyword': Units.KG_VS.value
     }, limit=LIMIT)
     return list(map(lambda n: n['@id'], terms))
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.44.4'
+VERSION = '0.44.6'

{hestia_earth_models-0.44.4.dist-info → hestia_earth_models-0.44.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.44.4
+Version: 0.44.6
 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.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia_earth_models-0.44.4.dist-info → hestia_earth_models-0.44.6.dist-info}/RECORD

@@ -2,7 +2,7 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/log.py,sha256=rOgKa-gSrcS-Y1gO9eJXJaA3ofxcQW_45hGly2Lf00Y,2444
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=tBx_5JQJNsiUeDysRRlUP8UVUNAVPuQss9MWumSKLhY,19
+hestia_earth/models/version.py,sha256=taeVh2_WgbOJy1VoS9mf7Yd35BQxdqpZcIFdshvWnD0,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=ztMnY6XTwsJD-lp62jJyzN2AUODvFHIs5d5CaFrlVGI,3567
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=10XV1fz_yBYlqmNJ3cxmT2I2Vp_0w7nT4zMIuBw2wCY,3294
@@ -314,14 +314,14 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py,sha256=4q7UTQJG1B7Mhdldp6Hnm9aArVC9WdLkW-NGHglJlTY,957
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=x6xsPu-Rwh-7HKsvHuKmgM1YML6fQy2z9Hsy9_BeO2Y,3565
 hestia_earth/models/mocking/__init__.py,sha256=Y39V6yj_3M1q8v9ShCHwPeJOstypOVIvb_FldMEbF7g,766
-hestia_earth/models/mocking/mock_search.py,sha256=VPrg1awdMsHTTdJ4u8xqfaVelrz0rGzfmnIIkzpB96g,1981
-hestia_earth/models/mocking/search-results.json,sha256=Vyi4MCr47ACbOAX6eRrM0wlLx8KJN_pJgpFmDsk3K2c,27733
+hestia_earth/models/mocking/mock_search.py,sha256=ysPhzvMGvsHKqQXKRFi8ZqohcnyKutBlNqT_j0OH8L4,1983
+hestia_earth/models/mocking/search-results.json,sha256=2OtWvfsZjgMVDQHmlMUHZMcsjIu6IaBub8vz492JnQ4,29411
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=trQBxjc8V77q96sxvK4Y9HfpD64zgyGuB5o5_o0lHts,2189
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=do9zHHR8VuqFcWNLnql5t3tV478SCVc7tC3mEs5cdUk,2184
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=iPNQCPSF0oXzmR7KQqgySpeQAkPFgmBhbta6m6t6Y2U,6603
-hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=fHPbi6D6GluKhjaRBZQTx4TtzNewvHdnWrPyuGZecE4,5677
-hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=bsSZcyzBoVB6Ybk5CgElzPp7mTpQJXsPMdB3ROf6dcM,7751
+hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=vgjxJP-KXmUujVerDtbLvDNGiqouFK4DgOiLPbSSPh4,5681
+hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=FAZDTyC-5tsqtFlfBPSdFaB6QeASwKIOc7d6_TT_eNQ,7693
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=Zlq4gfVPrneqTaahtUiEtmjNqct75AoIag33gOZbC3E,2820
 hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=RHrkBR-U2VSGpwPBs9RCWVlZtHin5BXESKE9jienrRw,1374
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=BgxKSBSRdyNU1_q8Vf9GULkIewuXKmgfDQU9Thzxc1g,2724
@@ -472,7 +472,7 @@ hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTj
 hestia_earth/models/utils/property.py,sha256=X4DDQKHEVYqtW6nNxBhLZ40_avix2dLDxR22Ipeq0TA,4274
 hestia_earth/models/utils/site.py,sha256=RZHcftsauPtvC7ma6ea31m3tIjyAR_VRBTcvYAC9v7s,2153
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
-hestia_earth/models/utils/term.py,sha256=u_tF-4ESmjxy9AvSpp4FkHJvdjBmFd9XUvRkf_eqLOU,11669
+hestia_earth/models/utils/term.py,sha256=Es4AMaD-sFL9-FxTDB9OSLd-xno-ZMHSorDKsUzTr2E,12095
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=fcqomqaWp4BNh937FdC5M-WrhBovtoH-pdUlCnkz7TU,4061
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -780,8 +780,8 @@ tests/models/pooreNemecek2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 tests/models/pooreNemecek2018/test_aboveGroundCropResidueTotal.py,sha256=m-cpFULarm0Ee4MV-OvhYPRg7W2_mvbrqHkjDZgcQsw,1660
 tests/models/pooreNemecek2018/test_belowGroundCropResidue.py,sha256=A6EOD2B6frN0UtuUTP3GwZ7bNEtEudQfztHXjdiDwdQ,1655
 tests/models/pooreNemecek2018/test_ch4ToAirAquacultureSystems.py,sha256=rUxD57yl82Ht8IyhbiQhi0xl8L9iLdnLpbI-T5C0Mck,2722
-tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=ZUV7ysGt359NHy3SGyHOziLB0SO6K7jFG7ejjz0hqfM,4004
-tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=K4gMk3e2uWoiFeo6LyWP-_-ZBhZN8WbEm_bTVl8Qe6Y,2698
+tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=WZViYAz9A7UwDrmVx4y7SYRFuLxdxJIdkQSxvXmzbhM,4016
+tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=2D3V4uLWFKdhdpFlr7gjb6Cli3tqBNcy0CXjIcPJ4x0,2707
 tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=PZ56Xqv6xHgjCpmDK1CTxGzLjaD8rzZ1RO-TopZNF3o,1652
 tests/models/pooreNemecek2018/test_longFallowPeriod.py,sha256=PuwIFqZs2yn4jg9mx4Lk7Z227KAbU5IoV5CiGUV8mpA,925
 tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=4YAoUhIwfEmRe2B5BvNg247VeB7UXHNeZqr2mRtJA7Y,2207
@@ -918,11 +918,11 @@ tests/models/utils/test_practice.py,sha256=ILaxkb3qICor9AquAGYiOtA-YKnq0hppmJQzN
 tests/models/utils/test_product.py,sha256=heyd7zYUXaqiiPgBkWJr-OxMNcdVzC8jSRCfvMt4CQE,1726
 tests/models/utils/test_property.py,sha256=t2npw86IK7C6G4ypiPtanFi0db4PB7G5VBR1GjRGl34,618
 tests/models/utils/test_site.py,sha256=deEIYptl2MHEklSfHbZV9qA59YKqZLQr8y5rWYiD460,680
-tests/models/utils/test_term.py,sha256=jcANyHzzLpkq7AQReFmTa16vtMlwgCNfhDbr9FLlYX4,1808
+tests/models/utils/test_term.py,sha256=-Wn2C1jyOLfkvhcKmKWT-Jms7yqLwx5ok91gYJNcGWc,2028
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.44.4.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.44.4.dist-info/METADATA,sha256=PuqOgOX-A9r6z0nnPInedXfBbMusHhjfS6fpb2595e0,3192
-hestia_earth_models-0.44.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-hestia_earth_models-0.44.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.44.4.dist-info/RECORD,,
+hestia_earth_models-0.44.6.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.44.6.dist-info/METADATA,sha256=sZ1RfX1WGhbTlTP_40S7dwt1QBruRa52MSpOWiZmD-w,3192
+hestia_earth_models-0.44.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+hestia_earth_models-0.44.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.44.6.dist-info/RECORD,,

tests/models/pooreNemecek2018/test_excretaKgN.py

@@ -9,7 +9,7 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgN"
 
 
 @patch(f"{class_path}._get_nitrogen_content", return_value=10)
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
 @patch(f"{class_path}.get_feed_nitrogen", return_value=0)
 @patch(f"{class_path}.animal_produced", return_value=0)
 @patch(f"{class_path}._get_excreta_n_term", return_value='excretaKgN')
@@ -59,7 +59,7 @@ def test_should_run(mock_get_excreta_term, mock_animal_produced, mock_get_feed,
     assert not should_run
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -72,7 +72,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_liveweight(*args):
     with open(f"{fixtures_folder}/with-liveweight/cycle.jsonld", encoding='utf-8') as f:
@@ -85,7 +85,7 @@ def test_run_with_liveweight(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_carcass(*args):
     with open(f"{fixtures_folder}/with-carcass/cycle.jsonld", encoding='utf-8') as f:
@@ -98,7 +98,7 @@ def test_run_with_carcass(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_head(*args):
     with open(f"{fixtures_folder}/with-head/cycle.jsonld", encoding='utf-8') as f:
@@ -111,7 +111,7 @@ def test_run_with_head(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_liveAquaticSpecies(*args):
     with open(f"{fixtures_folder}/with-liveAquaticSpecies/cycle.jsonld", encoding='utf-8') as f:

tests/models/pooreNemecek2018/test_excretaKgVs.py

@@ -9,7 +9,7 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgVs"
 
 
 @patch(f"{class_path}._get_excreta_n_term", return_value='')
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_VS_terms", return_value=[])
 @patch(f"{class_path}.get_feed_carbon", return_value=5)
 @patch(f"{class_path}._get_carbonContent", return_value=5)
 @patch(f"{class_path}._get_conv_aq_ocsed", return_value=0.35)
@@ -63,7 +63,7 @@ def test_should_run(*args):
     assert should_run is True
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_VS_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -76,7 +76,7 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.get_excreta_terms", return_value=[])
+@patch(f"{class_path}.get_excreta_VS_terms", return_value=[])
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_excretaKgN(*args):
     with open(f"{fixtures_folder}/with-excretaKgN/cycle.jsonld", encoding='utf-8') as f:

tests/models/utils/test_term.py

@@ -1,8 +1,8 @@
 from unittest.mock import patch
 
 from hestia_earth.models.utils.term import (
-    get_liquid_fuel_terms, get_irrigation_terms, get_urea_terms, get_excreta_terms, get_generic_crop,
-    get_rice_paddy_terms, get_tillage_terms, get_crop_residue_terms
+    get_liquid_fuel_terms, get_irrigation_terms, get_urea_terms, get_excreta_N_terms, get_excreta_VS_terms,
+    get_generic_crop, get_rice_paddy_terms, get_tillage_terms, get_crop_residue_terms
 )
 
 class_path = 'hestia_earth.models.utils.term'
@@ -30,10 +30,17 @@ def test_get_urea_terms(mock_find_node):
 
 
 @patch(f"{class_path}.find_node")
-def test_get_excreta_terms(mock_find_node):
+def test_get_excreta_N_terms(mock_find_node):
     id = 'term-id'
     mock_find_node.return_value = [{'@id': id}]
-    assert get_excreta_terms() == [id]
+    assert get_excreta_N_terms() == [id]
+
+
+@patch(f"{class_path}.find_node")
+def test_get_excreta_VS_terms(mock_find_node):
+    id = 'term-id'
+    mock_find_node.return_value = [{'@id': id}]
+    assert get_excreta_VS_terms() == [id]
 
 
 @patch(f"{class_path}.find_node")