Skip to content

Commit 05e4e3b

Browse files
committed
FPM-566 use consistant time column name based on what is originally provided to time-stream
1 parent a0c26da commit 05e4e3b

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/time_stream/infill.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from abc import ABC, abstractmethod
1616
from dataclasses import dataclass
1717
from datetime import datetime
18-
from typing import Any, Optional
18+
from typing import Any
1919

2020
import numpy as np
2121
import polars as pl
@@ -386,20 +386,20 @@ def _fill(self, df: pl.DataFrame, infill_column: str) -> pl.DataFrame:
386386
Returns:
387387
pl.DataFrame with infilled values.
388388
"""
389-
breakpoint()
390389
if self.alt_df is None:
391390
check_columns_in_dataframe(df, [self.alt_data_column])
392391
else:
393-
check_columns_in_dataframe(self.alt_df, ['time', self.alt_data_column])
392+
time_column_name = next(iter(df.schema))
393+
check_columns_in_dataframe(self.alt_df, [time_column_name, self.alt_data_column])
394394

395395
if self.alt_data_column in df.columns:
396396
raise ValueError(f"Column {self.alt_data_column} already exists in the main dataframe.")
397397

398398
df = df.join(
399-
self.alt_df.select(['time', self.alt_data_column]),
400-
on='time',
399+
self.alt_df.select([time_column_name, self.alt_data_column]),
400+
on=time_column_name,
401401
how="left",
402-
suffix="_alt"
402+
suffix="_alt",
403403
)
404404

405405
infilled = df.with_columns(

tests/time_stream/test_infill.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,4 +532,3 @@ def test_alt_data_infill_with_alt_data_and_column_in_main_df(self) -> None:
532532

533533
with self.assertRaises(ValueError):
534534
infiller.apply(self.tf.df, self.tf.time_name, self.tf.periodicity, "values")
535-

0 commit comments

Comments
 (0)