buildstock-fetch 1.0.2__tar.gz → 1.0.3__tar.gz

{buildstock_fetch-1.0.2/buildstock_fetch.egg-info → buildstock_fetch-1.0.3}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: buildstock-fetch
-Version: 1.0.2
+Version: 1.0.3
 Summary: This library simplifies downloading building characteristics and load curve data from NREL's ResStock and ComStock projects.
-Author-email: Switchbox <bryan@switch.box>
+Author-email: Switchbox <hello@switch.box>
 Project-URL: Homepage, https://switchbox-data.github.io/buildstock-fetch/
 Project-URL: Repository, https://github.com/switchbox-data/buildstock-fetch
 Project-URL: Documentation, https://switchbox-data.github.io/buildstock-fetch/
@@ -23,12 +23,7 @@ Requires-Dist: requests>=2.32.3
 Requires-Dist: typer>=0.9.0
 Requires-Dist: rich>=13.9.5
 Requires-Dist: questionary>=1.11.0
-Requires-Dist: pandas>=2.0.0
-Requires-Dist: boto3>=1.33.0
-Requires-Dist: botocore>=1.33.0
-Requires-Dist: pyarrow>=14.0.1
 Requires-Dist: polars>=0.20.0
-Requires-Dist: numpy>=1.26.4
 Dynamic: license-file
 
 # buildstock-fetch
@@ -43,9 +38,9 @@ This library simplifies downloading building characteristics and load curve data
 - **Github repository**: <https://github.com/switchbox-data/buildstock-fetch/>
 - **Documentation** <https://switchbox-data.github.io/buildstock-fetch/>
 
-## Using the library
+## Installing the library
 
-`buildstock-fetch` is available on PyPI and can be installed via:
+`buildstock-fetch` is available on [PyPI](https://pypi.org/project/buildstock-fetch/) and can be installed via:
 
 ```bash
 pip install buildstock-fetch
@@ -57,6 +52,27 @@ or
 uv pip install buildstock-fetch
 ```
 
+## Using the library
+
+To use the CLI tool in `buildstock-fetch` run:
+
+```bash
+bsf
+```
+
+to activate the interactive mode. Alternatively, provide the inputs directly. For example,
+
+```bash
+bsf --product resstock --release_year 2022 --weather_file tmy3 --release_version 1 --states CA --file_type "hpxml metadata" --upgrade_id "0 1 2" --output_directory ./CA_data
+```
+
+If the above options don't work, try:
+
+```bash
+python -m buildstock_fetch
+```
+
+For more details about the usage, see [Usage](https://switchbox-data.github.io/buildstock-fetch/usage/)
 
 ## Developing the library
 

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3}/README.md

@@ -10,9 +10,9 @@ This library simplifies downloading building characteristics and load curve data
 - **Github repository**: <https://github.com/switchbox-data/buildstock-fetch/>
 - **Documentation** <https://switchbox-data.github.io/buildstock-fetch/>
 
-## Using the library
+## Installing the library
 
-`buildstock-fetch` is available on PyPI and can be installed via:
+`buildstock-fetch` is available on [PyPI](https://pypi.org/project/buildstock-fetch/) and can be installed via:
 
 ```bash
 pip install buildstock-fetch
@@ -24,6 +24,27 @@ or
 uv pip install buildstock-fetch
 ```
 
+## Using the library
+
+To use the CLI tool in `buildstock-fetch` run:
+
+```bash
+bsf
+```
+
+to activate the interactive mode. Alternatively, provide the inputs directly. For example,
+
+```bash
+bsf --product resstock --release_year 2022 --weather_file tmy3 --release_version 1 --states CA --file_type "hpxml metadata" --upgrade_id "0 1 2" --output_directory ./CA_data
+```
+
+If the above options don't work, try:
+
+```bash
+python -m buildstock_fetch
+```
+
+For more details about the usage, see [Usage](https://switchbox-data.github.io/buildstock-fetch/usage/)
 
 ## Developing the library
 

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3}/buildstock_fetch/main.py

@@ -1,6 +1,5 @@
 import concurrent.futures
 import json
-import os
 import zipfile
 from dataclasses import asdict, dataclass
 from importlib.resources import files
@@ -211,9 +210,8 @@ def _validate_release_name(release_name: str) -> bool:
         True if the release name is valid, False otherwise.
     """
     # Read the valid release names from the JSON file
-    releases_file = files("buildstock_fetch.utils").joinpath("buildstock_releases.json")
-    with open(str(releases_file)) as f:
-        releases_data = json.load(f)
+    releases_file = files("buildstock_fetch").joinpath("data").joinpath("buildstock_releases.json")
+    releases_data = json.loads(Path(str(releases_file)).read_text(encoding="utf-8"))
 
     # Get the top-level keys as valid release names
     valid_release_names = list(releases_data.keys())
@@ -239,7 +237,7 @@ def fetch_bldg_ids(
     """
     # Construct the absolute path to the parquet directory
     parquet_dir = Path(
-        str(files("buildstock_fetch.utils").joinpath("building_data").joinpath("combined_metadata.parquet"))
+        str(files("buildstock_fetch").joinpath("data").joinpath("building_data").joinpath("combined_metadata.parquet"))
     )
 
     if product == "resstock":
@@ -304,7 +302,8 @@ def _download_with_progress(url: str, output_file: Path, progress: Progress, tas
 
     downloaded_size = 0
 
-    with open(output_file, "wb") as file:
+    # For streaming downloads, we still need the traditional approach for progress tracking
+    with open(str(output_file), "wb") as file:
         for chunk in response.iter_content(chunk_size=8192):
             if chunk:
                 file.write(chunk)
@@ -337,7 +336,7 @@ def download_bldg_data(
     if isinstance(output_dir, str):
         output_dir = Path(output_dir)
     if not output_dir.exists():
-        os.makedirs(output_dir, exist_ok=True)
+        output_dir.mkdir(parents=True, exist_ok=True)
 
     # Create a unique temporary directory for this building to avoid race conditions
     temp_dir = output_dir / f"temp_{str(bldg_id.bldg_id).zfill(7)}_{bldg_id.upgrade_id}"
@@ -361,8 +360,7 @@ def download_bldg_data(
         else:
             response = requests.get(download_url, timeout=30)
             response.raise_for_status()
-            with open(output_file, "wb") as file:
-                file.write(response.content)
+            output_file.write_bytes(response.content)
 
         # Extract specific files based on file_type
         with zipfile.ZipFile(output_file, "r") as zip_ref:
@@ -419,8 +417,7 @@ def download_metadata(bldg_id: BuildingID, output_dir: Path) -> Path:
     response.raise_for_status()
     output_file = output_dir / bldg_id.get_release_name() / "metadata" / bldg_id.state / "metadata.parquet"
     output_file.parent.mkdir(parents=True, exist_ok=True)
-    with open(output_file, "wb") as file:
-        file.write(response.content)
+    output_file.write_bytes(response.content)
     return output_file
 
 
@@ -446,8 +443,7 @@ def download_15min_load_curve(bldg_id: BuildingID, output_dir: Path) -> Path:
         / f"bldg{str(bldg_id.bldg_id).zfill(7)}-up{str(int(bldg_id.upgrade_id)).zfill(2)}_load_curve_15min.parquet"
     )
     output_file.parent.mkdir(parents=True, exist_ok=True)
-    with open(output_file, "wb") as file:
-        file.write(response.content)
+    output_file.write_bytes(response.content)
     return output_file
 
 
@@ -485,8 +481,7 @@ def download_15min_load_curve_with_progress(
     else:
         response = requests.get(download_url, timeout=30)
         response.raise_for_status()
-        with open(output_file, "wb") as file:
-            file.write(response.content)
+        output_file.write_bytes(response.content)
 
     return output_file
 

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3}/buildstock_fetch/main_cli.py

@@ -27,7 +27,7 @@ app = typer.Typer(
 
 
 # File configuration
-BUILDSTOCK_RELEASES_FILE = str(files("buildstock_fetch.utils").joinpath("buildstock_releases.json"))
+BUILDSTOCK_RELEASES_FILE = str(files("buildstock_fetch").joinpath("data").joinpath("buildstock_releases.json"))
 
 
 class InvalidProductError(Exception):
@@ -219,16 +219,14 @@ def _get_file_type_options_grouped(release_name: str) -> list[dict]:
 
 def _get_available_releases_names() -> list[str]:
     # Read the buildstock releases JSON file
-    with open(BUILDSTOCK_RELEASES_FILE) as f:
-        buildstock_releases = json.load(f)
+    buildstock_releases = json.loads(Path(BUILDSTOCK_RELEASES_FILE).read_text(encoding="utf-8"))
 
     # Return the top-level keys as release options
     return list(buildstock_releases.keys())
 
 
 def _get_all_available_releases() -> dict[str, dict]:
-    with open(BUILDSTOCK_RELEASES_FILE) as f:
-        buildstock_releases = json.load(f)
+    buildstock_releases = json.loads(Path(BUILDSTOCK_RELEASES_FILE).read_text(encoding="utf-8"))
     return cast(dict[str, dict], buildstock_releases)
 
 

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3/buildstock_fetch.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: buildstock-fetch
-Version: 1.0.2
+Version: 1.0.3
 Summary: This library simplifies downloading building characteristics and load curve data from NREL's ResStock and ComStock projects.
-Author-email: Switchbox <bryan@switch.box>
+Author-email: Switchbox <hello@switch.box>
 Project-URL: Homepage, https://switchbox-data.github.io/buildstock-fetch/
 Project-URL: Repository, https://github.com/switchbox-data/buildstock-fetch
 Project-URL: Documentation, https://switchbox-data.github.io/buildstock-fetch/
@@ -23,12 +23,7 @@ Requires-Dist: requests>=2.32.3
 Requires-Dist: typer>=0.9.0
 Requires-Dist: rich>=13.9.5
 Requires-Dist: questionary>=1.11.0
-Requires-Dist: pandas>=2.0.0
-Requires-Dist: boto3>=1.33.0
-Requires-Dist: botocore>=1.33.0
-Requires-Dist: pyarrow>=14.0.1
 Requires-Dist: polars>=0.20.0
-Requires-Dist: numpy>=1.26.4
 Dynamic: license-file
 
 # buildstock-fetch
@@ -43,9 +38,9 @@ This library simplifies downloading building characteristics and load curve data
 - **Github repository**: <https://github.com/switchbox-data/buildstock-fetch/>
 - **Documentation** <https://switchbox-data.github.io/buildstock-fetch/>
 
-## Using the library
+## Installing the library
 
-`buildstock-fetch` is available on PyPI and can be installed via:
+`buildstock-fetch` is available on [PyPI](https://pypi.org/project/buildstock-fetch/) and can be installed via:
 
 ```bash
 pip install buildstock-fetch
@@ -57,6 +52,27 @@ or
 uv pip install buildstock-fetch
 ```
 
+## Using the library
+
+To use the CLI tool in `buildstock-fetch` run:
+
+```bash
+bsf
+```
+
+to activate the interactive mode. Alternatively, provide the inputs directly. For example,
+
+```bash
+bsf --product resstock --release_year 2022 --weather_file tmy3 --release_version 1 --states CA --file_type "hpxml metadata" --upgrade_id "0 1 2" --output_directory ./CA_data
+```
+
+If the above options don't work, try:
+
+```bash
+python -m buildstock_fetch
+```
+
+For more details about the usage, see [Usage](https://switchbox-data.github.io/buildstock-fetch/usage/)
 
 ## Developing the library
 

buildstock_fetch-1.0.3/buildstock_fetch.egg-info/SOURCES.txt

@@ -0,0 +1,18 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+buildstock_fetch/__init__.py
+buildstock_fetch/__main__.py
+buildstock_fetch/main.py
+buildstock_fetch/main_cli.py
+buildstock_fetch.egg-info/PKG-INFO
+buildstock_fetch.egg-info/SOURCES.txt
+buildstock_fetch.egg-info/dependency_links.txt
+buildstock_fetch.egg-info/entry_points.txt
+buildstock_fetch.egg-info/requires.txt
+buildstock_fetch.egg-info/top_level.txt
+tests/test_ev_demand.py
+tests/test_ev_utils.py
+tests/test_main.py
+tests/test_main_cli.py

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3}/buildstock_fetch.egg-info/requires.txt

@@ -2,9 +2,4 @@ requests>=2.32.3
 typer>=0.9.0
 rich>=13.9.5
 questionary>=1.11.0
-pandas>=2.0.0
-boto3>=1.33.0
-botocore>=1.33.0
-pyarrow>=14.0.1
 polars>=0.20.0
-numpy>=1.26.4

buildstock_fetch-1.0.3/buildstock_fetch.egg-info/top_level.txt

@@ -0,0 +1 @@
+buildstock_fetch

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "buildstock-fetch"
-version = "v1.0.2"
+version = "v1.0.3"
 description = "This library simplifies downloading building characteristics and load curve data from NREL's ResStock and ComStock projects."
-authors = [{ name = "Switchbox", email = "bryan@switch.box" }]
+authors = [{ name = "Switchbox", email = "hello@switch.box" }]
 readme = "README.md"
 keywords = ['python']
 requires-python = ">=3.9,<4.0"
@@ -22,12 +22,7 @@ dependencies = [
     "typer>=0.9.0",
     "rich>=13.9.5",
     "questionary>=1.11.0",
-    "pandas>=2.0.0",
-    "boto3>=1.33.0",
-    "botocore>=1.33.0",
-    "pyarrow>=14.0.1",
     "polars>=0.20.0",
-    "numpy>=1.26.4",
 ]
 
 [project.urls]
@@ -42,6 +37,10 @@ bsf = "buildstock_fetch.main_cli:app"
 dev = [
     "pytest>=7.2.0",
     "pre-commit>=2.20.0",
+    "boto3>=1.33.0",
+    "botocore>=1.33.0",
+    "pyarrow>=14.0.1",
+    "numpy>=1.26.4",
     "tox-uv>=1.11.3",
     "deptry>=0.23.0",
     "mypy>=0.991",
@@ -52,6 +51,8 @@ dev = [
     "types-requests>=2.31.0",
     "types-boto3>=1.33.0",
     "pandas-stubs>=2.2.0",
+    "types-boto3>=1.33.0",
+    "scikit-learn>=1.6.1",
 ]
 
 [build-system]
@@ -61,12 +62,11 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools]
 include-package-data = true
 
-[tool.setuptools.packages.find]
-where = ["."]
+packages = ["buildstock_fetch"]
 
 [tool.setuptools.package-data]
-"buildstock_fetch.utils" = ["*.json", "building_data/*"]
-"buildstock_fetch.utils.building_data" = ["combined_metadata.parquet"]
+"buildstock_fetch" = ["*.json", "building_data/*"]
+"buildstock_fetch.data.building_data" = ["combined_metadata.parquet"]
 
 
 [tool.mypy]
@@ -132,3 +132,6 @@ ignore = [
 
 [tool.ruff.format]
 preview = true
+
+[tool.deptry]
+exclude = ["utils/", "tests/", ".venv/"]

buildstock_fetch-1.0.3/tests/test_ev_demand.py

@@ -0,0 +1,271 @@
+import numpy as np
+import polars as pl
+import pytest
+
+from utils.ev_demand import (
+    EVDemandCalculator,
+    MetadataDataFrameError,
+    VehicleOwnershipModelError,
+)
+
+
+@pytest.fixture
+def sample_pums_data():
+    """Create sample PUMS data for testing."""
+    return pl.DataFrame({
+        "occupants": [1, 2, 3, 4, 1, 2, 3, 4],
+        "income": [30000, 50000, 75000, 100000, 25000, 45000, 80000, 120000],
+        "metro": ["urban", "urban", "suburban", "suburban", "rural", "rural", "urban", "urban"],
+        "vehicles": [0, 1, 2, 2, 1, 2, 1, 2],
+        "hh_weight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+    })
+
+
+@pytest.fixture
+def sample_metadata():
+    """Create sample metadata for testing."""
+    return pl.DataFrame({
+        "bldg_id": ["00001", "00002", "00003", "00004", "00005"],
+        "occupants": [1, 2, 3, 4, 2],
+        "income": [30000, 50000, 75000, 100000, 45000],
+        "metro": ["urban", "urban", "suburban", "suburban", "rural"],
+        "weight": [1.0, 1.0, 1.0, 1.0, 1.0],
+    })
+
+
+@pytest.fixture
+def mock_nhts_data():
+    """Create mock NHTS data."""
+    return pl.DataFrame({
+        "vehicle_id": [1, 2, 3],
+        "start_time": ["08:00", "09:00", "10:00"],
+        "end_time": ["18:00", "19:00", "20:00"],
+        "miles_driven": [30.0, 25.0, 35.0],
+    })
+
+
+@pytest.fixture
+def calculator(sample_metadata, mock_nhts_data):
+    """Create EVDemandCalculator instance for testing."""
+    return EVDemandCalculator(
+        metadata_df=sample_metadata,
+        nhts_df=mock_nhts_data,
+        pums_df=pl.DataFrame(),  # Will be overridden in tests
+        random_state=42,
+    )
+
+
+def test_fit_vehicle_ownership_model_success(calculator, sample_pums_data):
+    """Test successful model fitting."""
+    model = calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Check that model was fitted
+    assert model is not None
+    assert calculator.vehicle_ownership_model is not None
+
+    # Check that encoders and scaler were created
+    assert hasattr(calculator, "label_encoders")
+    assert hasattr(calculator, "target_encoder")
+    assert hasattr(calculator, "scaler")
+
+    # Check that metro encoder was created
+    assert "metro" in calculator.label_encoders
+
+
+def test_fit_vehicle_ownership_model_caps_vehicles_at_2(calculator):
+    """Test that vehicles > 2 are capped at 2."""
+    pums_data = pl.DataFrame({
+        "occupants": [1, 2, 3, 4],
+        "income": [30000, 50000, 75000, 100000],
+        "metro": ["urban", "urban", "suburban", "suburban"],
+        "vehicles": [0, 1, 3, 5],  # Values including 0, 1, and > 2
+        "hh_weight": [1.0, 1.0, 1.0, 1.0],
+    })
+
+    model = calculator.fit_vehicle_ownership_model(pums_data)
+
+    # Check that the model was fitted successfully
+    assert model is not None
+
+    # The internal data should have vehicles capped at 2
+    # We can verify this by checking the target encoder classes
+    expected_classes = [0, 1, 2]  # Should only have 0, 1, 2 vehicles
+    assert set(calculator.target_encoder.classes_) == set(expected_classes)
+
+
+def test_fit_vehicle_ownership_model_with_sample_weights(calculator):
+    """Test model fitting with sample weights."""
+    from pytest import approx
+
+    # With fixed random_state=42 and fixed input data, coefficients should be exactly:
+    expected_coef = np.array([
+        [-0.6273701443561746, -0.5479382238614515, 0.14318094439321308],
+        [0.20244784926329684, 0.11506717219026819, 0.4769219156039682],
+        [0.42492229509287793, 0.4328710516711835, -0.6201028599971814],
+    ])
+    pums_data = pl.DataFrame({
+        "occupants": [1, 2, 3, 4],
+        "income": [30000, 50000, 75000, 100000],
+        "metro": ["urban", "urban", "suburban", "suburban"],
+        "vehicles": [0, 1, 2, 2],
+        "hh_weight": [2.0, 1.5, 1.0, 0.5],  # Different weights
+    })
+
+    model = calculator.fit_vehicle_ownership_model(pums_data)
+    assert calculator.vehicle_ownership_model is not None
+    # Check that model was fitted successfully and has expected coefficients
+    assert model.coef_ == approx(expected_coef, rel=1e-6)
+
+
+def test_fit_vehicle_ownership_model_handles_missing_values(calculator, caplog):
+    """Test that missing values are handled appropriately."""
+    pums_data = pl.DataFrame({
+        "occupants": [1, 2, None, 4, 3, 5],
+        "income": [30000, 50000, 75000, None, 60000, 80000],
+        "metro": ["urban", None, "suburban", "suburban", "urban", "rural"],
+        "vehicles": [0, 1, 2, 2, 1, 2],
+        "hh_weight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+    })
+
+    # The function should handle missing values gracefully by dropping incomplete rows
+    # After dropping rows with missing values, we should have enough data to fit the model
+    model = calculator.fit_vehicle_ownership_model(pums_data)
+    assert model is not None
+    assert calculator.vehicle_ownership_model is not None
+
+    # Check that the warning message was logged correctly
+    assert len(caplog.records) > 0
+    warning_message = caplog.records[0].message
+    assert "Dropped 3 records with missing values in vehicle ownership model features" in warning_message
+
+
+def test_predict_num_vehicles_success(calculator, sample_pums_data, sample_metadata):
+    """Test successful vehicle prediction."""
+    # First fit the model
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Then predict
+    result_df = calculator.predict_num_vehicles(sample_metadata)
+
+    # Check that result has the expected columns
+    assert "vehicles" in result_df.columns
+    assert len(result_df) == len(sample_metadata)
+
+    # Check that all original columns are preserved
+    for col in sample_metadata.columns:
+        assert col in result_df.columns
+
+    # Check that vehicle predictions are integers in expected range
+    vehicle_predictions = result_df.get_column("vehicles").to_list()
+    assert all(isinstance(v, (int, np.integer)) for v in vehicle_predictions)
+    assert all(0 <= v <= 2 for v in vehicle_predictions)
+
+
+def test_predict_num_vehicles_without_fitted_model(calculator, sample_metadata):
+    """Test that error is raised when model is not fitted."""
+    with pytest.raises(VehicleOwnershipModelError):
+        calculator.predict_num_vehicles(sample_metadata)
+
+
+def test_predict_num_vehicles_without_metadata(calculator, sample_pums_data):
+    """Test that error is raised when no metadata is provided."""
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+    # Clear the metadata_df to test the None case properly
+    calculator.metadata_df = None
+
+    with pytest.raises(MetadataDataFrameError):
+        calculator.predict_num_vehicles(None)
+
+
+def test_predict_num_vehicles_missing_required_features(calculator, sample_pums_data):
+    """Test that error is raised when required features are missing."""
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Create metadata with missing values
+    incomplete_metadata = pl.DataFrame({
+        "bldg_id": [1, 2, 3],
+        "occupants": [1, None, 3],  # Missing value
+        "income": [30000, 50000, None],  # Missing value
+        "metro": ["urban", "urban", None],  # Missing value
+    })
+
+    with pytest.raises(ValueError) as exc_info:
+        calculator.predict_num_vehicles(incomplete_metadata)
+
+    # Check that the error message mentions missing data
+    assert "Missing vehicle ownership model input data" in str(exc_info.value)
+    assert "building IDs" in str(exc_info.value)
+
+
+def test_predict_num_vehicles_consistent_predictions(calculator, sample_pums_data, sample_metadata):
+    """Test that predictions are consistent for same input."""
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Make predictions twice
+    result1 = calculator.predict_num_vehicles(sample_metadata)
+    result2 = calculator.predict_num_vehicles(sample_metadata)
+
+    # Results should be identical
+    assert result1.equals(result2)
+
+
+def test_predict_num_vehicles_feature_encoding(calculator, sample_pums_data):
+    """Test that categorical features are properly encoded during prediction."""
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Create metadata with new metro values not seen during training
+    new_metadata = pl.DataFrame({
+        "bldg_id": [1],
+        "occupants": [2],
+        "income": [50000],
+        "metro": ["urban"],  # This should be encoded properly
+    })
+
+    # Should not raise an error
+    result = calculator.predict_num_vehicles(new_metadata)
+    assert len(result) == 1
+    assert "vehicles" in result.columns
+
+
+def test_predict_num_vehicles_feature_scaling(calculator, sample_pums_data):
+    """Test that features are properly scaled during prediction."""
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Create metadata with extreme values to test scaling
+    extreme_metadata = pl.DataFrame({
+        "bldg_id": [1, 2],
+        "occupants": [1, 10],  # Extreme values
+        "income": [10000, 500000],  # Extreme values
+        "metro": ["urban", "suburban"],
+    })
+
+    # Should not raise an error and should produce predictions
+    result = calculator.predict_num_vehicles(extreme_metadata)
+    assert len(result) == 2
+    assert "vehicles" in result.columns
+    vehicle_predictions = result.get_column("vehicles").to_list()
+    assert all(0 <= v <= 2 for v in vehicle_predictions)
+
+
+def test_random_seed_reproducibility(calculator, sample_pums_data, sample_metadata):
+    """Test that the random seed produces consistent results across multiple runs."""
+    # Fit the model
+    calculator.fit_vehicle_ownership_model(sample_pums_data)
+
+    # Make predictions multiple times
+    result1 = calculator.predict_num_vehicles(sample_metadata)
+    result2 = calculator.predict_num_vehicles(sample_metadata)
+    result3 = calculator.predict_num_vehicles(sample_metadata)
+
+    # All results should be identical
+    assert result1.equals(result2)
+    assert result2.equals(result3)
+    assert result1.equals(result3)
+
+    # Check that the actual predictions are the same
+    predictions1 = result1.get_column("vehicles").to_list()
+    predictions2 = result2.get_column("vehicles").to_list()
+    predictions3 = result3.get_column("vehicles").to_list()
+
+    assert predictions1 == predictions2
+    assert predictions2 == predictions3

{buildstock_fetch-1.0.2 → buildstock_fetch-1.0.3}/tests/test_ev_utils.py

@@ -1,7 +1,7 @@
 import pytest
 
-from buildstock_fetch.ev_demand import EVDemandConfig
-from buildstock_fetch.utils.ev_utils import (
+from utils.ev_demand import EVDemandConfig
+from utils.ev_utils import (
     get_census_division_for_state,
 )