Merge remote-tracking branch 'origin/main' into CURA-12580_paint-on-support

Author: wawanbreton

.github/workflows/find-packages.yml

@@ -13,6 +13,14 @@ on:
         default: true
         required: false
         type: boolean
+      cura_conan_version:
+        description: 'Cura Conan Version (optional, overrides discovered packages)'
+        default: ''
+        type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated, in addition to discovered packages)'
+        default: ''
+        type: string
       conan_args:
         description: 'Conan args'
         default: ''
@@ -43,8 +51,8 @@ jobs:
     if: ${{ inputs.start_builds == true && needs.find-packages.outputs.discovered_packages != '' }}
     uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main
     with:
-      cura_conan_version: ${{ needs.find-packages.outputs.cura_package }}
-      package_overrides: ${{ needs.find-packages.outputs.package_overrides }}
+      cura_conan_version: ${{ inputs.cura_conan_version != '' && inputs.cura_conan_version || needs.find-packages.outputs.cura_package }}
+      package_overrides: ${{ needs.find-packages.outputs.package_overrides }} ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging  }}

conandata.yml

@@ -1,17 +1,17 @@
-version: "5.11.0"
+version: "5.12.0-alpha.0"
 commit: "unknown"
 requirements:
-  - "cura_resources/5.11.0"
-  - "uranium/5.11.0"
-  - "curaengine/5.11.0"
-  - "cura_binary_data/5.11.0"
-  - "fdm_materials/5.11.0"
+  - "cura_resources/5.12.0-alpha.0@ultimaker/testing"
+  - "uranium/5.12.0-alpha.0@ultimaker/testing"
+  - "curaengine/5.12.0-alpha.0@ultimaker/testing"
+  - "cura_binary_data/5.12.0-alpha.0@ultimaker/testing"
+  - "fdm_materials/5.12.0-alpha.0@ultimaker/testing"
   - "dulcificum/5.10.0"
   - "pysavitar/5.11.0-alpha.0"
   - "pynest2d/5.10.0"
 requirements_internal:
-  - "fdm_materials/5.11.0"
-  - "cura_private_data/5.11.0-alpha.0@internal/testing"
+  - "fdm_materials/5.12.0-alpha.0@ultimaker/testing"
+  - "cura_private_data/5.12.0-alpha.0@internal/testing"
 requirements_enterprise:
   - "native_cad_plugin/2.0.0"
 urls:

conanfile.py

@@ -153,71 +153,110 @@ def _is_repository_url(url):
     def _retrieve_pip_license(self, package, sources_url, dependency_description):
         # Download the sources to get the license file inside
         self.output.info(f"Retrieving license for {package}")
-        response = requests.get(sources_url)
-        response.raise_for_status()
-
-        with tempfile.TemporaryDirectory() as temp_dir:
-            sources_path = os.path.join(temp_dir, "sources.tar.gz")
-            with open(sources_path, 'wb') as sources_file:
-                sources_file.write(response.content)
-
-            with tarfile.open(sources_path, 'r:gz') as sources_archive:
-                license_file = "LICENSE"
-
-                for source_file in sources_archive.getnames():
-                    if Path(source_file).name == license_file:
-                        sources_archive.extract(source_file, temp_dir)
-
-                        license_file_path = os.path.join(temp_dir, source_file)
-                        with open(license_file_path, 'r', encoding='utf8') as file:
-                            dependency_description["license_full"] = file.read()
+        try:
+            response = requests.get(sources_url)
+            response.raise_for_status()
+
+            with tempfile.TemporaryDirectory() as temp_dir:
+                sources_path = os.path.join(temp_dir, "sources.tar.gz")
+                with open(sources_path, 'wb') as sources_file:
+                    sources_file.write(response.content)
+
+                with tarfile.open(sources_path, 'r:gz') as sources_archive:
+                    license_file = "LICENSE"
+
+                    for source_file in sources_archive.getnames():
+                        if Path(source_file).name == license_file:
+                            sources_archive.extract(source_file, temp_dir)
+
+                            license_file_path = os.path.join(temp_dir, source_file)
+                            with open(license_file_path, 'r', encoding='utf8') as file:
+                                dependency_description["license_full"] = file.read()
+                            break
+        except Exception as e:
+            self.output.warning(f"Failed to retrieve license for {package} from {sources_url}: {e}")
+            # Don't fail the build, just continue without the license
 
     def _make_pip_dependency_description(self, package, version, dependencies):
         url = ["https://pypi.org/pypi", package]
         if version is not None:
-            url.append(version)
+            # Strip local version identifiers (everything after '+') for PyPI API compatibility
+            # e.g., "1.26.1+mkl" becomes "1.26.1"
+            clean_version = version.split('+')[0] if '+' in version else version
+            url.append(clean_version)
         url.append("json")
 
-        data = requests.get("/".join(url)).json()
+        try:
+            response = requests.get("/".join(url))
+            response.raise_for_status()
+            data = response.json()
+        except (requests.RequestException, ValueError) as e:
+            self.output.warning(f"Failed to retrieve PyPI data for {package}: {e}")
+            # Create minimal dependency description with fallback values
+            dependencies[package] = {
+                "summary": f"Package {package}",
+                "version": version or "unknown",
+                "license": "unknown"
+            }
+            return
+
+        # Check if the response has the expected structure
+        if "info" not in data:
+            self.output.warning(f"PyPI response for {package} missing 'info' field")
+            dependencies[package] = {
+                "summary": f"Package {package}",
+                "version": version or "unknown", 
+                "license": "unknown"
+            }
+            return
 
+        info = data["info"]
         dependency_description = {
-            "summary": data["info"]["summary"],
-            "version": data["info"]["version"],
-            "license": data["info"]["license"]
+            "summary": info.get("summary", f"Package {package}"),
+            "version": version or info.get("version", "unknown"),  # Use original version if available
+            "license": info.get("license", "unknown")
         }
 
-        for url_data in data["urls"]:
-            if url_data["packagetype"] == "sdist":
-                sources_url = url_data["url"]
-                dependency_description["sources_url"] = sources_url
-
-                if not self.options.skip_licenses_download:
-                    self._retrieve_pip_license(package, sources_url, dependency_description)
-
-        for source_url, check_source in [("source", False),
-                                         ("Source", False),
-                                         ("Source Code", False),
-                                         ("Repository", False),
-                                         ("Code", False),
-                                         ("homepage", True),
-                                         ("Homepage", True)]:
-            try:
-                url = data["info"]["project_urls"][source_url]
-                if check_source and not self._is_repository_url(url):
-                    # That will not work for ALL open-source projects, but should already get a large majority of them
-                    self.output.warning(f"Source URL for {package} ({url}) doesn't seem to be a supported repository")
-                    continue
-                dependency_description["sources_url"] = url
-                break
-            except KeyError:
-                pass
+        # Handle URLs section safely
+        if "urls" in data:
+            for url_data in data["urls"]:
+                if url_data.get("packagetype") == "sdist":
+                    sources_url = url_data.get("url")
+                    if sources_url:
+                        dependency_description["sources_url"] = sources_url
+
+                        if not self.options.skip_licenses_download:
+                            try:
+                                self._retrieve_pip_license(package, sources_url, dependency_description)
+                            except Exception as e:
+                                self.output.warning(f"Failed to retrieve license for {package}: {e}")
+
+        # Handle project URLs safely
+        if "project_urls" in info:
+            for source_url, check_source in [("source", False),
+                                             ("Source", False),
+                                             ("Source Code", False),
+                                             ("Repository", False),
+                                             ("Code", False),
+                                             ("homepage", True),
+                                             ("Homepage", True)]:
+                try:
+                    url = info["project_urls"][source_url]
+                    if check_source and not self._is_repository_url(url):
+                        # That will not work for ALL open-source projects, but should already get a large majority of them
+                        self.output.warning(f"Source URL for {package} ({url}) doesn't seem to be a supported repository")
+                        continue
+                    dependency_description["sources_url"] = url
+                    break
+                except (KeyError, TypeError):
+                    pass
 
         if dependency_description["license"] is not None and len(dependency_description["license"]) > 32:
             # Some packages have their full license in this field
             dependency_description["license_full"] = dependency_description["license"]
-            dependency_description["license"] = data["info"]["name"]
+            dependency_description["license"] = info.get("name", package)
 
-        dependencies[data["info"]["name"]] = dependency_description
+        dependencies[info.get("name", package)] = dependency_description
 
     @staticmethod
     def _get_license_from_repository(sources_url, version, license_file_name = None):

cura/BuildVolume.py

@@ -116,7 +116,8 @@ def __init__(self, application: "CuraApplication", parent: Optional[SceneNode] =
         self._application.engineCreatedSignal.connect(self._onEngineCreated)
 
         self._has_errors = False
-        self._application.getController().getScene().sceneChanged.connect(self._onSceneChanged)
+        scene = self._application.getController().getScene()
+        scene.sceneChanged.connect(self._onSceneChanged)
 
         # Objects loaded at the moment. We are connected to the property changed events of these objects.
         self._scene_objects = set()  # type: Set[SceneNode]
@@ -318,16 +319,6 @@ def updateNodeBoundaryCheck(self):
                 if node_bounding_box and node_bounding_box.top < 0 and not node.getParent().callDecoration("isGroup"):
                     node.setOutsideBuildArea(True)
                     continue
-                # Mark the node as outside build volume if the set extruder is disabled
-                extruder_position = node.callDecoration("getActiveExtruderPosition")
-                try:
-                    if not self._global_container_stack.extruderList[int(extruder_position)].isEnabled and not node.callDecoration("isGroup"):
-                        node.setOutsideBuildArea(True)
-                        continue
-                except IndexError:  # Happens when the extruder list is too short. We're not done building the printer in memory yet.
-                    continue
-                except TypeError:  # Happens when extruder_position is None. This object has no extruder decoration.
-                    continue
 
                 node.setOutsideBuildArea(False)
 
@@ -655,7 +646,7 @@ def _calculateExtraZClearance(self, extruders: List["ContainerStack"]) -> float:
                     extra_z = retraction_hop
         return extra_z
 
-    def _onStackChanged(self):
+    def _onStackChanged(self, *args) -> None:
         self._stack_change_timer.start()
 
     def _onStackChangeTimerFinished(self) -> None:

cura/CuraApplication.py

@@ -1300,6 +1300,7 @@ def registerObjects(self, engine):
         qmlRegisterSingletonType(CuraSceneController, "Cura", 1, 0, self.getCuraSceneController, "SceneController")
         qmlRegisterSingletonType(ExtruderManager, "Cura", 1, 0, self.getExtruderManager, "ExtruderManager")
         qmlRegisterSingletonType(MachineManager, "Cura", 1, 0, self.getMachineManager, "MachineManager")
+        qmlRegisterSingletonType(MachineErrorChecker, "Cura", 1, 0, self.getMachineErrorChecker, "MachineErrorChecker")
         qmlRegisterSingletonType(IntentManager, "Cura", 1, 6, self.getIntentManager, "IntentManager")
         qmlRegisterSingletonType(SettingInheritanceManager, "Cura", 1, 0, self.getSettingInheritanceManager, "SettingInheritanceManager")
         qmlRegisterSingletonType(SimpleModeSettingsManager, "Cura", 1, 0, self.getSimpleModeSettingsManagerWrapper, "SimpleModeSettingsManager")

cura/CuraPackageManager.py

@@ -10,6 +10,7 @@
 from UM.PluginRegistry import PluginRegistry
 from cura.CuraApplication import CuraApplication  # To find some resource types.
 from cura.Settings.GlobalStack import GlobalStack
+from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 
 from UM.PackageManager import PackageManager  # The class we're extending.
 from UM.Resources import Resources  # To find storage paths for some resource types.
@@ -123,8 +124,7 @@ def getMachinesUsingPackage(self, package_id: str) -> Tuple[List[Tuple[GlobalSta
         """
 
         ids = self.getPackageContainerIds(package_id)
-        container_stacks = self._application.getContainerRegistry().findContainerStacks()
-        global_stacks = [container_stack for container_stack in container_stacks if isinstance(container_stack, GlobalStack)]
+        global_stacks = CuraContainerRegistry.getInstance().findGlobalStacks()
         machine_with_materials = []
         machine_with_qualities = []
         for container_id in ids:

cura/Machines/ContainerTree.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-
 from UM.Job import Job  # For our background task of loading MachineNodes lazily.
 from UM.JobQueue import JobQueue  # For our background task of loading MachineNodes lazily.
 from UM.Logger import Logger
@@ -10,7 +9,7 @@
 from cura.Machines.MachineNode import MachineNode
 from cura.Settings.GlobalStack import GlobalStack  # To listen only to global stacks being added.
 
-from typing import Dict, List, Optional, TYPE_CHECKING
+from typing import Dict, List, Optional, Any, Set, TYPE_CHECKING
 import time
 
 if TYPE_CHECKING:
@@ -78,9 +77,10 @@ def getCurrentQualityChangesGroups(self) -> List["QualityChangesGroup"]:
 
     def _onStartupFinished(self) -> None:
         """Ran after completely starting up the application."""
-
-        currently_added = ContainerRegistry.getInstance().findContainerStacks()  # Find all currently added global stacks.
-        JobQueue.getInstance().add(self._MachineNodeLoadJob(self, currently_added))
+        from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
+        currently_added_stacks = CuraContainerRegistry.getInstance().findGlobalStacks()
+        definitions_ids = set([stack.definition.getId() for stack in currently_added_stacks])
+        JobQueue.getInstance().add(self._MachineNodeLoadJob(self, definitions_ids))
 
     class _MachineNodeMap:
         """Dictionary-like object that contains the machines.
@@ -153,17 +153,17 @@ class _MachineNodeLoadJob(Job):
         faster.
         """
 
-        def __init__(self, tree_root: "ContainerTree", container_stacks: List["ContainerStack"]) -> None:
+        def __init__(self, tree_root: "ContainerTree", definitions_ids: Set[str]) -> None:
             """Creates a new background task.
 
             :param tree_root: The container tree instance. This cannot be obtained through the singleton static
             function since the instance may not yet be constructed completely.
-            :param container_stacks: All of the stacks to pre-load the container trees for. This needs to be provided
-            from here because the stacks need to be constructed on the main thread because they are QObject.
+            :param definitions_ids: The IDs of all the definitions to pre-load the container trees for. This needs to be
+            provided from here because the stacks need to be constructed on the main thread because they are QObject.
             """
 
             self.tree_root = tree_root
-            self.container_stacks = container_stacks
+            self.definitions_ids: Set[str] = definitions_ids
             super().__init__()
 
         def run(self) -> None:
@@ -172,14 +172,12 @@ def run(self) -> None:
             The ``JobQueue`` will schedule this on a different thread.
             """
             Logger.log("d", "Started background loading of MachineNodes")
-            for stack in self.container_stacks:  # Load all currently-added containers.
-                if not isinstance(stack, GlobalStack):
-                    continue
+            for definition_id in self.definitions_ids:  # Load all currently-added containers.
                 # Allow a thread switch after every container.
                 # Experimentally, sleep(0) didn't allow switching. sleep(0.1) or sleep(0.2) neither.
                 # We're in no hurry though. Half a second is fine.
                 time.sleep(0.5)
-                definition_id = stack.definition.getId()
+
                 if not self.tree_root.machines.is_loaded(definition_id):
                     _ = self.tree_root.machines[definition_id]
             Logger.log("d", "All MachineNode loading completed")