hestia-earth-models 0.74.1__py3-none-any.whl → 0.74.3__py3-none-any.whl

hestia_earth/models/ipcc2019/animal/pastureGrass.py

@@ -188,7 +188,9 @@ def calculate_NEwool(cycle: dict, animal: dict, products: list, total_weight: fl
     return total_energy * animal_weight/total_weight
 
 
-def _run_practice(animal: dict, values: dict, meanDE: float, meanECHHV: float, REM: float, REG: float, NEwool: float):
+def _run_practice(
+    cycle: dict, animal: dict, values: dict, meanDE: float, meanECHHV: float, REM: float, REG: float, NEwool: float
+):
     NEm_feed, NEg_feed, log_feed = calculate_NEfeed(animal)
 
     def run(practice: dict):
@@ -225,7 +227,7 @@ def _run_practice(animal: dict, values: dict, meanDE: float, meanECHHV: float, R
         ])
         has_positive_feed_values = all([NEm_feed >= 0, NEg_feed >= 0])
 
-        logRequirements(animal, model=MODEL, term=input_term_id, model_key=MODEL_KEY,
+        logRequirements(cycle, model=MODEL, term=input_term_id, animalId=animal.get('animalId'), model_key=MODEL_KEY,
                         feed_logs=log_as_table(log_feed),
                         has_positive_feed_values=has_positive_feed_values,
                         animal_logs=logs,
@@ -233,7 +235,7 @@ def _run_practice(animal: dict, values: dict, meanDE: float, meanECHHV: float, R
                         animal_properties=animal_properties)
 
         should_run = all([has_positive_feed_values])
-        logShouldRun(animal, MODEL, input_term_id, should_run, model_key=MODEL_KEY)
+        logShouldRun(cycle, MODEL, input_term_id, should_run, animalId=animal.get('animalId'), model_key=MODEL_KEY)
 
         return _input(input_term_id, value) if should_run else None
 
@@ -254,7 +256,7 @@ def _run_animal(cycle: dict, meanDE: float, meanECHHV: float, REM: float, REG: f
         animal_values = get_animal_values(cycle, animal, systems)
 
         inputs = non_empty_list(map(
-            _run_practice(animal, animal_values, meanDE, meanECHHV, REM, REG, NEwool),
+            _run_practice(cycle, animal, animal_values, meanDE, meanECHHV, REM, REG, NEwool),
             practices
         ))
         return animal | {
@@ -278,32 +280,37 @@ def _should_run(cycle: dict, animals: list, practices: dict):
     REM = calculate_REM(meanDE)
     REG = calculate_REG(meanDE)
 
+    has_practice_termType_system = len(systems) > 0
+    has_practice_pastureGrass_with_landCover_key = len(practices) > 0
+
     should_run = all([
         animalFeed_complete,
         animalPopulation_complete,
         freshForage_incomplete,
         no_cycle_inputs_feed,
         all_animals_have_value,
-        len(systems) > 0,
-        len(practices) > 0,
+        has_practice_termType_system,
+        has_practice_pastureGrass_with_landCover_key,
         meanDE > 0,
         meanECHHV > 0
     ])
 
     for term_id in [MODEL_KEY] + [practice_input_id(p) for p in practices]:
         for animal in animals:
-            logRequirements(animal, model=MODEL, term=term_id, model_key=MODEL_KEY,
+            logRequirements(cycle, model=MODEL, term=term_id, animalId=animal.get('animalId'), model_key=MODEL_KEY,
                             term_type_animalFeed_complete=animalFeed_complete,
                             term_type_animalPopulation_complete=animalPopulation_complete,
                             term_type_freshForage_incomplete=freshForage_incomplete,
                             no_cycle_inputs_feed=no_cycle_inputs_feed,
                             all_animals_have_value=all_animals_have_value,
+                            has_practice_termType_system=has_practice_termType_system,
+                            has_practice_pastureGrass_with_landCover_key=has_practice_pastureGrass_with_landCover_key,
                             grass_MeanDE=calculate_meanDE(practices, term=term_id),
                             grass_MeanECHHV=calculate_meanECHHV(practices, term=term_id),
                             grass_REM=REM,
                             grass_REG=REG)
 
-            logShouldRun(animal, MODEL, term_id, should_run, model_key=MODEL_KEY)
+            logShouldRun(cycle, MODEL, term_id, should_run, animalId=animal.get('animalId'), model_key=MODEL_KEY)
 
     return should_run, meanDE, meanECHHV, REM, REG, systems
 

hestia_earth/models/ipcc2019/animal/utils.py

@@ -62,7 +62,7 @@ def should_run_by_productivity_lookup(
         practice = value.get('practice')
         animal_term_id = animal.get('term').get('@id')
 
-        logRequirements(cycle, model=MODEL, term=animal_term_id, property=term_id,
+        logRequirements(cycle, model=MODEL, term=animal_term_id, animalId=animal.get('animalId'), property=term_id,
                         country_id=country_id,
                         **({
                             lookup_col.replace('-', '_'): lookup_value
@@ -75,7 +75,7 @@ def should_run_by_productivity_lookup(
             not practice_column or bool(practice),
             lookup_value is not None
         ])
-        logShouldRun(cycle, MODEL, animal_term_id, should_run, property=term_id)
+        logShouldRun(cycle, MODEL, animal_term_id, should_run, animalId=animal.get('animalId'), property=term_id)
 
         return should_run
 

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -233,14 +233,17 @@ def _should_run(cycle: dict, practices: dict):
     REM = calculate_REM(meanDE)
     REG = calculate_REG(meanDE)
 
+    has_practice_termType_system = len(systems) > 0
+    has_practice_pastureGrass_with_landCover_key = len(practices) > 0
+
     should_run = all([
         animalFeed_complete,
         animalPopulation_complete,
         freshForage_incomplete,
         has_cycle_inputs_feed,
         all_animals_have_value,
-        len(systems) > 0,
-        len(practices) > 0,
+        has_practice_termType_system,
+        has_practice_pastureGrass_with_landCover_key,
         meanDE > 0,
         meanECHHV > 0
     ])
@@ -252,6 +255,8 @@ def _should_run(cycle: dict, practices: dict):
                         term_type_freshForage_incomplete=freshForage_incomplete,
                         has_cycle_inputs_feed=has_cycle_inputs_feed,
                         all_animals_have_value=all_animals_have_value,
+                        has_practice_termType_system=has_practice_termType_system,
+                        has_practice_pastureGrass_with_landCover_key=has_practice_pastureGrass_with_landCover_key,
                         grass_MeanDE=calculate_meanDE(practices, term=term_id),
                         grass_MeanECHHV=calculate_meanECHHV(practices, term=term_id),
                         grass_REM=REM,