shrecc 0.0.5.dev1__tar.gz → 0.0.5.dev2__tar.gz

{shrecc-0.0.5.dev1/shrecc.egg-info → shrecc-0.0.5.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shrecc
-Version: 0.0.5.dev1
+Version: 0.0.5.dev2
 Summary: SHRECC: Smooth Hourly Resolution Electricity Consumption Calculation
 Author-email: Sabina Bednářová <sabina.bednarova@list.lu>
 Maintainer-email: Sabina Bednářová <sabina.bednarova@list.lu>

{shrecc-0.0.5.dev1 → shrecc-0.0.5.dev2}/shrecc/__init__.py

@@ -16,4 +16,4 @@ from .database import create_database, filt_cutoff
 from .download import get_data
 from .treatment import data_processing
 
-__version__ = "0.0.5.dev1"
+__version__ = "0.0.5.dev2"

{shrecc-0.0.5.dev1 → shrecc-0.0.5.dev2}/shrecc/database.py

@@ -20,7 +20,7 @@ UNUSED_SOURCE = "Import balance (physical)"
 
 def filt_cutoff(
     countries,
-    times=0,
+    times=[],
     general_range=0,
     refined_range=0,
     freq=0,
@@ -59,8 +59,9 @@ def filt_cutoff(
 
     if general_range:
         year = datetime.strptime(general_range[0], "%Y-%m-%d %H:%M:%S").year
-    elif times:
-        year = datetime.strptime(times[0], "%Y-%m-%d %H:%M:%S").year
+    elif len(times):
+        times = pd.to_datetime(times)
+        year = times[0].year
     else:
         raise ValueError("Either `times` or `general_range` must be provided")
 
@@ -70,7 +71,9 @@ def filt_cutoff(
     dataframe = dataframe.droplevel("source", axis=1)
     dataframe = filter_by_countries(dataframe, countries)
 
-    if times:
+    if len(times):
+        # For backwards compatibility and making sure datetime is used in the filtering
+        times = pd.to_datetime(times)
         dataframe = filter_by_times(dataframe, times)
     if general_range:
         dataframe = filter_by_range(dataframe, general_range, refined_range, freq)

{shrecc-0.0.5.dev1 → shrecc-0.0.5.dev2/shrecc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shrecc
-Version: 0.0.5.dev1
+Version: 0.0.5.dev2
 Summary: SHRECC: Smooth Hourly Resolution Electricity Consumption Calculation
 Author-email: Sabina Bednářová <sabina.bednarova@list.lu>
 Maintainer-email: Sabina Bednářová <sabina.bednarova@list.lu>

{shrecc-0.0.5.dev1 → shrecc-0.0.5.dev2}/tests/test_database.py

@@ -915,6 +915,51 @@ def test_filter_by_times_no_matching_times():
     assert result.shape[1] == 0
 
 
+@pytest.mark.parametrize(
+    "times_input",
+    [
+        pytest.param(
+            ["2023-06-01 08:00:00", "2023-06-01 10:00:00"],
+            id="list_of_strings",
+        ),
+        pytest.param(
+            pd.to_datetime(["2023-06-01 08:00:00", "2023-06-01 10:00:00"]),
+            id="datetime_index",
+        ),
+    ],
+)
+def test_filter_by_times_accepts_strings_and_datetimeindex(times_input):
+    """filter_by_times should accept either a list of strings or a pd.DatetimeIndex
+    and produce the same filtered DataFrame, regardless of whether the columns'
+    `time` level is stored as strings or as datetime objects.
+    """
+    time_values = pd.to_datetime(
+        [
+            "2023-06-01 08:00:00",
+            "2023-06-01 09:00:00",
+            "2023-06-01 10:00:00",
+            "2023-06-01 11:00:00",
+        ]
+    )
+    countries = ["FR", "DE", "IT", "FR"]
+    columns = pd.MultiIndex.from_arrays(
+        [time_values, countries], names=["time", "country"]
+    )
+    index = pd.MultiIndex.from_tuples(
+        [("FR", "tech1", "electricity, high voltage", "kWh")],
+        names=["geography", "activityName", "prod", "unit"],
+    )
+    df = pd.DataFrame([[1, 2, 3, 4]], index=index, columns=columns)
+
+    result = filter_by_times(df, times_input)
+
+    expected_times = pd.to_datetime(["2023-06-01 08:00:00", "2023-06-01 10:00:00"])
+    assert isinstance(result, pd.DataFrame)
+    assert result.shape == (1, 2)
+    assert set(result.columns.get_level_values("time")) == set(expected_times)
+    assert list(result.values.flatten()) == [1, 3]
+
+
 # ────────────────────────────────────────────────────────────────
 # Tests for: filter_by_range() — requires multiple sub-tests
 # ────────────────────────────────────────────────────────────────