[submitters] fix errors when no default submitter + skip error warnings when submitters plugins are not found

Author: Alxiice

meshroom/core/__init__.py

@@ -120,16 +120,19 @@ def loadClasses(folder: str, packageName: str, classType: type) -> list[type]:
                     else:
                         classes.append(p)
             except Exception as e:
-                tb = traceback.extract_tb(e.__traceback__)
-                last_call = tb[-1]
-                errors.append(f'  * {pluginName} ({type(e).__name__}): {e}\n'
-                              # filename:lineNumber functionName
-                              f'{last_call.filename}:{last_call.lineno} {last_call.name}\n'
-                              # line of code with the error
-                              f'{last_call.line}'
-                              # Full traceback
-                              f'\n{traceback.format_exc()}\n\n'
-                              )
+                if classType == BaseSubmitter:
+                    logging.warning(f" Could not load submitter {pluginName} from package '{package.__name__}'")
+                else:
+                    tb = traceback.extract_tb(e.__traceback__)
+                    last_call = tb[-1]
+                    errors.append(f'  * {pluginName} ({type(e).__name__}): {e}\n'
+                                # filename:lineNumber functionName
+                                f'{last_call.filename}:{last_call.lineno} {last_call.name}\n'
+                                # line of code with the error
+                                f'{last_call.line}'
+                                # Full traceback
+                                f'\n{traceback.format_exc()}\n\n'
+                                )
 
     if errors:
         logging.warning(' The following "{package}" plugins could not be loaded:\n'

meshroom/submitters/tractorSubmitter.py

@@ -443,6 +443,10 @@ def __init__(self, parent=None):
             self.environment['REZ_DEV_PACKAGES_ROOT'] = os.environ['REZ_DEV_PACKAGES_ROOT']
         if 'REZ_PROD_PACKAGES_PATH' in os.environ:
             self.environment['REZ_PROD_PACKAGES_PATH'] = os.environ['REZ_PROD_PACKAGES_PATH']
+        if 'PROD' in os.environ:
+            self.environment['PROD'] = os.environ['PROD']
+        if 'PROD_ROOT' in os.environ:
+            self.environment['PROD_ROOT'] = os.environ['PROD_ROOT']
 
     def createTask(self, meshroomFile, node):
         tags = self.DEFAULT_TAGS.copy()  # copy to not modify default tags
@@ -488,7 +492,7 @@ def submit(self, nodes, edges, filepath, submitLabel="{projectName}"):
             tags=mainTags,
             requirements={'service': str(','.join(allRequirements))},
             environment=self.environment,
-            user=os.environ.get('USER', os.environ.get('FARM_USER', getpass.getuser())),
+            user=os.environ.get('FARM_USER', os.environ.get('USER', getpass.getuser())),
         )
 
         nodeUidToTask = {}

meshroom/ui/app.py

@@ -722,11 +722,15 @@ def _submittersList(self):
             isDefault : True if this is the current submitter
         """
         submittersList = []
-        for s in meshroom.core.submitters:
+        for i, s in enumerate(meshroom.core.submitters):
             submitterName = s.name if isinstance(s, BaseSubmitter) else s
+            # If no explicit default submitter, this will be the first one
+            isDefault = (i == 0)
+            if self._defaultSubmitterName:
+                isDefault = (submitterName == self._defaultSubmitterName)
             submittersList.append({
                 "name": submitterName,
-                "isDefault": True if submitterName == self._defaultSubmitterName else False
+                "isDefault": isDefault
             })
         return submittersList
 

meshroom/ui/qml/Application.qml

@@ -979,15 +979,14 @@ Page {
                 MenuSeparator {}
                 Menu {
                     id: submitterSelectionMenu
-                    title: "Submitter selection"
+                    title: "Submitter Selection"
                     enabled: submitterItems.model !== undefined && submitterItems.model.length > 0
                     Repeater {
                         id: submitterItems
                         model: MeshroomApp.submittersListModel
                         RadioButton {
                             text: modelData["name"]
                             checked: modelData["isDefault"]
-                            // checked: MeshroomApp.submittersListModel[0]["name"] == modelData["name"]
                             onClicked: MeshroomApp.setDefaultSubmitter(modelData["name"])
                         }
                     }