spotforecast2 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

spotforecast2/forecaster/utils.py

@@ -20,6 +20,11 @@ from spotforecast2.utils import (
 )
 from spotforecast2.exceptions import set_skforecast_warnings, UnknownLevelWarning
 
+try:
+    from tqdm.auto import tqdm
+except ImportError:  # pragma: no cover - fallback when tqdm is not installed
+    tqdm = None
+
 
 def check_preprocess_series(series):
     pass
@@ -785,6 +790,7 @@ def predict_multivariate(
     forecasters: dict[str, Any],
     steps_ahead: int,
     exog: pd.DataFrame | None = None,
+    show_progress: bool = False,
 ) -> pd.DataFrame:
     """
     Generate multi-output predictions using multiple baseline forecasters.
@@ -796,6 +802,8 @@ def predict_multivariate(
         steps_ahead (int): Number of steps to forecast.
         exog (pd.DataFrame, optional): Exogenous variables for prediction.
             If provided, will be passed to each forecaster's predict method.
+        show_progress (bool, optional): Show progress bar while predicting
+            per target forecaster. Default: False.
 
     Returns:
         pd.DataFrame: DataFrame with predictions for all targets.
@@ -824,7 +832,15 @@ def predict_multivariate(
 
     predictions = {}
 
-    for target, forecaster in forecasters.items():
+    target_iter = forecasters.items()
+    if show_progress and tqdm is not None:
+        target_iter = tqdm(
+            forecasters.items(),
+            desc="Predicting targets",
+            unit="model",
+        )
+
+    for target, forecaster in target_iter:
         # Generate predictions for this target
         if exog is not None:
             pred = forecaster.predict(steps=steps_ahead, exog=exog)

spotforecast2/processing/n2n_predict.py

@@ -1,5 +1,5 @@
 import pandas as pd
-from typing import List, Optional, Tuple, Dict, Any
+from typing import List, Optional
 from spotforecast2.forecaster.recursive import ForecasterEquivalentDate
 from spotforecast2.data.fetch_data import fetch_data
 from spotforecast2.preprocessing.curate_data import basic_ts_checks
@@ -8,9 +8,13 @@ from spotforecast2.preprocessing.outlier import mark_outliers
 
 from spotforecast2.preprocessing.split import split_rel_train_val_test
 from spotforecast2.forecaster.utils import predict_multivariate
-from spotforecast2.model_selection import TimeSeriesFold, backtesting_forecaster
 from spotforecast2.preprocessing.curate_data import get_start_end
 
+try:
+    from tqdm.auto import tqdm
+except ImportError:  # pragma: no cover - fallback when tqdm is not installed
+    tqdm = None
+
 
 def n2n_predict(
     columns: Optional[List[str]] = None,
@@ -18,22 +22,22 @@ def n2n_predict(
     contamination: float = 0.01,
     window_size: int = 72,
     verbose: bool = True,
-) -> Tuple[pd.DataFrame, Optional[Dict[str, Any]]]:
+    show_progress: bool = True,
+) -> pd.DataFrame:
     """
     End-to-end prediction function replicating the workflow from 01_base_predictor combined with fetch_data.
 
     Args:
         columns: List of target columns to forecast. If None, uses a default set (defined internally or from data).
-                 Note: fetch_data now supports None to return all columns.
+                 Note: fetch_data supports None to return all columns.
         forecast_horizon: Number of steps to forecast.
         contamination: Contamination factor for outlier detection.
         window_size: Window size for weighting (not fully utilized in main flow but kept for consistency).
         verbose: Whether to print progress logs.
+        show_progress: Show progress bar during training and prediction.
 
     Returns:
-        Tuple containing:
-            - predictions (pd.DataFrame): The multi-output predictions.
-            - metrics (Optional[Dict]): Dictionary containing backtesting metrics if performed.
+        pd.DataFrame: The multi-output predictions.
     """
     if columns is not None:
         TARGET = columns
@@ -95,7 +99,11 @@ def n2n_predict(
 
     baseline_forecasters = {}
 
-    for target in data.columns:
+    target_iter = data.columns
+    if show_progress and tqdm is not None:
+        target_iter = tqdm(data.columns, desc="Training forecasters", unit="model")
+
+    for target in target_iter:
         forecaster = ForecasterEquivalentDate(offset=pd.DateOffset(days=1), n_offsets=1)
 
         forecaster.fit(y=data.loc[:end_validation, target])
@@ -105,13 +113,14 @@ def n2n_predict(
     if verbose:
         print("✓ Multi-output baseline system trained")
 
-    
     # --- Predict ---
     if verbose:
         print("Generating predictions...")
 
     predictions = predict_multivariate(
-        baseline_forecasters, steps_ahead=forecast_horizon
+        baseline_forecasters,
+        steps_ahead=forecast_horizon,
+        show_progress=show_progress,
     )
 
     return predictions

spotforecast2/processing/n2n_predict_with_covariates.py

@@ -0,0 +1,937 @@
+"""
+End-to-end recursive forecasting with exogenous covariates.
+
+This module provides a complete pipeline for time series forecasting using
+recursive forecasters with exogenous variables (weather, holidays, calendar features).
+It handles data preparation, feature engineering, model training, and prediction
+in a single integrated function.
+
+Examples:
+    Basic usage with default parameters:
+
+    >>> from spotforecast2.processing.n2n_predict_with_covariates import (
+    ...     n2n_predict_with_covariates
+    ... )
+    >>> predictions = n2n_predict_with_covariates(
+    ...     forecast_horizon=24,
+    ...     verbose=True
+    ... )
+
+    With custom parameters:
+
+    >>> predictions = n2n_predict_with_covariates(
+    ...     forecast_horizon=48,
+    ...     contamination=0.02,
+    ...     window_size=100,
+    ...     lags=48,
+    ...     train_ratio=0.75,
+    ...     verbose=True
+    ... )
+"""
+
+from typing import Dict, List, Optional, Tuple, Union
+
+import numpy as np
+import pandas as pd
+from astral import LocationInfo
+from lightgbm import LGBMRegressor
+from sklearn.preprocessing import PolynomialFeatures
+
+try:
+    from tqdm.auto import tqdm
+except ImportError:  # pragma: no cover - fallback when tqdm is not installed
+    tqdm = None
+
+from spotforecast2.data.fetch_data import (
+    fetch_data,
+    fetch_holiday_data,
+    fetch_weather_data,
+)
+from spotforecast2.forecaster.recursive import ForecasterRecursive
+from spotforecast2.forecaster.utils import predict_multivariate
+from spotforecast2.preprocessing import RollingFeatures
+from spotforecast2.preprocessing.curate_data import (
+    agg_and_resample_data,
+    basic_ts_checks,
+    curate_holidays,
+    curate_weather,
+    get_start_end,
+)
+from spotforecast2.preprocessing.imputation import custom_weights, get_missing_weights
+from spotforecast2.preprocessing.outlier import mark_outliers
+from spotforecast2.preprocessing.split import split_rel_train_val_test
+
+try:
+    from feature_engine.creation import CyclicalFeatures
+    from feature_engine.datetime import DatetimeFeatures
+    from feature_engine.timeseries.forecasting import WindowFeatures
+except ImportError:
+    raise ImportError(
+        "feature_engine is required. Install with: pip install feature-engine"
+    )
+
+try:
+    from astral.sun import sun
+except ImportError:
+    raise ImportError("astral is required. Install with: pip install astral")
+
+
+# ============================================================================
+# Helper Functions for Feature Engineering
+# ============================================================================
+
+
+def _get_weather_features(
+    data: pd.DataFrame,
+    start: Union[str, pd.Timestamp],
+    cov_end: Union[str, pd.Timestamp],
+    forecast_horizon: int,
+    latitude: float = 51.5136,
+    longitude: float = 7.4653,
+    timezone: str = "UTC",
+    freq: str = "h",
+    window_periods: Optional[List[str]] = None,
+    window_functions: Optional[List[str]] = None,
+    fallback_on_failure: bool = True,
+    cached: bool = True,
+    verbose: bool = False,
+) -> Tuple[pd.DataFrame, pd.DataFrame]:
+    """Fetch and process weather data with rolling window features.
+
+    Args:
+        data: Time series DataFrame for validation.
+        start: Start date for weather data.
+        cov_end: End date for weather data.
+        forecast_horizon: Number of forecast steps.
+        latitude: Latitude of location. Default: 51.5136 (Dortmund).
+        longitude: Longitude of location. Default: 7.4653 (Dortmund).
+        timezone: Timezone for data. Default: "UTC".
+        freq: Frequency of time series. Default: "h".
+        window_periods: Window periods for rolling features. Default: ["1D", "7D"].
+        window_functions: Functions for rolling windows. Default: ["mean", "max", "min"].
+        fallback_on_failure: Use fallback if API fails. Default: True.
+        cached: Use cached data if available. Default: True.
+        verbose: Print progress. Default: False.
+
+    Returns:
+        Tuple of (weather_features, weather_aligned).
+    """
+    if window_periods is None:
+        window_periods = ["1D", "7D"]
+    if window_functions is None:
+        window_functions = ["mean", "max", "min"]
+
+    if isinstance(start, str):
+        start = pd.to_datetime(start, utc=True)
+    if isinstance(cov_end, str):
+        cov_end = pd.to_datetime(cov_end, utc=True)
+
+    if verbose:
+        print("Fetching weather data...")
+
+    weather_df = fetch_weather_data(
+        cov_start=start,
+        cov_end=cov_end,
+        latitude=latitude,
+        longitude=longitude,
+        timezone=timezone,
+        freq=freq,
+        fallback_on_failure=fallback_on_failure,
+        cached=cached,
+    )
+
+    curate_weather(weather_df, data, forecast_horizon=forecast_horizon)
+
+    if verbose:
+        print("Processing weather features...")
+
+    extended_index = pd.date_range(start=start, end=cov_end, freq=freq, tz=timezone)
+    weather_aligned = weather_df.reindex(extended_index, method="ffill")
+
+    weather_columns = weather_aligned.select_dtypes(
+        include=[np.number]
+    ).columns.tolist()
+
+    if len(weather_columns) == 0:
+        raise ValueError("No numeric weather columns found")
+
+    weather_aligned_filled = weather_aligned[weather_columns].copy()
+    if weather_aligned_filled.isnull().any().any():
+        weather_aligned_filled = weather_aligned_filled.bfill()
+        if weather_aligned_filled.isnull().any().any():
+            raise ValueError("Missing values in weather data could not be filled")
+
+    wf_transformer = WindowFeatures(
+        variables=weather_columns,
+        window=window_periods,
+        functions=window_functions,
+        freq=freq,
+    )
+
+    weather_features = wf_transformer.fit_transform(weather_aligned_filled)
+
+    if weather_features.isnull().any().any():
+        weather_features = weather_features.bfill()
+        if weather_features.isnull().any().any():
+            raise ValueError("Missing values in weather features could not be filled")
+
+    if verbose:
+        print(f"Weather features shape: {weather_features.shape}")
+
+    return weather_features, weather_aligned
+
+
+def _get_calendar_features(
+    start: Union[str, pd.Timestamp],
+    cov_end: Union[str, pd.Timestamp],
+    freq: str = "h",
+    timezone: str = "UTC",
+    features_to_extract: Optional[List[str]] = None,
+) -> pd.DataFrame:
+    """Create calendar-based features for a time range.
+
+    Args:
+        start: Start date.
+        cov_end: End date.
+        freq: Frequency. Default: "h".
+        timezone: Timezone. Default: "UTC".
+        features_to_extract: Features to extract. Default: ["month", "week", "day_of_week", "hour"].
+
+    Returns:
+        DataFrame with calendar features.
+    """
+    if features_to_extract is None:
+        features_to_extract = ["month", "week", "day_of_week", "hour"]
+
+    if isinstance(start, str):
+        start = pd.to_datetime(start, utc=True)
+    if isinstance(cov_end, str):
+        cov_end = pd.to_datetime(cov_end, utc=True)
+
+    calendar_transformer = DatetimeFeatures(
+        variables="index",
+        features_to_extract=features_to_extract,
+        drop_original=True,
+    )
+
+    extended_index = pd.date_range(start=start, end=cov_end, freq=freq, tz=timezone)
+    extended_data = pd.DataFrame(index=extended_index)
+    extended_data["dummy"] = 0
+
+    return calendar_transformer.fit_transform(extended_data)[features_to_extract]
+
+
+def _get_day_night_features(
+    start: Union[str, pd.Timestamp],
+    cov_end: Union[str, pd.Timestamp],
+    location: LocationInfo,
+    freq: str = "h",
+    timezone: str = "UTC",
+) -> pd.DataFrame:
+    """Create day/night features using sunrise and sunset times.
+
+    Args:
+        start: Start date.
+        cov_end: End date.
+        location: Astral LocationInfo object.
+        freq: Frequency. Default: "h".
+        timezone: Timezone. Default: "UTC".
+
+    Returns:
+        DataFrame with sunrise/sunset and daylight features.
+    """
+    if isinstance(start, str):
+        start = pd.to_datetime(start, utc=True)
+    if isinstance(cov_end, str):
+        cov_end = pd.to_datetime(cov_end, utc=True)
+
+    extended_index = pd.date_range(start=start, end=cov_end, freq=freq, tz=timezone)
+
+    sunrise_hour = [
+        sun(location.observer, date=date, tzinfo=location.timezone)["sunrise"]
+        for date in extended_index
+    ]
+    sunset_hour = [
+        sun(location.observer, date=date, tzinfo=location.timezone)["sunset"]
+        for date in extended_index
+    ]
+
+    sunrise_hour = pd.Series(sunrise_hour, index=extended_index).dt.round("h").dt.hour
+    sunset_hour = pd.Series(sunset_hour, index=extended_index).dt.round("h").dt.hour
+
+    sun_light_features = pd.DataFrame(
+        {
+            "sunrise_hour": sunrise_hour,
+            "sunset_hour": sunset_hour,
+        }
+    )
+    sun_light_features["daylight_hours"] = (
+        sun_light_features["sunset_hour"] - sun_light_features["sunrise_hour"]
+    )
+    sun_light_features["is_daylight"] = np.where(
+        (extended_index.hour >= sun_light_features["sunrise_hour"])
+        & (extended_index.hour < sun_light_features["sunset_hour"]),
+        1,
+        0,
+    )
+
+    return sun_light_features
+
+
+def _get_holiday_features(
+    data: pd.DataFrame,
+    start: Union[str, pd.Timestamp],
+    cov_end: Union[str, pd.Timestamp],
+    forecast_horizon: int,
+    tz: str = "UTC",
+    freq: str = "h",
+    country_code: str = "DE",
+    state: str = "NW",
+) -> pd.DataFrame:
+    """Fetch and align holiday features to the extended time index.
+
+    Args:
+        data: Target time series for validation.
+        start: Start timestamp.
+        cov_end: End timestamp.
+        forecast_horizon: Number of forecast steps.
+        tz: Timezone. Default: "UTC".
+        freq: Frequency. Default: "h".
+        country_code: Country code. Default: "DE".
+        state: State code. Default: "NW".
+
+    Returns:
+        DataFrame with holiday features.
+    """
+    if isinstance(start, str):
+        start = pd.to_datetime(start, utc=True)
+    if isinstance(cov_end, str):
+        cov_end = pd.to_datetime(cov_end, utc=True)
+
+    holiday_df = fetch_holiday_data(
+        start=start,
+        end=cov_end,
+        tz=tz,
+        freq=freq,
+        country_code=country_code,
+        state=state,
+    )
+
+    curate_holidays(holiday_df, data, forecast_horizon=forecast_horizon)
+
+    extended_index = pd.date_range(start=start, end=cov_end, freq=freq, tz=tz)
+    holiday_features = holiday_df.reindex(extended_index, fill_value=0).astype(int)
+
+    return holiday_features
+
+
+def _apply_cyclical_encoding(
+    data: pd.DataFrame,
+    features_to_encode: Optional[List[str]] = None,
+    max_values: Optional[Dict[str, int]] = None,
+    drop_original: bool = False,
+) -> pd.DataFrame:
+    """Apply cyclical encoding to selected features.
+
+    Args:
+        data: DataFrame with features.
+        features_to_encode: Features to encode. Default: calendar and sun features.
+        max_values: Max values for features. Default: standard calendar/hour ranges.
+        drop_original: Drop original columns. Default: False.
+
+    Returns:
+        DataFrame with cyclical encoded features.
+    """
+    if features_to_encode is None:
+        features_to_encode = [
+            "month",
+            "week",
+            "day_of_week",
+            "hour",
+            "sunrise_hour",
+            "sunset_hour",
+        ]
+
+    if max_values is None:
+        max_values = {
+            "month": 12,
+            "week": 52,
+            "day_of_week": 6,
+            "hour": 24,
+            "sunrise_hour": 24,
+            "sunset_hour": 24,
+        }
+
+    # Filter features_to_encode to only those that exist in data
+    available_features = [f for f in features_to_encode if f in data.columns]
+    available_max_values = {
+        k: v for k, v in max_values.items() if k in available_features
+    }
+
+    cyclical_encoder = CyclicalFeatures(
+        variables=available_features,
+        max_values=available_max_values,
+        drop_original=drop_original,
+    )
+
+    return cyclical_encoder.fit_transform(data)
+
+
+def _create_interaction_features(
+    exogenous_features: pd.DataFrame,
+    weather_aligned: pd.DataFrame,
+    base_cols: Optional[List[str]] = None,
+    weather_window_pattern: str = "_window_",
+    include_weather_funcs: Optional[List[str]] = None,
+    holiday_col: str = "holiday",
+    degree: int = 1,
+) -> pd.DataFrame:
+    """Create interaction features from exogenous features.
+
+    Args:
+        exogenous_features: DataFrame with base features.
+        weather_aligned: DataFrame with raw weather columns.
+        base_cols: Base columns for interactions. Default: day_of_week and hour cyclical features.
+        weather_window_pattern: Pattern for weather window features. Default: "_window_".
+        include_weather_funcs: Functions to include. Default: ["_mean", "_min", "_max"].
+        holiday_col: Holiday column name. Default: "holiday".
+        degree: Polynomial degree. Default: 1.
+
+    Returns:
+        DataFrame with interaction features appended.
+    """
+    if base_cols is None:
+        base_cols = [
+            "day_of_week_sin",
+            "day_of_week_cos",
+            "hour_sin",
+            "hour_cos",
+        ]
+
+    if include_weather_funcs is None:
+        include_weather_funcs = ["_mean", "_min", "_max"]
+
+    transformer_poly = PolynomialFeatures(
+        degree=degree, interaction_only=True, include_bias=False
+    ).set_output(transform="pandas")
+
+    weather_window_cols = [
+        col
+        for col in exogenous_features.columns
+        if weather_window_pattern in col
+        and any(func in col for func in include_weather_funcs)
+    ]
+
+    raw_weather_cols = [
+        col
+        for col in exogenous_features.columns
+        if col in weather_aligned.columns and col not in weather_window_cols
+    ]
+
+    poly_cols = list(base_cols)
+    poly_cols.extend(weather_window_cols)
+    poly_cols.extend(raw_weather_cols)
+    if holiday_col in exogenous_features.columns:
+        poly_cols.append(holiday_col)
+
+    poly_features = transformer_poly.fit_transform(exogenous_features[poly_cols])
+    poly_features = poly_features.drop(columns=poly_cols)
+    poly_features.columns = [f"poly_{col}" for col in poly_features.columns]
+    poly_features.columns = poly_features.columns.str.replace(" ", "__")
+
+    return pd.concat([exogenous_features, poly_features], axis=1)
+
+
+def _select_exogenous_features(
+    exogenous_features: pd.DataFrame,
+    weather_aligned: pd.DataFrame,
+    cyclical_regex: str = "_sin$|_cos$",
+    include_weather_windows: bool = False,
+    include_holiday_features: bool = False,
+    include_poly_features: bool = False,
+) -> List[str]:
+    """Select exogenous feature columns for model training.
+
+    Args:
+        exogenous_features: DataFrame with all features.
+        weather_aligned: DataFrame with raw weather columns.
+        cyclical_regex: Regex for cyclical features. Default: "_sin$|_cos$".
+        include_weather_windows: Include weather window features. Default: False.
+        include_holiday_features: Include holiday features. Default: False.
+        include_poly_features: Include polynomial features. Default: False.
+
+    Returns:
+        List of selected feature column names.
+    """
+    exog_features: List[str] = []
+
+    exog_features.extend(
+        exogenous_features.filter(regex=cyclical_regex).columns.tolist()
+    )
+
+    if include_weather_windows:
+        weather_window_features = [
+            col
+            for col in exogenous_features.columns
+            if "_window_" in col and ("_mean" in col or "_min" in col or "_max" in col)
+        ]
+        exog_features.extend(weather_window_features)
+
+    raw_weather_features = [
+        col for col in exogenous_features.columns if col in weather_aligned.columns
+    ]
+    exog_features.extend(raw_weather_features)
+
+    if include_holiday_features:
+        holiday_related = [
+            col for col in exogenous_features.columns if col.startswith("holiday")
+        ]
+        exog_features.extend(holiday_related)
+
+    if include_poly_features:
+        poly_features_list = [
+            col for col in exogenous_features.columns if col.startswith("poly_")
+        ]
+        exog_features.extend(poly_features_list)
+
+    return list(dict.fromkeys(exog_features))
+
+
+def _merge_data_and_covariates(
+    data: pd.DataFrame,
+    exogenous_features: pd.DataFrame,
+    target_columns: List[str],
+    exog_features: List[str],
+    start: Union[str, pd.Timestamp],
+    end: Union[str, pd.Timestamp],
+    cov_end: Union[str, pd.Timestamp],
+    forecast_horizon: int,
+    cast_dtype: Optional[str] = "float32",
+) -> Tuple[pd.DataFrame, pd.DataFrame, pd.DataFrame]:
+    """Merge target data with exogenous features and build prediction covariates.
+
+    Args:
+        data: DataFrame with target variables.
+        exogenous_features: DataFrame with exogenous features.
+        target_columns: Target column names.
+        exog_features: Exogenous feature column names.
+        start: Start date.
+        end: End date.
+        cov_end: Covariate end date.
+        forecast_horizon: Number of forecast steps.
+        cast_dtype: Data type for merged data. Default: "float32".
+
+    Returns:
+        Tuple of (data_with_exog, exo_tmp, exo_pred).
+    """
+    if isinstance(start, str):
+        start = pd.to_datetime(start, utc=True)
+    if isinstance(end, str):
+        end = pd.to_datetime(end, utc=True)
+    if isinstance(cov_end, str):
+        cov_end = pd.to_datetime(cov_end, utc=True)
+
+    exo_tmp = exogenous_features.loc[start:end].copy()
+    exo_pred = exogenous_features.loc[end + pd.Timedelta(hours=1) : cov_end].copy()
+
+    data_with_exog = data[target_columns].merge(
+        exo_tmp[exog_features],
+        left_index=True,
+        right_index=True,
+        how="inner",
+    )
+
+    if cast_dtype is not None:
+        data_with_exog = data_with_exog.astype(cast_dtype)
+
+    return data_with_exog, exo_tmp, exo_pred
+
+
+# ============================================================================
+# Main Function
+# ============================================================================
+
+
+def n2n_predict_with_covariates(
+    forecast_horizon: int = 24,
+    contamination: float = 0.01,
+    window_size: int = 72,
+    lags: int = 24,
+    train_ratio: float = 0.8,
+    latitude: float = 51.5136,
+    longitude: float = 7.4653,
+    timezone: str = "UTC",
+    country_code: str = "DE",
+    state: str = "NW",
+    estimator: Optional[object] = None,
+    include_weather_windows: bool = False,
+    include_holiday_features: bool = False,
+    include_poly_features: bool = False,
+    verbose: bool = True,
+    show_progress: bool = True,
+) -> Tuple[pd.DataFrame, Dict, Dict]:
+    """End-to-end recursive forecasting with exogenous covariates.
+
+    This function implements a complete forecasting pipeline that:
+    1. Loads and validates target data
+    2. Detects and removes outliers
+    3. Imputes missing values with weighted gaps
+    4. Creates exogenous features (weather, holidays, calendar, day/night)
+    5. Performs feature engineering (cyclical encoding, interactions)
+    6. Merges target and exogenous data
+    7. Splits into train/validation/test sets
+    8. Trains recursive forecasters with sample weighting
+    9. Generates multi-step ahead predictions
+
+    Args:
+        forecast_horizon: Number of time steps to forecast ahead. Default: 24.
+        contamination: Contamination parameter for outlier detection. Default: 0.01.
+        window_size: Rolling window size for gap detection. Default: 72.
+        lags: Number of lags for recursive forecaster. Default: 24.
+        train_ratio: Fraction of data for training. Default: 0.8.
+        latitude: Location latitude. Default: 51.5136 (Dortmund).
+        longitude: Location longitude. Default: 7.4653 (Dortmund).
+        timezone: Timezone for data. Default: "UTC".
+        country_code: Country code for holidays. Default: "DE".
+        state: State code for holidays. Default: "NW".
+        estimator: Base estimator for recursive forecaster.
+            If None, uses LGBMRegressor. Default: None.
+        include_weather_windows: Include weather window features. Default: False.
+        include_holiday_features: Include holiday features. Default: False.
+        include_poly_features: Include polynomial interaction features. Default: False.
+        verbose: Print progress messages. Default: True.
+        show_progress: Show progress bar during training. Default: True.
+
+    Returns:
+        Tuple containing:
+        - predictions: DataFrame with forecast values for each target variable.
+        - metadata: Dictionary with forecast metadata (index, shapes, etc.).
+        - forecasters: Dictionary of trained ForecasterRecursive objects keyed by target.
+
+    Raises:
+        ValueError: If data validation fails or required data cannot be retrieved.
+        ImportError: If required dependencies are not installed.
+
+    Examples:
+        Basic usage:
+
+        >>> predictions, metadata, forecasters = n2n_predict_with_covariates(
+        ...     forecast_horizon=24,
+        ...     verbose=True
+        ... )
+        >>> print(predictions.shape)
+        (24, 11)
+
+        Custom location and features:
+
+        >>> predictions, metadata, forecasters = n2n_predict_with_covariates(
+        ...     forecast_horizon=48,
+        ...     latitude=52.5200,  # Berlin
+        ...     longitude=13.4050,
+        ...     lags=48,
+        ...     include_poly_features=True,
+        ...     verbose=True
+        ... )
+
+    Notes:
+        - The function uses cached weather data when available.
+        - Missing values are handled via forward/backward fill with downweighting
+          observations near gaps.
+        - Sample weights are passed to the forecaster to penalize observations
+          near missing data.
+        - Train/validation splits are temporal (80/20 by default).
+        - All features are cast to float32 for memory efficiency.
+    """
+    if verbose:
+        print("=" * 80)
+        print("N2N Recursive Forecasting with Exogenous Covariates")
+        print("=" * 80)
+
+    # ========================================================================
+    # 1. DATA PREPARATION
+    # ========================================================================
+
+    if verbose:
+        print("\n[1/9] Loading and preparing target data...")
+
+    data = fetch_data()
+    target_columns = data.columns.tolist()
+
+    if verbose:
+        print(f"  Target variables: {target_columns}")
+
+    start, end, cov_start, cov_end = get_start_end(
+        data=data,
+        forecast_horizon=forecast_horizon,
+        verbose=verbose,
+    )
+
+    basic_ts_checks(data, verbose=verbose)
+    data = agg_and_resample_data(data, verbose=verbose)
+
+    # ========================================================================
+    # 2. OUTLIER DETECTION AND REMOVAL
+    # ========================================================================
+
+    if verbose:
+        print("\n[2/9] Detecting and marking outliers...")
+
+    data, outliers = mark_outliers(
+        data,
+        contamination=contamination,
+        random_state=1234,
+        verbose=verbose,
+    )
+
+    # ========================================================================
+    # 3. MISSING VALUE IMPUTATION WITH WEIGHTING
+    # ========================================================================
+
+    if verbose:
+        print("\n[3/9] Processing missing values and creating sample weights...")
+
+    imputed_data, missing_mask = get_missing_weights(
+        data, window_size=window_size, verbose=verbose
+    )
+
+    # Create weight function for forecaster
+    # Invert missing_mask: True (missing) -> 0 (weight), False (valid) -> 1 (weight)
+    weights_series = (~missing_mask).astype(float)
+
+    def weight_func(index):
+        """Return sample weights for given index."""
+        return custom_weights(index, weights_series)
+
+    # ========================================================================
+    # 4. EXOGENOUS FEATURES ENGINEERING
+    # ========================================================================
+
+    if verbose:
+        print("\n[4/9] Creating exogenous features...")
+
+    # Location for day/night features
+    location = LocationInfo(
+        latitude=latitude,
+        longitude=longitude,
+        timezone=timezone,
+    )
+
+    # Holidays
+    holiday_features = _get_holiday_features(
+        data=imputed_data,
+        start=start,
+        cov_end=cov_end,
+        forecast_horizon=forecast_horizon,
+        tz=timezone,
+        freq="h",
+        country_code=country_code,
+        state=state,
+    )
+
+    # Weather
+    weather_features, weather_aligned = _get_weather_features(
+        data=imputed_data,
+        start=start,
+        cov_end=cov_end,
+        forecast_horizon=forecast_horizon,
+        latitude=latitude,
+        longitude=longitude,
+        timezone=timezone,
+        freq="h",
+        verbose=verbose,
+    )
+
+    # Calendar
+    calendar_features = _get_calendar_features(
+        start=start,
+        cov_end=cov_end,
+        freq="h",
+        timezone=timezone,
+    )
+
+    # Day/night
+    sun_light_features = _get_day_night_features(
+        start=start,
+        cov_end=cov_end,
+        location=location,
+        freq="h",
+        timezone=timezone,
+    )
+
+    # ========================================================================
+    # 5. COMBINE EXOGENOUS FEATURES
+    # ========================================================================
+
+    if verbose:
+        print("\n[5/9] Combining and encoding exogenous features...")
+
+    exogenous_features = pd.concat(
+        [
+            calendar_features,
+            sun_light_features,
+            weather_features,
+            holiday_features,
+        ],
+        axis=1,
+    )
+
+    assert (
+        sum(exogenous_features.isnull().sum()) == 0
+    ), "Missing values in exogenous features"
+
+    # Apply cyclical encoding
+    exogenous_features = _apply_cyclical_encoding(
+        data=exogenous_features,
+        drop_original=False,
+    )
+
+    # Create interactions
+    exogenous_features = _create_interaction_features(
+        exogenous_features=exogenous_features,
+        weather_aligned=weather_aligned,
+    )
+
+    # ========================================================================
+    # 6. SELECT EXOGENOUS FEATURES
+    # ========================================================================
+
+    exog_features = _select_exogenous_features(
+        exogenous_features=exogenous_features,
+        weather_aligned=weather_aligned,
+        include_weather_windows=include_weather_windows,
+        include_holiday_features=include_holiday_features,
+        include_poly_features=include_poly_features,
+    )
+
+    if verbose:
+        print(f"  Selected {len(exog_features)} exogenous features")
+
+    # ========================================================================
+    # 7. MERGE DATA AND COVARIATES
+    # ========================================================================
+
+    if verbose:
+        print("\n[6/9] Merging target and exogenous data...")
+
+    data_with_exog, exo_tmp, exo_pred = _merge_data_and_covariates(
+        data=imputed_data,
+        exogenous_features=exogenous_features,
+        target_columns=target_columns,
+        exog_features=exog_features,
+        start=start,
+        end=end,
+        cov_end=cov_end,
+        forecast_horizon=forecast_horizon,
+        cast_dtype="float32",
+    )
+
+    if verbose:
+        print(f"  Merged data shape: {data_with_exog.shape}")
+        print(f"  Exogenous prediction shape: {exo_pred.shape}")
+
+    # ========================================================================
+    # 8. TRAIN/VALIDATION/TEST SPLIT
+    # ========================================================================
+
+    if verbose:
+        print("\n[7/9] Splitting data into train/validation/test...")
+
+    perc_val = 1.0 - train_ratio
+    data_train, data_val, data_test = split_rel_train_val_test(
+        data_with_exog,
+        perc_train=train_ratio,
+        perc_val=perc_val,
+        verbose=verbose,
+    )
+
+    # ========================================================================
+    # 9. MODEL TRAINING
+    # ========================================================================
+
+    if verbose:
+        print("\n[8/9] Training recursive forecasters with exogenous variables...")
+
+    if estimator is None:
+        estimator = LGBMRegressor(random_state=1234, verbose=-1)
+
+    window_features = RollingFeatures(stats=["mean"], window_sizes=window_size)
+    end_validation = pd.concat([data_train, data_val]).index[-1]
+
+    recursive_forecasters = {}
+
+    target_iter = target_columns
+    if show_progress and tqdm is not None:
+        target_iter = tqdm(target_columns, desc="Training forecasters", unit="model")
+
+    for target in target_iter:
+        if verbose:
+            print(f"  Training forecaster for {target}...")
+
+        forecaster = ForecasterRecursive(
+            estimator=estimator,
+            lags=lags,
+            window_features=window_features,
+            weight_func=weight_func,
+        )
+
+        forecaster.fit(
+            y=data_with_exog[target].loc[:end_validation].squeeze(),
+            exog=data_with_exog[exog_features].loc[:end_validation],
+        )
+
+        recursive_forecasters[target] = forecaster
+
+        if verbose:
+            print(f"    ✓ Forecaster trained for {target}")
+
+    if verbose:
+        print(f"  ✓ Total forecasters trained: {len(recursive_forecasters)}")
+
+    # ========================================================================
+    # 10. PREDICTION
+    # ========================================================================
+
+    if verbose:
+        print("\n[9/9] Generating predictions...")
+
+    exo_pred_subset = exo_pred[exog_features]
+
+    predictions = predict_multivariate(
+        recursive_forecasters,
+        steps_ahead=forecast_horizon,
+        exog=exo_pred_subset,
+        show_progress=show_progress,
+    )
+
+    if verbose:
+        print(f"  Predictions shape: {predictions.shape}")
+        print("\n" + "=" * 80)
+        print("Forecasting completed successfully!")
+        print("=" * 80)
+
+    # ========================================================================
+    # COMPILE METADATA
+    # ========================================================================
+
+    metadata = {
+        "forecast_horizon": forecast_horizon,
+        "target_columns": target_columns,
+        "exog_features": exog_features,
+        "n_exog_features": len(exog_features),
+        "train_size": len(data_train),
+        "val_size": len(data_val),
+        "test_size": len(data_test),
+        "data_shape_original": data.shape,
+        "data_shape_merged": data_with_exog.shape,
+        "training_end": end_validation,
+        "prediction_start": exo_pred.index[0],
+        "prediction_end": exo_pred.index[-1],
+        "lags": lags,
+        "window_size": window_size,
+        "contamination": contamination,
+        "n_outliers": (
+            outliers.sum() if isinstance(outliers, pd.Series) else len(outliers)
+        ),
+    }
+
+    return predictions, metadata, recursive_forecasters

spotforecast2/weather/__init__.py

@@ -0,0 +1,5 @@
+"""Weather data utilities for spotforecast2."""
+
+from .weather_client import WeatherClient
+
+__all__ = ["WeatherClient"]

{spotforecast2-0.0.2.dist-info → spotforecast2-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spotforecast2
-Version: 0.0.2
+Version: 0.0.3
 Summary: Forecasting with spot
 Author: bartzbeielstein
 Author-email: bartzbeielstein <32470350+bartzbeielstein@users.noreply.github.com>

{spotforecast2-0.0.2.dist-info → spotforecast2-0.0.3.dist-info}/RECORD

@@ -1,8 +1,10 @@
+spotforecast2/.DS_Store,sha256=4yBH5_e0YHcGSgDSeKs4V5_sHINqyWiP33kMXar-lz8,6148
 spotforecast2/__init__.py,sha256=X9sBx15iz8yqr9iDJcrGJM5nhvnpaczXto4XV_GtfhE,59
 spotforecast2/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spotforecast2/data/data.py,sha256=HEgr-FULaqHvuMeKTviOgYyo3GbxpGRTo3ZnmIU9w2Y,4422
 spotforecast2/data/fetch_data.py,sha256=LcHowE6tnjKPNMTCGr8h29ioGHT4xmj6l6iZmZkJdLU,6842
 spotforecast2/exceptions.py,sha256=gi8rmJWLKEpi3kNB9jWdHcH6XYkmsfyHfXTNg_fAy0w,20497
+spotforecast2/forecaster/.DS_Store,sha256=GXyLvW6LC7GpVyo-vy-zehyHDbffWnsn_ZBT5AX0CQI,6148
 spotforecast2/forecaster/__init__.py,sha256=BbCOS2ouKcPC9VzcdprllVyqlZIyAWXCOvUAiInxDi4,140
 spotforecast2/forecaster/base.py,sha256=rXhcjY4AMpyQhkpbtLIA8OOrGEb8fU57SQiyeR9c9DQ,16748
 spotforecast2/forecaster/metrics.py,sha256=MiZs9MAvT5JjPEGEks1uWR0nFuzYucCWuu4bMV_4HPQ,19316
@@ -10,7 +12,7 @@ spotforecast2/forecaster/recursive/__init__.py,sha256=YNVxLReLEwSFDasmjXXMSKJqNL
 spotforecast2/forecaster/recursive/_forecaster_equivalent_date.py,sha256=Mdr-3D1lUivXO07Rp4T8NIgQ2H_2y4IR4BqCwjBtZsw,48261
 spotforecast2/forecaster/recursive/_forecaster_recursive.py,sha256=oU2zCOI0UaGIn8doLJGphP7jcNL5FF6Y972UCwlxDJI,35739
 spotforecast2/forecaster/recursive/_warnings.py,sha256=BtZ3UoycywjEQ0ceXe4TL1WEdFcLAi1EnDMvZXHw_U8,325
-spotforecast2/forecaster/utils.py,sha256=DuYQcWZlJclSQoelFxcrydAAE8gHH_tgq6tzF7h837g,36030
+spotforecast2/forecaster/utils.py,sha256=hWyDjDNhoYfu9vheLk2-bTNDX-fbX1oJhIbpzc8nu_I,36530
 spotforecast2/model_selection/__init__.py,sha256=uP60TkgDzs_x5V60rnKanc12S9-yXx2ZLsXsXdqAYEA,208
 spotforecast2/model_selection/bayesian_search.py,sha256=Vwb_LatDnt22LhIWyzqNhCdlDQ_UgVCyFcXmOxF3Pic,17407
 spotforecast2/model_selection/grid_search.py,sha256=a5rNEndTXlx1ghT7ws5qs7WM0XBFMqEiK3Q5k7P0EJg,10998
@@ -31,7 +33,8 @@ spotforecast2/preprocessing/imputation.py,sha256=lmH-HumI_QLLm9aMESe_oZq84Axn60w
 spotforecast2/preprocessing/outlier.py,sha256=jZxAR870QtYner7b4gXk6LLGJw0juLq1VU4CGklYd3c,4208
 spotforecast2/preprocessing/split.py,sha256=mzzt5ltUZdVzfWtBBTQjp8E2MyqVdWUFtz7nN11urbU,5011
 spotforecast2/processing/agg_predict.py,sha256=VKlruB0x-eJKokkHyJxR87rZ4m53si3ODbrd0ibPlow,2378
-spotforecast2/processing/n2n_predict.py,sha256=WSbAXWuGtl6esZRL6nGLJHrDV35Cl5M5i9EHLMBQ-2s,3903
+spotforecast2/processing/n2n_predict.py,sha256=Jkf-fMw2RSKY8-0UDc8D0yiiZxiF9s5DyfeRpfx90ks,4060
+spotforecast2/processing/n2n_predict_with_covariates.py,sha256=Py9oMSUFv_9Tw5S9TfNF__MzEZNmGaN85lPbg6GBluw,31111
 spotforecast2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spotforecast2/utils/__init__.py,sha256=NrMt_xJLe4rbTFbsbgSQYeREohEOiYG5S-97e6Jj07I,1018
 spotforecast2/utils/convert_to_utc.py,sha256=hz8mJUHK9jDLUiN5LdNX5l3KZuOKlklyycB4zFdB9Ng,1405
@@ -39,8 +42,8 @@ spotforecast2/utils/data_transform.py,sha256=PhLeZoimM0TLfp34Fp56dQrxlCYNWGVU8h8
 spotforecast2/utils/forecaster_config.py,sha256=0jchk_9tjxzttN8btWlRBfAjT2bz27JO4CDrpPsC58E,12875
 spotforecast2/utils/generate_holiday.py,sha256=SHaPvPMt-abis95cChHf5ObyPwCTrzJ87bxffeqZLRc,2707
 spotforecast2/utils/validation.py,sha256=vcfpS6HF7YzVjKUZl-AGrIW71vCXrATJlfg2ZLjUse0,21633
-spotforecast2/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spotforecast2/weather/__init__.py,sha256=1Jco88pl0deNESgNATin83Nf5i9c58pxN7G-vNiOiu0,120
 spotforecast2/weather/weather_client.py,sha256=Ec_ywug6uoa71MfXM8RNbXEvtBtBzr-SUS5xq_HKtZE,9837
-spotforecast2-0.0.2.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
-spotforecast2-0.0.2.dist-info/METADATA,sha256=fbDOhS-fEbTmFRAFcZFMGQGTM2kH5tyPslhcNTdaN8U,1475
-spotforecast2-0.0.2.dist-info/RECORD,,
+spotforecast2-0.0.3.dist-info/WHEEL,sha256=ZyFSCYkV2BrxH6-HRVRg3R9Fo7MALzer9KiPYqNxSbo,79
+spotforecast2-0.0.3.dist-info/METADATA,sha256=4jGNYzlX26Q1h9l0lfe2AU1AVhA-IyfXbRXktBIPKdg,1475
+spotforecast2-0.0.3.dist-info/RECORD,,

{spotforecast2-0.0.2.dist-info → spotforecast2-0.0.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.24
+Generator: uv 0.9.18
 Root-Is-Purelib: true
 Tag: py3-none-any