validation format change

Author: Irina

Homepage.py

@@ -1,6 +1,7 @@
 import matplotlib.pyplot as plt
 import requests
 import streamlit as st
+from validation import eia_schema
 
 from tests.eia_part3 import (
     build_df_from_eia_data,
@@ -59,8 +60,6 @@ def fetch_supply_json(url: str) -> dict:
 
 # Filter (2012–present)
 df = filter_since(df, date_col="week", start_date="2012-01-01")
-from tests.validation import eia_schema
-
 df = eia_schema.validate(df)
 
 weekly_total = sum_by_week(df, date_col="week", value_col="value")

tests/test_validation.py

@@ -1,13 +1,17 @@
 import pandas as pd
+import pandera as pa
 import pytest
 from validation import eia_schema
 
 
 def test_schema_rejects_negative_values():
-    df = pd.DataFrame({
-        "week": pd.to_datetime(["2012-01-06"]),
-        "value": [-5]
-    })
+    df = pd.DataFrame(
+        {
+            "week": pd.to_datetime(["2012-01-06"]),
+            "value": [-5],
+        }
+    )
+
+    with pytest.raises(pa.errors.SchemaError):
+        eia_schema.validate(df)
 
-    with pytest.raises(Exception):
-        eia_schema.validate(df)

tests/validation.py

@@ -6,8 +6,8 @@
         "week": Column(pa.DateTime),
         "value": Column(
             pa.Float,
-            coerce=True,                 
-            checks=Check.ge(0),          
+            coerce=True,
+            checks=Check.ge(0),
             nullable=False,
         ),
     }