From 8a0690dfe85a8898b9ff67ffbb5db53de9ab6e4c Mon Sep 17 00:00:00 2001 From: Karthik Rishinarada Date: Fri, 3 Jan 2025 17:49:18 +0530 Subject: [PATCH 1/6] config: remove configwritermixin class --- tardis/io/configuration/config_reader.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tardis/io/configuration/config_reader.py b/tardis/io/configuration/config_reader.py index c4efb949031..b9bdfb0c90d 100644 --- a/tardis/io/configuration/config_reader.py +++ b/tardis/io/configuration/config_reader.py @@ -190,18 +190,7 @@ def deepcopy(self): return ConfigurationNameSpace(copy.deepcopy(dict(self))) -class ConfigWriterMixin(HDFWriterMixin): - """ - Overrides HDFWriterMixin to obtain HDF properties from configuration keys - """ - - def get_properties(self): - data = yaml.dump(self) - data = pd.DataFrame(index=[0], data={"config": data}) - return data - - -class Configuration(ConfigurationNameSpace, ConfigWriterMixin): +class Configuration(ConfigurationNameSpace): """ Tardis configuration class """ From 956c3b1ca67f7a02575a510bef9f3fabdf662e66 Mon Sep 17 00:00:00 2001 From: Karthik Rishinarada Date: Fri, 3 Jan 2025 18:43:58 +0530 Subject: [PATCH 2/6] config: remove configwritermixin --- .mailmap | 2 ++ tardis/io/configuration/config_reader.py | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index ed00506c00f..95ec8111936 100644 --- a/.mailmap +++ b/.mailmap @@ -119,6 +119,8 @@ Josh Shields Karan Desai Karan Desai karandesai-96 +Karthik Rishinarada + Kaushik Varanasi Kaushik Varanasi kaushik94 diff --git a/tardis/io/configuration/config_reader.py b/tardis/io/configuration/config_reader.py index b9bdfb0c90d..c32ff0b8b18 100644 --- a/tardis/io/configuration/config_reader.py +++ b/tardis/io/configuration/config_reader.py @@ -3,13 +3,12 @@ import os import pprint -import pandas as pd import yaml from astropy import units as u from tardis.io.configuration import config_validator from tardis.io.model.readers.csvy import load_yaml_from_csvy -from tardis.io.util import HDFWriterMixin, YAMLLoader, yaml_load_file +from tardis.io.util import YAMLLoader, yaml_load_file pp = pprint.PrettyPrinter(indent=4) From a45999a0b5b6d63d98a3de547ffeef0d60c6b36d Mon Sep 17 00:00:00 2001 From: Karthik Rishinarada Date: Fri, 3 Jan 2025 19:17:03 +0530 Subject: [PATCH 3/6] remove test related to configwritermixin --- tardis/io/configuration/tests/test_config_reader.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tardis/io/configuration/tests/test_config_reader.py b/tardis/io/configuration/tests/test_config_reader.py index 5fb3557c268..3814d196e55 100644 --- a/tardis/io/configuration/tests/test_config_reader.py +++ b/tardis/io/configuration/tests/test_config_reader.py @@ -61,16 +61,6 @@ def test_from_config_dict(tardis_config_verysimple): ) -def test_config_hdf(hdf_file_path, tardis_config_verysimple): - expected = Configuration.from_config_dict( - tardis_config_verysimple, validate=True, config_dirname="test" - ) - expected.to_hdf(hdf_file_path, overwrite=True) - actual = pd.read_hdf(hdf_file_path, key="/simulation/config") - expected = expected.get_properties()["config"] - assert actual[0] == expected[0] - - def test_model_section_config(tardis_config_verysimple): """ Configuration Validation Test for Model Section of the Tardis Config YAML File From 84ea40c1f4c4450cbc9f30c12d1693c22c3554f7 Mon Sep 17 00:00:00 2001 From: Karthik Rishinarada Date: Tue, 21 Jan 2025 22:22:35 +0530 Subject: [PATCH 4/6] add HDFWriterMixin to Configuration --- tardis/io/configuration/config_reader.py | 10 ++++++++-- tardis/io/configuration/tests/test_config_reader.py | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tardis/io/configuration/config_reader.py b/tardis/io/configuration/config_reader.py index c32ff0b8b18..050537dad85 100644 --- a/tardis/io/configuration/config_reader.py +++ b/tardis/io/configuration/config_reader.py @@ -2,13 +2,14 @@ import logging import os import pprint +import pandas as pd import yaml from astropy import units as u from tardis.io.configuration import config_validator from tardis.io.model.readers.csvy import load_yaml_from_csvy -from tardis.io.util import YAMLLoader, yaml_load_file +from tardis.io.util import HDFWriterMixin, YAMLLoader, yaml_load_file pp = pprint.PrettyPrinter(indent=4) @@ -189,7 +190,7 @@ def deepcopy(self): return ConfigurationNameSpace(copy.deepcopy(dict(self))) -class Configuration(ConfigurationNameSpace): +class Configuration(ConfigurationNameSpace, HDFWriterMixin): """ Tardis configuration class """ @@ -291,6 +292,11 @@ def from_config_dict(cls, config_dict, validate=True, config_dirname=""): ) return cls(validated_config_dict) + + def get_properties(self): + data = yaml.dump(self) + data = pd.DataFrame(index=[0], data={"config": data}) + return data @staticmethod def validate_spectrum_section( diff --git a/tardis/io/configuration/tests/test_config_reader.py b/tardis/io/configuration/tests/test_config_reader.py index 3814d196e55..0d063f83e58 100644 --- a/tardis/io/configuration/tests/test_config_reader.py +++ b/tardis/io/configuration/tests/test_config_reader.py @@ -61,6 +61,16 @@ def test_from_config_dict(tardis_config_verysimple): ) +def test_config_hdf(hdf_file_path, tardis_config_verysimple): + expected = Configuration.from_config_dict( + tardis_config_verysimple, validate=True, config_dirname="test" + ) + expected.to_hdf(hdf_file_path, overwrite=True) + actual = pd.read_hdf(hdf_file_path, key="/simulation/config") + expected = expected.get_properties()["config"] + assert actual[0] == expected[0] + + def test_model_section_config(tardis_config_verysimple): """ Configuration Validation Test for Model Section of the Tardis Config YAML File From 75ea8f84490716accd7e72e6a94f39960ba47888 Mon Sep 17 00:00:00 2001 From: Karthik Rishinarada Date: Tue, 21 Jan 2025 22:24:45 +0530 Subject: [PATCH 5/6] lint fix --- tardis/io/configuration/config_reader.py | 1 + tardis/io/configuration/tests/test_config_reader.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tardis/io/configuration/config_reader.py b/tardis/io/configuration/config_reader.py index 050537dad85..c051b61abd2 100644 --- a/tardis/io/configuration/config_reader.py +++ b/tardis/io/configuration/config_reader.py @@ -2,6 +2,7 @@ import logging import os import pprint + import pandas as pd import yaml diff --git a/tardis/io/configuration/tests/test_config_reader.py b/tardis/io/configuration/tests/test_config_reader.py index 0d063f83e58..5fb3557c268 100644 --- a/tardis/io/configuration/tests/test_config_reader.py +++ b/tardis/io/configuration/tests/test_config_reader.py @@ -70,7 +70,7 @@ def test_config_hdf(hdf_file_path, tardis_config_verysimple): expected = expected.get_properties()["config"] assert actual[0] == expected[0] - + def test_model_section_config(tardis_config_verysimple): """ Configuration Validation Test for Model Section of the Tardis Config YAML File From 5d78234cd201377068fc6df01503306d358fe4d6 Mon Sep 17 00:00:00 2001 From: Karthik Rishinarada Date: Tue, 21 Jan 2025 22:25:16 +0530 Subject: [PATCH 6/6] lint fix --- tardis/io/configuration/config_reader.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tardis/io/configuration/config_reader.py b/tardis/io/configuration/config_reader.py index c051b61abd2..8b4b0cf73e8 100644 --- a/tardis/io/configuration/config_reader.py +++ b/tardis/io/configuration/config_reader.py @@ -4,7 +4,6 @@ import pprint import pandas as pd - import yaml from astropy import units as u