refactor: separate type models from User

bitsrun/models.py

@@ -0,0 +1,32 @@
+from enum import Enum
+from typing import Literal, Optional, TypedDict, Union
+
+
+class Action(Enum):
+    LOGIN = "login"
+    LOGOUT = "logout"
+
+
+class UserResponseType(TypedDict):
+    client_ip: str
+    online_ip: str
+    # Field `error` is also `login_error` when logout action fails
+    error: Union[Literal["login_error"], Literal["ok"]]
+    error_msg: str
+    res: Union[Literal["login_error"], Literal["ok"]]
+    # Field `username` is not present on login fails and all logout scenarios
+    username: Optional[str]
+
+
+class LoginStatusRespType(TypedDict):
+    # Field `error` is `not_online_error` when device is not logged in
+    error: str
+    client_ip: Optional[str]
+    # Field `online_ip` is always present regardless of login status
+    online_ip: str
+    # Below are fields only present when device is logged in
+    sum_bytes: Optional[int]
+    sum_seconds: Optional[int]
+    user_balance: Optional[int]
+    user_name: Optional[str]
+    wallet_balance: Optional[int]

bitsrun/user.py

@@ -1,48 +1,18 @@
 import hmac
 import json
-from enum import Enum
 from hashlib import sha1
-from typing import Dict, Literal, Optional, TypedDict, Union
+from typing import Dict, Optional, Union
 
 import httpx
 
+from bitsrun.models import Action, LoginStatusRespType, UserResponseType
 from bitsrun.utils import fkbase64, xencode
 
 _API_BASE = "http://10.0.0.55"
 _TYPE_CONST = 1
 _N_CONST = 200
 
 
-class Action(Enum):
-    LOGIN = "login"
-    LOGOUT = "logout"
-
-
-class UserResponseType(TypedDict):
-    client_ip: str
-    online_ip: str
-    # Field `error` is also `login_error` when logout action fails
-    error: Union[Literal["login_error"], Literal["ok"]]
-    error_msg: str
-    res: Union[Literal["login_error"], Literal["ok"]]
-    # Field `username` is not present on login fails and all logout scenarios
-    username: Optional[str]
-
-
-class LoginStatusRespType(TypedDict):
-    # Field `error` is `not_online_error` when device is not logged in
-    error: str
-    client_ip: Optional[str]
-    # Field `online_ip` is always present regardless of login status
-    online_ip: str
-    # Below are fields only present when device is logged in
-    sum_bytes: Optional[int]
-    sum_seconds: Optional[int]
-    user_balance: Optional[int]
-    user_name: Optional[str]
-    wallet_balance: Optional[int]
-
-
 def get_login_status(client: Optional[httpx.Client] = None) -> LoginStatusRespType:
     """Get current login status of the device.