diff --git a/config/config.template.json b/config/config.template.json index 3f5e85b0..98b37365 100644 --- a/config/config.template.json +++ b/config/config.template.json @@ -1,5 +1,5 @@ { - "version": "1.4", + "version": "1.5", "general": { "metadata": { "github_repository": "tum-esm/em27-metadata-storage", diff --git a/docs/components/config-schema.ts b/docs/components/config-schema.ts index b38f8398..257893dd 100644 --- a/docs/components/config-schema.ts +++ b/docs/components/config-schema.ts @@ -4,7 +4,7 @@ const CONFIG_SCHEMA: any = { "description": "A pydantic model describing the config file schema.", "properties": { "version": { - "const": "1.4", + "const": "1.5", "description": "Version of the retrieval pipeline which is compatible with this config file. Retrievals done with any version `1.x` will produce the same output files as retrievals done with version `1.0`. But higher version numbers might use a different config file structure and produce more output files.", "title": "Version", "type": "string" diff --git a/docs/pages/api-reference/configuration.mdx b/docs/pages/api-reference/configuration.mdx index c73d00d0..739fbe72 100644 --- a/docs/pages/api-reference/configuration.mdx +++ b/docs/pages/api-reference/configuration.mdx @@ -10,7 +10,7 @@ import { ```json { - "version": "1.4", + "version": "1.5", "general": { "metadata": { "github_repository": "tum-esm/em27-metadata-storage", diff --git a/docs/pages/guides/configuration.mdx b/docs/pages/guides/configuration.mdx index e1e0df6c..68f29079 100644 --- a/docs/pages/guides/configuration.mdx +++ b/docs/pages/guides/configuration.mdx @@ -18,7 +18,7 @@ Template: ```json { - "version": "1.4", + "version": "1.5", "general": { "metadata": { "github_repository": "tum-esm/em27-metadata-storage", diff --git a/pdm.lock b/pdm.lock index b93c89c8..36c1cd14 100644 --- a/pdm.lock +++ b/pdm.lock @@ -659,17 +659,17 @@ files = [ [[package]] name = "polars" -version = "1.15.0" +version = "1.16.0" requires_python = ">=3.9" summary = "Blazingly fast DataFrame library" groups = ["default"] files = [ - {file = "polars-1.15.0-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:d66ae8aae1a5b1273f7235173ad8022e479378eb36ff7ea6b1dd8224430d18bd"}, - {file = "polars-1.15.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:537df3259543956248c62b636a4e00b11becb30f97d1b4bd80a9e11f46c038bd"}, - {file = "polars-1.15.0-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c6686bc8acaaed24f337ae1623536210370ab4d3099c1dbb79ccfc9ec083914a"}, - {file = "polars-1.15.0-cp39-abi3-manylinux_2_24_aarch64.whl", hash = "sha256:1d15b86b73653befd834e48418d759954daeb831a08b32cd21034c88378c4037"}, - {file = "polars-1.15.0-cp39-abi3-win_amd64.whl", hash = "sha256:e4602b715dc58b84e38102c9ffcc7738f078373415f55acf0760204443d62371"}, - {file = "polars-1.15.0.tar.gz", hash = "sha256:4f60a64ceb2e56fd0f9f403d4b6734e033876904d04cb9a29c43653c6b2b2d43"}, + {file = "polars-1.16.0-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:072f5ff3b5fe05797c59890de0e464b34ede75a9735e7d7221622fa3a0616d8e"}, + {file = "polars-1.16.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:ebaf7a1ea114b042fa9f1cd17d49436279eb30545dd74361a2f5e3febeb867cd"}, + {file = "polars-1.16.0-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e626d21dcd2566e1442dac414fe177bc70ebfc2f16620d59d778b1b774361018"}, + {file = "polars-1.16.0-cp39-abi3-manylinux_2_24_aarch64.whl", hash = "sha256:53debcce55f68731ee2c7d6c787afdee26860ed6576f1ffa0cb9111b57f82857"}, + {file = "polars-1.16.0-cp39-abi3-win_amd64.whl", hash = "sha256:17efcb550c42d51034ff79702612b9184d8eac0d500de1dd7fb98490459276d3"}, + {file = "polars-1.16.0.tar.gz", hash = "sha256:dd99808b833872babe02434a809fd45c1cffe66a3d57123cdc5e447c7753d328"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index e23b0cf1..f68f8e74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "em27-retrieval-pipeline" -version = "1.4.1" +version = "1.5.0" description = "automated EM27 data processing" authors = [ { name = "Moritz Makowski", email = "moritz.makowski@tum.de" }, diff --git a/src/retrieval/algorithms/proffast-1.0/main/.gitignore b/src/retrieval/algorithms/proffast-1.0/main/.gitignore index 25c1bc5a..9332b022 100644 --- a/src/retrieval/algorithms/proffast-1.0/main/.gitignore +++ b/src/retrieval/algorithms/proffast-1.0/main/.gitignore @@ -1 +1,2 @@ -prf \ No newline at end of file +prf +2021-03-08_prf96-EM27-fast \ No newline at end of file diff --git a/src/types/config.py b/src/types/config.py index 7ffba5fb..a0ea9fb5 100644 --- a/src/types/config.py +++ b/src/types/config.py @@ -461,7 +461,7 @@ class Config(pydantic.BaseModel): model_config = pydantic.ConfigDict(extra="forbid") - version: Literal["1.4"] = pydantic.Field( + version: Literal["1.5"] = pydantic.Field( ..., description="Version of the retrieval pipeline which is compatible with this config file. Retrievals done with any version `1.x` will produce the same output files as retrievals done with version `1.0`. But higher version numbers might use a different config file structure and produce more output files.", ) diff --git a/tests/bundle/test_bundling.py b/tests/bundle/test_bundling.py index 2f00306a..30b106a4 100644 --- a/tests/bundle/test_bundling.py +++ b/tests/bundle/test_bundling.py @@ -12,8 +12,7 @@ BUNDLE_OUTPUT_DIR = os.path.join(PROJECT_DIR, "data", "testing", "bundle", "outputs") CONFIG = { - "version": - "1.4", + "version": "1.5", "general": { "metadata": None, "data": { @@ -33,20 +32,25 @@ "results": os.path.join(INPUT_DATA_DIR, "results"), }, }, - "profiles": - None, - "retrieval": - None, - "bundles": [{ - "dst_dir": BUNDLE_OUTPUT_DIR, - "output_formats": ["csv", "parquet"], - "sensor_ids": ["so", "mc"], - "retrieval_algorithms": ["proffast-1.0", "proffast-2.2", "proffast-2.3", "proffast-2.4"], - "atmospheric_profile_models": ["GGG2014", "GGG2020"], - "from_datetime": "2017-01-01T00:00:00+0000", - "to_datetime": "2024-12-31T23:59:59+0000", - "parse_dc_timeseries": True, - }], + "profiles": None, + "retrieval": None, + "bundles": [ + { + "dst_dir": BUNDLE_OUTPUT_DIR, + "output_formats": ["csv", "parquet"], + "sensor_ids": ["so", "mc"], + "retrieval_algorithms": [ + "proffast-1.0", + "proffast-2.2", + "proffast-2.3", + "proffast-2.4", + ], + "atmospheric_profile_models": ["GGG2014", "GGG2020"], + "from_datetime": "2017-01-01T00:00:00+0000", + "to_datetime": "2024-12-31T23:59:59+0000", + "parse_dc_timeseries": True, + } + ], } @@ -68,7 +72,7 @@ def test_bundling(download_sample_data: None) -> None: locations_path=os.path.join(METADATA_DIR, "locations.json"), sensors_path=os.path.join(METADATA_DIR, "sensors.json"), campaigns_path=os.path.join(METADATA_DIR, "campaigns.json"), - ) + ), ) bundle = config.bundles[0] @@ -80,14 +84,16 @@ def test_bundling(download_sample_data: None) -> None: if retrieval_algorithm == "proffast-1.0" and atmospheric_profile_model == "GGG2020": continue - filename = "-".join([ - "em27-retrieval-bundle", - sensor_id, - retrieval_algorithm, - atmospheric_profile_model, - bundle.from_datetime.strftime("%Y%m%d"), - bundle.to_datetime.strftime("%Y%m%d"), - ]) + filename = "-".join( + [ + "em27-retrieval-bundle", + sensor_id, + retrieval_algorithm, + atmospheric_profile_model, + bundle.from_datetime.strftime("%Y%m%d"), + bundle.to_datetime.strftime("%Y%m%d"), + ] + ) # fmt: off csv_path = os.path.join(BUNDLE_OUTPUT_DIR, f"{filename}.csv") assert os.path.exists(csv_path), f"Expected file {csv_path} does not exist."