update user-agent

octoprint_bambu_printer/printer/bambu_virtual_printer.py

@@ -210,7 +210,7 @@ class BambuVirtualPrinter:
         self._telemetry.bedTemp = temperatures.bed_temp
         self._telemetry.bedTargetTemp = temperatures.target_bed_temp
         self._telemetry.chamberTemp = temperatures.chamber_temp
-        if device_data.push_all_data:
+        if device_data.push_all_data and "ams" in device_data.push_all_data:
             self._telemetry.ams_current_tray = device_data.push_all_data["ams"]["tray_now"] or 255
 
         if self._telemetry.ams_current_tray != self._settings.get_int(["ams_current_tray"]):
@@ -367,8 +367,9 @@ class BambuVirtualPrinter:
     ##~~ command implementations
 
     @gcode_executor.register_no_data("M21")
-    def _sd_status(self) -> None:
+    def _sd_status(self) -> bool:
         self.sendIO("SD card ok")
+        return True
 
     @gcode_executor.register("M23")
     def _select_sd_file(self, data: str) -> bool:
@@ -469,6 +470,9 @@ class BambuVirtualPrinter:
     # noinspection PyUnusedLocal
     @gcode_executor.register_no_data("M115")
     def _report_firmware_info(self) -> bool:
+        # wait for connection to be established before sending back firmware info
+        while self.bambu_client.connected is False:
+            time.sleep(1)
         self.sendIO("Bambu Printer Integration")
         self.sendIO("Cap:AUTOREPORT_SD_STATUS:1")
         self.sendIO("Cap:AUTOREPORT_TEMP:1")
@@ -681,7 +685,7 @@ class BambuVirtualPrinter:
         self._state_change_queue.join()
 
     def _printer_worker(self):
-        self._create_client_connection_async()
+        # self._create_client_connection_async()
         self.sendIO("Printer connection complete")
         while self._running:
             try:

octoprint_bambu_printer/printer/file_system/cached_file_view.py

@@ -87,7 +87,7 @@ class CachedFileView:
     def _get_file_by_stem_cached(self, file_stem: str, allowed_suffixes: list[str]):
         for file_path_str in list(self._file_data_cache.keys()) + list(self._file_alias_cache.keys()):
             file_path = Path(file_path_str)
-            if file_stem == file_path.with_suffix("").stem and all(
+            if file_stem == file_path.with_suffix("").stem and any(
                 suffix in allowed_suffixes for suffix in file_path.suffixes
             ):
                 return self.get_file_data_cached(file_path)

octoprint_bambu_printer/printer/pybambu/bambu_cloud.py

@@ -10,7 +10,7 @@ from .const import LOGGER
 
 @dataclass
 class BambuCloud:
-  
+
     def __init__(self, region: str, email: str, username: str, auth_token: str):
         self._region = region
         self._email = email
@@ -23,7 +23,7 @@ class BambuCloud:
             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)
@@ -40,7 +40,7 @@ class BambuCloud:
         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',
@@ -79,7 +79,7 @@ class BambuCloud:
     #             }
     #     ]
     # }
-    
+
     def test_authentication(self, region: str, email: str, username: str, auth_token: str) -> bool:
         self._region = region
         self._email = email
@@ -105,7 +105,7 @@ class BambuCloud:
             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:
@@ -186,14 +186,14 @@ class BambuCloud:
             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,
@@ -241,14 +241,14 @@ class BambuCloud:
             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)
@@ -283,11 +283,11 @@ class BambuCloud:
     @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"

setup.py

@@ -14,7 +14,7 @@ plugin_package = "octoprint_bambu_printer"
 plugin_name = "OctoPrint-BambuPrinter"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.8rc2"
+plugin_version = "0.1.8rc5"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module