weatherdb 1.2.4__tar.gz → 1.2.5__tar.gz

{weatherdb-1.2.4 → weatherdb-1.2.5}/.gitlab-ci.yml

@@ -12,8 +12,9 @@ workflow:
 test_single:
   stage: test_single
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG == null
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_TAG =~ /^[Vv]*\d+\.\d+\.\d+$/
   image: "python:$PYTHON_VERSION"
   services:
     - name: timescale/timescaledb-ha:pg17
@@ -154,8 +155,13 @@ deploy2zenodo:
   stage: release
   rules:
     - !reference [build, rules]
-  dependencies:
-    - release_pypi
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: never
+    - when: manual
+      allow_failure: true
+  needs:
+    - job: release_pypi
+      optional: true
   variables:
     DEPLOY2ZENODO_JSON: zenodo.json
     DEPLOY2ZENODO_ADD_IsNewVersionOf: yes
@@ -164,6 +170,7 @@ deploy2zenodo:
     - apk add --no-cache curl jq git pandoc
     # pack
     - TAG=$(echo $CI_COMMIT_TAG | cut -d "v" -f 2)
+    - if [ -z "$TAG" ]; then echo "TAG is empty, exiting"; exit 1; fi
     - DEPLOY2ZENODO_UPLOAD=v$TAG.zip
     - git archive --format zip --output "$DEPLOY2ZENODO_UPLOAD" $CI_COMMIT_SHA
     # prepare zenodo.json

{weatherdb-1.2.4 → weatherdb-1.2.5}/CHANGES.md

@@ -1,5 +1,10 @@
 # Change-log
 
+## Version 1.2.5
+
+- cli updating methods have now additional parameters for stids, period and para to be able to update only a some specific stations
+- fillup: update also Temperature values if the filled_max and filled_min are NULL.
+
 ## Version 1.2.4
 
 - added Zenodo upload

{weatherdb-1.2.4 → weatherdb-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weatherdb
-Version: 1.2.4
+Version: 1.2.5
 Summary: This is a package to work with and to create the Weather Database which handles, checks, fills and corrects DWD Weather Station data.
 Author-email: Max Schmit <max.schmit@hydrology.uni-freiburg.de>
 License:                     GNU GENERAL PUBLIC LICENSE

weatherdb-1.2.5/weatherdb/_version.py

@@ -0,0 +1 @@
+__version__ = "1.2.5"

{weatherdb-1.2.4 → weatherdb-1.2.5}/weatherdb/cli.py

@@ -7,6 +7,43 @@ from textwrap import dedent
 sys.path.insert(0, Path(__file__).resolve().parent.parent.as_posix())
 import weatherdb
 
+# Reusable option decorators
+# ---------------------------------------
+
+def period_options(f):
+    """Add period options only"""
+    f = click.option("--period_from", "-f",
+                     default=None, show_default=True,
+                     help="The from timestamp of the period to apply the method on. Timestamp should be in the format YYYY-MM-DD.")(f)
+    f = click.option("--period_until", "-u",
+                     default=None, show_default=True,
+                     help="The until timestamp of the period to apply the method on. Timestamp should be in the format YYYY-MM-DD.")(f)
+    return f
+
+def stid_option(f):
+    """Add station ID options"""
+    f = click.option("--stid", "-i",
+                     default=["all"], show_default=True, multiple=True,
+                     callback=lambda ctx, param, value: "all" if "all" in value else [int(v) for v in value],
+                     help="The station IDs to apply the method to. Options are 'all' or a specific station ID. " +
+                          "You can enter multiple values to add multiple station IDs.")(f)
+    return f
+
+def para_options(f):
+    """Add parameter options"""
+    f = click.option("--para", "-p",
+                     default=["p", "t", "et"], show_default=True, multiple=True,
+                     help="The parameters to work with. Options are 'p', 't' and 'et'. " +
+                          "You can enter multiple values to add multiple parameters.")(f)
+    return f
+
+def common_update_options(f):
+    """Add common options for processing commands (para, stid, period)"""
+    f = para_options(f)
+    f = stid_option(f)
+    f = period_options(f)
+    return f
+
 # main cli group
 # ---------------------------------------
 
@@ -185,31 +222,43 @@ def update_ma_raster():
 
 
 @cli.command(short_help="Update the raw data of the complete database.")
-def update_raw():
+@common_update_options
+def update_raw(para, stid, period_from, period_until):
     click.echo("starting updating the raw data")
     broker = weatherdb.broker.Broker()
-    broker.update_raw()
+    broker.update_raw(paras=para,
+                      stids=stid,
+                      period=(period_from, period_until))
 
 
 @cli.command(short_help="Do the quality check of the complete database.")
-def quality_check():
+@common_update_options
+def quality_check(para, stid, period_from, period_until):
     click.echo("starting quality check")
     broker = weatherdb.broker.Broker()
-    broker.quality_check()
+    broker.quality_check(paras=para,
+                         stids=stid,
+                         period=(period_from, period_until))
 
 
 @cli.command(short_help="Do the filling of the complete database.")
-def fillup():
+@common_update_options
+def fillup(para, stid, period_from, period_until):
     click.echo("starting filling up")
     broker = weatherdb.broker.Broker()
-    broker.fillup()
+    broker.fillup(paras=para,
+                  stids=stid,
+                  period=(period_from, period_until))
 
 
 @cli.command(short_help="Do the richter correction of the complete database.")
-def richter_correct():
+@stid_option
+@period_options
+def richter_correct(stid, period_from, period_until):
     click.echo("starting richter correction")
     broker = weatherdb.broker.Broker()
-    broker.richter_correct()
+    broker.richter_correct(stids=stid,
+                           period=(period_from, period_until))
 
 
 # cli admin stuff

{weatherdb-1.2.4 → weatherdb-1.2.5}/weatherdb/station/StationBases.py

@@ -1447,7 +1447,8 @@ class StationBase:
                     {sql_format_dict["extra_exec_cols"].format(i=i)}
                     filled_by[{i}]=%1$s
                 FROM timeseries.%2$I nb
-                WHERE nf.filled IS NULL AND nf.nb_mean[{i}] IS NULL {prev_check}
+                WHERE (nf.filled IS NULL {sql_format_dict["extra_fillup_update_where"]})
+                    AND nf.nb_mean[{i}] IS NULL {prev_check}
                     AND nf.timestamp = nb.timestamp;"""
                 prev_check += f" AND nf.nb_mean[{i}] IS NOT NULL AND nf.filled_by[{i}] != %1$s"
 
@@ -1689,6 +1690,7 @@ class StationBase:
                 "extra_fillup_where": "",
                 "mul_elev_order": "",
                 "extra_exec_cols": "",
+                "extra_fillup_update_where": "",
                 "extra_after_loop_extra_col": ""}
 
     @db_engine.deco_update_privilege

{weatherdb-1.2.4 → weatherdb-1.2.5}/weatherdb/station/StationT.py

@@ -135,6 +135,7 @@ class StationT(StationTETBase):
                                   ' OR ts."filled_max" IS DISTINCT FROM new."filled_max"',
             "extra_exec_cols": "nb_max[{i}]=round(nb.raw_max + %3$s, 0)::int,"+
                                "nb_min[{i}]=round(nb.raw_min + %3$s, 0)::int,",
+            "extra_fillup_update_where": ' OR nf."filled_min" IS NULL OR nf."filled_max" IS NULL',
             "extra_after_loop_extra_col": """,
                 filled_min=(SELECT percentile_cont(0.5) WITHIN GROUP (ORDER BY v)
                             FROM unnest(nb_min) as T(v)),

{weatherdb-1.2.4 → weatherdb-1.2.5}/weatherdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weatherdb
-Version: 1.2.4
+Version: 1.2.5
 Summary: This is a package to work with and to create the Weather Database which handles, checks, fills and corrects DWD Weather Station data.
 Author-email: Max Schmit <max.schmit@hydrology.uni-freiburg.de>
 License:                     GNU GENERAL PUBLIC LICENSE

{weatherdb-1.2.4 → weatherdb-1.2.5}/zenodo.json

@@ -7,7 +7,7 @@
                 "orcid": "0000-0002-0712-4116"
             }
         ],
-        "contributor":[
+        "contributors":[
             {
                 "name": "Weiler, Markus",
                 "affiliation": "University of Freiburg",
@@ -24,12 +24,12 @@
             {
                 "relation": "cites",
                 "identifier": "10.5281/zenodo.10066044",
-                "resource_type": "Dataset"
+                "resource_type": "dataset"
             },
             {
                 "relation": "requires",
                 "identifier": "https://opendata.dwd.de/climate_environment/CDC/",
-                "resource_type": "Dataset"
+                "resource_type": "dataset"
             }
         ],
         "references": [
@@ -52,6 +52,6 @@
             {"term": "Meteorology", "identifier": "euroscivoc:281"},
             {"term": "Meteorology", "identifier": "gemet:concept/5197"}
         ],
-        "language": "English"
+        "language": "eng"
     }
 }

weatherdb-1.2.4/weatherdb/_version.py

@@ -1 +0,0 @@
-__version__ = "1.2.4"