tesla-fleet-api 0.6.2__tar.gz → 0.7.1__tar.gz

{tesla_fleet_api-0.6.2/tesla_fleet_api.egg-info → tesla_fleet_api-0.7.1}/PKG-INFO

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

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/setup.py

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

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/tesla_fleet_api/__init__.py

@@ -1,5 +1,6 @@
 from .teslafleetapi import TeslaFleetApi
 from .teslafleetoauth import TeslaFleetOAuth
+from .teslafleetopensource import TeslaFleetOpenSource
 from .teslemetry import Teslemetry
 from .tessie import Tessie
 from .charging import Charging

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/tesla_fleet_api/const.py

@@ -3,7 +3,7 @@
 from enum import Enum
 import logging
 
-VERSION = "0.6.2"
+VERSION = "0.7.1"
 LOGGER = logging.getLogger(__package__)
 SERVERS = {
     "na": "https://fleet-api.prd.na.vn.cloud.tesla.com",

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/tesla_fleet_api/exceptions.py

@@ -363,7 +363,12 @@ async def raise_for_status(resp: aiohttp.ClientResponse) -> None:
     elif resp.status == 424:
         raise InvalidResponse(data)
     elif resp.status == 429:
-        raise RateLimited(data)
+        raise RateLimited(
+            {
+                "reset": resp.headers.get("RateLimit-Reset"),
+                "after": resp.headers.get("Retry-After"),
+            }
+        )
     elif resp.status == 451:
         raise ResourceUnavailableForLegalReasons(data)
     elif resp.status == 499:

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/tesla_fleet_api/teslafleetapi.py

@@ -1,7 +1,7 @@
 """Tesla Fleet API for Python."""
 
 from json import dumps
-from typing import Any
+from typing import Any, Awaitable
 import aiohttp
 
 from .exceptions import raise_for_status, InvalidRegion, LibraryError, ResponseError
@@ -22,6 +22,7 @@ class TeslaFleetApi:
     server: str | None = None
     session: aiohttp.ClientSession
     headers: dict[str, str]
+    refresh_hook: Awaitable | None
 
     def __init__(
         self,
@@ -34,11 +35,13 @@ class TeslaFleetApi:
         partner_scope: bool = True,
         user_scope: bool = True,
         vehicle_scope: bool = True,
+        refresh_hook: Awaitable | None = None,
     ):
         """Initialize the Tesla Fleet API."""
 
         self.session = session
         self.access_token = access_token
+        self.refresh_hook = refresh_hook
 
         if server is not None:
             self.server = server
@@ -46,8 +49,6 @@ class TeslaFleetApi:
             if region not in SERVERS:
                 raise ValueError(f"Region must be one of {', '.join(SERVERS.keys())}")
             self.server = SERVERS.get(region)
-        else:
-            raise ValueError("Either server or region must be provided.")
 
         LOGGER.debug("Using server %s", self.server)
 
@@ -92,6 +93,10 @@ class TeslaFleetApi:
         if method == Method.GET and json is not None:
             raise ValueError("GET requests cannot have a body.")
 
+        # Call a pre-request hook if provided
+        if self.refresh_hook is not None:
+            await self.refresh_hook()
+
         LOGGER.debug("Sending request to %s", path)
 
         # Remove None values from params and json
@@ -116,8 +121,16 @@ class TeslaFleetApi:
             LOGGER.debug("Response Status: %s", resp.status)
             if "x-txid" in resp.headers:
                 LOGGER.debug("Response TXID: %s", resp.headers["x-txid"])
+            if "RateLimit-Reset" in resp.headers:
+                LOGGER.debug(
+                    "Rate limit reset: %s", resp.headers.get("RateLimit-Reset")
+                )
+            if "Retry-After" in resp.headers:
+                LOGGER.debug("Retry after: %s", resp.headers.get("Retry-After"))
+
             if not resp.ok:
                 await raise_for_status(resp)
+
             if not resp.content_type.lower().startswith("application/json"):
                 LOGGER.debug("Response type is: %s", resp.content_type)
                 raise ResponseError(status=resp.status, data=await resp.text())

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/tesla_fleet_api/teslafleetoauth.py

@@ -11,11 +11,16 @@ class TeslaFleetOAuth(TeslaFleetApi):
     """Tesla Fleet OAuth API."""
 
     expires: int
+    refresh_token: str
+    redirect_uri: str | None
+    _client_secret: str | None
 
     def __init__(
         self,
         session: aiohttp.ClientSession,
         client_id: str,
+        client_secret: str | None = None,
+        redirect_uri: str | None = None,
         access_token: str | None = None,
         refresh_token: str | None = None,
         expires: int = 0,
@@ -23,6 +28,8 @@ class TeslaFleetOAuth(TeslaFleetApi):
         server: str | None = None,
     ):
         self.client_id = client_id
+        self._client_secret = client_secret
+        self.redirect_uri = redirect_uri
         self.access_token = access_token
         self.refresh_token = refresh_token
         self.expires = expires
@@ -34,25 +41,34 @@ class TeslaFleetOAuth(TeslaFleetApi):
             server=server,
         )
 
-    def get_login_url(
-        self, redirect_uri: str, scopes: list[Scope], state: str = "login"
-    ) -> str:
+    def get_login_url(self, scopes: list[Scope], state: str = "login") -> str:
         """Get the login URL."""
-        return f"https://auth.tesla.com/oauth2/v3/authorize?response_type=code&client_id={self.client_id}&redirect_uri={redirect_uri}&scope={' '.join(scopes)}&state={state}"
+        if self.redirect_uri is None:
+            raise ValueError("Redirect URI is missing")
+        return f"https://auth.tesla.com/oauth2/v3/authorize?response_type=code&prompt=login&client_id={self.client_id}&redirect_uri={self.redirect_uri}&scope={' '.join(scopes)}&state={state}"
 
-    async def get_refresh_token(
-        self, client_secret: str, code: str, redirect_uri: str
-    ) -> None:
+    async def get_refresh_token(self, code: str) -> None:
         """Get the refresh token."""
+
+        if self._client_secret is None:
+            raise ValueError("Client secret is missing")
+
+        if self.redirect_uri is None:
+            raise ValueError("Redirect URI is missing")
+
+        if self.server is None:
+            self.region = code.split("_")[0].lower()
+            self.server = SERVERS.get(self.region)
+
         async with self.session.post(
             "https://auth.tesla.com/oauth2/v3/token",
             data={
                 "grant_type": "authorization_code",
                 "client_id": self.client_id,
-                "client_secret": client_secret,
+                "client_secret": self._client_secret,
                 "code": code,
                 "audience": self.server,
-                "redirect_uri": redirect_uri,
+                "redirect_uri": self.redirect_uri,
             },
         ) as resp:
             if resp.ok:

tesla_fleet_api-0.7.1/tesla_fleet_api/teslafleetopensource.py

@@ -0,0 +1,61 @@
+import aiohttp
+import time
+import secrets
+import hashlib
+import base64
+
+from .teslafleetoauth import TeslaFleetOAuth
+from .const import Scope, SERVERS
+
+
+class TeslaFleetOpenSource(TeslaFleetOAuth):
+    """Tesla Fleet Open Source OAuth API."""
+
+    code_verifier: str
+    code_challenge: str
+
+    def __init__(
+        self,
+        session: aiohttp.ClientSession,
+        client_id: str,
+        redirect_uri: str,
+    ):
+        self.code_verifier = secrets.token_urlsafe(32)
+
+        # Hash the code_verifier using SHA-256
+        hashed_verifier = hashlib.sha256(self.code_verifier.encode()).digest()
+        # Encode the hash using URL-safe Base64 encoding, without padding
+        self.code_challenge = (
+            base64.urlsafe_b64encode(hashed_verifier).decode().replace("=", "")
+        )
+
+        super().__init__(session, client_id, redirect_uri=redirect_uri)
+
+    def get_login_url(self, scopes: list[Scope], state: str = "login") -> str:
+        """Get the login URL without a client secret."""
+
+        return (
+            super().get_login_url(scopes, state)
+            + f"&code_challenge={self.code_challenge}"
+        )
+
+    async def get_refresh_token(self, code: str) -> None:
+        """Get the refresh token."""
+        async with self.session.post(
+            "https://auth.tesla.com/oauth2/v3/token",
+            data={
+                "grant_type": "authorization_code",
+                "client_id": self.client_id,
+                "code": code,
+                "audience": self.server,
+                "redirect_uri": self.redirect_uri,
+                "code_verifier": self.code_verifier,
+            },
+        ) as resp:
+            if resp.ok:
+                data = await resp.json()
+                self.refresh_token = data["refresh_token"]
+                self.access_token = data["access_token"]
+                self.expires = int(time.time()) + data["expires_in"]
+                region = code.split("_")[0].lower()
+                self.server = SERVERS.get(region)

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1/tesla_fleet_api.egg-info}/PKG-INFO

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

{tesla_fleet_api-0.6.2 → tesla_fleet_api-0.7.1}/tesla_fleet_api.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ tesla_fleet_api/exceptions.py
 tesla_fleet_api/partner.py
 tesla_fleet_api/teslafleetapi.py
 tesla_fleet_api/teslafleetoauth.py
+tesla_fleet_api/teslafleetopensource.py
 tesla_fleet_api/teslemetry.py
 tesla_fleet_api/tessie.py
 tesla_fleet_api/user.py