From d7699878525e4d4a9d968cfce0dcd8f35ee72f9c Mon Sep 17 00:00:00 2001
From: Carsten Hinz <c.hinz@fz-juelich.de>
Date: Sat, 29 Jun 2024 00:57:21 +0200
Subject: [PATCH] adopted script to test example class.
---
examples/quality_controll.ipynb | 6 +++---
src/toargridding/contributors.py | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/examples/quality_controll.ipynb b/examples/quality_controll.ipynb
index a95cef8..a954b8e 100644
--- a/examples/quality_controll.ipynb
+++ b/examples/quality_controll.ipynb
@@ -28,7 +28,7 @@
"from toargridding.metadata import Metadata, TimeSample, AnalysisRequestResult, Coordinates\n",
"from toargridding.variables import Coordinate\n",
"\n",
- "from toargridding.contributors import contributionsManager\n",
+ "from toargridding.contributors import contributionsManager, contributions_manager_by_name\n",
"\n",
"import logging\n",
"from toargridding.defaultLogging import toargridding_defaultLogging\n",
@@ -61,12 +61,12 @@
"data = analysis_service.get_data(metadata)\n",
"\n",
"# create contributors endpoint and write result to metadata\n",
- "contrib = contributionsManager(metadata.get_id(), data_download_dir)\n",
+ "contrib = contributions_manager_by_name(metadata.get_id(), data_download_dir)\n",
"contrib.extract_contributors_from_data_frame(data.stations_data)\n",
"metadata.contributors_metadata_field = contrib.setup_contributors_endpoint_for_metadata()\n",
"ds = my_grid.as_xarray(data)\n",
"#store dataset\n",
- "ds.to_netcdf(data_download_dir / f\"{metadata.get_id()}_{my_grid.get_id()}.nc\")"
+ "ds.to_netcdf(data_download_dir / f\"{metadata.get_id()}_by_names_inline_{my_grid.get_id()}.nc\")"
]
},
{
diff --git a/src/toargridding/contributors.py b/src/toargridding/contributors.py
index 9837ce9..9fac9f4 100644
--- a/src/toargridding/contributors.py
+++ b/src/toargridding/contributors.py
@@ -37,7 +37,7 @@ class contributionsManager:
with open(self.contributors_path / f"{self.requestID}.{ext}", "w") as f:
for id in self.timeseriesIDs:
f.write(f"{id}\n")
- return f"curl -d @{self.requestID}.{ext} -X POST {self.endpoint}"
+ return f'curl -X POST "file=@{self.requestID}.{ext}" {self.endpoint}'
def setup_contributors_service(self) -> str:
# TODO: missing implementation
raise NotImplementedError("This has not been implemented as this package is not yet operated as a service.")
@@ -63,18 +63,17 @@ class contributions_manager_by_name(contributionsManager):
for name in names:
self.timeseriesIDs.add(name)
def id_to_names(self, id : int) -> list[str]:
- for _ in range(10):
+ for pos in range(10):
req_res = requests.get(f"https://toar-data.fz-juelich.de/api/v2/timeseries/{id}")
try:
results = req_res.json()
break
except:
+ print("Test debug:", pos, " try for id", id)
sleep(30)
pass
else:
raise RuntimeError(f"Could not get the response for the timeseries with id {id}.")
-
-
names = set()
for r in results["roles"]:
try:
--
GitLab