fix: rename hm / ts

metno · May 27, 2024 · 052eb7f · 052eb7f
1 parent 35b4d74
commit 052eb7f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/aerovaldb/aerovaldb.py b/src/aerovaldb/aerovaldb.py
@@ -171,7 +171,7 @@ def put_contour(
         raise NotImplementedError
 
     @get_method("/v0/ts/{project}/{experiment}/{region}/{network}/{obsvar}/{layer}")
-    async def get_ts(
+    async def get_timeseries(
         self,
         project: str,
         experiment: str,
@@ -199,7 +199,7 @@ async def get_ts(
         raise NotImplementedError
 
     @put_method("/v0/ts/{project}/{experiment}/{region}/{network}/{obsvar}/{layer}")
-    def put_ts(
+    def put_timeseries(
         self,
         obj,
         project: str,
@@ -231,7 +231,7 @@ def put_ts(
     @get_method(
         "/v0/ts_weekly/{project}/{experiment}/{station}_{network}-{obsvar}_{layer}"
     )
-    async def get_ts_weekly(
+    async def get_timeseries_weekly(
         self,
         project: str,
         experiment: str,
@@ -257,7 +257,7 @@ async def get_ts_weekly(
     @put_method(
         "/v0/ts_weekly/{project}/{experiment}/{station}_{network}-{obsvar}_{layer}"
     )
-    def put_ts_weekly(
+    def put_timeseries_weekly(
         self,
         obj,
         project: str,
@@ -477,7 +477,7 @@ def put_map(
     @get_method(
         "/v0/scat/{project}/{experiment}/{network}-{obsvar}_{layer}_{model}-{modvar}"
     )
-    async def get_scat(
+    async def get_scatter(
         self,
         project: str,
         experiment: str,
@@ -506,7 +506,7 @@ async def get_scat(
     @put_method(
         "/v0/scat/{project}/{experiment}/{network}-{obsvar}_{layer}_{model}-{modvar}"
     )
-    def put_scat(
+    def put_scatter(
         self,
         obj,
         project: str,
@@ -579,7 +579,7 @@ def put_profiles(
         raise NotImplementedError
 
     @get_method("/v0/hm_ts/{project}/{experiment}")
-    async def get_hm_ts(
+    async def get_heatmap_timeseries(
         self,
         project: str,
         experiment: str,
@@ -599,7 +599,7 @@ async def get_hm_ts(
         raise NotImplementedError
 
     @put_method("/v0/hm_ts/{project}/{experiment}")
-    def put_hm_ts(
+    def put_heatmap_timeseries(
         self,
         obj,
         project: str,

diff --git a/tests/test_jsonfiledb.py b/tests/test_jsonfiledb.py
@@ -23,13 +23,13 @@
             "./project/experiment/contour/",
         ),
         (
-            "get_ts",
+            "get_timeseries",
             ["project", "experiment", "region", "network", "obsvar", "layer"],
             None,
             "./project/experiment/ts/",
         ),
         (
-            "get_ts_weekly",
+            "get_timeseries_weekly",
             ["project", "experiment", "region", "network", "obsvar", "layer"],
             None,
             "./project/experiment/ts/dirunal/",
@@ -60,19 +60,19 @@
             "./project/experiment/map/with_time",
         ),
         (
-            "get_ts_weekly",
+            "get_timeseries_weekly",
             ["project", "experiment", "region", "network", "obsvar", "layer"],
             None,
             "./project/experiment/ts/dirunal/",
         ),
         (
-            "get_scat",
+            "get_scatter",
             ["project", "experiment", "network", "obsvar", "layer", "model", "modvar"],
             None,
             "./project/experiment/scat/",
         ),
         (
-            "get_scat",
+            "get_scatter",
             ["project", "experiment", "network", "obsvar", "layer", "model", "modvar"],
             {"time": "time"},
             "./project/experiment/scat/time",
@@ -84,13 +84,13 @@
             "./project/experiment/profiles/",
         ),
         (
-            "get_hm_ts",
+            "get_heatmap_timeseries",
             ["project", "experiment"],
             None,
             "project/experiment/hm/ts/stats_ts.json",
         ),
         (
-            "get_hm_ts",
+            "get_heatmap_timeseries",
             ["project", "experiment"],
             {
                 "network": "network",
@@ -100,7 +100,7 @@
             "./project/experiment/hm/ts/network-obsvar-layer",
         ),
         (
-            "get_hm_ts",
+            "get_heatmap_timeseries",
             ["project", "experiment"],
             {
                 "network": "network",
@@ -165,12 +165,12 @@ async def test_put_contour():
 
 
 @pytest.mark.asyncio
-async def test_put_ts():
+async def test_put_timeseries():
     with aerovaldb.open("json_files:./tests/test-db/tmp") as db:
         obj = {"data": "gibberish"}
-        db.put_ts(obj, "test1", "test2", "test3", "test4", "test5", "test6")
+        db.put_timeseries(obj, "test1", "test2", "test3", "test4", "test5", "test6")
 
-        read_data = await db.get_ts(
+        read_data = await db.get_timeseries(
             "test1", "test2", "test3", "test4", "test5", "test6"
         )