Merge branch 'cloud-output-device' of github.com:Ultimaker/Cura into cloud-output-device

plugins/CuraEngineBackend/StartSliceJob.py

@@ -66,11 +66,19 @@ class GcodeStartEndFormatter(Formatter):
             return "{" + key + "}"
 
         key = key_fragments[0]
-        try:
-            return kwargs[str(extruder_nr)][key]
-        except KeyError:
+
+        default_value_str = "{" + key + "}"
+        value = default_value_str
+        # "-1" is global stack, and if the setting value exists in the global stack, use it as the fallback value.
+        if key in kwargs["-1"]:
+            value = kwargs["-1"]
+        if key in kwargs[str(extruder_nr)]:
+            value = kwargs[str(extruder_nr)][key]
+
+        if value == default_value_str:
             Logger.log("w", "Unable to replace '%s' placeholder in start/end g-code", key)
-            return "{" + key + "}"
+
+        return value
 
 
 ##  Job class that builds up the message of scene data to send to CuraEngine.

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -93,6 +93,11 @@ class FirmwareUpdateCheckerJob(Job):
 
                 current_version = self.getCurrentVersion()
 
+                # This case indicates that was an error checking the version.
+                # It happens for instance when not connected to internet.
+                if current_version == self.ZERO_VERSION:
+                    return
+
                 # If it is the first time the version is checked, the checked_version is ""
                 setting_key_str = getSettingsKeyForMachine(machine_id)
                 checked_version = Version(Application.getInstance().getPreferences().getValue(setting_key_str))

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py

@@ -47,7 +47,6 @@ class CloudOutputDeviceManager(NetworkClient):
         self._update_clusters_thread = Thread(target=self._updateClusters, daemon=True)
         self._update_clusters_thread.start()
 
-
     ##  Override _createEmptyRequest to add the needed authentication header for talking to the Ultimaker Cloud API.
     def _createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json") -> QNetworkRequest:
         request = super()._createEmptyRequest(self.API_ROOT_PATH + path, content_type = content_type)
@@ -97,7 +96,7 @@ class CloudOutputDeviceManager(NetworkClient):
     @staticmethod
     def _parseStatusResponse(reply: QNetworkReply) -> Dict[str, CloudCluster]:
         try:
-            return {c["guid"]: CloudCluster(**c) for c in json.loads(reply.readAll().data().decode("utf-8"))}
+            return {c["cluster_id"]: CloudCluster(**c) for c in json.loads(reply.readAll().data().decode("utf-8"))}
         except UnicodeDecodeError:
             Logger.log("w", "Unable to read server response")
         except json.decoder.JSONDecodeError:

plugins/UM3NetworkPrinting/src/Models.py

@@ -14,7 +14,7 @@ class BaseModel:
 
 ##  Class representing a material that was fetched from the cluster API.
 class ClusterMaterial(BaseModel):
-    def __init__(self, guid = str, version = str, **kwargs) -> None:
+    def __init__(self, guid: str, version: int, **kwargs) -> None:
         self.guid = guid  # type: str
         self.version = version  # type: int
         super().__init__(**kwargs)
@@ -28,7 +28,7 @@ class ClusterMaterial(BaseModel):
 
 ##  Class representing a local material that was fetched from the container registry.
 class LocalMaterial(BaseModel):
-    def __init__(self, GUID = str, id = str, version = str, **kwargs) -> None:
+    def __init__(self, GUID: str, id: str, version: int, **kwargs) -> None:
         self.GUID = GUID  # type: str
         self.id = id  # type: str
         self.version = version  # type: int

plugins/UM3NetworkPrinting/src/SendMaterialJob.py

@@ -160,7 +160,9 @@ class SendMaterialJob(Job):
         except json.JSONDecodeError:
             Logger.log("e", "Request material storage on printer: I didn't understand the printer's answer.")
         except ValueError:
-            Logger.log("e", "Request material storage on printer: Printer's answer was missing a value.")
+            Logger.log("e", "Request material storage on printer: Printer's answer had an incorrect value.")
+        except TypeError:
+            Logger.log("e", "Request material storage on printer: Printer's answer was missing a required value.")
 
     ##  Retrieves a list of local materials
     #
@@ -189,5 +191,7 @@ class SendMaterialJob(Job):
                 Logger.logException("w", "Local material {} has missing values.".format(material["id"]))
             except ValueError:
                 Logger.logException("w", "Local material {} has invalid values.".format(material["id"]))
+            except TypeError:
+                Logger.logException("w", "Local material {} has invalid values.".format(material["id"]))
 
         return result