Merge pull request #2739 from RuminantFarmSystems/removing-storage-strings

KFosterReed · web-flow · commit adce1c354c4a · 2026-02-11T09:04:35.000-05:00
Fixing E2E for initiation of version update!
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-[![Flake8](https://img.shields.io/badge/Flake8-failed-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)
+[![Flake8](https://img.shields.io/badge/Flake8-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)
 [![Pytest](https://img.shields.io/badge/Pytest-passed-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)
 [![Coverage](https://img.shields.io/badge/Coverage-99%25-brightgreen)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)
-[![Mypy](https://img.shields.io/badge/Mypy-1685%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)
+[![Mypy](https://img.shields.io/badge/Mypy-1683%20errors-red)](https://github.com/RuminantFarmSystems/MASM/actions/workflows/combined_format_lint_test_mypy.yml)
 
 
 # RuFaS: Ruminant Farm Systems
diff --git a/RUFAS/biophysical/manure/storage/anaerobic_lagoon.py b/RUFAS/biophysical/manure/storage/anaerobic_lagoon.py
@@ -106,7 +106,7 @@ def process_manure(self, current_day_conditions: CurrentDayConditions, time: Ruf
         )
         self._report_processor_output(
             "outdoor_storage_manure_temperature",
-            str(manure_temperature),
+            manure_temperature,
             function_name,
             MeasurementUnits.DEGREES_CELSIUS,
             time.simulation_day,
diff --git a/RUFAS/biophysical/manure/storage/slurry_storage_outdoor.py b/RUFAS/biophysical/manure/storage/slurry_storage_outdoor.py
@@ -80,7 +80,7 @@ def process_manure(self, current_day_conditions: CurrentDayConditions, time: Ruf
         units = MeasurementUnits.KILOGRAMS
         self._report_processor_output(
             "outdoor_storage_manure_temperature",
-            str(manure_temperature),
+            manure_temperature,
             data_origin_name,
             MeasurementUnits.DEGREES_CELSIUS,
             time.simulation_day,
diff --git a/RUFAS/data_validator.py b/RUFAS/data_validator.py
@@ -641,7 +641,7 @@ def _metadata_object_validator(self, key_path: list[str], value: dict[str, Any])
             return valid, message
         return True, ""
 
-    def validate_metadata(
+    def validate_metadata(  # noqa: C901
         self,
         metadata: dict[str, Any],
         valid_data_types: set[str],
diff --git a/changelog.md b/changelog.md
@@ -302,6 +302,8 @@ v0.9.2
 - [2608](https://github.com/RuminantFarmSystems/MASM/pull/2608) - [minor change] [InputChange][OutputChange][Animal] Implements the Genetics submodule.
 - [2705](https://github.com/RuminantFarmSystems/MASM/pull/2705) - [minor change] [InputChange][OutputChange][e2e-testing] Fix end to end testing for the new emission files.
 - [2732](https://github.com/RuminantFarmSystems/RuFaS/pull/2732) - [minor change] [NoInputChange] [NoOutputChange] Skip Animal module and Manure module if no animals are present in simulation.
+- [2739](https://github.com/RuminantFarmSystems/RuFaS/pull/2739) - [minor change] [NoInputChange] [NoOutputChange] Fixes manure outputs and updates E2E expected results accordingly.
+
 ### v0.9.2
 
 - [1968](https://github.com/RuminantFarmSystems/MASM/pull/1968) - [minor change] [Changelog] Move the changelog from a Google sheet into a markdown document in the repository.
diff --git a/input/data/end_to_end_testing/freestall/e2e_json_manure_filter.json b/input/data/end_to_end_testing/freestall/e2e_json_manure_filter.json
diff --git a/input/data/end_to_end_testing/no_animal/e2e_json_manure_filter.json b/input/data/end_to_end_testing/no_animal/e2e_json_manure_filter.json
@@ -3,6 +3,6 @@
     "filters": [
         "Manure.*"
     ],
-    "expected_results_last_updated": "07-Feb-2026_Sat_00-12-46",
+    "expected_results_last_updated": "09-Feb-2026_Mon_18-36-15",
     "expected_results": {"DISCLAIMER":"Under construction, use the results with caution.","EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2013_124_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2013_124_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2013_124_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2013_124_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2013_124_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2013_124_field_1":{"values":[11939.038999999999]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2013_124_field_1":{"values":[4.367977371524996]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2014_311_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2014_311_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2014_311_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2014_311_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2014_311_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2014_311_field_1":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2014_311_field_1":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2015_311_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2015_311_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2015_311_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2015_311_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2015_311_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2015_311_field_1":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2015_311_field_1":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2016_311_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2016_311_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2016_311_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2016_311_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2016_311_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2016_311_field_1":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2016_311_field_1":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2013_124_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2013_124_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2013_124_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2013_124_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2013_124_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2013_124_field_2":{"values":[11939.038999999999]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2013_124_field_2":{"values":[4.367977371524996]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2014_311_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2014_311_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2014_311_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2014_311_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2014_311_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2014_311_field_2":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2014_311_field_2":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2015_311_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2015_311_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2015_311_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2015_311_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2015_311_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2015_311_field_2":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2015_311_field_2":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2016_311_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2016_311_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2016_311_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2016_311_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2016_311_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2016_311_field_2":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2016_311_field_2":{"values":[6.555790906124207]}}
 }
diff --git a/input/data/end_to_end_testing/open_lot/e2e_json_manure_filter.json b/input/data/end_to_end_testing/open_lot/e2e_json_manure_filter.json
diff --git a/tests/test_biophysical/test_manure/test_storage/test_anaerobic_lagoon.py b/tests/test_biophysical/test_manure/test_storage/test_anaerobic_lagoon.py
@@ -166,7 +166,7 @@ def mock_process_manure_side_effect(_: CurrentDayConditions, __: RufasTime) -> d
             call("storage_methane", 2.0, "process_manure", MeasurementUnits.KILOGRAMS, dummy_time.simulation_day),
             call(
                 "outdoor_storage_manure_temperature",
-                str(25.0),
+                25.0,
                 "process_manure",
                 MeasurementUnits.DEGREES_CELSIUS,
                 dummy_time.simulation_day,
diff --git a/tests/test_biophysical/test_manure/test_storage/test_slurry_storage_outdoor.py b/tests/test_biophysical/test_manure/test_storage/test_slurry_storage_outdoor.py
@@ -181,7 +181,7 @@ def process_manure_side_effect(_: CurrentDayConditions, __: RufasTime) -> dict[s
     assert mock_report_processor_output.call_args_list == [
         call(
             "outdoor_storage_manure_temperature",
-            str(dummy_manure_temperature),
+            dummy_manure_temperature,
             expected_data_origin_name,
             MeasurementUnits.DEGREES_CELSIUS,
             dummy_time.simulation_day,

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ def process_manure(self, current_day_conditions: CurrentDayConditions, time: Ruf`
`106`	`106`	`)`
`107`	`107`	`self._report_processor_output(`
`108`	`108`	`"outdoor_storage_manure_temperature",`
`109`		`- str(manure_temperature),`
	`109`	`+ manure_temperature,`
`110`	`110`	`function_name,`
`111`	`111`	`MeasurementUnits.DEGREES_CELSIUS,`
`112`	`112`	`time.simulation_day,`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"filters": [`
`4`	`4`	`"Manure.*"`
`5`	`5`	`],`
`6`		`- "expected_results_last_updated": "07-Feb-2026_Sat_00-12-46",`
	`6`	`+ "expected_results_last_updated": "09-Feb-2026_Mon_18-36-15",`
`7`	`7`	"expected_results": {"DISCLAIMER":"Under construction, use the results with caution.","EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2013_124_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2013_124_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2013_124_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2013_124_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2013_124_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2013_124_field_1":{"values":[11939.038999999999]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2013_124_field_1":{"values":[4.367977371524996]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2014_311_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2014_311_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2014_311_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2014_311_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2014_311_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2014_311_field_1":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2014_311_field_1":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2015_311_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2015_311_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2015_311_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2015_311_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2015_311_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2015_311_field_1":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2015_311_field_1":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2016_311_field_1":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2016_311_field_1":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2016_311_field_1":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2016_311_field_1":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2016_311_field_1":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2016_311_field_1":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2016_311_field_1":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2013_124_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2013_124_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2013_124_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2013_124_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2013_124_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2013_124_field_2":{"values":[11939.038999999999]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2013_124_field_2":{"values":[4.367977371524996]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2014_311_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2014_311_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2014_311_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2014_311_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2014_311_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2014_311_field_2":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2014_311_field_2":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2015_311_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2015_311_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2015_311_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2015_311_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2015_311_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2015_311_field_2":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2015_311_field_2":{"values":[6.555790906124207]},"EnergyEstimator.estimate_all.tractor_size_for_Manure Application_2016_311_field_2":{"values":["Small"]},"EnergyEstimator.estimate_all.operation_event_for_Manure Application_2016_311_field_2":{"values":["Manure Application"]},"EnergyEstimator.estimate_all.herd_size_for_Manure Application_2016_311_field_2":{"values":[100]},"EnergyEstimator.estimate_all.field_production_size_for_Manure Application_2016_311_field_2":{"values":[10.0]},"EnergyEstimator.estimate_all.application_depth_for_Manure Application_2016_311_field_2":{"values":[30.0]},"EnergyEstimator.estimate_all.application_mass_Manure Application_2016_311_field_2":{"values":[17919.013]},"EnergyEstimator.estimate_all.diesel_consumption_for_Manure Application_2016_311_field_2":{"values":[6.555790906124207]}}
`8`	`8`	`}`