From d6a7f143ad4ac75b877b2b66f3a67f23518d7cac Mon Sep 17 00:00:00 2001 From: Mathilde Leuridan Date: Wed, 10 Jan 2024 16:45:09 +0100 Subject: [PATCH 1/5] fix tests --- tests/test_ecmwf_oper_data_fdb.py | 2 +- tests/test_fdb_datacube.py | 3 +-- tests/test_slice_date_range_fdb.py | 4 +--- tests/test_slice_date_range_fdb_v2.py | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/test_ecmwf_oper_data_fdb.py b/tests/test_ecmwf_oper_data_fdb.py index 7ec4a4659..553407eab 100644 --- a/tests/test_ecmwf_oper_data_fdb.py +++ b/tests/test_ecmwf_oper_data_fdb.py @@ -16,7 +16,7 @@ def setup_method(self, method): "date": {"merge": {"with": "time", "linkers": ["T", "00"]}}, "step": {"type_change": "int"}, } - self.config = {"class": "od", "expver": "0001", "levtype": "sfc", "step": 0, "type": "fc"} + self.config = {"class": "od", "expver": "0001", "levtype": "sfc", "stream": "oper", "type": "fc"} self.fdbdatacube = FDBDatacube(self.config, axis_options=self.options) self.slicer = HullSlicer() self.API = Polytope(datacube=self.fdbdatacube, engine=self.slicer, axis_options=self.options) diff --git a/tests/test_fdb_datacube.py b/tests/test_fdb_datacube.py index a7c54816a..bf4452a35 100644 --- a/tests/test_fdb_datacube.py +++ b/tests/test_fdb_datacube.py @@ -20,7 +20,7 @@ def setup_method(self, method): "step": {"type_change": "int"}, "number": {"type_change": "int"}, } - self.config = {"class": "od", "expver": "0001", "levtype": "sfc"} + self.config = {"class": "od", "expver": "0001", "levtype": "sfc", "stream": "oper"} self.fdbdatacube = FDBDatacube(self.config, axis_options=self.options) self.slicer = HullSlicer() self.API = Polytope(datacube=self.fdbdatacube, engine=self.slicer, axis_options=self.options) @@ -38,7 +38,6 @@ def test_fdb_datacube(self): Select("class", ["od"]), Select("stream", ["oper"]), Select("type", ["an"]), - Select("number", [1]), Box(["latitude", "longitude"], [0, 0], [0.2, 0.2]), ) result = self.API.retrieve(request) diff --git a/tests/test_slice_date_range_fdb.py b/tests/test_slice_date_range_fdb.py index 624a77fe2..319bc2c24 100644 --- a/tests/test_slice_date_range_fdb.py +++ b/tests/test_slice_date_range_fdb.py @@ -17,7 +17,7 @@ def setup_method(self, method): "step": {"type_change": "int"}, "number": {"type_change": "int"}, } - self.config = {"class": "od", "expver": "0001", "levtype": "sfc", "step": "0"} + self.config = {"class": "od", "expver": "0001", "levtype": "sfc", "stream": "oper"} self.fdbdatacube = FDBDatacube(self.config, axis_options=self.options) self.slicer = HullSlicer() self.API = Polytope(datacube=self.fdbdatacube, engine=self.slicer, axis_options=self.options) @@ -27,7 +27,6 @@ def setup_method(self, method): def test_fdb_datacube(self): request = Request( Select("step", [0]), - Select("number", [1]), Select("levtype", ["sfc"]), Span("date", pd.Timestamp("20230625T120000"), pd.Timestamp("20230626T120000")), Select("domain", ["g"]), @@ -36,7 +35,6 @@ def test_fdb_datacube(self): Select("class", ["od"]), Select("stream", ["oper"]), Select("type", ["an"]), - Select("number", [1]), Box(["latitude", "longitude"], [0, 0], [0.2, 0.2]), ) result = self.API.retrieve(request) diff --git a/tests/test_slice_date_range_fdb_v2.py b/tests/test_slice_date_range_fdb_v2.py index 24ae1a9a5..ee50e75b6 100644 --- a/tests/test_slice_date_range_fdb_v2.py +++ b/tests/test_slice_date_range_fdb_v2.py @@ -16,7 +16,7 @@ def setup_method(self, method): "date": {"merge": {"with": "time", "linkers": ["T", "00"]}}, "step": {"type_change": "int"}, } - self.config = {"class": "ea", "expver": "0001", "levtype": "pl", "step": 0} + self.config = {"class": "ea", "expver": "0001", "levtype": "pl"} self.fdbdatacube = FDBDatacube(self.config, axis_options=self.options) self.slicer = HullSlicer() self.API = Polytope(datacube=self.fdbdatacube, engine=self.slicer, axis_options=self.options) From 0c6764a2a2aefd204d4eacd81af97ae07f306474 Mon Sep 17 00:00:00 2001 From: Mathilde Leuridan Date: Thu, 11 Jan 2024 11:08:40 +0100 Subject: [PATCH 2/5] rename fdb to gj --- polytope/datacube/backends/fdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polytope/datacube/backends/fdb.py b/polytope/datacube/backends/fdb.py index cbc76893f..3231dd2a1 100644 --- a/polytope/datacube/backends/fdb.py +++ b/polytope/datacube/backends/fdb.py @@ -19,7 +19,7 @@ def __init__(self, config={}, axis_options={}): partial_request = config # Find values in the level 3 FDB datacube - self.fdb = pygj.GribJump() + self.gj = pygj.GribJump() self.fdb_coordinates = self.fdb.axes(partial_request) self.fdb_coordinates["values"] = [] for name, values in self.fdb_coordinates.items(): From 1dd0cb20dcf6fe9e59c362e1821696534bd30de3 Mon Sep 17 00:00:00 2001 From: Mathilde Leuridan Date: Thu, 11 Jan 2024 11:11:00 +0100 Subject: [PATCH 3/5] rename fdb to gj --- polytope/datacube/backends/fdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polytope/datacube/backends/fdb.py b/polytope/datacube/backends/fdb.py index 3231dd2a1..a3c230fec 100644 --- a/polytope/datacube/backends/fdb.py +++ b/polytope/datacube/backends/fdb.py @@ -20,7 +20,7 @@ def __init__(self, config={}, axis_options={}): # Find values in the level 3 FDB datacube self.gj = pygj.GribJump() - self.fdb_coordinates = self.fdb.axes(partial_request) + self.fdb_coordinates = self.gj.axes(partial_request) self.fdb_coordinates["values"] = [] for name, values in self.fdb_coordinates.items(): values.sort() From 06e634289729240581362c67b849246ece107d67 Mon Sep 17 00:00:00 2001 From: Mathilde Leuridan Date: Thu, 11 Jan 2024 11:11:40 +0100 Subject: [PATCH 4/5] rename fdb to gj --- polytope/datacube/backends/fdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polytope/datacube/backends/fdb.py b/polytope/datacube/backends/fdb.py index a3c230fec..19650d14e 100644 --- a/polytope/datacube/backends/fdb.py +++ b/polytope/datacube/backends/fdb.py @@ -146,7 +146,7 @@ def find_fdb_values(self, path, range_lengths, current_start_idx, lat_length): sorted_list = sorted(request_ranges_with_idx, key=lambda x: x[1][0]) original_indices, sorted_request_ranges = zip(*sorted_list) fdb_requests.append(tuple((path, sorted_request_ranges))) - output_values = self.fdb.extract(fdb_requests) + output_values = self.gj.extract(fdb_requests) return (output_values, original_indices) def datacube_natural_indexes(self, axis, subarray): From 196842cadc0ced67159a8f9de1bc7923e5e0ae6c Mon Sep 17 00:00:00 2001 From: Mathilde Leuridan Date: Tue, 23 Jan 2024 10:34:50 +0100 Subject: [PATCH 5/5] black setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0bcb9ac6c..005e76dfd 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ io.open("polytope/version.py", encoding="utf_8_sig").read(), ).group(1) -with open('requirements.txt') as f: +with open("requirements.txt") as f: requirements = f.read().splitlines() setup( @@ -25,5 +25,5 @@ packages=find_packages(), zip_safe=False, include_package_data=True, - install_requires=requirements + install_requires=requirements, )