v/wideq
1
0
Fork 0
mirror of https://github.com/no2chem/wideq.git synced 2025-05-16 15:20:09 -07:00
Code Issues Projects Releases Wiki Activity

Incorporate review comments

Browse Source
This commit is contained in:
Jason Swails 2020-04-10 09:24:39 -04:00
parent e7b5a7d28b
commit c595749eb9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wideq/core.py
View File

@ -8,7 +8,6 @@ import hmac
import datetime import datetime
import requests import requests
import logging import logging
from functools import lru_cache
from typing import Any, Dict, List, Tuple from typing import Any, Dict, List, Tuple
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
from requests.packages.urllib3.util.retry import Retry from requests.packages.urllib3.util.retry import Retry
@ -24,9 +23,9 @@ OAUTH_CLIENT_KEY = 'LGAO221A02'
DATE_FORMAT = '%a, %d %b %Y %H:%M:%S +0000' DATE_FORMAT = '%a, %d %b %Y %H:%M:%S +0000'
DEFAULT_COUNTRY = 'US' DEFAULT_COUNTRY = 'US'
DEFAULT_LANGUAGE = 'en-US' DEFAULT_LANGUAGE = 'en-US'
NUM_RETRIES = 100 # fail *eventually*, but effectively retry in perpetuity NUM_RETRIES = 5 # Anecdotally this seems sufficient.
BACKOFF_FACTOR = 0.5 BACKOFF_FACTOR = 0.5
STATUS_FORCELIST = (500, 502, 504) STATUS_FORCELIST = (502, 503, 504)
def get_wideq_logger() -> logging.Logger: def get_wideq_logger() -> logging.Logger:
@ -65,13 +64,12 @@ def get_wideq_logger() -> logging.Logger:
LOGGER = get_wideq_logger() LOGGER = get_wideq_logger()
@lru_cache(maxsize=5)
def get_retry_session(): def get_retry_session():
# See https://www.peterbe.com/plog/best-practice-with-retries-with-requests # See https://www.peterbe.com/plog/best-practice-with-retries-with-requests
# for the source of this retry mechanism # for the source of this retry mechanism
session = requests.Session() session = requests.Session()
retry = Retry( retry = Retry(
totaL=NUM_RETRIES, total=NUM_RETRIES,
read=NUM_RETRIES, read=NUM_RETRIES,
connect=NUM_RETRIES, connect=NUM_RETRIES,
backoff_factor=BACKOFF_FACTOR, backoff_factor=BACKOFF_FACTOR,
@ -83,6 +81,9 @@ def get_retry_session():
return session return session
SESSION = get_retry_session()
def set_log_level(level: int): def set_log_level(level: int):
logger = get_wideq_logger() logger = get_wideq_logger()
logger.setLevel(level) logger.setLevel(level)
@ -197,8 +198,7 @@ def lgedm_post(url, data=None, access_token=None, session_id=None):
if session_id: if session_id:
headers['x-thinq-jsessionId'] = session_id headers['x-thinq-jsessionId'] = session_id
session = get_retry_session() res = SESSION.post(url, json={DATA_ROOT: data}, headers=headers)
res = session.post(url, json={DATA_ROOT: data}, headers=headers)
out = res.json()[DATA_ROOT] out = res.json()[DATA_ROOT]
# Check for API errors. # Check for API errors.
@ -290,7 +290,7 @@ def refresh_auth(oauth_root, refresh_token):
'Accept': 'application/json', 'Accept': 'application/json',
} }
res = get_retry_session().post(token_url, data=data, headers=headers) res = SESSION.post(token_url, data=data, headers=headers)
res_data = res.json() res_data = res.json()
if res_data['status'] != 1: if res_data['status'] != 1: