revise code to ingest-csv fixes

NREL · Nov 14, 2024 · cf7d5bc · cf7d5bc
1 parent 03c6b81
commit cf7d5bc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/chronify/time_configs.py b/src/chronify/time_configs.py
@@ -324,7 +324,7 @@ def iter_timestamps(self) -> Generator[int, None, None]:
             case RepresentativePeriodFormat.ONE_WEEKDAY_DAY_AND_ONE_WEEKEND_DAY_PER_MONTH_BY_HOUR:
                 return OneWeekdayDayAndWeekendDayPerMonthByHourHandler().iter_timestamps()
 
-    def list_timestamps_from_dataframe(self, df: pd.DataFrame) -> list[Any]:
+    def list_distinct_timestamps_from_dataframe(self, df: pd.DataFrame) -> list[Any]:
         return df[self.list_time_columns()].drop_duplicates().apply(tuple, axis=1).to_list()
 
 

diff --git a/src/chronify/time_series_checker.py b/src/chronify/time_series_checker.py
@@ -74,7 +74,7 @@ def _run_timestamp_checks_on_tmp_table(self, table_name: str) -> None:
         result3 = self._conn.execute(text(query3)).fetchone()
         assert result3 is not None
         actual_count = result3[0]
-        expected_count = len(schema.time_config.list_timestamps())
+        expected_count = len(self._schema.time_config.list_timestamps())
         if actual_count != expected_count:
             msg = f"Time arrays must have length={expected_count}. Actual = {actual_count}"
             raise InvalidTable(msg)
diff --git a/tests/test_store.py b/tests/test_store.py
@@ -95,7 +95,6 @@ def test_ingest_csv(iter_engines: Engine, tmp_path, generators_schema, use_time_
     )
     store.ingest_from_csv(new_file, src_schema2, dst_schema)
     df = store.read_table(dst_schema)
-    breakpoint()
     assert len(df) == 8784 * 3 * 2
     all(df.timestamp.unique() == dst_schema.time_config.list_timestamps())