npm - @hestia-earth/engine-models - Versions diffs - 0.70.2 → 0.70.3 - Mend

@hestia-earth/engine-models 0.70.2 → 0.70.3

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.

Files changed (7) hide show

package/config/Cycle.json CHANGED Viewed

@@ -182,6 +182,14 @@
       "mergeStrategy": "list",
       "stage": 1
     },
+    {
+      "key": "practices",
+      "model": "cycle",
+      "value": "practice.landCover",
+      "runStrategy": "always",
+      "mergeStrategy": "list",
+      "stage": 1
+    },
     {
       "key": "products",
       "model": "hestia",

package/dist/version.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export declare const ENGINE_VERSION = "0.70.2";
1	+ export declare const ENGINE_VERSION = "0.70.3";

package/dist/version.js CHANGED Viewed

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ENGINE_VERSION = void 0;
-exports.ENGINE_VERSION = '0.70.2';
+exports.ENGINE_VERSION = '0.70.3';

package/model-links.json CHANGED Viewed

@@ -274,6 +274,12 @@
       "model": "cycle",
       "modelKey": "input.value"
     },
+    {
+      "path": "hestia_earth/models/cycle/practice/landCover.py",
+      "docPath": "hestia_earth/models/cycle/practice/landCover.md",
+      "model": "cycle",
+      "modelKey": "practice.landCover"
+    },
     {
       "path": "hestia_earth/models/cycle/practice/value.py",
       "docPath": "hestia_earth/models/cycle/practice/value.md",
@@ -6021,6 +6027,30 @@
           "term": "n2OToAirOrganicSoilCultivationDirect"
         }
       ],
+      "landCoverTermId": [
+        {
+          "model": "cycle",
+          "modelKey": "practice.landCover"
+        },
+        {
+          "model": "hestia",
+          "modelKey": "management"
+        },
+        {
+          "model": "hestia",
+          "modelKey": "seed_emissions"
+        }
+      ],
+      "maximumCycleDuration": [
+        {
+          "model": "cycle",
+          "modelKey": "practice.landCover"
+        },
+        {
+          "model": "hestia",
+          "modelKey": "management"
+        }
+      ],
       "global_economic_value_share": [
         {
           "model": "cycle",
@@ -6105,22 +6135,6 @@
           "term": "organicCarbonPerHa"
         }
       ],
-      "landCoverTermId": [
-        {
-          "model": "hestia",
-          "modelKey": "management"
-        },
-        {
-          "model": "hestia",
-          "modelKey": "seed_emissions"
-        }
-      ],
-      "maximumCycleDuration": [
-        {
-          "model": "hestia",
-          "modelKey": "management"
-        }
-      ],
       "correspondingSeedTermIds": [
         {
           "model": "hestia",
@@ -6723,34 +6737,38 @@
           "modelKey": "product.properties"
         }
       ],
-      "commonToSupplementInAnimalFeed": [
+      "GAP_FILL_TO_MANAGEMENT": [
         {
-          "model": "hestia",
-          "term": "concentrateFeedBlend"
+          "model": "cycle",
+          "modelKey": "practice.landCover"
         },
         {
           "model": "hestia",
-          "term": "concentrateFeedUnspecified"
+          "modelKey": "management"
+        }
+      ],
+      "CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY": [
+        {
+          "model": "cycle",
+          "modelKey": "practice.landCover"
         },
         {
           "model": "hestia",
-          "term": "feedMix"
+          "modelKey": "landCover"
         }
       ],
-      "CALCULATE_TOTAL_LAND_COVER_SHARE_SEPARATELY": [
+      "commonToSupplementInAnimalFeed": [
         {
           "model": "hestia",
-          "modelKey": "landCover"
+          "term": "concentrateFeedBlend"
         },
         {
           "model": "hestia",
-          "modelKey": "management"
-        }
-      ],
-      "GAP_FILL_TO_MANAGEMENT": [
+          "term": "concentrateFeedUnspecified"
+        },
         {
           "model": "hestia",
-          "modelKey": "management"
+          "term": "feedMix"
         }
       ]
     },
@@ -6788,6 +6806,132 @@
         }
       ]
     },
+    "forage": {
+      "landCoverTermId": [
+        {
+          "model": "cycle",
+          "modelKey": "practice.landCover"
+        },
+        {
+          "model": "hestia",
+          "modelKey": "management"
+        }
+      ],
+      "ecoalimMapping": [
+        {
+          "model": "ecoalimV9",
+          "modelKey": "cycle"
+        },
+        {
+          "model": "ecoalimV9",
+          "modelKey": "impact_assessment"
+        }
+      ],
+      "IPCC_2019_Ratio_AGRes_YieldDM": [
+        {
+          "model": "ipcc2019",
+          "term": "aboveGroundCropResidueTotal"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "belowGroundCropResidue"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "carbonContent"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "ligninContent"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "nitrogenContent"
+        }
+      ],
+      "IPCC_2019_Ratio_BGRes_AGRes": [
+        {
+          "model": "ipcc2019",
+          "term": "belowGroundCropResidue"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "carbonContent"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "ligninContent"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "nitrogenContent"
+        }
+      ],
+      "C_CONTENT_AG_CROP_RESIDUE": [
+        {
+          "model": "ipcc2019",
+          "term": "carbonContent"
+        }
+      ],
+      "C_CONTENT_BG_CROP_RESIDUE": [
+        {
+          "model": "ipcc2019",
+          "term": "carbonContent"
+        }
+      ],
+      "isPlantation": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirOrganicSoilCultivation"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "co2ToAirOrganicSoilCultivation"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "n2OToAirOrganicSoilCultivationDirect"
+        }
+      ],
+      "IPCC_2013_ORGANIC_SOIL_CULTIVATION_CATEGORY": [
+        {
+          "model": "ipcc2019",
+          "term": "ch4ToAirOrganicSoilCultivation"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "co2ToAirOrganicSoilCultivation"
+        },
+        {
+          "model": "ipcc2019",
+          "term": "n2OToAirOrganicSoilCultivationDirect"
+        }
+      ],
+      "LIGNIN_CONTENT_AG_CROP_RESIDUE": [
+        {
+          "model": "ipcc2019",
+          "term": "ligninContent"
+        }
+      ],
+      "LIGNIN_CONTENT_BG_CROP_RESIDUE": [
+        {
+          "model": "ipcc2019",
+          "term": "ligninContent"
+        }
+      ],
+      "N_Content_AG_Residue": [
+        {
+          "model": "ipcc2019",
+          "term": "nitrogenContent"
+        }
+      ],
+      "N_Content_BG_Residue": [
+        {
+          "model": "ipcc2019",
+          "term": "nitrogenContent"
+        }
+      ]
+    },
     "excreta": {
       "global_economic_value_share": [
         {
@@ -6960,128 +7104,6 @@
         }
       ]
     },
-    "forage": {
-      "ecoalimMapping": [
-        {
-          "model": "ecoalimV9",
-          "modelKey": "cycle"
-        },
-        {
-          "model": "ecoalimV9",
-          "modelKey": "impact_assessment"
-        }
-      ],
-      "landCoverTermId": [
-        {
-          "model": "hestia",
-          "modelKey": "management"
-        }
-      ],
-      "IPCC_2019_Ratio_AGRes_YieldDM": [
-        {
-          "model": "ipcc2019",
-          "term": "aboveGroundCropResidueTotal"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "belowGroundCropResidue"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "carbonContent"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "ligninContent"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "nitrogenContent"
-        }
-      ],
-      "IPCC_2019_Ratio_BGRes_AGRes": [
-        {
-          "model": "ipcc2019",
-          "term": "belowGroundCropResidue"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "carbonContent"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "ligninContent"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "nitrogenContent"
-        }
-      ],
-      "C_CONTENT_AG_CROP_RESIDUE": [
-        {
-          "model": "ipcc2019",
-          "term": "carbonContent"
-        }
-      ],
-      "C_CONTENT_BG_CROP_RESIDUE": [
-        {
-          "model": "ipcc2019",
-          "term": "carbonContent"
-        }
-      ],
-      "isPlantation": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirOrganicSoilCultivation"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "co2ToAirOrganicSoilCultivation"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "n2OToAirOrganicSoilCultivationDirect"
-        }
-      ],
-      "IPCC_2013_ORGANIC_SOIL_CULTIVATION_CATEGORY": [
-        {
-          "model": "ipcc2019",
-          "term": "ch4ToAirOrganicSoilCultivation"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "co2ToAirOrganicSoilCultivation"
-        },
-        {
-          "model": "ipcc2019",
-          "term": "n2OToAirOrganicSoilCultivationDirect"
-        }
-      ],
-      "LIGNIN_CONTENT_AG_CROP_RESIDUE": [
-        {
-          "model": "ipcc2019",
-          "term": "ligninContent"
-        }
-      ],
-      "LIGNIN_CONTENT_BG_CROP_RESIDUE": [
-        {
-          "model": "ipcc2019",
-          "term": "ligninContent"
-        }
-      ],
-      "N_Content_AG_Residue": [
-        {
-          "model": "ipcc2019",
-          "term": "nitrogenContent"
-        }
-      ],
-      "N_Content_BG_Residue": [
-        {
-          "model": "ipcc2019",
-          "term": "nitrogenContent"
-        }
-      ]
-    },
     "feedFoodAdditive": {
       "ecoalimMapping": [
         {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/engine-models",
-  "version": "0.70.2",
+  "version": "0.70.3",
   "description": "HESTIA Engine Models",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -46,15 +46,15 @@
     "@hestia-earth/schema": "*"
   },
   "devDependencies": {
-    "@babel/preset-typescript": "^7.27.0",
-    "@commitlint/cli": "^19.8.0",
-    "@commitlint/config-conventional": "^19.8.0",
-    "@hestia-earth/api": "^0.24.77",
+    "@babel/preset-typescript": "^7.27.1",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@hestia-earth/api": "^0.24.78",
     "@hestia-earth/eslint-config": "^0.1.0",
-    "@hestia-earth/json-schema": "^31.4.1",
-    "@hestia-earth/schema": "^31.4.1",
-    "@hestia-earth/schema-validation": "^31.4.1",
-    "@hestia-earth/utils": "^0.14.0",
+    "@hestia-earth/json-schema": "^32.0.1",
+    "@hestia-earth/schema": "^32.0.1",
+    "@hestia-earth/schema-validation": "^32.0.1",
+    "@hestia-earth/utils": "^0.14.3",
     "@jest/globals": "^29.7.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
@@ -62,7 +62,7 @@
     "ajv-cli": "^5.0.0",
     "ajv-formats": "^3.0.1",
     "aws-sdk": "^2.1692.0",
-    "axios": "^1.8.4",
+    "axios": "^1.9.0",
     "capitalize": "^2.0.4",
     "csvtojson": "^2.0.10",
     "dotenv": "^8.6.0",
@@ -73,7 +73,7 @@
     "lodash.merge": "^4.6.2",
     "pluralize": "^8.0.0",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.3.1"
+    "ts-jest": "^29.3.2"
   },
   "standard-version": {
     "scripts": {

package/search-results.json CHANGED Viewed

@@ -3925,11 +3925,11 @@
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityOtherAnimals"
+        "@id": "energyDigestibilityPoultry"
       },
       {
         "@type": "Term",
-        "@id": "energyDigestibilityPoultry"
+        "@id": "energyDigestibilityOtherAnimals"
       },
       {
         "@type": "Term",
@@ -3954,27 +3954,27 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgN"
+        "@id": "excretaPoultryKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaSolidFishCrustaceansKgN"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaGoatsKgN"
+        "@id": "excretaDucksKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaPoultryKgN"
+        "@id": "excretaDeerKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgN"
+        "@id": "excretaSolidFishCrustaceansKgN"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgN"
+        "@id": "excretaGoatsKgN"
       },
       {
         "@type": "Term",
@@ -3996,10 +3996,6 @@
         "@type": "Term",
         "@id": "excretaTurkeysKgN"
       },
-      {
-        "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgN"
-      },
       {
         "@type": "Term",
         "@id": "excretaKgN"
@@ -4012,6 +4008,10 @@
         "@type": "Term",
         "@id": "excretaInsectsKgN"
       },
+      {
+        "@type": "Term",
+        "@id": "excretaBeefCattleFeedlotFedKgN"
+      },
       {
         "@type": "Term",
         "@id": "excretaSheepKgN"
@@ -4067,15 +4067,15 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaCamelsKgVs"
+        "@id": "excretaPigsKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaPigsKgVs"
+        "@id": "excretaDucksKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDucksKgVs"
+        "@id": "excretaCamelsKgVs"
       },
       {
         "@type": "Term",
@@ -4111,19 +4111,19 @@
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
+        "@id": "excretaBeefCattleFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaDeerKgVs"
+        "@id": "excretaBeefCattleExceptFeedlotFedKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaBeefCattleFeedlotFedKgVs"
+        "@id": "excretaKgVs"
       },
       {
         "@type": "Term",
-        "@id": "excretaKgVs"
+        "@id": "excretaDeerKgVs"
       }
     ]
   },
@@ -4180,7 +4180,7 @@
         "@type": "Term",
         "name": "Generic crop, seed",
         "@id": "genericCropSeed",
-        "_score": 22.649164
+        "_score": 22.662407
       }
     ]
   },
@@ -4462,169 +4462,169 @@
         "@type": "Term",
         "name": "Glass or high accessible cover",
         "@id": "glassOrHighAccessibleCover",
-        "_score": 61.805214
+        "_score": 61.776108
       },
       {
         "@type": "Term",
         "name": "Sea or ocean",
         "@id": "seaOrOcean",
-        "_score": 51.3974
+        "_score": 50.309784
       },
       {
         "@type": "Term",
         "name": "River or stream",
         "@id": "riverOrStream",
-        "_score": 48.80929
+        "_score": 48.736115
       },
       {
         "@type": "Term",
-        "name": "Other natural vegetation",
-        "@id": "otherNaturalVegetation",
-        "_score": 41.345604
+        "name": "Agri-food processor",
+        "@id": "agriFoodProcessor",
+        "_score": 41.47336
       },
       {
         "@type": "Term",
-        "name": "Agri-food processor",
-        "@id": "agriFoodProcessor",
-        "_score": 41.200302
+        "name": "Other natural vegetation",
+        "@id": "otherNaturalVegetation",
+        "_score": 41.24772
       },
       {
         "@type": "Term",
         "name": "Food retailer",
         "@id": "foodRetailer",
-        "_score": 39.40757
+        "_score": 39.13082
       },
       {
         "@type": "Term",
         "name": "Natural forest",
         "@id": "naturalForest",
-        "_score": 30.954716
+        "_score": 30.847563
       },
       {
         "@type": "Term",
         "name": "Permanent pasture",
         "@id": "permanentPasture",
-        "_score": 28.733797
+        "_score": 28.668303
       },
       {
         "@type": "Term",
         "name": "Animal housing",
         "@id": "animalHousing",
-        "_score": 27.314993
+        "_score": 27.123905
       },
       {
         "@type": "Term",
         "name": "Root or tuber crop plant",
         "@id": "rootOrTuberCropPlant",
-        "_score": 25.612892
+        "_score": 25.500269
       },
       {
         "@type": "Term",
         "name": "High intensity grazing pasture",
         "@id": "highIntensityGrazingPasture",
-        "_score": 25.085224
+        "_score": 25.064548
       },
       {
         "@type": "Term",
         "name": "Permanent cropland",
         "@id": "permanentCropland",
-        "_score": 20.495056
+        "_score": 20.20596
       },
       {
         "@type": "Term",
         "name": "Forest",
         "@id": "forest",
-        "_score": 19.183342
+        "_score": 19.290152
       },
       {
         "@type": "Term",
-        "name": "Other land",
-        "@id": "otherLand",
-        "_score": 18.45823
+        "name": "Primary forest",
+        "@id": "primaryForest",
+        "_score": 18.45046
       },
       {
         "@type": "Term",
-        "name": "Lake",
-        "@id": "lake",
-        "_score": 18.216282
+        "name": "Other land",
+        "@id": "otherLand",
+        "_score": 18.418287
       },
       {
         "@type": "Term",
-        "name": "Primary forest",
-        "@id": "primaryForest",
-        "_score": 18.14983
+        "name": "Plantation forest",
+        "@id": "plantationForest",
+        "_score": 18.265854
       },
       {
         "@type": "Term",
-        "name": "Plantation forest",
-        "@id": "plantationForest",
-        "_score": 18.021662
+        "name": "Lake",
+        "@id": "lake",
+        "_score": 18.230291
       },
       {
         "@type": "Term",
         "name": "Improved pasture",
         "@id": "improvedPasture",
-        "_score": 17.772917
+        "_score": 17.785988
       },
       {
         "@type": "Term",
         "name": "Secondary forest",
         "@id": "secondaryForest",
-        "_score": 17.765026
+        "_score": 17.757538
       },
       {
         "@type": "Term",
         "name": "Native pasture",
         "@id": "nativePasture",
-        "_score": 17.518377
+        "_score": 17.527752
       },
       {
         "@type": "Term",
         "name": "Nominally managed pasture",
         "@id": "nominallyManagedPasture",
-        "_score": 16.49458
+        "_score": 16.500256
+      },
+      {
+        "@type": "Term",
+        "name": "Sea kale plant",
+        "@id": "seaKalePlant",
+        "_score": 16.128777
       },
       {
         "@type": "Term",
         "name": "Red sea plume alga",
         "@id": "redSeaPlumeAlga",
-        "_score": 16.421041
+        "_score": 16.10274
       },
       {
         "@type": "Term",
         "name": "Severely degraded pasture",
         "@id": "severelyDegradedPasture",
-        "_score": 16.277512
-      },
-      {
-        "@type": "Term",
-        "name": "Sea kale plant",
-        "@id": "seaKalePlant",
-        "_score": 16.218529
+        "_score": 15.984688
       },
       {
         "@type": "Term",
         "name": "Pond",
         "@id": "pond",
-        "_score": 13.82317
+        "_score": 13.815231
       },
       {
         "@type": "Term",
         "name": "River tamarind tree",
         "@id": "riverTamarindTree",
-        "_score": 12.985474
+        "_score": 12.997887
       },
       {
         "@type": "Term",
         "name": "Cropland",
         "@id": "cropland",
-        "_score": 9.878035
+        "_score": 9.890675
       },
       {
         "@type": "Term",
         "name": "Annual cropland",
         "@id": "annualCropland",
-        "_score": 9.241321
+        "_score": 8.967179
       }
     ]
   },
@@ -7449,39 +7449,39 @@
     "results": [
       {
         "@type": "Term",
-        "@id": "stripTillage"
+        "@id": "ridgeTillage"
       },
       {
         "@type": "Term",
-        "@id": "mulchTillage"
+        "@id": "noTillage"
       },
       {
         "@type": "Term",
-        "@id": "deepTillage"
+        "@id": "verticalTillage"
       },
       {
         "@type": "Term",
-        "@id": "ridgeTillage"
+        "@id": "stripTillage"
       },
       {
         "@type": "Term",
-        "@id": "noTillage"
+        "@id": "mulchTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullTillage"
+        "@id": "deepTillage"
       },
       {
         "@type": "Term",
-        "@id": "minimumTillage"
+        "@id": "fullInversionTillage"
       },
       {
         "@type": "Term",
-        "@id": "verticalTillage"
+        "@id": "fullTillage"
       },
       {
         "@type": "Term",
-        "@id": "fullInversionTillage"
+        "@id": "minimumTillage"
       }
     ]
   },

package/src/version.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export const ENGINE_VERSION = '0.70.2';
1	+ export const ENGINE_VERSION = '0.70.3';