From adbaf2a0799ebc080ea5688cc4768a47f10b9ab1 Mon Sep 17 00:00:00 2001
From: Carsten Hinz <c.hinz@fz-juelich.de>
Date: Tue, 2 Jul 2024 14:07:26 +0200
Subject: [PATCH] added exclusion of N/A from contributors
---
examples/produce_data_withOptional.ipynb | 12 ++++++------
src/toargridding/contributors.py | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/examples/produce_data_withOptional.ipynb b/examples/produce_data_withOptional.ipynb
index cb1caa1..2e7ee5e 100644
--- a/examples/produce_data_withOptional.ipynb
+++ b/examples/produce_data_withOptional.ipynb
@@ -56,12 +56,12 @@
"for year in range(0,19):\n",
" valid_data = Config(\n",
" grid,\n",
- " #TimeSample( start=dt(2000+year,1,1), end=dt(2000+year,12,31), sampling=\"daily\"),#possibly adopt range:-)\n",
- " TimeSample( start=dt(2000+year,1,1), end=dt(2000+year,12,31), sampling=\"monthly\"),#possibly adopt range:-)\n",
+ " TimeSample( start=dt(2000+year,1,1), end=dt(2000+year,12,31), sampling=\"daily\"),#possibly adopt range:-)\n",
+ " #TimeSample( start=dt(2000+year,1,1), end=dt(2000+year,12,31), sampling=\"monthly\"),#possibly adopt range:-)\n",
" [\"mole_fraction_of_ozone_in_air\"],#variable name\n",
" #[ \"mean\", \"dma8epax\"],# will start one request after another other...\n",
- " #[ \"dma8epa_strict\" ],\n",
- " [ \"mean\" ],\n",
+ " [ \"dma8epa_strict\" ],\n",
+ " #[ \"mean\" ],\n",
" details4Query\n",
" )\n",
" \n",
@@ -89,7 +89,7 @@
"\n",
"# maybe adopt the interval for requesting the results and the total duration, before the client pauses the requests.\n",
"# as the requests take about 45min, it is more suitable to wait 60min before timing out the requests than the original 30min.\n",
- "analysis_service.connection.setRequestTimes(interval_min=5, maxWait_min=60)\n",
+ "analysis_service.connection.set_request_times(interval_min=5, max_wait_minutes=60)\n",
"\n",
"for person, config in configs.items():\n",
" print(f\"\\nProcessing {person}:\")\n",
@@ -100,7 +100,7 @@
" time=config.time,\n",
" variables=config.variables,\n",
" stats=config.stats,\n",
- " contributors_path=result_basepath\n",
+ " contributors_path=result_basepath,\n",
" **config.moreOptions\n",
" )\n",
"\n",
diff --git a/src/toargridding/contributors.py b/src/toargridding/contributors.py
index af9b759..04ec406 100644
--- a/src/toargridding/contributors.py
+++ b/src/toargridding/contributors.py
@@ -61,7 +61,8 @@ class contributions_manager_by_name(contributionsManager):
for id in ids:
names = self.id_to_names(id)
for name in names:
- self.timeseriesIDs.add(name)
+ if name != "N/A":
+ self.timeseriesIDs.add(name)
def id_to_names(self, id : int) -> list[str]:
for pos in range(10):
req_res = requests.get(f"https://toar-data.fz-juelich.de/api/v2/timeseries/{id}", timeout=40)
--
GitLab