Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions watttime/api.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from datetime import datetime, timedelta, date
from dateutil.parser import parse
from pytz import timezone, UTC
from typing import List, Tuple, Dict, Union, Optional, Literal, Any
import os
import time
from pathlib import Path
from datetime import date, datetime, timedelta
from functools import cache
from pathlib import Path
from typing import Any, Dict, List, Literal, Optional, Tuple, Union

import requests
import pandas as pd
import requests
from dateutil.parser import parse
from pytz import UTC, timezone


class WattTimeBase:
Expand Down Expand Up @@ -218,7 +218,9 @@ def get_historical_jsons(
j = rsp.json()
responses.append(j)
except Exception as e:
raise Exception(f"\nAPI Response Error: {rsp.status_code}, {rsp.text}")
raise Exception(
f"\nAPI Response Error: {rsp.status_code}, {rsp.text} [{rsp.headers.get('x-request-id')}]"
)

if len(j["meta"]["warnings"]):
print("\n", "Warnings Returned:", params, j["meta"])
Expand Down Expand Up @@ -487,7 +489,9 @@ def get_historical_forecast_json(
j = rsp.json()
responses.append(j)
except Exception as e:
raise Exception(f"\nAPI Response Error: {rsp.status_code}, {rsp.text}")
raise Exception(
f"\nAPI Response Error: {rsp.status_code}, {rsp.text} [{rsp.headers.get('x-request-id')}]"
)

if len(j["meta"]["warnings"]):
print("\n", "Warnings Returned:", params, j["meta"])
Expand Down