buildstock-fetch 1.0.3__py3-none-any.whl → 1.1.0__py3-none-any.whl

buildstock_fetch/main_cli.py

@@ -1,6 +1,5 @@
 import json
 import pprint
-import random
 from collections.abc import Mapping
 from importlib.resources import files
 from pathlib import Path
@@ -94,6 +93,26 @@ def _get_weather_options(
     return available_releases, available_weather_files
 
 
+def _normalize_release_version(release_version: Union[str, float, int]) -> str:
+    """
+    Convert release_version to integer if it's a whole number, then to string.
+
+    Args:
+        release_version: The release version to normalize
+
+    Returns:
+        str: Normalized release version string
+    """
+    try:
+        release_version_float = float(release_version)
+        if release_version_float.is_integer():
+            return str(int(release_version_float))
+        else:
+            return str(release_version)
+    except (ValueError, TypeError):
+        return str(release_version)
+
+
 def _get_release_versions_options(
     available_releases: list[str], product_type: str, release_year: str, weather_file: str
 ) -> tuple[list[str], list[str]]:
@@ -360,6 +379,7 @@ def _run_interactive_mode() -> dict[str, Union[str, list[str]]]:
             validate=_validate_output_directory,
         ).ask()
     )
+
     output_directory_path = Path(output_directory_str)
     output_directory_path.mkdir(parents=True, exist_ok=True)
     return {
@@ -413,7 +433,7 @@ def _print_data_processing_info(inputs: Mapping[str, Union[str, list[str]]]) ->
 
 def _check_unavailable_file_types(inputs: Mapping[str, Union[str, list[str]]]) -> None:
     """Check and print warning for unavailable file types."""
-    unavailable_file_types = ["load_curve_hourly", "load_curve_daily", "load_curve_monthly", "load_curve_annual"]
+    unavailable_file_types = ["load_curve_hourly", "load_curve_daily"]
     selected_file_types = inputs["file_type"].split() if isinstance(inputs["file_type"], str) else inputs["file_type"]
     selected_unavailable = [ft for ft in selected_file_types if ft in unavailable_file_types]
     if selected_unavailable:
@@ -492,8 +512,8 @@ def _get_user_download_choice(bldg_ids: list) -> list:
                 console.print(f"[yellow]No files will be downloaded for State {state}, Upgrade {upgrade_id}.[/yellow]")
                 continue
 
-            # Randomly select the specified number of building IDs for this state-upgrade_id pair
-            selected_for_state_upgrade = random.sample(bldg_list, sample_size)
+            # Select the first N building IDs for this state-upgrade_id pair
+            selected_for_state_upgrade = bldg_list[:sample_size]
             selected_bldg_ids.extend(selected_for_state_upgrade)
             console.print(f"[green]Selected {sample_size} buildings for State {state}, Upgrade {upgrade_id}.[/green]")
 
@@ -627,7 +647,7 @@ def main_callback(
     product: str = PRODUCT_OPTION,
     release_year: str = RELEASE_YEAR_OPTION,
     weather_file: str = WEATHER_FILE_OPTION,
-    release_version: int = RELEASE_VERSION_OPTION,
+    release_version: float = RELEASE_VERSION_OPTION,
     states: str = STATES_OPTION,
     file_type: str = FILE_TYPE_OPTION,
     upgrade_id: str = UPGRADE_ID_OPTION,
@@ -657,7 +677,7 @@ def main_callback(
             "product": product,
             "release_year": release_year,
             "weather_file": weather_file,
-            "release_version": str(release_version),
+            "release_version": _normalize_release_version(release_version),
             "states": states_list,
             "file_type": file_type_list,
             "upgrade_ids": upgrade_ids_list,

{buildstock_fetch-1.0.3.dist-info → buildstock_fetch-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildstock-fetch
-Version: 1.0.3
+Version: 1.1.0
 Summary: This library simplifies downloading building characteristics and load curve data from NREL's ResStock and ComStock projects.
 Author-email: Switchbox <hello@switch.box>
 Project-URL: Homepage, https://switchbox-data.github.io/buildstock-fetch/
@@ -24,6 +24,30 @@ Requires-Dist: typer>=0.9.0
 Requires-Dist: rich>=13.9.5
 Requires-Dist: questionary>=1.11.0
 Requires-Dist: polars>=0.20.0
+Provides-Extra: test
+Requires-Dist: pytest>=7.2.0; extra == "test"
+Provides-Extra: docs
+Requires-Dist: mkdocs>=1.4.2; extra == "docs"
+Requires-Dist: mkdocs-material>=8.5.10; extra == "docs"
+Requires-Dist: mkdocstrings[python]>=0.26.1; extra == "docs"
+Provides-Extra: lint
+Requires-Dist: pre-commit>=2.20.0; extra == "lint"
+Requires-Dist: mypy>=0.991; extra == "lint"
+Requires-Dist: ruff>=0.11.5; extra == "lint"
+Requires-Dist: deptry>=0.23.0; extra == "lint"
+Requires-Dist: types-requests>=2.31.0; extra == "lint"
+Requires-Dist: types-boto3>=1.33.0; extra == "lint"
+Requires-Dist: pandas-stubs>=2.2.0; extra == "lint"
+Provides-Extra: dev-utils
+Requires-Dist: boto3>=1.33.0; extra == "dev-utils"
+Requires-Dist: botocore>=1.33.0; extra == "dev-utils"
+Requires-Dist: pyarrow>=14.0.1; extra == "dev-utils"
+Requires-Dist: numpy>=1.26.4; extra == "dev-utils"
+Requires-Dist: scikit-learn>=1.6.1; extra == "dev-utils"
+Requires-Dist: xmltodict>=0.14.2; extra == "dev-utils"
+Provides-Extra: dev
+Requires-Dist: buildstock-fetch[dev-utils,docs,lint,test]; extra == "dev"
+Requires-Dist: tox-uv>=1.11.3; extra == "dev"
 Dynamic: license-file
 
 # buildstock-fetch
@@ -36,7 +60,8 @@ Dynamic: license-file
 This library simplifies downloading building characteristics and load curve data from NREL's ResStock and ComStock projects.
 
 - **Github repository**: <https://github.com/switchbox-data/buildstock-fetch/>
-- **Documentation** <https://switchbox-data.github.io/buildstock-fetch/>
+- **Documentation**: <https://switchbox-data.github.io/buildstock-fetch/>
+- **PyPI page***: <https://pypi.org/project/buildstock-fetch/>
 
 ## Installing the library
 
@@ -49,7 +74,7 @@ pip install buildstock-fetch
 or
 
 ```bash
-uv pip install buildstock-fetch
+uv add buildstock-fetch
 ```
 
 ## Using the library