spotforecast2 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

spotforecast2/data/fetch_data.py

@@ -44,57 +44,90 @@ def get_data_home(data_home: Optional[Union[str, Path]] = None) -> Path:
 
 
 def fetch_data(
-    filename: str = "data_in.csv",
+    filename: Optional[str] = None,
+    dataframe: Optional[pd.DataFrame] = None,
     columns: Optional[list] = None,
     index_col: int = 0,
     parse_dates: bool = True,
     dayfirst: bool = False,
     timezone: str = "UTC",
 ) -> pd.DataFrame:
-    """Fetches the integrated raw dataset from a CSV file.
+    """Fetches the integrated raw dataset from a CSV file or processes a DataFrame.
 
     Args:
-        filename (str):
-            Filename of the CSV file containing the dataset. It must be located in the data home directory, which can be get or set using `get_data_home()`.
+        filename (str, optional):
+            Filename of the CSV file containing the dataset. Must be located in the 
+            data home directory. If both filename and dataframe are None, defaults to "data_in.csv".
+        dataframe (pd.DataFrame, optional):
+            A pandas DataFrame to process. If provided, it will be processed with
+            proper timezone handling. Mutually exclusive with filename.
         columns (list, optional):
             List of columns to be included in the dataset. If None, all columns are included.
-            If an empty list is provided, a ValueError is blocked.
+            If an empty list is provided, a ValueError is raised.
         index_col (int):
-            Column index to be used as the index.
+            Column index to be used as the index (only used when loading from CSV).
         parse_dates (bool):
-            Whether to parse dates in the index column.
+            Whether to parse dates in the index column (only used when loading from CSV).
         dayfirst (bool):
-            Whether the day comes first in date parsing.
+            Whether the day comes first in date parsing (only used when loading from CSV).
         timezone (str):
-            Timezone to set for the datetime index.
+            Timezone to set for the datetime index. If a DataFrame with naive index is provided,
+            it will be localized to this timezone then converted to UTC. Default: "UTC".
 
     Returns:
-        pd.DataFrame: The integrated raw dataset.
+        pd.DataFrame: The integrated raw dataset with UTC timezone.
 
     Raises:
-        ValueError: If columns is an empty list.
+        ValueError: If columns is an empty list or if both filename and dataframe are provided.
+        FileNotFoundError: If CSV file does not exist.
 
     Examples:
+        Load from CSV (default):
         >>> from spotforecast2.data.fetch_data import fetch_data
         >>> data = fetch_data(columns=["col1", "col2"])
         >>> data.head()
                         Header1  Header2  Header3
+        
+        Load from specific CSV:
+        >>> data = fetch_data(filename="custom_data.csv")
+        
+        Process a DataFrame:
+        >>> import pandas as pd
+        >>> df = pd.DataFrame({"value": [1, 2, 3]}, 
+        ...                   index=pd.date_range("2024-01-01", periods=3, freq="h"))
+        >>> data = fetch_data(dataframe=df, timezone="Europe/Berlin")
+        >>> data.index.tz
+        <UTC>
     """
     if columns is not None and len(columns) == 0:
         raise ValueError("columns must be specified and cannot be empty.")
-
-    csv_path = get_data_home() / filename
-    if not Path(csv_path).is_file():
-        raise FileNotFoundError(f"The file {csv_path} does not exist.")
-
-    dataset = Data.from_csv(
-        csv_path=csv_path,
-        index_col=index_col,
-        parse_dates=parse_dates,
-        dayfirst=dayfirst,
-        timezone=timezone,
-        columns=columns,
-    )
+    
+    if filename is not None and dataframe is not None:
+        raise ValueError("Cannot specify both filename and dataframe. Please provide only one.")
+
+    # Process DataFrame if provided
+    if dataframe is not None:
+        dataset = Data.from_dataframe(
+            df=dataframe,
+            timezone=timezone,
+            columns=columns,
+        )
+    else:
+        # Load from CSV file
+        if filename is None:
+            filename = "data_in.csv"
+        csv_path = get_data_home() / filename
+        if not Path(csv_path).is_file():
+            raise FileNotFoundError(f"The file {csv_path} does not exist.")
+
+        dataset = Data.from_csv(
+            csv_path=csv_path,
+            index_col=index_col,
+            parse_dates=parse_dates,
+            dayfirst=dayfirst,
+            timezone=timezone,
+            columns=columns,
+        )
 
     return dataset.data
 

spotforecast2/processing/n2n_predict.py

@@ -314,13 +314,15 @@ def n2n_predict(
 
     if verbose:
         print("--- Starting n2n_predict ---")
-        print("Fetching data...")
 
-    # Fetch data
+    # Handle data input - fetch_data handles both CSV and DataFrame
     if data is not None:
-        if TARGET is not None:
-            data = data[TARGET]
+        if verbose:
+            print("Using provided dataframe...")
+        data = fetch_data(dataframe=data, columns=TARGET)
     else:
+        if verbose:
+            print("Fetching data from CSV...")
         data = fetch_data(columns=TARGET)
 
     START, END, COV_START, COV_END = get_start_end(

spotforecast2/processing/n2n_predict_with_covariates.py

@@ -868,8 +868,16 @@ def n2n_predict_with_covariates(
     if verbose:
         print("\n[1/9] Loading and preparing target data...")
 
+    # Handle data input - fetch_data handles both CSV and DataFrame
     if data is None:
-        data = fetch_data()
+        if verbose:
+            print("  Fetching data from CSV...")
+        data = fetch_data(timezone=timezone)
+    else:
+        if verbose:
+            print("  Using provided dataframe...")
+        data = fetch_data(dataframe=data, timezone=timezone)
+    
     target_columns = data.columns.tolist()
 
     if verbose:

{spotforecast2-0.2.0.dist-info → spotforecast2-0.2.2.dist-info}/METADATA

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

{spotforecast2-0.2.0.dist-info → spotforecast2-0.2.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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/data/fetch_data.py,sha256=N99W-NNTC2hbXmx1FofITsvXJfHj9py4r5Kllf5950Y,8464
 spotforecast2/exceptions.py,sha256=6gOji-3cP-YAisPoxXCcrEEbjTnfPN1YqEhGYhmyZ8Y,20499
 spotforecast2/forecaster/__init__.py,sha256=BbCOS2ouKcPC9VzcdprllVyqlZIyAWXCOvUAiInxDi4,140
 spotforecast2/forecaster/base.py,sha256=rXhcjY4AMpyQhkpbtLIA8OOrGEb8fU57SQiyeR9c9DQ,16748
@@ -31,8 +31,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=KVd7h25EzLKZL71NI3aDDXyPq5RvaRxUPEOqrmYYUrA,14764
-spotforecast2/processing/n2n_predict_with_covariates.py,sha256=aaCozQ8JpfHm_KzCSxNPi-WdbSXM5--rm8ae9y4eXkU,40613
+spotforecast2/processing/n2n_predict.py,sha256=Sr2AFaCZxP-tbsxlEjiSdjBU-mtBiDa_f6rJLEJov64,14912
+spotforecast2/processing/n2n_predict_with_covariates.py,sha256=PyB3X1rNb18JBC72YiN12hUg5eSjUAsW4M-atczmCSQ,40914
 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
@@ -42,6 +42,6 @@ spotforecast2/utils/generate_holiday.py,sha256=SHaPvPMt-abis95cChHf5ObyPwCTrzJ87
 spotforecast2/utils/validation.py,sha256=x9ypQzcneDhWJA_piiY4Q3_ogoGd1LTsZ7__MFeG9Fc,21618
 spotforecast2/weather/__init__.py,sha256=1Jco88pl0deNESgNATin83Nf5i9c58pxN7G-vNiOiu0,120
 spotforecast2/weather/weather_client.py,sha256=Ec_ywug6uoa71MfXM8RNbXEvtBtBzr-SUS5xq_HKtZE,9837
-spotforecast2-0.2.0.dist-info/WHEEL,sha256=5DEXXimM34_d4Gx1AuF9ysMr1_maoEtGKjaILM3s4w4,80
-spotforecast2-0.2.0.dist-info/METADATA,sha256=OH6q5340Sup2MG37NmpxUaaxTTct1vQoADada9JVVm8,3481
-spotforecast2-0.2.0.dist-info/RECORD,,
+spotforecast2-0.2.2.dist-info/WHEEL,sha256=5DEXXimM34_d4Gx1AuF9ysMr1_maoEtGKjaILM3s4w4,80
+spotforecast2-0.2.2.dist-info/METADATA,sha256=f5BfMpKyfzwbTOTguKeNPgjbuEu2N0zwMrfcjG82XYo,3481
+spotforecast2-0.2.2.dist-info/RECORD,,