tesla-fleet-api 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

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/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/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/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.dist-info → tesla_fleet_api-1.2.4.dist-info}/METADATA

@@ -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.dist-info → tesla_fleet_api-1.2.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
-tesla_fleet_api/__init__.py,sha256=GKlKy5acGJwH2mDdMg1xhMFo2YIu3pCWhNi5UJkNRiQ,474
+tesla_fleet_api/__init__.py,sha256=siyAEludaE4uQJm8V0svOQIDtGkWsTJHnMauvHd6Szc,474
 tesla_fleet_api/const.py,sha256=CMux_Tju1Qu8Zz3xIenazMU3Vbse94ChYyz5QfrUzHI,4180
 tesla_fleet_api/exceptions.py,sha256=39O76jiybiAQSjfVnp4KMJz7z9TP1WYBZ1zovN_Aock,36435
 tesla_fleet_api/tesla/__init__.py,sha256=ahqqQigZbXfysOpo28qUudUfWrQfKRpD_1az368Sjr0,823
 tesla_fleet_api/tesla/bluetooth.py,sha256=lyPRVf1YdcElrYBsKOMCaLwMPE9rO7Iw1a6nE7VUZ94,2369
 tesla_fleet_api/tesla/charging.py,sha256=D7I7cAf-3-95sIjyP6wpVqCq9Cppj6U-VPFQGpQQ8bs,1704
 tesla_fleet_api/tesla/energysite.py,sha256=vStffklBQfQNAO_1wrHLFu7BlBCTVVbLh7_IrAUL3wg,6131
-tesla_fleet_api/tesla/fleet.py,sha256=nFTatXH-X3ikRQDh0BKjPST3Wb6qEDC_dGBz_WZ8wm8,7022
-tesla_fleet_api/tesla/oauth.py,sha256=hlOJ1Ln5EKbxhwf3GUNHVFvIcEz8dBDKDTxiolr0Cyk,4142
+tesla_fleet_api/tesla/fleet.py,sha256=T3ofpxmctY7Kv_2gTnQGnTQAl2934eXY7bOX1WGDfYQ,7027
+tesla_fleet_api/tesla/oauth.py,sha256=NhbwjhEW3uhKuYM5EXOlwtsBDtCitSsqgxDr50WugzY,4183
 tesla_fleet_api/tesla/partner.py,sha256=e-l6sEP6-IupjFEQieSUjhhvRXF3aL4ebPNahcGFRCE,1238
 tesla_fleet_api/tesla/tesla.py,sha256=JVDHDh-D_8JAp74ji2p2d1EfrWEO9hCo6kjjh6qa2EY,3189
 tesla_fleet_api/tesla/user.py,sha256=w8rwiAOIFjuDus8M0RpZ0wucJtw8kYFKtJfYVk7Ekr0,1194
@@ -38,13 +38,13 @@ tesla_fleet_api/tesla/vehicle/proto/vcsec_pb2.pyi,sha256=tXsoZtCtKjxu7WayydmFBip
 tesla_fleet_api/tesla/vehicle/proto/vehicle_pb2.py,sha256=psmlpmURBaVO45hMbtmfVvIAhEdWEnrkVYk2H5kOZoI,44888
 tesla_fleet_api/tesla/vehicle/proto/vehicle_pb2.pyi,sha256=HKiB-RdmRH80PGq8EII3KKPEknMhmKOF9xQqD5sf5aE,74636
 tesla_fleet_api/teslemetry/__init__.py,sha256=BFi16_y-1wRF8XhtgHsYM22eT8T1hTAGJ10S3Q9rWHI,464
-tesla_fleet_api/teslemetry/teslemetry.py,sha256=r26kS1JqYj2KzRQpK_Kn_v2xz42yho2eFs4FSGIo79Y,2980
+tesla_fleet_api/teslemetry/teslemetry.py,sha256=atRW5RL-EDBU8UYkVuKHGZwfrRe7IXfYAoUhwTd99-c,3018
 tesla_fleet_api/teslemetry/vehicles.py,sha256=73xWsLP0iGml1DAw13mKnpG1Spb-NwkE4aD1rZ-2_N4,10410
 tesla_fleet_api/tessie/__init__.py,sha256=8HiaMLz1RueRoT5PSF1Y7iRr0-RV6ujgOH2RBSSUFk4,436
 tesla_fleet_api/tessie/tessie.py,sha256=UByX0BmDcqLPiW8ofNuGmMcjXvaWRn3taC68Ji80Yf8,2666
 tesla_fleet_api/tessie/vehicles.py,sha256=Cdp0pt2Z8bzK5T9wQ8_KubGSZ3Gevx1Q18kqJqEUxfs,1011
-tesla_fleet_api-1.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tesla_fleet_api-1.2.2.dist-info/METADATA,sha256=oA55duaDdz87DxfHoCnLNbGC7qIqxqe9sGN3GJTBH7Q,6720
-tesla_fleet_api-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tesla_fleet_api-1.2.2.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
-tesla_fleet_api-1.2.2.dist-info/RECORD,,
+tesla_fleet_api-1.2.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tesla_fleet_api-1.2.4.dist-info/METADATA,sha256=o_O1SdarmbMyUUVM2JD89IiuB-RFJwfEVBufSrDDEjU,6720
+tesla_fleet_api-1.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tesla_fleet_api-1.2.4.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
+tesla_fleet_api-1.2.4.dist-info/RECORD,,