meteostat 2.0.0__tar.gz → 2.0.1__tar.gz

{meteostat-2.0.0 → meteostat-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meteostat
-Version: 2.0.0
+Version: 2.0.1
 Summary: Access and analyze historical weather and climate data with Python.
 License-File: LICENSE
 Author: Meteostat
@@ -18,12 +18,11 @@ Description-Content-Type: text/markdown
 <!-- PROJECT SHIELDS -->
 <div align="center">
   
-  [![Contributors][contributors-shield]][contributors-url]
-  [![Forks][forks-shield]][forks-url]
-  [![Stargazers][stars-shield]][stars-url]
+  [![Downloads][downloads-shield]][downloads-url]
+  [![Provider Tests][provider-tests-shield]][provider-tests-url]
   [![Issues][issues-shield]][issues-url]
-  [![Unlicense License][license-shield]][license-url]
-  [![LinkedIn][linkedin-shield]][linkedin-url]
+  [![MIT License][license-shield]][license-url]
+  [![Stargazers][stars-shield]][stars-url]
   
 </div>
 
@@ -118,17 +117,14 @@ Meteostat is licensed under the [**MIT License**](https://github.com/meteostat/m
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
-[contributors-shield]: https://img.shields.io/github/contributors/meteostat/meteostat.svg?style=for-the-badge
-[contributors-url]: https://github.com/meteostat/meteostat/graphs/contributors
-[forks-shield]: https://img.shields.io/github/forks/meteostat/meteostat.svg?style=for-the-badge
-[forks-url]: https://github.com/meteostat/meteostat/network/members
-[stars-shield]: https://img.shields.io/github/stars/meteostat/meteostat.svg?style=for-the-badge
-[stars-url]: https://github.com/meteostat/meteostat/stargazers
-[issues-shield]: https://img.shields.io/github/issues/meteostat/meteostat.svg?style=for-the-badge
+[downloads-shield]: https://img.shields.io/pypi/dm/meteostat
+[downloads-url]: https://pypi.org/project/meteostat/
+[provider-tests-shield]: https://github.com/meteostat/meteostat/actions/workflows/provider-tests.yml/badge.svg
+[provider-tests-url]: https://github.com/meteostat/meteostat/actions/workflows/provider-tests.yml
+[issues-shield]: https://img.shields.io/github/issues/meteostat/meteostat.svg
 [issues-url]: https://github.com/meteostat/meteostat/issues
-[license-shield]: https://img.shields.io/github/license/meteostat/meteostat.svg?style=for-the-badge
-[license-url]: https://github.com/meteostat/meteostat/blob/main/LICENSE
-[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=for-the-badge&logo=linkedin&colorB=555
-[linkedin-url]: https://www.linkedin.com/company/meteostat
+[license-shield]: https://img.shields.io/github/license/meteostat/meteostat.svg
+[license-url]: https://github.com/meteostat/meteostat?tab=readme-ov-file#-license
 [product-screenshot]: https://dev.meteostat.net/assets/images/example-8b6cf2a3fe2efa285bc72d7dc72c4865.png
-
+[stars-shield]: https://img.shields.io/github/stars/meteostat/meteostat.svg
+[stars-url]: https://github.com/meteostat/meteostat/stargazers

{meteostat-2.0.0 → meteostat-2.0.1}/README.md

@@ -1,12 +1,11 @@
 <!-- PROJECT SHIELDS -->
 <div align="center">
   
-  [![Contributors][contributors-shield]][contributors-url]
-  [![Forks][forks-shield]][forks-url]
-  [![Stargazers][stars-shield]][stars-url]
+  [![Downloads][downloads-shield]][downloads-url]
+  [![Provider Tests][provider-tests-shield]][provider-tests-url]
   [![Issues][issues-shield]][issues-url]
-  [![Unlicense License][license-shield]][license-url]
-  [![LinkedIn][linkedin-shield]][linkedin-url]
+  [![MIT License][license-shield]][license-url]
+  [![Stargazers][stars-shield]][stars-url]
   
 </div>
 
@@ -101,16 +100,14 @@ Meteostat is licensed under the [**MIT License**](https://github.com/meteostat/m
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
-[contributors-shield]: https://img.shields.io/github/contributors/meteostat/meteostat.svg?style=for-the-badge
-[contributors-url]: https://github.com/meteostat/meteostat/graphs/contributors
-[forks-shield]: https://img.shields.io/github/forks/meteostat/meteostat.svg?style=for-the-badge
-[forks-url]: https://github.com/meteostat/meteostat/network/members
-[stars-shield]: https://img.shields.io/github/stars/meteostat/meteostat.svg?style=for-the-badge
-[stars-url]: https://github.com/meteostat/meteostat/stargazers
-[issues-shield]: https://img.shields.io/github/issues/meteostat/meteostat.svg?style=for-the-badge
+[downloads-shield]: https://img.shields.io/pypi/dm/meteostat
+[downloads-url]: https://pypi.org/project/meteostat/
+[provider-tests-shield]: https://github.com/meteostat/meteostat/actions/workflows/provider-tests.yml/badge.svg
+[provider-tests-url]: https://github.com/meteostat/meteostat/actions/workflows/provider-tests.yml
+[issues-shield]: https://img.shields.io/github/issues/meteostat/meteostat.svg
 [issues-url]: https://github.com/meteostat/meteostat/issues
-[license-shield]: https://img.shields.io/github/license/meteostat/meteostat.svg?style=for-the-badge
-[license-url]: https://github.com/meteostat/meteostat/blob/main/LICENSE
-[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=for-the-badge&logo=linkedin&colorB=555
-[linkedin-url]: https://www.linkedin.com/company/meteostat
+[license-shield]: https://img.shields.io/github/license/meteostat/meteostat.svg
+[license-url]: https://github.com/meteostat/meteostat?tab=readme-ov-file#-license
 [product-screenshot]: https://dev.meteostat.net/assets/images/example-8b6cf2a3fe2efa285bc72d7dc72c4865.png
+[stars-shield]: https://img.shields.io/github/stars/meteostat/meteostat.svg
+[stars-url]: https://github.com/meteostat/meteostat/stargazers

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/__init__.py

@@ -12,29 +12,34 @@ The code is licensed under the MIT license.
 """
 
 __appname__ = "meteostat"
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 from meteostat.api.daily import daily
 from meteostat.api.hourly import hourly
 from meteostat.api.interpolate import interpolate
+from meteostat.api.inventory import Inventory
 from meteostat.api.merge import merge
 from meteostat.api.monthly import monthly
 from meteostat.api.normals import normals
 from meteostat.api.point import Point
 from meteostat.api.stations import stations
+from meteostat.api.timeseries import TimeSeries
 from meteostat.core.cache import purge
-from meteostat.core.config import config
-from meteostat.enumerations import Parameter, Provider, UnitSystem
+from meteostat.api.config import config
+from meteostat.enumerations import Granularity, Parameter, Provider, UnitSystem
 from meteostat.interpolation.lapserate import lapse_rate
-from meteostat.typing import Station
+from meteostat.typing import Station, License
 
 # Export public API
 __all__ = [
     "config",
     "daily",
     "hourly",
+    "Granularity",
     "interpolate",
+    "Inventory",
     "lapse_rate",
+    "License",
     "merge",
     "monthly",
     "normals",
@@ -44,5 +49,6 @@ __all__ = [
     "purge",
     "Station",
     "stations",
+    "TimeSeries",
     "UnitSystem",
 ]

{meteostat-2.0.0/meteostat/core → meteostat-2.0.1/meteostat/api}/config.py

@@ -15,9 +15,9 @@ from meteostat.enumerations import TTL, Parameter
 from meteostat.utils.types import extract_property_type, validate_parsed_value
 
 
-class Config:
+class ConfigService:
     """
-    Configuration Base Class
+    Configuration Service for Meteostat
     """
 
     prefix: str
@@ -92,9 +92,9 @@ class Config:
                 self._set_env_value(key, value)
 
 
-class ConfigService(Config):
+class Config(ConfigService):
     """
-    Configuration Service for Meteostat
+    Meteostat Configuration
 
     Manages all configuration settings including cache, network, stations,
     interpolation, and provider-specific settings. Supports loading configuration
@@ -155,4 +155,4 @@ class ConfigService(Config):
     metno_user_agent: Optional[str] = None
 
 
-config = ConfigService("MS")
+config = Config("MS")

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/api/interpolate.py

@@ -12,12 +12,19 @@ import pandas as pd
 from meteostat.api.point import Point
 from meteostat.api.timeseries import TimeSeries
 from meteostat.typing import Station
+from meteostat.enumerations import Parameter
 from meteostat.interpolation.lapserate import apply_lapse_rate
 from meteostat.interpolation.nearest import nearest_neighbor
 from meteostat.interpolation.idw import inverse_distance_weighting
 from meteostat.utils.data import aggregate_sources, reshape_by_source, stations_to_df
 from meteostat.utils.geo import get_distance
 from meteostat.utils.parsers import parse_station
+from meteostat.core.schema import schema_service
+from meteostat.core.logger import logger
+
+
+# Parameters that are categorical and should not use IDW interpolation
+CATEGORICAL_PARAMETERS = {Parameter.WDIR, Parameter.CLDC, Parameter.COCO}
 
 
 def _create_timeseries(
@@ -77,6 +84,191 @@ def _add_source_columns(
     return result
 
 
+def _prepare_data_with_distances(
+    df: pd.DataFrame, point: Point, elevation_weight: float
+) -> pd.DataFrame:
+    """
+    Add distance and elevation calculations to the DataFrame
+    """
+    # Add distance column
+    df["distance"] = get_distance(
+        point.latitude, point.longitude, df["latitude"], df["longitude"]
+    )
+
+    # Add effective distance column if elevation is available
+    if point.elevation is not None and "elevation" in df.columns:
+        elev_diff = np.abs(df["elevation"] - point.elevation)
+        df["effective_distance"] = np.sqrt(
+            df["distance"] ** 2 + (elev_diff * elevation_weight) ** 2
+        )
+    else:
+        df["effective_distance"] = df["distance"]
+
+    # Add elevation difference column
+    if "elevation" in df.columns and point.elevation is not None:
+        df["elevation_diff"] = np.abs(df["elevation"] - point.elevation)
+    else:
+        df["elevation_diff"] = np.nan
+
+    return df
+
+
+def _should_use_nearest_neighbor(
+    df: pd.DataFrame,
+    point: Point,
+    distance_threshold: Union[int, None],
+    elevation_threshold: Union[int, None],
+) -> bool:
+    """
+    Determine if nearest neighbor should be used based on thresholds
+    """
+    min_distance = df["distance"].min()
+    use_nearest = distance_threshold is None or min_distance <= distance_threshold
+
+    if use_nearest and point.elevation is not None and "elevation" in df.columns:
+        min_elev_diff = np.abs(df["elevation"] - point.elevation).min()
+        use_nearest = (
+            elevation_threshold is None or min_elev_diff <= elevation_threshold
+        )
+
+    return use_nearest
+
+
+def _get_categorical_columns(df: pd.DataFrame) -> list:
+    """
+    Identify categorical columns in the data (excluding source columns)
+    """
+    data_cols = [c for c in df.columns if not c.endswith("_source")]
+    return [c for c in data_cols if c in CATEGORICAL_PARAMETERS]
+
+
+def _interpolate_with_nearest_neighbor(
+    df: pd.DataFrame,
+    ts: TimeSeries,
+    point: Point,
+    distance_threshold: Union[int, None],
+    elevation_threshold: Union[int, None],
+) -> Optional[pd.DataFrame]:
+    """
+    Perform nearest neighbor interpolation with threshold filtering
+    """
+    distance_filter = (
+        pd.Series([True] * len(df), index=df.index)
+        if distance_threshold is None
+        else (df["distance"] <= distance_threshold)
+    )
+    elevation_filter = (
+        pd.Series([True] * len(df), index=df.index)
+        if elevation_threshold is None
+        else (np.abs(df["elevation"] - point.elevation) <= elevation_threshold)
+    )
+    df_filtered = df[distance_filter & elevation_filter]
+    return nearest_neighbor(df_filtered, ts, point)
+
+
+def _interpolate_with_idw_and_categorical(
+    df: pd.DataFrame,
+    ts: TimeSeries,
+    point: Point,
+    categorical_cols: list,
+    power: float,
+) -> Optional[pd.DataFrame]:
+    """
+    Perform IDW interpolation for non-categorical parameters and nearest neighbor for categorical
+    """
+    # For categorical parameters, always use nearest neighbor
+    if categorical_cols:
+        df_categorical = nearest_neighbor(df, ts, point)
+        # Keep only categorical columns that exist in the result
+        existing_categorical = [
+            c for c in categorical_cols if c in df_categorical.columns
+        ]
+        df_categorical = (
+            df_categorical[existing_categorical]
+            if existing_categorical
+            else pd.DataFrame()
+        )
+    else:
+        df_categorical = pd.DataFrame()
+
+    # Perform IDW interpolation for all parameters
+    idw_func = inverse_distance_weighting(power=power)
+    df_idw = idw_func(df, ts, point)
+
+    # Remove categorical columns from IDW result if they exist
+    if not df_categorical.empty and df_idw is not None:
+        # Drop categorical columns from IDW result
+        idw_cols_to_keep = [c for c in df_idw.columns if c not in categorical_cols]
+        df_idw = df_idw[idw_cols_to_keep] if idw_cols_to_keep else pd.DataFrame()
+
+    # Combine categorical (nearest) and non-categorical (IDW) results
+    if not df_categorical.empty and not df_idw.empty:
+        return pd.concat([df_idw, df_categorical], axis=1)
+    elif not df_categorical.empty:
+        return df_categorical
+    else:
+        return df_idw
+
+
+def _merge_interpolation_results(
+    df_nearest: Optional[pd.DataFrame],
+    df_idw: Optional[pd.DataFrame],
+    use_nearest: bool,
+) -> Optional[pd.DataFrame]:
+    """
+    Merge nearest neighbor and IDW results with appropriate priority
+    """
+    if use_nearest and df_nearest is not None and len(df_nearest) > 0:
+        if df_idw is not None:
+            # Combine nearest and IDW results, prioritizing nearest values
+            return df_nearest.combine_first(df_idw)
+        else:
+            return df_nearest
+    else:
+        return df_idw
+
+
+def _postprocess_result(
+    result: pd.DataFrame, df: pd.DataFrame, ts: TimeSeries
+) -> pd.DataFrame:
+    """
+    Post-process the interpolation result: drop location columns, add sources, format, reshape
+    """
+    # Drop location-related columns
+    result = result.drop(
+        [
+            "latitude",
+            "longitude",
+            "elevation",
+            "distance",
+            "effective_distance",
+            "elevation_diff",
+        ],
+        axis=1,
+        errors="ignore",
+    )
+
+    # Add source columns
+    result = _add_source_columns(result, df)
+
+    # Reshape by source
+    result = reshape_by_source(result)
+
+    # Add station index
+    result["station"] = "$0001"
+    result = result.set_index("station", append=True).reorder_levels(
+        ["station", "time", "source"]
+    )
+
+    # Reorder columns to match the canonical schema order
+    result = schema_service.purge(result, ts.parameters)
+
+    # Format the result using schema_service to apply proper rounding
+    result = schema_service.format(result, ts.granularity)
+
+    return result
+
+
 def interpolate(
     ts: TimeSeries,
     point: Point,
@@ -127,27 +319,11 @@ def interpolate(
 
     # If no data is returned, return None
     if df is None:
+        logger.debug("No data available for interpolation. Returning empty TimeSeries.")
         return _create_timeseries(ts, point)
 
-    # Add distance column
-    df["distance"] = get_distance(
-        point.latitude, point.longitude, df["latitude"], df["longitude"]
-    )
-
-    # Add effective distance column if elevation is available
-    if point.elevation is not None and "elevation" in df.columns:
-        elev_diff = np.abs(df["elevation"] - point.elevation)
-        df["effective_distance"] = np.sqrt(
-            df["distance"] ** 2 + (elev_diff * elevation_weight) ** 2
-        )
-    else:
-        df["effective_distance"] = df["distance"]
-
-    # Add elevation difference column
-    if "elevation" in df.columns and point.elevation is not None:
-        df["elevation_diff"] = np.abs(df["elevation"] - point.elevation)
-    else:
-        df["elevation_diff"] = np.nan
+    # Prepare data with distance and elevation calculations
+    df = _prepare_data_with_distances(df, point, elevation_weight)
 
     # Apply lapse rate if specified and elevation is available
     if (
@@ -155,86 +331,48 @@ def interpolate(
         and point.elevation
         and df["elevation_diff"].max() >= lapse_rate_threshold
     ):
+        logger.debug("Applying lapse rate correction.")
         df = apply_lapse_rate(df, point.elevation, lapse_rate)
 
-    # Check if any stations are close enough for nearest neighbor
-    min_distance = df["distance"].min()
-    use_nearest = distance_threshold is None or min_distance <= distance_threshold
-    if use_nearest and point.elevation is not None and "elevation" in df.columns:
-        # Calculate minimum elevation difference
-        min_elev_diff = np.abs(df["elevation"] - point.elevation).min()
-        use_nearest = (
-            elevation_threshold is None or min_elev_diff <= elevation_threshold
-        )
+    # Determine if nearest neighbor should be used
+    use_nearest = _should_use_nearest_neighbor(
+        df, point, distance_threshold, elevation_threshold
+    )
 
-    # Initialize variables
+    # Identify categorical columns
+    categorical_cols = _get_categorical_columns(df)
+    logger.debug(f"Categorical columns identified: {categorical_cols}")
+
+    # Perform interpolation
     df_nearest = None
     df_idw = None
 
-    # Perform nearest neighbor if applicable
     if use_nearest:
-        # Filter applicable stations based on thresholds
-        distance_filter = (
-            pd.Series([True] * len(df), index=df.index)
-            if distance_threshold is None
-            else (df["distance"] <= distance_threshold)
-        )
-        elevation_filter = (
-            pd.Series([True] * len(df), index=df.index)
-            if elevation_threshold is None
-            else (np.abs(df["elevation"] - point.elevation) <= elevation_threshold)
+        logger.debug("Using nearest neighbor interpolation.")
+        df_nearest = _interpolate_with_nearest_neighbor(
+            df, ts, point, distance_threshold, elevation_threshold
         )
-        df_filtered = df[distance_filter & elevation_filter]
-        df_nearest = nearest_neighbor(df_filtered, ts, point)
 
-    # Check if we need to use IDW
+    # Use IDW if nearest neighbor doesn't provide complete data
     if (
         not use_nearest
         or df_nearest is None
         or len(df_nearest) == 0
         or df_nearest.isna().any().any()
     ):
-        # Perform IDW interpolation
-        idw_func = inverse_distance_weighting(power=power)
-        df_idw = idw_func(df, ts, point)
+        logger.debug("Using IDW interpolation.")
+        df_idw = _interpolate_with_idw_and_categorical(
+            df, ts, point, categorical_cols, power
+        )
 
-    # Merge DataFrames with priority to nearest neighbor
-    if use_nearest and df_nearest is not None and len(df_nearest) > 0:
-        if df_idw is not None:
-            # Combine nearest and IDW results, prioritizing nearest values
-            result = df_nearest.combine_first(df_idw)
-        else:
-            result = df_nearest
-    else:
-        result = df_idw
+    # Merge results
+    result = _merge_interpolation_results(df_nearest, df_idw, use_nearest)
 
     # If no data is returned, return None
     if result is None or result.empty:
         return _create_timeseries(ts, point)
 
-    # Drop location-related columns & return
-    result = result.drop(
-        [
-            "latitude",
-            "longitude",
-            "elevation",
-            "distance",
-            "effective_distance",
-            "elevation_diff",
-        ],
-        axis=1,
-    )
-
-    # Add source columns: aggregate all columns that end with "_source"
-    result = _add_source_columns(result, df)
-
-    # Reshape by source
-    result = reshape_by_source(result)
-
-    # Add station index
-    result["station"] = "$0001"
-    result = result.set_index("station", append=True).reorder_levels(
-        ["station", "time", "source"]
-    )
+    # Post-process result
+    result = _postprocess_result(result, df, ts)
 
     return _create_timeseries(ts, point, result)

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/api/stations.py

@@ -15,7 +15,7 @@ from requests import Response
 from meteostat.api.inventory import Inventory
 from meteostat.api.point import Point
 from meteostat.core.cache import cache_service
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.core.logger import logger
 from meteostat.core.network import network_service
 from meteostat.enumerations import Provider

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/core/cache.py

@@ -14,7 +14,7 @@ from typing import Any, Callable, Optional
 
 import pandas as pd
 
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.core.logger import logger
 
 

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/core/data.py

@@ -18,6 +18,7 @@ from meteostat.core.schema import schema_service
 from meteostat.enumerations import Parameter, Provider
 from meteostat.typing import Station, Request
 from meteostat.utils.data import stations_to_df
+from meteostat.utils.guards import request_size_guard
 
 
 class DataService:
@@ -147,6 +148,9 @@ class DataService:
         """
         Load meteorological time series data from different providers
         """
+        # Guard request
+        request_size_guard(req)
+
         # Convert stations to list if single Station
         stations: List[Station] = (
             cast(List[Station], req.station)

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/core/network.py

@@ -11,7 +11,7 @@ import requests
 
 from meteostat import __version__
 from meteostat.core.logger import logger
-from meteostat.core.config import config
+from meteostat.api.config import config
 
 
 class NetworkService:

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/interpolation/lapserate.py

@@ -5,7 +5,7 @@ import numpy as np
 import pandas as pd
 
 from meteostat.api.timeseries import TimeSeries
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.enumerations import Parameter
 
 

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/dwd/climat.py

@@ -10,7 +10,7 @@ from typing import List, Optional
 import pandas as pd
 
 from meteostat.core.logger import logger
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.enumerations import TTL, Parameter
 from meteostat.typing import ProviderRequest, Station
 from meteostat.core.cache import cache_service

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/dwd/daily.py

@@ -14,7 +14,7 @@ from zipfile import ZipFile
 
 import pandas as pd
 
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.enumerations import TTL, Parameter
 from meteostat.typing import ProviderRequest
 from meteostat.core.cache import cache_service

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/dwd/hourly.py

@@ -18,7 +18,7 @@ from meteostat.enumerations import TTL, Parameter
 from meteostat.core.logger import logger
 from meteostat.typing import ProviderRequest, Station
 from meteostat.core.cache import cache_service
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.utils.conversions import ms_to_kmh
 from meteostat.providers.dwd.shared import get_condicode
 from meteostat.providers.dwd.shared import get_ftp_connection

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/dwd/shared.py

@@ -1,7 +1,7 @@
 from typing import Union
 from ftplib import FTP
 
-from meteostat.core.config import config
+from meteostat.api.config import config
 
 
 DWD_FTP_SERVER = config.dwd_ftp_host

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/meteostat/daily.py

@@ -10,7 +10,7 @@ import pandas as pd
 from meteostat.providers.meteostat.shared import filter_model_data, handle_exceptions
 from meteostat.typing import ProviderRequest
 from meteostat.core.cache import cache_service
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.utils.data import reshape_by_source
 
 ENDPOINT = config.daily_endpoint

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/meteostat/hourly.py

@@ -9,7 +9,7 @@ import pandas as pd
 
 from meteostat.providers.meteostat.shared import filter_model_data, handle_exceptions
 from meteostat.typing import ProviderRequest
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.core.cache import cache_service
 from meteostat.utils.data import reshape_by_source
 

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/meteostat/monthly.py

@@ -6,7 +6,7 @@ from typing import Optional
 
 import pandas as pd
 
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.enumerations import TTL
 from meteostat.providers.meteostat.shared import filter_model_data, handle_exceptions
 from meteostat.typing import ProviderRequest

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/meteostat/shared.py

@@ -4,7 +4,7 @@ from typing import Optional, Callable, TypeVar
 
 import pandas as pd
 
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.core.logger import logger
 from meteostat.core.providers import provider_service
 from meteostat.enumerations import Grade

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/metno/forecast.py

@@ -3,7 +3,7 @@ from urllib.error import HTTPError
 
 import pandas as pd
 
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.enumerations import TTL, Parameter
 from meteostat.core.logger import logger
 from meteostat.core.network import network_service

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/providers/noaa/metar.py

@@ -8,7 +8,7 @@ import pandas as pd
 from metar import Metar
 
 from meteostat.core.logger import logger
-from meteostat.core.config import config
+from meteostat.api.config import config
 from meteostat.enumerations import TTL, Frequency, Parameter
 from meteostat.typing import ProviderRequest
 from meteostat.utils.conversions import temp_dwpt_to_rhum

meteostat-2.0.1/meteostat/utils/guards.py

@@ -0,0 +1,51 @@
+"""
+Guard functions for Meteostat.
+
+The code is licensed under the MIT license.
+"""
+
+from datetime import datetime
+from meteostat.api.config import config
+from meteostat.core.logger import logger
+from meteostat.enumerations import Granularity
+from meteostat.typing import Request
+
+
+def request_size_guard(req: Request) -> None:
+    """
+    Guard to block large requests
+    """
+    if not config.block_large_requests:
+        logger.debug("Large request blocking is disabled.")
+        return
+
+    if isinstance(req.station, list) and len(req.station) > 10:
+        raise ValueError(
+            "Requests with more than 10 stations are blocked by default. "
+            "To enable large requests, set `config.block_large_requests = False`."
+        )
+
+    if req.granularity not in [Granularity.HOURLY, Granularity.DAILY]:
+        return
+
+    if req.start is None:
+        raise ValueError(
+            "Hourly and daily requests without a start date are blocked by default. "
+            "To enable large requests, set `config.block_large_requests = False`."
+        )
+
+    time_diff_years = abs((req.end or datetime.now()).year - req.start.year)
+
+    logger.debug(f"Request time range: {time_diff_years} years.")
+
+    if req.granularity is Granularity.HOURLY and time_diff_years > 3:
+        raise ValueError(
+            "Hourly requests longer than 3 years are blocked by default. "
+            "To enable large requests, set `config.block_large_requests = False`."
+        )
+
+    if req.granularity is Granularity.DAILY and time_diff_years > 30:
+        raise ValueError(
+            "Daily requests longer than 30 years are blocked by default. "
+            "To enable large requests, set `config.block_large_requests = False`."
+        )

{meteostat-2.0.0 → meteostat-2.0.1}/meteostat/utils/parsers.py

@@ -13,7 +13,6 @@ import pytz
 
 from meteostat.api.stations import stations as stations_service
 from meteostat.api.point import Point
-from meteostat.core.config import config
 from meteostat.typing import Station
 
 
@@ -54,12 +53,6 @@ def parse_station(
         # It's a list
         stations = station
 
-    if config.block_large_requests and len(stations) > 10:
-        raise ValueError(
-            "Requests with more than 10 stations are blocked by default. "
-            "To enable large requests, set `config.block_large_requests = False`."
-        )
-
     # Get station meta data
     data = []
     point_counter = 0

{meteostat-2.0.0 → meteostat-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meteostat"
-version = "2.0.0"
+version = "2.0.1"
 description = "Access and analyze historical weather and climate data with Python."
 authors = ["Meteostat", "Christian Lamprecht"]
 readme = "README.md"