tesla-fleet-api 1.2.2__tar.gz → 1.2.4__tar.gz

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tesla_fleet_api
-Version: 1.2.2
+Version: 1.2.4
 Summary: Tesla Fleet API library for Python
 Author-email: Brett Adams <hello@teslemetry.com>
 License-Expression: Apache-2.0

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools>=77.0"]
 
 [project]
 name = "tesla_fleet_api"
-version = "1.2.2"
+version = "1.2.4"
 license = "Apache-2.0"
 description = "Tesla Fleet API library for Python"
 readme = "README.md"

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/tesla_fleet_api/__init__.py

@@ -1,7 +1,7 @@
 """Tesla Fleet API"""
 
 __author__ = "hello@teslemetry.com"
-__version__ = "1.2.2"
+__version__ = "1.2.4"
 
 from tesla_fleet_api.tesla.fleet import TeslaFleetApi
 from tesla_fleet_api.tesla.bluetooth import TeslaBluetooth

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/tesla_fleet_api/tesla/fleet.py

@@ -1,7 +1,7 @@
 """Tesla Fleet API for Python."""
 
 from json import dumps
-from typing import Any, Awaitable, Callable
+from typing import Any, Awaitable, Callable, Literal
 import aiohttp
 
 from tesla_fleet_api.tesla.tesla import Tesla
@@ -14,7 +14,6 @@ class TeslaFleetApi(Tesla):
     """Class describing the Tesla Fleet API."""
 
     access_token: str | None = None
-    region: str | None = None
     server: str | None = None
     session: aiohttp.ClientSession
     headers: dict[str, str]
@@ -24,7 +23,7 @@ class TeslaFleetApi(Tesla):
         self,
         session: aiohttp.ClientSession,
         access_token: str | None = None,
-        region: str | None = None,
+        region: Literal["na", "eu", "cn"] | None = None,
         server: str | None = None,
         charging_scope: bool = True,
         energy_scope: bool = True,
@@ -41,10 +40,11 @@ class TeslaFleetApi(Tesla):
 
         if server is not None:
             self.server = server
-        elif region is not None:
-            if region not in SERVERS:
-                raise ValueError(f"Region must be one of {', '.join(SERVERS.keys())}")
+        elif region in SERVERS:
+            self.region = region
             self.server = SERVERS.get(region)
+        else:
+            raise ValueError(f"Region must be one of {', '.join(SERVERS.keys())}")
 
         LOGGER.debug("Using server %s", self.server)
 

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/tesla_fleet_api/tesla/oauth.py

@@ -1,4 +1,5 @@
-from typing import Any
+from pickle import INT
+from typing import Any, Literal
 import aiohttp
 import time
 
@@ -17,14 +18,13 @@ class TeslaFleetOAuth(TeslaFleetApi):
     def __init__(
         self,
         session: aiohttp.ClientSession,
+        region: Literal["na", "eu", "cn"],
         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,
-        region: str | None = None,
-        server: str | None = None,
     ):
         self.client_id = client_id
         self._client_secret = client_secret
@@ -37,14 +37,18 @@ class TeslaFleetOAuth(TeslaFleetApi):
             session,
             access_token="",
             region=region,
-            server=server,
         )
 
     def get_login_url(self, scopes: list[Scope], state: str = "login") -> str:
         """Get the login URL."""
         if self.redirect_uri is None:
             raise ValueError("Redirect URI is missing")
-        return f"https://auth.tesla.com/oauth2/v3/authorize?response_type=code&client_id={self.client_id}&redirect_uri={self.redirect_uri}&scope={'+'.join(scopes)}&state={state}"
+        if self.region == "cn":
+            domain = "auth.tesla.cn"
+        else:
+            domain = "auth.tesla.com"
+
+        return f"https://{domain}/oauth2/v3/authorize?response_type=code&client_id={self.client_id}&redirect_uri={self.redirect_uri}&scope={'+'.join(scopes)}&state={state}"
 
     async def get_refresh_token(self, code: str) -> None:
         """Get the refresh token."""
@@ -56,7 +60,6 @@ class TeslaFleetOAuth(TeslaFleetApi):
             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(

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/tesla_fleet_api/teslemetry/teslemetry.py

@@ -8,18 +8,20 @@ from tesla_fleet_api.tesla import TeslaFleetApi
 
 class Teslemetry(TeslaFleetApi):
 
-    server = "https://api.teslemetry.com"
+
     Vehicles = TeslemetryVehicles
 
     def __init__(
         self,
         session: aiohttp.ClientSession,
         access_token: str,
+        server: str = "https://api.teslemetry.com"
     ):
         """Initialize the Teslemetry API."""
 
         self.session = session
         self.access_token = access_token
+        self.server = server
 
         self.charging = self.Charging(self)
         self.energySites = self.EnergySites(self)
@@ -56,7 +58,7 @@ class Teslemetry(TeslaFleetApi):
         )
         if update_region and "region" in resp:
             self.region = resp["region"].lower()
-            #self.server = f"https://{self.region}.teslemetry.com"
+            self.server = f"https://{self.region}.teslemetry.com"
             LOGGER.debug("Using server %s", self.server)
         return resp
 

{tesla_fleet_api-1.2.2 → tesla_fleet_api-1.2.4}/tesla_fleet_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tesla_fleet_api
-Version: 1.2.2
+Version: 1.2.4
 Summary: Tesla Fleet API library for Python
 Author-email: Brett Adams <hello@teslemetry.com>
 License-Expression: Apache-2.0