weatherdb 1.1.2__py3-none-any.whl → 1.2.1__py3-none-any.whl

docker/docker-compose.yaml

@@ -14,12 +14,14 @@ services:
       WEATHERDB_USER_CONFIG_FILE: /home/config_user.yaml
       WEATHERDB_DATA_BASE_DIR: /home/data
       WEATHERDB_HANDLE_NON_EXISTING_CONFIG: create
+      WEATHERDB_OPENTOPO_API_KEY: /run/secrets/opentopo_api_key
       DOCKER_ENV: main
     volumes:
       - weatherdb_home:/home
     command: ["sleep", "infinity"] # to keep awake
     secrets:
       - db_password
+      - opentopo_api_key
     develop:
       watch:
         - action: rebuild
@@ -53,6 +55,8 @@ volumes:
 secrets:
   db_password:
     file: ./db_password.docker-secret
+  opentopo_api_key:
+    file: ./opentopo_api_key.docker-secret
 
 # start from parent folder with `docker compose -f docker\\docker-compose.yaml up --build`
-# To connect to ther weatherdb service use `docker-compose exec weatherdb bash`
+# To connect to the weatherdb service use `docker-compose exec weatherdb bash`

docs/source/Methode.md

@@ -117,7 +117,11 @@ N_{neighbor} * \dfrac{N_{station,ma,winter}}{N_{neighbor,ma,winter}} \space if\s
 N_{neighbor} * \dfrac{N_{station,ma,summer}}{N_{neighbor,ma,summer}} \space if\space month\notin[4:9]
 \end{cases}$
 
-For the precipitation stations only stations within a 100 km radius are taken to fill missing values. For the potential Evapotranspiration and the temperature this radius is 150km. For the temperature stations the median of the regionalised values from the 5 closest stations (but not more than 150 km away) is taken to fill missing values.
+For the precipitation stations only stations within a 110 km radius are taken to fill missing values. For the potential Evapotranspiration and the temperature this radius is 150km. For the temperature stations the median of the regionalised values from the 5 closest stations (but not more than 150 km away) is taken to fill missing values. Those limits can get configured in the user configurations.
+
+### linear interpolation
+
+After missing values got filled with regionalised values from the neighboring stations there can still be missing values left. To fill those residual missing values, they get interpolated linearly. Those linear interpolations have configurable limits for how big the interval of missing values can be. The default values are 1h for precipitation and 2 days for temperature and evapotranspiration.
 
 ### adjusting precipitation to daily station measurements
 

docs/source/api/weatherdb.broker.rst

@@ -0,0 +1,7 @@
+broker
+------
+
+.. autoclass:: weatherdb.broker.Broker
+
+
+

docs/source/api/weatherdb.db.rst

@@ -19,5 +19,15 @@ base models
 
 .. autoclass:: weatherdb.db.models.MetaBaseQC
 
+views
+-----
 
+Those are the database views
+
+.. automodule:: weatherdb.db.views
+
+connections
+-----------
+
+.. automodule:: weatherdb.db.connections
 

docs/source/api/weatherdb.rst

@@ -1,7 +1,6 @@
 weatherdb
 =========
 
-
 .. toctree::
    :maxdepth: 2
 

docs/source/api/weatherdb.station.GroupStation.rst

@@ -0,0 +1,5 @@
+GroupStation
+============
+
+.. py:module:: weatherdb.station
+.. autoclass:: weatherdb.station.GroupStation

docs/source/api/weatherdb.station.StationBases.rst

@@ -0,0 +1,18 @@
+StationBases
+============
+
+Those are the base station classes on which the real station classes above depend on.
+None of them is working on its own, because the class variables are not yet set correctly.
+
+.. py:module:: weatherdb.station.StationBases
+
+.. autoclass:: weatherdb.station.StationBases.StationBase
+
+
+.. autoclass:: weatherdb.station.StationBases.StationPBase
+
+
+.. autoclass:: weatherdb.station.StationBases.StationCanVirtualBase
+
+
+.. autoclass:: weatherdb.station.StationBases.StationTETBase

docs/source/api/weatherdb.station.StationET.rst

@@ -0,0 +1,5 @@
+StationET
+=========
+
+.. py:module:: weatherdb.station
+.. autoclass:: weatherdb.station.StationET

docs/source/api/weatherdb.station.StationP.rst

@@ -0,0 +1,5 @@
+StationP
+========
+
+.. py:module:: weatherdb.station
+.. autoclass:: weatherdb.station.StationP

docs/source/api/weatherdb.station.StationPD.rst

@@ -0,0 +1,6 @@
+StationPD
+=========
+
+.. py:module:: weatherdb.station
+.. autoclass:: weatherdb.station.StationPD
+  :exclude-members: quality_check, last_imp_quality_check, get_corr, get_adj, get_qc

docs/source/api/weatherdb.station.StationT.rst

@@ -0,0 +1,5 @@
+StationT
+========
+
+.. py:module:: weatherdb.station
+.. autoclass:: weatherdb.station.StationT

docs/source/api/weatherdb.station.rst

@@ -1,56 +1,17 @@
 station
--------
-.. module:: weatherdb.station
+--------
 
-StationP
-^^^^^^^^
-.. autoclass:: weatherdb.station.StationP
+.. py:module:: weatherdb.station
 
-  .. autoclasstoc::
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
 
-StationT
-^^^^^^^^
-.. autoclass:: weatherdb.station.StationT
+   weatherdb.station.StationP
+   weatherdb.station.StationT
+   weatherdb.station.StationET
+   weatherdb.station.StationPD
+   weatherdb.station.GroupStation
+   weatherdb.station.StationBases
 
-  .. autoclasstoc::
 
-StationET
-^^^^^^^^^
-
-.. autoclass:: weatherdb.station.StationET
-
-  .. autoclasstoc::
-
-StationPD
-^^^^^^^^^
-.. autoclass:: weatherdb.station.StationPD
-   :exclude-members: quality_check, last_imp_quality_check, get_corr, get_adj, get_qc
-
-  .. autoclasstoc::
-
-GroupStation
-^^^^^^^^^^^^
-.. autoclass:: weatherdb.station.GroupStation
-
-   .. autoclasstoc::
-
-StationBase...
-^^^^^^^^^^^^^^
-Those are the base station classes on which the real station classes above depend on.
-None of them is working on its own, because the class variables are not yet set correctly.
-
-.. autoclass:: weatherdb.station.StationBases.StationBase
-
-  .. autoclasstoc::
-
-.. autoclass:: weatherdb.station.StationBases.StationPBase
-
-  .. autoclasstoc::
-
-.. autoclass:: weatherdb.station.StationBases.StationCanVirtualBase
-
-  .. autoclasstoc::
-
-.. autoclass:: weatherdb.station.StationBases.StationTETBase
-
-  .. autoclasstoc::

docs/source/api/weatherdb.stations.StationsBase.rst

@@ -0,0 +1,15 @@
+StationsBase
+============
+
+Those are the base stations classes on which the real stations classes above depend on.
+None of them is working on its own, because the class variables are not yet set correctly.
+
+.. py:module:: weatherdb.stations.StationsBase
+
+.. autoclass:: weatherdb.stations.StationsBase.StationsBase
+
+  .. autoclasstoc::
+
+.. autoclass:: weatherdb.stations.StationsBaseTET.StationsBaseTET
+
+   .. autoclasstoc::

docs/source/api/weatherdb.stations.StationsET.rst

@@ -0,0 +1,6 @@
+StationsET
+==========
+
+.. py:module:: weatherdb.stations
+
+.. autoclass:: weatherdb.stations.StationsET

docs/source/api/weatherdb.stations.StationsP.rst

@@ -0,0 +1,6 @@
+StationsP
+=========
+
+.. py:module:: weatherdb.stations
+
+.. autoclass:: weatherdb.stations.StationsP

docs/source/api/weatherdb.stations.StationsPD.rst

@@ -0,0 +1,7 @@
+StationsPD
+==========
+
+.. py:module:: weatherdb.stations
+
+.. autoclass:: weatherdb.stations.StationsP
+

docs/source/api/weatherdb.stations.StationsT.rst

@@ -0,0 +1,7 @@
+StationsT
+=========
+
+.. py:module:: weatherdb.stations
+
+.. autoclass:: weatherdb.stations.StationsT
+

docs/source/api/weatherdb.stations.rst

@@ -1,46 +1,15 @@
 stations
 --------
-.. module:: weatherdb.stations
 
-StationsP
-^^^^^^^^^
-.. autoclass:: weatherdb.stations.StationsP
+.. py:module:: weatherdb.stations
 
-  .. autoclasstoc::
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
 
-StationsT
-^^^^^^^^^
-.. autoclass:: weatherdb.stations.StationsT
-
-  .. autoclasstoc::
-
-StationsET
-^^^^^^^^^^
-.. autoclass:: weatherdb.stations.StationsET
-
-  .. autoclasstoc::
-
-StationsPD
-^^^^^^^^^^
-.. autoclass:: weatherdb.stations.StationsPD
-
-  .. autoclasstoc::
-
-GroupStations
-^^^^^^^^^^^^^
-.. autoclass:: weatherdb.stations.GroupStations
-
-  .. autoclasstoc::
-
-StationsBase...
-^^^^^^^^^^^^^^^
-Those are the base stations classes on which the real stations classes above depend on.
-None of them is working on its own, because the class variables are not yet set correctly.
-
-.. autoclass:: weatherdb.stations.StationsBase.StationsBase
-
-  .. autoclasstoc::
-
-.. autoclass:: weatherdb.stations.StationsBaseTET.StationsBaseTET
-
-   .. autoclasstoc::
+   weatherdb.stations.StationsP
+   weatherdb.stations.StationsT
+   weatherdb.stations.StationsET
+   weatherdb.stations.StationsPD
+   weatherdb.stations.GroupStations
+   weatherdb.stations.StationsBase

docs/source/api/weatherdb.utils.rst

@@ -3,6 +3,8 @@ utils
 
 In this module there are several utilities used by the WeatherDB package, you shouldn't need to use them directly.
 
+TimestampPeriod
+---------------
 .. autoclass:: weatherdb.utils.TimestampPeriod
 
 dwd

docs/source/conf.py

@@ -84,6 +84,9 @@ autoclasstoc_sections = [
 # Autosummary options
 autosummary_generate = True
 autosummary_generate_overwrite = True
+suppress_warnings = [
+    'autosummary.import_cycle',
+]
 
 # intersphinx
 intersphinx_mapping = {

docs/source/setup/Quickstart.md

@@ -46,7 +46,8 @@ So there is:
 - "raw" : the raw measurements as on the DWD server
 - "qc"  : The quality checked data
 - "filled" : The filled timeseries
-- "filled_by" : The station ID of the station from which the data was taken to fill the measurements
+- "filled_by" : The station ID of the station from which the data was taken to fill the measurements.
+                If the value was filled by linear intrepolation "filled_by" is `-1`
 - "corr"    : The Richter corrected timeserie.
 
 If you want more than just one kind of timeseries, e.g. the filled timeseries, together with the id from which station the respective field got filled with use:

tests/test-data/DEM/README.md

@@ -0,0 +1,3 @@
+# Readme
+
+The DEM file in this folder originates from Copernicus and got clipped to the region of analysis in the test environment + 40km

tests/test-data/regionalisation/README.md

@@ -0,0 +1,3 @@
+# Readme
+
+The files in this folder originate from https://zenodo.org/records/10066045 and got clipped to the region of analysis in the test environment

tests/test-data/test-data-config.ini

@@ -0,0 +1,28 @@
+; Those are configs that should get loaded, when the test files are loaded
+[data:rasters]
+DEMS = ${data:BASE_DIR}/DEM/COP-DEM_GLO-30-DGED__2023_1_clipped.tif
+
+[data:rasters:hyras]
+FILE = ${data:BASE_DIR}/regionalisation/HYRAS_ma_1991_2020_DGM25_clipped.tif
+BAND_P_WIHY = n_hyras_wihj
+BAND_P_SUHY = n_hyras_sohj
+BAND_P_YEAR = n_hyras_year
+SRID = 3035
+FACTOR_P_WIHY = 1
+FACTOR_P_SUHY = 1
+FACTOR_P_YEAR = 1
+
+[data:rasters:dwd]
+FILE = ${data:BASE_DIR}/regionalisation/DWD-grid_ma_1991_2020_DGM25_clipped.tif
+BAND_P_WIHY = n_wihj
+BAND_P_SUHY = n_sohj
+BAND_P_YEAR = n_year
+BAND_T_YEAR = t_year
+BAND_ET_YEAR = et_year
+SRID = 3035
+FACTOR_P_WIHY = 1
+FACTOR_P_SUHY = 1
+FACTOR_P_YEAR = 1
+FACTOR_T_YEAR = 0.1
+FACTOR_ET_YEAR = 1
+

weatherdb/_version.py

@@ -1 +1 @@
-__version__ = "1.1.2"
+__version__ = "1.2.1"

weatherdb/broker.py

@@ -647,8 +647,9 @@ class Broker(object):
         is_active : bool
             Whether the broker is active.
         """
+        if self._is_active != is_active:
+            self.set_setting("broker_active", str(is_active))
         self._is_active = is_active
-        self.set_setting("broker_active", str(is_active))
 
     def _deactivate(self):
         self.is_active = False
@@ -664,4 +665,13 @@ class Broker(object):
             yield self
         finally:
             self._deactivate()
-            atexit.unregister(self._deactivate)
+            atexit.unregister(self._deactivate)
+
+    def force_deactivate_all(self):
+        """Forcefully set the active broker flag in the database to deactivated.
+
+        This is useful if the broker got exited before it could deactivate itself.
+        """
+        if self.is_active:
+            self._deactivate()
+        self.set_setting("broker_active", "False")

weatherdb/cli.py

@@ -16,6 +16,7 @@ import weatherdb
                  show_default=True
                  )
             )
+@click.version_option(weatherdb.__version__)
 @click.option('--do-logging/--no-logging',
               is_flag=True, default=True, show_default=True,
               help="Should the logging be done to the console?")
@@ -98,8 +99,11 @@ def create_user_config(file, on_exists):
 def download_ma_rasters(which, overwrite, update_user_config):
     """Get the multi annual rasters on which bases the regionalisation is done.
 
-    The refined multi annual datasets, that are downloaded are published on Zenodo:
-    Schmit, M.; Weiler, M. (2023). German weather services (DWD) multi annual meteorological rasters for the climate period 1991-2020 refined to 25m grid (1.0.0) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.10066045
+    The refined multi annual datasets, that are downloaded are published on Zenodo. [1]_
+
+    References:
+    -----------
+    .. [1]  Schmit, M.; Weiler, M. (2023). German weather services (DWD) multi annual meteorological rasters for the climate period 1991-2020 refined to 25m grid (1.0.0) [Data set]. Zenodo. `DOI:10.5281/zenodo.10066045 <https://doi.org/10.5281/zenodo.10066045>`_
     """
     click.echo("starting downloading multi annual raster data")
     from weatherdb.utils.get_data import download_ma_rasters
@@ -127,7 +131,7 @@ def download_ma_rasters(which, overwrite, update_user_config):
               help="The service to use to download the DEM. Options are 'prism' or 'openTopography'. " +\
                    "You can use this option muultiple times to test both in the given order until the file could be downloaded.")
 def download_dem(out_dir, overwrite, extent, update_user_config, service="prism"):
-    """Download the newest DEM data from the Copernicus Sentinel dataset.
+    """Download the newest DEM data from the Copernicus Sentinel dataset. [1]_
 
     Only the GLO-30 DEM, wich has a 30m resolution, is downloaded as it is freely available.
     If you register as a scientific researcher also the EEA-10, with 10 m resolution, is available.
@@ -136,8 +140,9 @@ def download_dem(out_dir, overwrite, extent, update_user_config, service="prism"
     After downloading the data, the files are merged and saved as a single tif file in the data directory in a subfolder called 'dems'.
     To use the DEM data in the WeatherDB, you will have to define the path to the tif file in the configuration file.
 
-    Source:
-    Copernicus DEM - Global and European Digital Elevation Model. Digital Surface Model (DSM) provided in 3 different resolutions (90m, 30m, 10m) with varying geographical extent (EEA: European and GLO: global) and varying format (INSPIRE, DGED, DTED). DOI:10.5270/ESA-c5d3d65.
+    References:
+    -----------
+    .. [1] Copernicus DEM - Global and European Digital Elevation Model. Digital Surface Model (DSM) provided in 3 different resolutions (90m, 30m, 10m) with varying geographical extent (EEA: European and GLO: global) and varying format (INSPIRE, DGED, DTED). `DOI:10.5270/ESA-c5d3d65 <https://doi.org/10.5270/ESA-c5d3d65>`_
     """
     click.echo("Starting downloading digital elevation model from Copernicus")
     from weatherdb.utils.get_data import download_dem
@@ -221,6 +226,16 @@ def set_db_version():
     else:
         click.echo("aborting setting db version")
 
+@cli.command(short_help="Forcefully set the active broker flag in the database to deactivated. This is useful if the broker got exited before it could deactivate itself. (!!!Only use this if you're sure that the database did all the necessary updates!!!)")
+def force_deactivate_all_broker():
+    click.echo(dedent("""
+        Are you sure that there is no more broker running? This could lead to problems as multiple brokers could run at the same time contradicting themself."""))
+    if click.confirm("Are you sure you want to set the activation flag in the database to deactivated?"):
+        click.echo("deactivating the brokers flag")
+        broker = weatherdb.broker.Broker()
+        broker.force_deactivate_all()
+    else:
+        click.echo("aborting the deactivation of the brokers flag")
 
 # cli
 # ---------------------------------------

weatherdb/config/config_default.ini

@@ -143,17 +143,46 @@ RASTER_BUFFER_CRS = ${weatherdb:HORIZON_CRS}
 ; The default is 1999-01-01
 MIN_DATE = 1999-01-01
 
+[weatherdb:LINEAR_INTERPOLATION_LIMIT]
+; When there are still NAs after filling with neighboring stations, the module can use linear interpolation to fill the gaps
+; The limit defines the maximum interval that is allowed to fill with linear interpolation
+; The value is given with a unit, e.g. 3 days, 30 minutes, 1 hour
+; For further explanation about the format see https://www.postgresql.org/docs/current/datatype-datetime.html#DATATYPE-INTERVAL-INPUT
+; for precipitation, where the timeseries resolution is 10 minutes, 30 minutes means 3 missing values are interpolated, but not more.
+; If there shouldn't be any linear interpolation, set the limit to 0
+; For precipitation, the default is 1 hour
+P = 1 hour
+; For temperature, the default is 2 days
+T = 2 days
+; For Evapotranspiration, the default is 2 days
+ET = 2 days
+
 
 [weatherdb:max_fillup_distance]
 ; The maximum distance in meters to use for the filling of the station data
 ; For each parameter (P, T, ET) the module uses a different distance
 ; Precipitation (P)
-P = 110000
+P = 130000
 ; Temperature (T)
 T = 150000
 ; Evapotranspiration (ET)
 ET = 150000
 
+
+[system:parallel_processes]
+; You can configure how many processes are getting started in parrallel when tghe database is updated.
+; depending on your system, the database can handle more or less processes
+; There  are 2 possible ways to configure this.
+; either define the absolute number of processes:
+; ABSOLUTE =
+
+; or define the number of processes in relation to the number of CPUs,
+; by defining how many CPUs should be used less than the maximum available CPUs
+; if the absolute number is defined, the relative number is ignored
+; This is the default setting of cpu count -1
+CPU_COUNT_MINUS = 1
+
+
 ; for developpers:
 ; ----------------
 ;

weatherdb/station/StationBases.py

@@ -1491,6 +1491,77 @@ class StationBase:
                 extra_fillup_where=sql_format_dict["extra_fillup_where"] +\
                     ' OR ts."filled_by" IS DISTINCT FROM new."filled_by"'))
 
+        # linear interpolation for the last missing values
+        lr_limit = config.get(
+            "weatherdb:linear_interpolation_limit",
+            self._para_base,
+            fallback="0")
+        if lr_limit != "0":
+            sql_format_dict.update(dict(
+                sql_linear_interpolation=f"""
+                    DO
+                    $do$
+                        DECLARE reg_borders record;
+                        BEGIN
+                            FOR reg_borders IN
+                                WITH empty_periods AS (
+                                    SELECT *
+                                    FROM (  SELECT
+                                                CASE WHEN dist_next::interval>'{self._interval}'::interval
+                                                     THEN timestamp
+                                                     ELSE NULL
+                                                END AS start,
+                                                CASE WHEN dist_next>'{self._interval}'::interval
+                                                     THEN LEAD(timestamp) OVER (ORDER BY timestamp)
+                                                     ELSE NULL
+                                                END AS end
+                                            FROM (
+                                                SELECT *,
+                                                    (timestamp::timestamp
+                                                        - lag(timestamp::timestamp, 1)  OVER ( ORDER BY timestamp)
+                                                    )::interval AS dist_prev,
+                                                    (lead(timestamp::timestamp, 1) OVER ( ORDER BY timestamp)
+                                                        - timestamp::timestamp
+                                                    )::interval AS dist_next
+                                                FROM new_filled_{self.id}_{self._para}
+                                                WHERE filled IS NOT NULL) t
+                                            WHERE t.dist_prev > '{self._interval}'::interval
+                                                  OR t.dist_next > '{self._interval}'::interval
+                                         ) p
+                                    WHERE p.start IS NOT NULL AND p.end IS NOT NULL)
+                                SELECT
+                                    ep.start AS timestamp_start,
+                                    ttss.filled AS value_start,
+                                    ep.end AS timestamp_end,
+                                    ttse.filled AS value_end,
+                                    (ttse.filled - ttss.filled)::numeric/(EXTRACT(EPOCH FROM (ep.end::timestamp - ep.start::timestamp))/EXTRACT(EPOCH FROM '{self._interval}'::interval))::numeric as slope
+                                FROM empty_periods ep
+                                LEFT JOIN new_filled_{self.id}_{self._para} ttss ON ep.start::timestamp = ttss.timestamp::timestamp
+                                LEFT JOIN new_filled_{self.id}_{self._para} ttse ON ep.end::timestamp = ttse.timestamp::timestamp
+                                WHERE (ep.end::timestamp - ep.start::timestamp - '{self._interval}'::interval) <= '{lr_limit}'::interval
+                            loop
+                                execute FORMAT(
+                                $$
+                                UPDATE new_filled_{self.id}_{self._para} ts
+                                SET filled=%2$L::numeric + (%5$L::numeric *
+                                        EXTRACT(EPOCH FROM ts.timestamp::timestamp - %1$L::timestamp)::numeric
+                                         /EXTRACT(EPOCH FROM '{self._interval}'::interval)::numeric),
+                                    filled_by={"ARRAY[-1]::smallint[]" if self._filled_by_n>1 else "-1::smallint"}
+                                WHERE ts.timestamp > %1$L AND ts.timestamp < %3$L;
+                                $$,
+                                reg_borders.timestamp_start,
+                                reg_borders.value_start,
+                                reg_borders.timestamp_end,
+                                reg_borders.value_end,
+                                reg_borders.slope
+                                );
+                            END loop;
+                        END
+                    $do$;"""))
+        else:
+            sql_format_dict.update(dict(sql_linear_interpolation=""))
+
+
         # Make SQL statement to fill the missing values with values from nearby stations
         sql = """
             CREATE TEMP TABLE new_filled_{stid}_{para}
@@ -1563,15 +1634,16 @@ class StationBase:
                         FROM new_filled_{stid}_{para}
                         WHERE "filled" IS NULL {extra_unfilled_period_where};
                     END LOOP;
-                    {sql_extra_after_loop}
-                    UPDATE timeseries."{stid}_{para}" ts
-                    SET filled = new.filled, {extra_cols_fillup}
-                        filled_by = new.filled_by
-                    FROM new_filled_{stid}_{para} new
-                    WHERE ts.timestamp = new.timestamp
-                        AND (ts."filled" IS DISTINCT FROM new."filled" {extra_fillup_where}) ;
                 END
             $do$;
+            {sql_linear_interpolation}
+            {sql_extra_after_loop}
+            UPDATE timeseries."{stid}_{para}" ts
+            SET filled = new.filled, {extra_cols_fillup}
+                filled_by = new.filled_by
+            FROM new_filled_{stid}_{para} new
+            WHERE ts.timestamp = new.timestamp
+                AND (ts."filled" IS DISTINCT FROM new."filled" {extra_fillup_where}) ;
         """.format(**sql_format_dict)
 
         # execute
@@ -1815,8 +1887,8 @@ class StationBase:
             The timeseries kinds of the denominator or the multi annual raster key.
             If the denominator is a multi annual raster key, then the result is the quotient of the timeserie and the raster value.
             Possible values are:
-                - for timeserie kinds: 'raw', 'qc', 'filled' or for precipitation also "corr".
-                - for raster keys: 'hyras', 'dwd' or 'regnie', depending on your defined raster files.
+            - for timeserie kinds: 'raw', 'qc', 'filled' or for precipitation also "corr".
+            - for raster keys: 'hyras', 'dwd' or 'regnie', depending on your defined raster files.
         return_as : str, optional
             The format of the return value.
             If "df" then a pandas DataFrame is returned.
@@ -2154,7 +2226,6 @@ class StationBase:
             The elevation difference is considered with the formula from LARSIM (equation 3-18 & 3-19 from the LARSIM manual [1]_ ):
 
             .. math::
-
                 L_{weighted} = L_{horizontal} * (1 + (\\frac{|\\delta H|}{P_1})^{P_2})
             If None, then the height difference is not considered and only the nearest stations are returned.
             The default is None.
@@ -2851,18 +2922,21 @@ class StationTETBase(StationCanVirtualBase):
         Parameters
         ----------
         p_elev : tuple, optional
-            In Larsim those parameters are defined as $P_1 = 500$ and $P_2 = 1$.
-            Stoelzle et al. (2016) found that $P_1 = 100$ and $P_2 = 4$ is better for Baden-Würtemberg to consider the quick changes in topographie.
+            In Larsim [3]_ those parameters are defined as $P_1 = 500$ and $P_2 = 1$.
+            Stoelzle et al. (2016) [2]_ found that $P_1 = 100$ and $P_2 = 4$ is better for Baden-Würtemberg to consider the quick changes in topographie.
             For all of germany, those parameter values are giving too much weight to the elevation difference, which can result in getting neighboor stations from the border of the Tschec Republic for the Feldberg station. Therefor the values $P_1 = 250$ and $P_2 = 1.5$ are used as default values.
-            literature:
-                - Stoelzle, Michael & Weiler, Markus & Steinbrich, Andreas. (2016) Starkregengefährdung in Baden-Württemberg – von der Methodenentwicklung zur Starkregenkartierung. Tag der Hydrologie.
-                - LARSIM Dokumentation, Stand 06.04.2023, online unter https://www.larsim.info/dokumentation/LARSIM-Dokumentation.pdf
             The default is (250, 1.5).
 
+        References
+        ----------
+        .. [2] Stoelzle, Michael & Weiler, Markus & Steinbrich, Andreas. (2016) Starkregengefährdung in Baden-Württemberg – von der Methodenentwicklung zur Starkregenkartierung. Tag der Hydrologie.
+        .. [3] LARSIM Dokumentation, Stand 06.04.2023, online unter `LARSIM-Dokumentation <https://www.larsim.info/dokumentation/LARSIM-Dokumentation.pdf>`_
+
         Returns
         -------
-        _type_
-            _description_
+        list of int
+            A list of station Ids in order of distance.
+            The closest station is the first in the list.
         """
         # define the P1 and P2 default values for T and ET
         return super().get_neighboor_stids(p_elev=p_elev, **kwargs)

weatherdb/stations/StationsBase.py

@@ -20,6 +20,7 @@ from ..utils.dwd import get_dwd_meta, get_cdc_file_list
 from ..station.StationBases import StationBase
 from ..db import models
 from ..db.queries.get_quotient import _get_quotient
+from ..config import config
 
 # set settings
 # ############
@@ -430,8 +431,8 @@ class StationsBase:
             The timeseries kinds of the denominator or the multi annual raster key.
             If the denominator is a multi annual raster key, then the result is the quotient of the timeserie and the raster value.
             Possible values are:
-                - for timeserie kinds: 'raw', 'qc', 'filled' or for precipitation also "corr".
-                - for raster keys: 'hyras', 'dwd' or 'regnie', depending on your defined raster files.
+            - for timeserie kinds: 'raw', 'qc', 'filled' or for precipitation also "corr".
+            - for raster keys: 'hyras', 'dwd' or 'regnie', depending on your defined raster files.
         stids : list of Integer
             The stations IDs for which to compute the quotient.
         return_as : str, optional
@@ -567,7 +568,16 @@ class StationsBase:
         return pbar
 
     def _run_method(self, stations, method, name, kwds=dict(),
-            do_mp=True, processes=mp.cpu_count()-1, **kwargs):
+            do_mp=True,
+            processes=config.getint(
+                "system:parallel_processes",
+                "absolute",
+                fallback=mp.cpu_count() - \
+                    config.getint(
+                        "system:parallel_processes",
+                        "cpu_count_minus",
+                        fallback=1)),
+            **kwargs):
         """Run methods of the given stations objects in multiprocessing/threading mode.
 
         Parameters
@@ -589,6 +599,9 @@ class StationsBase:
         processes : int, optional
             The number of processes that should get started simultaneously.
             If 1 or less, then the process is computed as a simple loop, so there is no multiprocessing or threading done.
+            There are two possible configuration values in the config file to set the number of processes:
+            - system:parallel_processes:absolute: The absolute number of processes to start.
+            - system:parallel_processes:cpu_count_minus: The number of CPU kernels are substracted by this number, to get the number of processes to start.
             The default is the cpu count -1.
         """
         log.info(

weatherdb/utils/get_data.py

@@ -22,11 +22,11 @@ log = logging.getLogger(__name__)
 def download_ma_rasters(which="all", overwrite=None, update_user_config=False):
     """Get the multi annual rasters on which bases the regionalisation is done.
 
-    The refined multi annual datasets, that are downloaded are published on Zenodo [1]_
+    The refined multi annual datasets, that are downloaded are published on Zenodo. [1]_
 
     References
     ----------
-    .. [1] Schmit, M.; Weiler, M. (2023). German weather services (DWD) multi annual meteorological rasters for the climate period 1991-2020 refined to 25m grid (1.0.0) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.10066045
+    .. [1] Schmit, M.; Weiler, M. (2023). German weather services (DWD) multi annual meteorological rasters for the climate period 1991-2020 refined to 25m grid (1.0.0) [Data set]. Zenodo. `DOI:10.5281/zenodo.10066045 <https://doi.org/10.5281/zenodo.10066045>`_
 
     Parameters
     ----------
@@ -301,7 +301,7 @@ def _download_dem_opentopo(
         extent=(5.3, 46.1, 15.6, 55.4),
         api_key=os.environ.get(
             "WEATHERDB_OPENTOPO_API_KEY",
-            fallback=keyring.get_password("weatherdb", "opentopo_api_key"))):
+            default=keyring.get_password("weatherdb", "opentopo_api_key"))):
     """Download the DEM data from the OpenTopography service.
 
     Get an API key from (OpenTopography)[https://portal.opentopography.org/] to use this service.
@@ -322,6 +322,7 @@ def _download_dem_opentopo(
         The API key for the OpenTopography service.
         If None the user will be asked.
         The default is to check if the environment variable "WEATHERDB_OPENTOPO_API_KEY" is set or if the keyring has a password for "weatherdb" and "opentopo_api_key".
+        If the value is a valid filepath the content of the file is used as the API key.
 
     Returns
     -------
@@ -332,6 +333,9 @@ def _download_dem_opentopo(
     if api_key is None:
         print("No API key for OpenTopography was given or found in the keyring or environment variable.")
         api_key = getpass("Please enter your API key for OpenTopography: ")
+    if Path(api_key).exists():
+        with open(api_key) as f:
+            api_key = f.read().strip()
 
     # make query
     w, s, e, n = extent
@@ -356,14 +360,14 @@ def _download_dem_opentopo(
             log.info(f"Downloaded DEM data from OpenTopography to '{out_fp}'.")
             return out_fp
 
-    log.error(f"Request to openTopography API with url {r.url.replace(api_key, "[MASKED]")} returned status code {r.status_code}")
+    log.error(f"Request to openTopography API with url {r.url.replace(api_key, '[MASKED]')} returned status code {r.status_code}")
 
 def download_dem(out_dir=None,
                  overwrite=None,
                  extent=(5.3, 46.1, 15.6, 55.4),
                  update_user_config=False,
                  service=["prism", "openTopography"], **kwargs):
-    """Download the newest DEM data from the Copernicus Sentinel dataset.
+    """Download the newest DEM data from the Copernicus Sentinel dataset. [2]_
 
     Only the GLO-30 DEM, which has a 30m resolution, is downloaded as it is freely available.
     If you register as a scientific researcher also the EEA-10, with 10 m resolution, is available.
@@ -372,8 +376,9 @@ def download_dem(out_dir=None,
     After downloading the data, the files are merged and saved as a single tif file in the data directory in a subfolder called 'DEM'.
     To use the DEM data in the WeatherDB, you will have to define the path to the tif file in the configuration file.
 
-    Source:
-    Copernicus DEM - Global and European Digital Elevation Model. Digital Surface Model (DSM) provided in 3 different resolutions (90m, 30m, 10m) with varying geographical extent (EEA: European and GLO: global) and varying format (INSPIRE, DGED, DTED). DOI:10.5270/ESA-c5d3d65.
+    References
+    ----------
+    .. [2] Copernicus DEM - Global and European Digital Elevation Model. Digital Surface Model (DSM) provided in 3 different resolutions (90m, 30m, 10m) with varying geographical extent (EEA: European and GLO: global) and varying format (INSPIRE, DGED, DTED). `DOI:10.5270/ESA-c5d3d65 <https://doi.org/10.5270/ESA-c5d3d65>`_ .
 
     Parameters
     ----------

{weatherdb-1.1.2.dist-info → weatherdb-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weatherdb
-Version: 1.1.2
+Version: 1.2.1
 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.1.2.dist-info → weatherdb-1.2.1.dist-info}/RECORD

@@ -1,34 +1,52 @@
 docker/Dockerfile,sha256=AmSjZsQHA3-XANZz8RiH0B5skIlF7MXCNiy8yIzZXr4,1051
-docker/docker-compose.yaml,sha256=krm0W_Nj1ZTuyKIr4I4dAfPM0XiM0lZQGhVfmjQIHM0,1568
+docker/docker-compose.yaml,sha256=ezHqCUib83b5cbfbSy0fsrg0xl2iufp6diItsctJbRM,1719
 docker/docker-compose_test.yaml,sha256=LTCehPG6Oid-ri7kcPBMzXzeJBqYC-zXTs_i6XOkSyQ,931
 docker/start-docker-test.sh,sha256=8ue4LfoUrZU8inEZhNjsSDqucoN73Kn1cC3--lUPqTo,222
 docs/requirements.txt,sha256=gVqMWeiE0PAEz41NGrLwgzx1WUGuEIE7sfPLkFV4vU4,141
 docs/source/Changelog.md,sha256=5SUQr5KRoe5BUCsEM5IMXV7ryKwjp3_gDukYZP5i_9I,33
 docs/source/License.rst,sha256=BhhDehmlauu1zhoPc2tqYM2SNhgns67tmpFnA64scXQ,79
-docs/source/Methode.md,sha256=4UyLIEOwAx2ysWNeoSvw5g5ZHjZ_SGeaNo4j_c7f794,18232
-docs/source/conf.py,sha256=StlvffI0pTq2R7WhE64cLlS4fi6DXgBuV1YDUgeu2-c,3718
+docs/source/Methode.md,sha256=rhnfAjbn_xSz7rjOSnJC-9_LmmbiiP1DYrlLDmQ_XV0,18716
+docs/source/conf.py,sha256=plhE9qI_QUc6zewvKep9-TwFT1zDUiIK5v6hnDqdldU,3774
 docs/source/index.rst,sha256=ByYiqrC2n_FO3zWpq-zfXUzxdcNLs4EQ38hlhXiU_z0,1832
 docs/source/_static/custom.css,sha256=FgPX621XaAYw41aiF6nWU6T6snJA42WLiCpe3ziYcQA,161
 docs/source/_static/favicon.ico,sha256=aie4tcqqOisNg8vHIyEDYrzQE8vwcxVG5_rjq-mxUPM,3262
 docs/source/_static/logo.png,sha256=6gg2g1aeGF_j5GOXR9i-4UjWZ-uEiqKidMENmFHKtNE,6073
 docs/source/api/api.rst,sha256=kOiT9-3LGkYR6IJ2LwPaVfEclS5K_pBgbIxGrq09_Bg,251
 docs/source/api/cli.rst,sha256=EzwCHyg0tK6284v_gWPWFogwhhnxlmUhYNcogWSWCu8,153
-docs/source/api/weatherDB.broker.rst,sha256=ZkSN7ZB1BccWvJEtpg0-_zOPIUv0C3DVBYdWccwhdOY,119
+docs/source/api/weatherdb.broker.rst,sha256=qX-srGa6M8Bz_N5Q7tRoOqyoLP_X8Batsgrdwd_hjQ4,57
 docs/source/api/weatherdb.config.rst,sha256=ZXlRZZgxpihqI20adHzyYhHCRq1DItIJgDJrEgLVu4E,148
-docs/source/api/weatherdb.db.rst,sha256=fWNfp0UEqLGy_rr6g2oJEt5rSvHaSdief1mm8X0RX-g,388
-docs/source/api/weatherdb.rst,sha256=iECl8UDC1ekg-RhsyjLjUyoxr76DrRg5IzgalJMJcf8,320
-docs/source/api/weatherdb.station.rst,sha256=57igu_OrWxTDCyN3pAGw-hOJRvM7dJi3PSePmBH6dps,1103
-docs/source/api/weatherdb.stations.rst,sha256=ij3rBivaLTJ7VKAsNMdqCfQBnrupqZCIUoFzyI_wReE,879
-docs/source/api/weatherdb.utils.rst,sha256=j4nbIiCxYFtBkzi-jGEiefW4uKYRtSM4xnJHP69mjyE,398
+docs/source/api/weatherdb.db.rst,sha256=R42Xjq8vumUcC4cgBjW3LdryatiZOeKXzaMTrhf1YWs,532
+docs/source/api/weatherdb.rst,sha256=SDM6tfQV1XJ6N4wQXuR-91m_pan-_Ci4BVV9GXZPD78,319
+docs/source/api/weatherdb.station.GroupStation.rst,sha256=paukwOe25pt7ddKlpY19qF0fUT7XaVQy0tGZRHcimoY,106
+docs/source/api/weatherdb.station.StationBases.rst,sha256=1ni2YbUuo4MMdZzmvr1ec5JLPuL8RfOL-AOWhWlMJzA,504
+docs/source/api/weatherdb.station.StationET.rst,sha256=adfhyCvFbeUstNQaEKRDbSKnyMwUTUp0JIk1TaQUumw,97
+docs/source/api/weatherdb.station.StationP.rst,sha256=7bcKSCVO13MeJXK914_yYdZsWt0KO3Bo4Xz1LMnuIVQ,94
+docs/source/api/weatherdb.station.StationPD.rst,sha256=APTTuGAqUByM0ZMiRn4VZHlmAsu01SdIFTGgF9P7VbY,182
+docs/source/api/weatherdb.station.StationT.rst,sha256=BmGDdbWhvGk4z3ol0Asmh8sjaaVGPQwZyHCYTAr4OoA,94
+docs/source/api/weatherdb.station.rst,sha256=QcZkzrs2ZWjKxj11j62O0-UhNYecCnVTXlLpyy3x1S4,290
+docs/source/api/weatherdb.stations.StationsBase.rst,sha256=r4VMDCYAGOFxNqktTsv47vFDQYtXViSrfvi6JA9a2As,424
+docs/source/api/weatherdb.stations.StationsET.rst,sha256=g-z-RwzsTl-LNJIsmV05bqLDggRjwd9DO16al1_mt24,103
+docs/source/api/weatherdb.stations.StationsP.rst,sha256=txit7SAn5YurLTsWMlubGyZxps-hA76ZXTv6c0GGr-o,99
+docs/source/api/weatherdb.stations.StationsPD.rst,sha256=I_qGiuP_kWheS7xQ-wTk70DckrqcBnFrU-V6rarWJn8,103
+docs/source/api/weatherdb.stations.StationsT.rst,sha256=WrC2rsEh7WWE4TMjzvPblSHOv6o_IGWkPFnGXX9FOGc,101
+docs/source/api/weatherdb.stations.rst,sha256=zF6bbx7hupKzaSbYGOF7ZeHRcJOjk9a5A2FMYXetiXw,300
+docs/source/api/weatherdb.utils.rst,sha256=uinSSO55lVv9j8rJbfa30a35dK4FMVlLm5HlOowVe_0,430
 docs/source/setup/Configuration.md,sha256=qtJ-gvXmaVfp_ldBMv60YaKENtoGb-L5HHc7rb9MaZQ,4340
 docs/source/setup/Hosting.md,sha256=4CUOgonpPhG-cPihrEsN3Z31rRKGWYeizg1QUhETmLw,105
 docs/source/setup/Install.md,sha256=IdmycMBztQFs_FAqfiU1OxtN2ihGXfIqwW4KBnsG_Iw,1265
-docs/source/setup/Quickstart.md,sha256=NmTvECVOS_uKoyWxgKtwQWHaH87gVFf1_QGGmZ97AZY,7062
+docs/source/setup/Quickstart.md,sha256=suk3QweF4pQREBisXtLP0EJukInQePH0jWvwzY--D5U,7147
 docs/source/setup/setup.rst,sha256=bOmfcf-n9iivxbaBWk5t0nmiIc87bks_BMIJ1d6UHOM,258
+tests/test-data/test-data-config.ini,sha256=XC1dho-dQglFhQCXWHtZRUuQLKjeOmjH4W0j0UumgoE,717
+tests/test-data/DEM/COP-DEM_GLO-30-DGED__2023_1_clipped.tif,sha256=6JJpOHf-cDzBaTn6BIWkmroiuW9P8g9SLGfC2h7xCyk,35433174
+tests/test-data/DEM/README.md,sha256=tnvGke8KzWFm3TKGbdCqajBJ4MbcRFZ0wv875x0_EMM,137
+tests/test-data/DEM/eula_F.pdf,sha256=MgSZFMN_FOfVO0jRPXSknnfAMCNuKsx6DfQm-TRP66I,117522
+tests/test-data/regionalisation/DWD-grid_ma_1991_2020_DGM25_clipped.tif,sha256=82r1UEYAjA6YzMC32ByZGHQFoYm1zcSajhKFtPjTqMw,2931290
+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=gtlfDPgq15HdgNzpLyxP5z-pg7TxLdIYeJw2QiTMNWs,21
-weatherdb/broker.py,sha256=gA5zWq4RpTJxgvKIzo9Bc5ol3k8JxAZ1BKZGkYCcr80,24474
-weatherdb/cli.py,sha256=jS_QNu4k2y7Q3d-iXTkdGP8qAEw2MWmE70wQdxBtqPo,10301
+weatherdb/_version.py,sha256=aFv1WGaOhOg9bRuL25OuA7ozD3PSckRRpjaC84FZ7uo,21
+weatherdb/broker.py,sha256=qJaKVwo1zcTLKmP-sF_DMod6_7jVsdHEoiKEMvsPx9A,24842
+weatherdb/cli.py,sha256=oZFQVteBjxI1tEK37CEO-8mJd9PQ7I-rHEI-kIl4T_A,11295
 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
@@ -40,7 +58,7 @@ weatherdb/alembic/versions/V1.0.5_fix-ma-raster-values.py,sha256=EvJ_JLLJKUN5YXw
 weatherdb/alembic/versions/V1.0.6_update-views.py,sha256=ZA7cK5yeAqivFG2V8O7mvyKSkGRlphVOs0qKpBYgYKE,420
 weatherdb/config/ConfigParser.py,sha256=UEJlpeZSggG93C3MjpaNGpqKe_Ks6Jg6g5CjnhKCrpY,27978
 weatherdb/config/__init__.py,sha256=JBNlYPT43JnO8XMI8HTtg2hyA7C_JnMdtWmJ2vAtNZ8,85
-weatherdb/config/config_default.ini,sha256=f22zLpLVlguotbdENqUarNf-SlYwMjJFwIiXldnfBGc,6453
+weatherdb/config/config_default.ini,sha256=5DQzOqOJ9EVRAu9IA_EO4c8aqnuUvTmocwidOhLLXbY,7884
 weatherdb/db/__init__.py,sha256=g6F66XR6UPz41kPtSRc1qvDoOEZ5OawYxYtYXCgZ06s,76
 weatherdb/db/connections.py,sha256=mxArp79JOLTYYNB9fZEIspwcpdRZoxYWfQXh2Sq9ATw,14097
 weatherdb/db/models.py,sha256=6Oor07T1sAD6qEtoxwEcpmY1SkLVVONChXIIcTjbUk4,15242
@@ -48,7 +66,7 @@ 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=XAovs-zK5mZmJuvNJ3iCgpWH-1yWHL0axtygYu1mVi0,30292
-weatherdb/station/StationBases.py,sha256=x0MlqHesPVQgijcThWBoIbgM7-_iJQLL86Teab-nlJc,125671
+weatherdb/station/StationBases.py,sha256=1XylC_k2ZCSJf3-xs4SBE-JSfwrlZWzn1N154S0KzgU,130330
 weatherdb/station/StationET.py,sha256=hM6K8fCLC6mOLaE4cN92LHOyPGP01ifO6l2qO77I_bA,3621
 weatherdb/station/StationP.py,sha256=ENmWqEFwKR1WFsWmZ8-webEGTmrxODan8QO0gwIDDIU,32719
 weatherdb/station/StationPD.py,sha256=Bcg_uQTgIQPffsMGhNEwKAXhYs1Ii4VeB75afdFG-Kk,3367
@@ -56,7 +74,7 @@ weatherdb/station/StationT.py,sha256=-T1GKfUsvulm5c_-JufJ34H048fGlG21UF0_2z1dd9A
 weatherdb/station/__init__.py,sha256=v1sPfmhhLRMOr5DJ2c5BLIFY7GWkP5iMLA5vtZm-osg,591
 weatherdb/station/constants.py,sha256=vtdhgcK8A2cJaknT6qI8w5tAh_Hb5i2SvxxtHZOPyVc,511
 weatherdb/stations/GroupStations.py,sha256=442gPqx0lKcOaqThffNIhJqrmDMI37DX1d_EHsfJzvM,21569
-weatherdb/stations/StationsBase.py,sha256=orCQ5KSjEOsDcVv73_Ko9QW2Odo4jmledRmJT51tYCw,42308
+weatherdb/stations/StationsBase.py,sha256=M7VyWJgUmIygJ2rByQy0Zz6RKsaDVT8-iaXzhPTa_b4,42991
 weatherdb/stations/StationsBaseTET.py,sha256=CuE5gXAF4eS4bHorI-sUqksm0jdj9SzAiOHtc4vv7aA,1032
 weatherdb/stations/StationsET.py,sha256=OjyEaEK0nPJ9txRfUbHfW9bEEx5HAISWmnk5F4GBs7I,433
 weatherdb/stations/StationsP.py,sha256=51wMu5y4jscfSv2fqvswOqB1LBRX5b9XDGvekXUxQ4w,4993
@@ -67,11 +85,11 @@ weatherdb/utils/TimestampPeriod.py,sha256=6whEr2FLoHC-ldpMg9wW27ELEse5RW6dvaZ84M
 weatherdb/utils/__init__.py,sha256=siIvJT8lKLVvtdvWMpY3F9_h72Ky2d71DEdRGMWud5M,85
 weatherdb/utils/dwd.py,sha256=amEVVPLzXTSScBP5VAK35dBxuiy-Ua4hHyKnDGxD_4Q,12394
 weatherdb/utils/geometry.py,sha256=Od-RDAW1MASVAsGBXpHti9osbVJDqUbumSKBSJPbQqc,1823
-weatherdb/utils/get_data.py,sha256=RyRQjgUjnRadGmpu88SKyxOwtkqw9f8qEDe7HJby4LY,16997
+weatherdb/utils/get_data.py,sha256=62wV37fuzGhC2fLSCL7JyyMd3BAiRiimIhV95-mEROU,17294
 weatherdb/utils/logging.py,sha256=iaWnzCdBYxFmzWgLq9a6VAeBMdwy-rnt2d9PSAQq4lA,4242
-weatherdb-1.1.2.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-weatherdb-1.1.2.dist-info/METADATA,sha256=nADh5aUQ2vFhvlFlN_uVWEIyBotUkXpp35KULolqCec,44266
-weatherdb-1.1.2.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-weatherdb-1.1.2.dist-info/entry_points.txt,sha256=kJemTd9Cm_QWPZt03KUWhpn1aB0-l_5ce6Ms3EoS_NM,55
-weatherdb-1.1.2.dist-info/top_level.txt,sha256=fI1xpTdDzn7NW-aRqQSj_VHgLvfN7wbK8Z1YXMx7ktM,22
-weatherdb-1.1.2.dist-info/RECORD,,
+weatherdb-1.2.1.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+weatherdb-1.2.1.dist-info/METADATA,sha256=5auMHq9HFkOsckfAF-JKxImQ3v-a93_lm023SiGsTMk,44266
+weatherdb-1.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+weatherdb-1.2.1.dist-info/entry_points.txt,sha256=kJemTd9Cm_QWPZt03KUWhpn1aB0-l_5ce6Ms3EoS_NM,55
+weatherdb-1.2.1.dist-info/top_level.txt,sha256=kLlRbXLn0GHvMWmciWRyvm0-FYEy56F6d0fGwfle9-g,28
+weatherdb-1.2.1.dist-info/RECORD,,

{weatherdb-1.1.2.dist-info → weatherdb-1.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{weatherdb-1.1.2.dist-info → weatherdb-1.2.1.dist-info}/top_level.txt

@@ -1,3 +1,4 @@
 docker
 docs
+tests
 weatherdb

docs/source/api/weatherDB.broker.rst

@@ -1,10 +0,0 @@
-broker
-------
-.. module:: weatherdb.broker
-
-Broker
-^^^^^^
-.. autoclass:: weatherdb.broker.Broker
-
-  .. autoclasstoc::
-