tesla-fleet-api 0.7.5__tar.gz → 0.7.6__tar.gz

{tesla_fleet_api-0.7.5/tesla_fleet_api.egg-info → tesla_fleet_api-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tesla_fleet_api
-Version: 0.7.5
+Version: 0.7.6
 Summary: Tesla Fleet API library for Python
 Home-page: https://github.com/Teslemetry/tesla_fleet_api
 Author: Brett Adams

{tesla_fleet_api-0.7.5 → tesla_fleet_api-0.7.6}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tesla_fleet_api",
-    version="0.7.5",
+    version="0.7.6",
     author="Brett Adams",
     author_email="hello@teslemetry.com",
     description="Tesla Fleet API library for Python",

{tesla_fleet_api-0.7.5 → tesla_fleet_api-0.7.6}/tesla_fleet_api/const.py

@@ -3,7 +3,7 @@
 from enum import Enum
 import logging
 
-VERSION = "0.7.5"
+VERSION = "0.7.6"
 LOGGER = logging.getLogger(__package__)
 SERVERS = {
     "na": "https://fleet-api.prd.na.vn.cloud.tesla.com",
@@ -15,10 +15,16 @@ SERVERS = {
 class IntEnum(int, Enum):
     """Integer Enum."""
 
+    def __str__(self) -> str:
+        return str(self.value)
+
 
 class StrEnum(str, Enum):
     """String Enum."""
 
+    def __str__(self) -> str:
+        return self.value
+
 
 class Method(StrEnum):
     """HTTP Methods."""
@@ -302,3 +308,13 @@ class TelemetryAlert(StrEnum):
     CUSTOMER = "Customer"
     SERVICE = "Service"
     SERVICE_FIX = "ServiceFix"
+
+
+class TeslaEnergyPeriod(StrEnum):
+    """Period for history for energy sites"""
+
+    DAY = "day"
+    WEEK = "week"
+    MONTH = "month"
+    YEAR = "year"
+    LIFETIME = "lifetime"

{tesla_fleet_api-0.7.5 → tesla_fleet_api-0.7.6}/tesla_fleet_api/energy.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Any, TYPE_CHECKING
-from .const import Method, EnergyOperationMode, EnergyExportMode
+from .const import Method, EnergyOperationMode, EnergyExportMode, TeslaEnergyKind, TeslaEnergyPeriod
 from .energyspecific import EnergySpecific
 
 if TYPE_CHECKING:
@@ -32,18 +32,17 @@ class Energy:
     async def backup_history(
         self,
         energy_site_id: int,
-        kind: str,
         start_date: str,
         end_date: str,
-        period: str,
+        period: TeslaEnergyPeriod | str,
         time_zone: str,
     ) -> dict[str, Any]:
         """Returns the backup (off-grid) event history of the site in duration of seconds."""
         return await self._request(
             Method.GET,
             f"api/1/energy_sites/{energy_site_id}/calendar_history",
-            json={
-                "kind": kind,
+            params={
+                "kind": "backup",
                 "start_date": start_date,
                 "end_date": end_date,
                 "period": period,
@@ -54,7 +53,6 @@ class Energy:
     async def charge_history(
         self,
         energy_site_id: int,
-        kind: str,
         start_date: str,
         end_date: str,
         time_zone: str,
@@ -64,7 +62,7 @@ class Energy:
             Method.GET,
             f"api/1/energy_sites/{energy_site_id}/telemetry_history",
             params={
-                "kind": kind,
+                "kind": "charge",
                 "start_date": start_date,
                 "end_date": end_date,
                 "time_zone": time_zone,
@@ -74,10 +72,9 @@ class Energy:
     async def energy_history(
         self,
         energy_site_id: int,
-        kind: str,
         start_date: str,
         end_date: str,
-        period: str,
+        period: TeslaEnergyPeriod | str,
         time_zone: str,
     ) -> dict[str, Any]:
         """Returns the energy measurements of the site, aggregated to the requested period."""
@@ -85,7 +82,7 @@ class Energy:
             Method.GET,
             f"api/1/energy_sites/{energy_site_id}/calendar_history",
             params={
-                "kind": kind,
+                "kind": "energy",
                 "start_date": start_date,
                 "end_date": end_date,
                 "period": period,

{tesla_fleet_api-0.7.5 → tesla_fleet_api-0.7.6}/tesla_fleet_api/energyspecific.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Any, TYPE_CHECKING
-from .const import EnergyExportMode, EnergyOperationMode
+from .const import EnergyExportMode, EnergyOperationMode, TeslaEnergyKind, TeslaEnergyPeriod
 
 if TYPE_CHECKING:
     from .energy import Energy
@@ -29,20 +29,22 @@ class EnergySpecific:
 
     async def backup_history(
         self,
-        kind: str,
         start_date: str,
         end_date: str,
-        period: str,
+        period: TeslaEnergyPeriod | str,
         time_zone: str,
     ) -> dict[str, Any]:
         """Returns the backup (off-grid) event history of the site in duration of seconds."""
         return await self._parent.backup_history(
-            self.energy_site_id, kind, start_date, end_date, period, time_zone
+            self.energy_site_id,
+            start_date,
+            end_date,
+            period,
+            time_zone,
         )
 
     async def charge_history(
         self,
-        kind: str,
         start_date: str,
         end_date: str,
         time_zone: str,
@@ -50,7 +52,6 @@ class EnergySpecific:
         """Returns the charging history of a wall connector."""
         return await self._parent.charge_history(
             self.energy_site_id,
-            kind,
             start_date,
             end_date,
             time_zone,
@@ -58,16 +59,14 @@ class EnergySpecific:
 
     async def energy_history(
         self,
-        kind: str,
         start_date: str,
         end_date: str,
-        period: str,
+        period: TeslaEnergyPeriod | str,
         time_zone: str,
     ) -> dict[str, Any]:
         """Returns the energy measurements of the site, aggregated to the requested period."""
         return await self._parent.energy_history(
             self.energy_site_id,
-            kind,
             start_date,
             end_date,
             period,

{tesla_fleet_api-0.7.5 → tesla_fleet_api-0.7.6}/tesla_fleet_api/teslafleetapi.py

@@ -98,7 +98,6 @@ class TeslaFleetApi:
             if access_token := await self.refresh_hook():
                 self.access_token = access_token
 
-        LOGGER.debug("Sending request to %s", path)
 
         # Remove None values from params and json
         if params:
@@ -119,6 +118,7 @@ class TeslaFleetApi:
             json=json,
             params=params,
         ) as resp:
+            LOGGER.debug("Requested: %s", resp.url)
             LOGGER.debug("Response Status: %s", resp.status)
             if "x-txid" in resp.headers:
                 LOGGER.debug("Response TXID: %s", resp.headers["x-txid"])

{tesla_fleet_api-0.7.5 → tesla_fleet_api-0.7.6/tesla_fleet_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tesla_fleet_api
-Version: 0.7.5
+Version: 0.7.6
 Summary: Tesla Fleet API library for Python
 Home-page: https://github.com/Teslemetry/tesla_fleet_api
 Author: Brett Adams