weatherdb 1.2.4__py3-none-any.whl → 1.2.5__py3-none-any.whl

weatherdb/_version.py

@@ -1 +1 @@
-__version__ = "1.2.4"
+__version__ = "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/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/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.dist-info → weatherdb-1.2.5.dist-info}/METADATA

@@ -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.dist-info → weatherdb-1.2.5.dist-info}/RECORD

@@ -44,9 +44,9 @@ tests/test-data/regionalisation/DWD-grid_ma_1991_2020_DGM25_clipped.tif,sha256=8
 tests/test-data/regionalisation/HYRAS_ma_1991_2020_DGM25_clipped.tif,sha256=HiSmi715dUpryQ1WSLSXR7GmGPHzK0rl6WOOrwjRwXw,2116377
 tests/test-data/regionalisation/README.md,sha256=equFOPJVaESGKIK1ZPVEJHY4TEqkW3NpJOFQzjsBy7M,151
 weatherdb/__init__.py,sha256=2BzziScTYzA65WS6nhtCRZOWSLfwHTCwvZdeyuHw79U,846
-weatherdb/_version.py,sha256=qjo-Usbvp802f_1XeGyTsWsDwlFERHYfz7wsKPXKb4Q,21
+weatherdb/_version.py,sha256=mVbto7ql37Z5qaxZdvFimhabXBR9vUiM-sBD79-zjmQ,21
 weatherdb/broker.py,sha256=qJaKVwo1zcTLKmP-sF_DMod6_7jVsdHEoiKEMvsPx9A,24842
-weatherdb/cli.py,sha256=b5p9SRP5aqQ3w89MLErAjFj37aZMy9OsF23nCDC8NJY,11358
+weatherdb/cli.py,sha256=RnN_aiKbOOVkBXPn9weKqoL6OPJNXdpLWKsIM9T0NrM,13635
 weatherdb/alembic/README.md,sha256=6hq24TPr8z3nqJCaqrmj6__kLikVG66kLGqfC_aFPWQ,440
 weatherdb/alembic/alembic.ini,sha256=Mc3-qkQfA42ApX9douZT77g1pWE9gn4oMVJEDoebmdQ,3087
 weatherdb/alembic/config.py,sha256=Q4aolMUUT7f6VmbY0uz_dWBtKkj3KgTUs_xOY_Gbzjw,264
@@ -66,11 +66,11 @@ weatherdb/db/views.py,sha256=DxY_IIonmiiRM-IhQrUMLwj12gIg6Q30rQAmR3wP3BE,6359
 weatherdb/db/fixtures/RichterParameters.json,sha256=CKxrB5FBX_BRKqxegXNyNtn9DUKmgibUtdvHoE8E5JI,836
 weatherdb/db/queries/get_quotient.py,sha256=9wVFmXE8tk8igGj-Xk5uSI0eiF_PQ9d-yRq7RJpvMAA,6787
 weatherdb/station/GroupStation.py,sha256=ikVsAMXlhJY8I991mJ3IBCLPW9AH5Hd7QLnDUDawM3U,31066
-weatherdb/station/StationBases.py,sha256=0OwEl85220DI6MIffjf4KpS4UA5zCR4yE2DNzydOlKE,130329
+weatherdb/station/StationBases.py,sha256=wR8PsVGf3IyxU8lADcjwe07AuhdmsJBSW_OeMplDKC0,130447
 weatherdb/station/StationET.py,sha256=hM6K8fCLC6mOLaE4cN92LHOyPGP01ifO6l2qO77I_bA,3621
 weatherdb/station/StationP.py,sha256=w_0l5cw8zTACIbmVFV4cdPwxuyP2Cnv97dnNrMElBDE,32691
 weatherdb/station/StationPD.py,sha256=Bcg_uQTgIQPffsMGhNEwKAXhYs1Ii4VeB75afdFG-Kk,3367
-weatherdb/station/StationT.py,sha256=-T1GKfUsvulm5c_-JufJ34H048fGlG21UF0_2z1dd9A,6012
+weatherdb/station/StationT.py,sha256=uatVrNie891Ht4uuZ5zMb-INMrXuoLk48-dYP4smzO0,6111
 weatherdb/station/__init__.py,sha256=v1sPfmhhLRMOr5DJ2c5BLIFY7GWkP5iMLA5vtZm-osg,591
 weatherdb/station/constants.py,sha256=vtdhgcK8A2cJaknT6qI8w5tAh_Hb5i2SvxxtHZOPyVc,511
 weatherdb/stations/GroupStations.py,sha256=Q-0sZ4skZgE-2hwE2QKmwDz_8_U4xWb2hYsKv5RvR1E,21927
@@ -87,9 +87,9 @@ weatherdb/utils/dwd.py,sha256=amEVVPLzXTSScBP5VAK35dBxuiy-Ua4hHyKnDGxD_4Q,12394
 weatherdb/utils/geometry.py,sha256=Od-RDAW1MASVAsGBXpHti9osbVJDqUbumSKBSJPbQqc,1823
 weatherdb/utils/get_data.py,sha256=62wV37fuzGhC2fLSCL7JyyMd3BAiRiimIhV95-mEROU,17294
 weatherdb/utils/logging.py,sha256=iaWnzCdBYxFmzWgLq9a6VAeBMdwy-rnt2d9PSAQq4lA,4242
-weatherdb-1.2.4.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-weatherdb-1.2.4.dist-info/METADATA,sha256=NNHSK3kH_KjYWLwXTNxNDtY0PvXoYsnTuF-rf5K7zIw,44308
-weatherdb-1.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-weatherdb-1.2.4.dist-info/entry_points.txt,sha256=kJemTd9Cm_QWPZt03KUWhpn1aB0-l_5ce6Ms3EoS_NM,55
-weatherdb-1.2.4.dist-info/top_level.txt,sha256=kLlRbXLn0GHvMWmciWRyvm0-FYEy56F6d0fGwfle9-g,28
-weatherdb-1.2.4.dist-info/RECORD,,
+weatherdb-1.2.5.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+weatherdb-1.2.5.dist-info/METADATA,sha256=fgnO1_o_ONvVUqZf94vmh4HgT3avg67MVV4B5H7YEZ0,44308
+weatherdb-1.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+weatherdb-1.2.5.dist-info/entry_points.txt,sha256=kJemTd9Cm_QWPZt03KUWhpn1aB0-l_5ce6Ms3EoS_NM,55
+weatherdb-1.2.5.dist-info/top_level.txt,sha256=kLlRbXLn0GHvMWmciWRyvm0-FYEy56F6d0fGwfle9-g,28
+weatherdb-1.2.5.dist-info/RECORD,,