Skip to content

Commit

Permalink
update user-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
jneilliii committed Nov 2, 2024
1 parent 21e3003 commit 1d9f874
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions octoprint_bambu_printer/printer/pybambu/bambu_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

@dataclass
class BambuCloud:

def __init__(self, region: str, email: str, username: str, auth_token: str):
self._region = region
self._email = email
Expand All @@ -23,7 +23,7 @@ def _get_authentication_token(self) -> dict:
url = 'https://api.bambulab.cn/v1/user-service/user/login'
else:
url = 'https://api.bambulab.com/v1/user-service/user/login'
headers = {'User-Agent' : "HA Bambulab"}
headers = {'User-Agent' : "OctoPrint Plugin"}
data = {'account': self._email, 'password': self._password}
with httpx.Client(http2=True) as client:
response = client.post(url, headers=headers, json=data, timeout=10)
Expand All @@ -40,7 +40,7 @@ def _get_username_from_authentication_token(self) -> str:
jsonAuthToken = json.loads(base64.b64decode(b64_string))
# Gives json payload with "username":"u_<digits>" within it
return jsonAuthToken['username']

# Retrieves json description of devices in the form:
# {
# 'message': 'success',
Expand Down Expand Up @@ -79,7 +79,7 @@ def _get_username_from_authentication_token(self) -> str:
# }
# ]
# }

def test_authentication(self, region: str, email: str, username: str, auth_token: str) -> bool:
self._region = region
self._email = email
Expand All @@ -105,7 +105,7 @@ def get_device_list(self) -> dict:
url = 'https://api.bambulab.cn/v1/iot-service/api/user/bind'
else:
url = 'https://api.bambulab.com/v1/iot-service/api/user/bind'
headers = {'Authorization': 'Bearer ' + self._auth_token, 'User-Agent' : "HA Bambulab"}
headers = {'Authorization': 'Bearer ' + self._auth_token, 'User-Agent' : "OctoPrint Plugin"}
with httpx.Client(http2=True) as client:
response = client.get(url, headers=headers, timeout=10)
if response.status_code >= 400:
Expand Down Expand Up @@ -186,14 +186,14 @@ def get_slicer_settings(self) -> dict:
url = 'https://api.bambulab.cn/v1/iot-service/api/slicer/setting?version=undefined'
else:
url = 'https://api.bambulab.com/v1/iot-service/api/slicer/setting?version=undefined'
headers = {'Authorization': 'Bearer ' + self._auth_token, 'User-Agent' : "HA Bambulab"}
headers = {'Authorization': 'Bearer ' + self._auth_token, 'User-Agent' : "OctoPrint Plugin"}
with httpx.Client(http2=True) as client:
response = client.get(url, headers=headers, timeout=10)
if response.status_code >= 400:
LOGGER.error(f"Slicer settings load failed: {response.status_code}")
return None
return response.json()

# The task list is of the following form with a 'hits' array with typical 20 entries.
#
# "total": 531,
Expand Down Expand Up @@ -241,14 +241,14 @@ def get_tasklist(self) -> dict:
url = 'https://api.bambulab.cn/v1/user-service/my/tasks'
else:
url = 'https://api.bambulab.com/v1/user-service/my/tasks'
headers = {'Authorization': 'Bearer ' + self._auth_token, 'User-Agent' : "HA Bambulab"}
headers = {'Authorization': 'Bearer ' + self._auth_token, 'User-Agent' : "OctoPrint Plugin"}
with httpx.Client(http2=True) as client:
response = client.get(url, headers=headers, timeout=10)
if response.status_code >= 400:
LOGGER.debug(f"Received error: {response.status_code}")
raise ValueError(response.status_code)
return response.json()

def get_latest_task_for_printer(self, deviceId: str) -> dict:
LOGGER.debug(f"Getting latest task from Bambu Cloud for Printer: {deviceId}")
data = self.get_tasklist_for_printer(deviceId)
Expand Down Expand Up @@ -283,11 +283,11 @@ def download(self, url: str) -> bytearray:
@property
def username(self):
return self._username

@property
def auth_token(self):
return self._auth_token

@property
def cloud_mqtt_host(self):
return "cn.mqtt.bambulab.com" if self._region == "China" else "us.mqtt.bambulab.com"

0 comments on commit 1d9f874

Please sign in to comment.