EPA-PM-API-Wrapper 0.3.0__tar.gz → 0.3.1__tar.gz

epa_pm_api_wrapper-0.3.1/CHANGELOG/0.3.1.md

@@ -0,0 +1,8 @@
+# 0.3.1 (2026-05-06)
+
+### Fixed
+
+- **CLI:** Enabled `.env` file override in `load_dotenv` to ensure credentials in the environment file take precedence over shell environment variables.
+- **CLI:** Refactored command parameter handling to use `Annotated` types for shared options, improving robustness and consistency across the CLI tool.
+- **CLI:** Fixed a Python syntax error in `get-consumption` command caused by incorrect parameter ordering.
+- **CLI:** Fixed a regression where `meter.get` was incorrectly called in `get-meter` command.

{epa_pm_api_wrapper-0.3.0 → epa_pm_api_wrapper-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: EPA-PM-API-Wrapper
-Version: 0.3.0
+Version: 0.3.1
 Summary: Client wrapper for the EPA Portfolio Manager API.
 Project-URL: bugs, https://github.com/harryw1/EPA-PM-API-Wrapper/issues
 Project-URL: changelog, https://github.com/harryw1/EPA-PM-API-Wrapper/releases

{epa_pm_api_wrapper-0.3.0 → epa_pm_api_wrapper-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "EPA-PM-API-Wrapper"
-version = "0.3.0"
+version = "0.3.1"
 description = "Client wrapper for the EPA Portfolio Manager API."
 readme = "README.md"
 authors = [

{epa_pm_api_wrapper-0.3.0 → epa_pm_api_wrapper-0.3.1}/src/epa_pm_api_wrapper/cli.py

@@ -10,6 +10,8 @@ Each command takes ``--username`` / ``--password`` / ``--test`` (with matching
 variables, also picked up from a `.env` file in the working directory).
 """
 
+from typing import Annotated, Optional
+
 import typer
 from dotenv import load_dotenv
 from rich.console import Console
@@ -17,10 +19,10 @@ from rich.table import Table
 
 from epa_pm_api_wrapper.client import EpaPmClient
 
-# Load environment variables from .env file
-load_dotenv()
+# Load environment variables from .env file, allowing them to override existing env vars
+load_dotenv(override=True)
 
-app = typer.Typer()
+app = typer.Typer(help="EPA Portfolio Manager CLI exploration tool.")
 console = Console()
 
 
@@ -28,16 +30,17 @@ def _client(username: str, password: str, test: bool) -> EpaPmClient:
     return EpaPmClient(username=username, password=password, use_test_env=test)
 
 
-_USERNAME = typer.Option(..., envvar="EPA_PM_USERNAME", help="EPA PM Username")
-_PASSWORD = typer.Option(..., envvar="EPA_PM_PASSWORD", help="EPA PM Password", hide_input=True)
-_TEST = typer.Option(False, "--test", envvar="EPA_PM_TEST", help="Use test environment")
+# Common options defined as Annotated types for reuse across commands
+Username = Annotated[str, typer.Option(envvar="EPA_PM_USERNAME", help="EPA PM Username")]
+Password = Annotated[str, typer.Option(envvar="EPA_PM_PASSWORD", help="EPA PM Password", hide_input=True)]
+Test = Annotated[bool, typer.Option("--test", envvar="EPA_PM_TEST", help="Use test environment")]
 
 
 @app.command()
 def account(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """Get account details."""
     client = _client(username, password, test)
@@ -54,10 +57,10 @@ def account(
 
 @app.command("list-properties")
 def list_properties(
-    account_id: int = typer.Argument(..., help="Account ID to list properties for"),
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    account_id: Annotated[int, typer.Argument(help="Account ID to list properties for")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List all properties accessible under an account."""
     client = _client(username, password, test)
@@ -78,10 +81,10 @@ def list_properties(
 
 @app.command("get-property")
 def get_property(
-    property_id: int,
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    property_id: Annotated[int, typer.Argument(help="Property ID")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """Get property details."""
     client = _client(username, password, test)
@@ -102,10 +105,10 @@ def get_property(
 
 @app.command("list-meters")
 def list_meters(
-    property_id: int = typer.Argument(..., help="Property ID to list meters for"),
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    property_id: Annotated[int, typer.Argument(help="Property ID to list meters for")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List meters on a property."""
     client = _client(username, password, test)
@@ -126,10 +129,10 @@ def list_meters(
 
 @app.command("get-meter")
 def get_meter(
-    meter_id: int,
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    meter_id: Annotated[int, typer.Argument(help="Meter ID")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """Get meter details."""
     client = _client(username, password, test)
@@ -148,13 +151,13 @@ def get_meter(
 
 @app.command("get-consumption")
 def get_consumption(
-    meter_id: int,
-    page: int = typer.Option(1, help="1-based page number (120 records per page)"),
-    start_date: str | None = typer.Option(None, help="ISO 8601 start date (YYYY-MM-DD)"),
-    end_date: str | None = typer.Option(None, help="ISO 8601 end date (YYYY-MM-DD)"),
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    meter_id: Annotated[int, typer.Argument(help="Meter ID")],
+    username: Username,
+    password: Password,
+    page: Annotated[int, typer.Option(help="1-based page number (120 records per page)")] = 1,
+    start_date: Annotated[Optional[str], typer.Option(help="ISO 8601 start date (YYYY-MM-DD)")] = None,
+    end_date: Annotated[Optional[str], typer.Option(help="ISO 8601 end date (YYYY-MM-DD)")] = None,
+    test: Test = False,
 ) -> None:
     """Get consumption records for a meter."""
     client = _client(username, password, test)
@@ -185,9 +188,9 @@ def get_consumption(
 
 @app.command("list-customers")
 def list_customers(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List customers connected to your account."""
     client = _client(username, password, test)
@@ -208,9 +211,9 @@ def list_customers(
 
 @app.command("list-pending-shares")
 def list_pending_shares(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List pending property and meter share requests."""
     client = _client(username, password, test)
@@ -228,10 +231,10 @@ def list_pending_shares(
 
 @app.command("list-property-uses")
 def list_property_uses(
-    property_id: int = typer.Argument(..., help="Property ID to list property uses for"),
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    property_id: Annotated[int, typer.Argument(help="Property ID to list property uses for")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List property uses defined for a property."""
     client = _client(username, password, test)
@@ -252,10 +255,10 @@ def list_property_uses(
 
 @app.command("list-buildings")
 def list_buildings(
-    property_id: int = typer.Argument(..., help="Property ID to list buildings for"),
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    property_id: Annotated[int, typer.Argument(help="Property ID to list buildings for")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List buildings under a property."""
     client = _client(username, password, test)
@@ -276,10 +279,10 @@ def list_buildings(
 
 @app.command("list-edu")
 def list_edu(
-    property_id: int = typer.Argument(..., help="Property ID to list available EDUs for"),
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    property_id: Annotated[int, typer.Argument(help="Property ID to list available EDUs for")],
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List available Electric Distribution Utilities for a property."""
     client = _client(username, password, test)
@@ -307,9 +310,9 @@ def list_edu(
 
 @app.command("list-federal-agencies")
 def list_federal_agencies(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List federal agencies (catalog)."""
     client = _client(username, password, test)
@@ -337,9 +340,9 @@ def list_federal_agencies(
 
 @app.command("list-egrid-subregions")
 def list_egrid_subregions(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List eGrid subregions (catalog)."""
     client = _client(username, password, test)
@@ -365,9 +368,9 @@ def list_egrid_subregions(
 
 @app.command("list-reports")
 def list_reports(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List reports in your account."""
     client = _client(username, password, test)
@@ -388,9 +391,9 @@ def list_reports(
 
 @app.command("list-report-templates")
 def list_report_templates(
-    username: str = _USERNAME,
-    password: str = _PASSWORD,
-    test: bool = _TEST,
+    username: Username,
+    password: Password,
+    test: Test = False,
 ) -> None:
     """List report templates available to your account."""
     client = _client(username, password, test)

{epa_pm_api_wrapper-0.3.0 → epa_pm_api_wrapper-0.3.1}/uv.lock

@@ -149,7 +149,7 @@ wheels = [
 
 [[package]]
 name = "epa-pm-api-wrapper"
-version = "0.3.0"
+version = "0.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },