From 7ea15624d3a27f2441751b463f7ef50c3d3c86bd Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:23:47 +0200
Subject: [PATCH 01/79] doc!: update cuesubmit example config file with new
 jobs syntax + help section

---
 cuesubmit/cuesubmit_config.example.yaml | 127 +++++++++++++++++++++++-
 1 file changed, 123 insertions(+), 4 deletions(-)

diff --git a/cuesubmit/cuesubmit_config.example.yaml b/cuesubmit/cuesubmit_config.example.yaml
index 0a89a9f39..90d3d123b 100644
--- a/cuesubmit/cuesubmit_config.example.yaml
+++ b/cuesubmit/cuesubmit_config.example.yaml
@@ -5,7 +5,126 @@
 
 UI_NAME : "OPENCUESUBMIT"
 SUBMIT_APP_WINDOW_TITLE : "OpenCue Submit"
-MAYA_RENDER_CMD : "Render"
-NUKE_RENDER_CMD : "nuke"
-BLENDER_RENDER_CMD : "blender"
-FRAME_TOKEN : "#IFRAME#"
+
+RENDER_CMDS:
+  Shell:
+    command: ""
+    options:
+      "{Command to run}": "\n"
+
+  Maya:
+    command: "Render"
+    options:
+      "-r {Renderer}":
+        - file
+        - default
+        - hw2
+        - sw
+        - arnold
+      "-s {Start Frame}": "#FRAME_START#"
+      "-e {End Frame}": "#FRAME_END#"
+      "{!mayaFile*}":
+          - Maya Ascii file (*.ma)
+          - Maya Binary file (*.mb)
+          - Maya file (*.ma *.mb)
+
+  Blender:
+    command: "blender"
+    options:
+      "--background~": ""
+      "-noaudio~": ""
+      "{!file*}":
+          - Blender file (*.blend)
+      "-s {Start Frame}": "#FRAME_START#"
+      "-e {End Frame}": "#FRAME_END#"
+      "-o {Output Path (Optional)*}": "//render_"
+      "-F {Output Format}": ['', 'AVIJPEG', 'AVIRAW', 'BMP', 'CINEON', 'DPX', 'EXR', 'HDR', 'IRIS', 'IRIZ',
+                   'JP2', 'JPEG', 'MPEG', 'MULTILAYER', 'PNG', 'RAWTGA', 'TGA', 'TIFF']
+
+  Nuke:
+    command: "nuke"
+    options:
+      "-X {!Write Nodes}": ""
+      "-F {Frame Range}": "#FRAME_START#-#FRAME_END#"
+      "-x {!Nuke File}":
+        - Nuke Script File (*.nk)
+
+  Isolated Job Example:
+    config_file: "$MAYA_JOB_CONFIG_FILE"
+
+
+Help: >
+  RENDER_CMDS section describes custom job types that will appear in the UI
+  There are 2 ways to declare a job:
+   - directly in the list
+   - from a separate config file (yaml)
+  You can use environment variables to define paths
+  
+  1) To configure a job directly:
+    Command name:
+      command: "path/to/executable"
+      options:
+        "-strFlag": "default value"
+        "-strFlagB {Nice Name}": "default value"
+        "-boolFlag": false
+        "-intFlag": 10
+                    # Creates a slider from 0 to 999
+        "-intRange": [0, 5, 3]
+                    #[min, max, default]
+        "-floatRange": [0, 1, 0.5, 2]
+                      #[min, max, default, float_precision]
+        "-choiceList":
+          -choiceA
+          -choiceB
+        "-browsableFolder {Output Folder/}": ""
+        "-anyBrowsableFile {Any File*}": ""
+        "-filteredBrowsableFile {Maya File*}":
+          - Maya Ascii file (*.ma)
+          - Maya Binary file (*.mb)
+          - Maya file (*.ma *.mb)
+        "{No flag argument}": ""
+        "{!Mandatory argument}": ""
+        "-hiddenFlag~": ""
+    
+    Note:
+     - arguments order is respected
+     - flags can have double dash (--background)
+     - Syntax:
+  
+     "-flagName"
+       command uses `-flagName`
+       UI displays `-flagName`
+  
+     "-flagName {Nice Name}"
+       command uses `-flagName`
+       UI displays `Nice Name`
+  
+     "{Nice Name}"
+       command uses blank space (no flag)
+       UI displays `Nice Name`
+  
+     "-flagName~"
+       command uses '-flagName'
+       the widget is hidden
+  
+     "-f {Frame}": "#IFRAME#"
+       command uses '-f #IFRAME#'
+       the widget is hidden (with any opencue token)
+  
+     "{Nice Name}": "\n"
+       Creates a multiline widget
+  
+     To make string browsable, use:
+       "{Nice Name/}" for folders
+       "{Nice Name*}" for files
+  
+     To make an option mandatory, use:
+       "{!Nice Name}"
+       UI will make it red if empty
+  
+  2) To load a command from another config_file:
+    Command Name:
+      config_file: "path/to/command/config.yaml"
+    
+    Note:
+      see cuesubmit_isolated_job_config.example.yaml
\ No newline at end of file

From 14a0385d8f129703d58fa1b471df40fab0dafba8 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:24:37 +0200
Subject: [PATCH 02/79] doc!: add a cuesubmit isolated example config file

---
 .../cuesubmit_isolated_job_config.example.yaml   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 cuesubmit/cuesubmit_isolated_job_config.example.yaml

diff --git a/cuesubmit/cuesubmit_isolated_job_config.example.yaml b/cuesubmit/cuesubmit_isolated_job_config.example.yaml
new file mode 100644
index 000000000..394a74c02
--- /dev/null
+++ b/cuesubmit/cuesubmit_isolated_job_config.example.yaml
@@ -0,0 +1,16 @@
+#Isolated Maya command example:
+command: "Render"
+options:
+  "-cam {!camera}": "persp"
+  "-s {startFrame}": "#FRAME_START#"
+  "-e {endFrame}": "#FRAME_END#"
+  "-log {logLevel}": [0, 5, 3]
+  "-renderer {engine}":
+      - arnold
+      - default
+      - hw2
+      - sw
+  "{!mayaFile*}":
+      - Maya Ascii file (*.ma)
+      - Maya Binary file (*.mb)
+      - Maya file (*.ma *.mb)
\ No newline at end of file

From d761fac744f7dfddc0912c3e9722686f3825808d Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:25:25 +0200
Subject: [PATCH 03/79] feat: add `notEmptyString` validator

---
 cuesubmit/cuesubmit/Validators.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cuesubmit/cuesubmit/Validators.py b/cuesubmit/cuesubmit/Validators.py
index 540f92e21..b4a1a13a8 100644
--- a/cuesubmit/cuesubmit/Validators.py
+++ b/cuesubmit/cuesubmit/Validators.py
@@ -70,3 +70,8 @@ def moreThan3Chars(value):
     if len(value) >= 3:
         return True
     return False
+def notEmptyString(value):
+    """String must contain at least 1 character."""
+    if len(value) == 0:
+        return False
+    return True

From 72adc3d79397f22e4afbbd976b74f3aafb528167 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:34:29 +0200
Subject: [PATCH 04/79] feat: extract yaml loading to a function and add one to
 expand any sub `config_file` + error handling

---
 cuesubmit/cuesubmit/Config.py | 56 ++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/cuesubmit/cuesubmit/Config.py b/cuesubmit/cuesubmit/Config.py
index 3bfb443a7..d2906d9a2 100644
--- a/cuesubmit/cuesubmit/Config.py
+++ b/cuesubmit/cuesubmit/Config.py
@@ -35,19 +35,59 @@
 
 def getConfigValues():
     """Reads the config file from disk and returns the values it defines."""
-    configData = {}
     configFile = os.environ.get(CONFIG_FILE_ENV_VAR)
     if not configFile:
         configFile = os.path.join(opencue.config.config_base_directory(), 'cuesubmit.yaml')
-    if os.path.exists(configFile):
-        with open(configFile, 'r', encoding='utf-8') as data:
-            try:
-                configData = yaml.load(data, Loader=yaml.SafeLoader)
-            except yaml.YAMLError:
-                raise CuesubmitConfigError("Could not load yaml file: {}. Please check its "
-                                           "formatting".format(configFile))
+    configData = _loadYamlFile(yaml_file=configFile)
+    if 'RENDER_CMDS' in configData:
+        # look for any sub-config files and load them
+        configData['RENDER_CMDS'] = _expandRenderConfigValues(configData['RENDER_CMDS'])
     return configData
 
 
+def _loadYamlFile(yaml_file):
+    """ Load config yaml as dict
+    :param yaml_file: path to a config.yaml file (path can be an env var)
+    :type yaml_file: str
+    :returns: yaml content
+    :rtype: dict
+    """
+    _yaml_file = os.path.expandvars(yaml_file)
+    if not os.path.exists(_yaml_file):
+        raise FileExistsError(f'{_yaml_file=} not found')
+    config_data = {}
+    with open(_yaml_file, 'r') as data:
+        try:
+            config_data = yaml.load(data, Loader=yaml.SafeLoader)
+        except yaml.YAMLError:
+            raise CuesubmitConfigError("Could not load yaml file: {}. Please check its "
+                                       "formatting".format(_yaml_file))
+    return config_data
+
+
+def _expandRenderConfigValues(RENDER_CMDS):
+    """ Looks through each render command and loads their 'config_file' if any
+    If 'config_file' is set but does not exist, replace its content with error for proper feedback
+
+    :param RENDER_CMDS: all render commands from the cuesubmit_config.yaml file
+    :type RENDER_CMDS: dict
+    :returns: Updated RENDER_CMDS
+    :rtype: dict
+    """
+    for job_type, _options in RENDER_CMDS.items():
+        _sub_config_file = _options.get('config_file')
+        if not _sub_config_file:
+            continue
+        try:
+            RENDER_CMDS[job_type] = _loadYamlFile(yaml_file=_sub_config_file)
+        except FileExistsError as error:
+            RENDER_CMDS[job_type] = {
+                'command': 'error',
+                'options': {
+                    '{ERROR}': error}
+            }
+    return RENDER_CMDS
+
+
 class CuesubmitConfigError(Exception):
     """Thrown when an error occurs reading the config file."""

From 959613dec1a4e0b14c50cae04c809737b86ca195 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:35:55 +0200
Subject: [PATCH 05/79] feat: load RENDER_CMDS in Constants

---
 cuesubmit/cuesubmit/Constants.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/Constants.py b/cuesubmit/cuesubmit/Constants.py
index 89bbbea51..aee7a2b8b 100644
--- a/cuesubmit/cuesubmit/Constants.py
+++ b/cuesubmit/cuesubmit/Constants.py
@@ -36,6 +36,8 @@
 MAYA_RENDER_CMD = config.get('MAYA_RENDER_CMD', 'Render')
 NUKE_RENDER_CMD = config.get('NUKE_RENDER_CMD', 'nuke')
 BLENDER_RENDER_CMD = config.get('BLENDER_RENDER_CMD', 'blender')
+RENDER_CMDS = config.get('RENDER_CMDS', {})
+
 FRAME_TOKEN = config.get('FRAME_TOKEN', '#IFRAME#')
 FRAME_START_TOKEN = config.get('FRAME_START', '#FRAME_START#')
 FRAME_END_TOKEN = config.get('FRAME_END', '#FRAME_END#')
@@ -62,7 +64,6 @@
 NUKE_FILE_FILTERS = ['Nuke script file (*.nk)']
 BLENDER_FILE_FILTERS = ['Blender file (*.blend)']
 
-
 BLENDER_FORMATS = ['', 'AVIJPEG', 'AVIRAW', 'BMP', 'CINEON', 'DPX', 'EXR', 'HDR', 'IRIS', 'IRIZ',
                    'JP2', 'JPEG', 'MPEG', 'MULTILAYER', 'PNG', 'RAWTGA', 'TGA', 'TIFF']
 BLENDER_OUTPUT_OPTIONS_URL = \

From f26d5ca82c594351015ce9a9ffc7cc550ca31ddd Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:39:16 +0200
Subject: [PATCH 06/79] feat: add regex to get opencue tokens

---
 cuesubmit/cuesubmit/Constants.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cuesubmit/cuesubmit/Constants.py b/cuesubmit/cuesubmit/Constants.py
index aee7a2b8b..be7699669 100644
--- a/cuesubmit/cuesubmit/Constants.py
+++ b/cuesubmit/cuesubmit/Constants.py
@@ -69,6 +69,8 @@
 BLENDER_OUTPUT_OPTIONS_URL = \
     'https://docs.blender.org/manual/en/latest/advanced/command_line/arguments.html#render-options'
 
+REGEX_CUETOKEN = r'^#.*#$' #FRAME_START#
+
 DIR_PATH = os.path.dirname(__file__)
 
 # Dropdown label to specify the default Facility, i.e. let Cuebot decide.

From 195091ffc17360cb6c415c4651409917b4fb88c3 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:39:59 +0200
Subject: [PATCH 07/79] feat: add regex to parse options from the cuesubmit
 config file

---
 cuesubmit/cuesubmit/Constants.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cuesubmit/cuesubmit/Constants.py b/cuesubmit/cuesubmit/Constants.py
index be7699669..2f8f5d52f 100644
--- a/cuesubmit/cuesubmit/Constants.py
+++ b/cuesubmit/cuesubmit/Constants.py
@@ -70,6 +70,14 @@
     'https://docs.blender.org/manual/en/latest/advanced/command_line/arguments.html#render-options'
 
 REGEX_CUETOKEN = r'^#.*#$' #FRAME_START#
+REGEX_COMMAND_OPTIONS = (r'(?P<command_flag>-+\w*)?'   # -optionFlag
+                         r'(?P<hidden>\~)?'            # -hiddenFlag~
+                         r'\s?'
+                         r'({'
+                           r'(?P<mandatory>\!)?'      # {!Mandatory argument}
+                           r'(?P<label>[^{}\*\/\!]+)' # {Nice name}
+                           r'(?P<browsable>\*?\/?)'   # {browseFile*} or {browseFolder/}
+                         r'})?')
 
 DIR_PATH = os.path.dirname(__file__)
 

From 0d375d2626f7c1c303dc34a76886c949f69cc3ac Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:41:36 +0200
Subject: [PATCH 08/79] feat: add `convertCommandOptions()` to parse command
 options from the config file

---
 cuesubmit/cuesubmit/Util.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index 1b25da8ef..a088f8927 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -60,3 +60,39 @@ def getFacilities(allocations):
     default_facilities = [Constants.DEFAULT_FACILITY_TEXT]
     facilities = set(alloc.data.facility for alloc in allocations)
     return default_facilities + list(facilities)
+
+def convertCommandOptions(options):
+    """ Parse command options from the config file and return parameters to feed the UI (name, type, value)
+
+    :param options: All options for a given command (ex:{"-flag {Nice Name}": "default_value"})
+    :type options: dict
+    :return: list of dict of parameters
+    """
+    import re
+    parameters = []
+    for option_line, value in options.items():
+        parse_option = re.search(Constants.REGEX_COMMAND_OPTIONS,
+                                 option_line)
+        options = {
+            'option_line': option_line,
+            'label': parse_option.group('label'),
+            'command_flag': parse_option.group('command_flag'),
+            'value': value,
+            'type': type(value),
+            'hidden': bool(parse_option.group('hidden'))
+                      or re.match(Constants.REGEX_CUETOKEN, str(value)),
+            'mandatory': bool(parse_option.group('mandatory')),
+            'browsable': parse_option.group('browsable'),
+            }
+        if isinstance(value, (tuple, list))\
+                and len(value) in (3, 4)\
+                and isinstance(value[0], (int, float)):
+            options.update({
+                'type': range,
+                'min': value[0],
+                'max': value[1],
+                'value': value[2],
+                'float_precision': value[3] if len(value)==4 else None
+                })
+        parameters.append(options)
+    return parameters
\ No newline at end of file

From da98b0450558063f5a662b75cf7daf755b12db72 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:43:18 +0200
Subject: [PATCH 09/79] feat: Append jobs from the config file to `JobTypes`

---
 cuesubmit/cuesubmit/JobTypes.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cuesubmit/cuesubmit/JobTypes.py b/cuesubmit/cuesubmit/JobTypes.py
index 3c867b921..ce152c1b6 100644
--- a/cuesubmit/cuesubmit/JobTypes.py
+++ b/cuesubmit/cuesubmit/JobTypes.py
@@ -24,6 +24,7 @@
 
 from builtins import object
 from cuesubmit.ui import SettingsWidgets
+from cuesubmit import Constants
 
 
 class JobTypes(object):
@@ -36,6 +37,7 @@ class JobTypes(object):
     MAYA = 'Maya'
     NUKE = 'Nuke'
     BLENDER = 'Blender'
+    FROM_CONFIG = Constants.RENDER_CMDS.keys()
 
     SETTINGS_MAP = {
         SHELL: SettingsWidgets.ShellSettings,
@@ -43,6 +45,7 @@ class JobTypes(object):
         NUKE: SettingsWidgets.BaseNukeSettings,
         BLENDER: SettingsWidgets.BaseBlenderSettings,
     }
+    SETTINGS_MAP.update(Constants.RENDER_CMDS)
 
     def __init__(self):
         pass

From 47ac2ef3fd8ca8eaf5b625529a575c9274e811e3 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:44:37 +0200
Subject: [PATCH 10/79] feat: return JobTypes.types dynamically

---
 cuesubmit/cuesubmit/JobTypes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/JobTypes.py b/cuesubmit/cuesubmit/JobTypes.py
index ce152c1b6..6eb6818c6 100644
--- a/cuesubmit/cuesubmit/JobTypes.py
+++ b/cuesubmit/cuesubmit/JobTypes.py
@@ -57,5 +57,5 @@ def build(cls, jobType, *args, **kwargs):
 
     @classmethod
     def types(cls):
-        """return a list of types available."""
-        return [cls.SHELL, cls.MAYA, cls.NUKE, cls.BLENDER]
+        """return a list of available types."""
+        return list(cls.SETTINGS_MAP.keys())

From 6feddc314f4187164f4cac8bf6beb4deb3d06089 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:06:36 +0200
Subject: [PATCH 11/79] feat: Associate `DynamicSettingsWidget` to all jobs
 from the config file

---
 cuesubmit/cuesubmit/JobTypes.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/JobTypes.py b/cuesubmit/cuesubmit/JobTypes.py
index 6eb6818c6..c249be8bc 100644
--- a/cuesubmit/cuesubmit/JobTypes.py
+++ b/cuesubmit/cuesubmit/JobTypes.py
@@ -37,7 +37,7 @@ class JobTypes(object):
     MAYA = 'Maya'
     NUKE = 'Nuke'
     BLENDER = 'Blender'
-    FROM_CONFIG = Constants.RENDER_CMDS.keys()
+    FROM_CONFIG_FILE = Constants.RENDER_CMDS.keys()
 
     SETTINGS_MAP = {
         SHELL: SettingsWidgets.ShellSettings,
@@ -45,7 +45,8 @@ class JobTypes(object):
         NUKE: SettingsWidgets.BaseNukeSettings,
         BLENDER: SettingsWidgets.BaseBlenderSettings,
     }
-    SETTINGS_MAP.update(Constants.RENDER_CMDS)
+    for jobType in FROM_CONFIG_FILE:
+        SETTINGS_MAP[jobType] = SettingsWidgets.DynamicSettingsWidget
 
     def __init__(self):
         pass

From 03c08b6ad5ee64cde0937b9aee2a0a32cffa79b7 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:07:29 +0200
Subject: [PATCH 12/79] feat: Convert custom commands options and pass them to
 the `DynamicSettingsWidget`

---
 cuesubmit/cuesubmit/JobTypes.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/JobTypes.py b/cuesubmit/cuesubmit/JobTypes.py
index c249be8bc..184a889f0 100644
--- a/cuesubmit/cuesubmit/JobTypes.py
+++ b/cuesubmit/cuesubmit/JobTypes.py
@@ -25,7 +25,7 @@
 from builtins import object
 from cuesubmit.ui import SettingsWidgets
 from cuesubmit import Constants
-
+from cuesubmit import Util
 
 class JobTypes(object):
     """Base Job Types available in the UI.
@@ -54,6 +54,11 @@ def __init__(self):
     @classmethod
     def build(cls, jobType, *args, **kwargs):
         """Factory method for creating a settings widget."""
+        if jobType in cls.FROM_CONFIG_FILE:
+            jobOptions = Constants.RENDER_CMDS[jobType].get('options')
+            parameters = Util.convertCommandOptions(options=jobOptions)
+            kwargs.update({'tool_name': jobType,
+                           'parameters': parameters})
         return cls.SETTINGS_MAP[jobType](*args, **kwargs)
 
     @classmethod

From 2c2bf7a6c60ae46d1c2d8ad25da0f1ded6cffcf9 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:08:07 +0200
Subject: [PATCH 13/79] test: add validator test `testNotEmptyString`

---
 cuesubmit/tests/Validators_tests.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cuesubmit/tests/Validators_tests.py b/cuesubmit/tests/Validators_tests.py
index 0a5ef78eb..acbb7c538 100644
--- a/cuesubmit/tests/Validators_tests.py
+++ b/cuesubmit/tests/Validators_tests.py
@@ -30,6 +30,7 @@
                                 matchNumbersOnly,
                                 matchPositiveIntegers,
                                 moreThan3Chars,
+                                notEmptyString,
 )
 
 
@@ -103,6 +104,13 @@ def testMoreThan3Chars(self):
         self.assertFalse(moreThan3Chars(''))
 
         self.assertRaises(TypeError, moreThan3Chars, None)
+    def testNotEmptyString(self):
+        self.assertTrue(notEmptyString('abcd'))
+        self.assertTrue(notEmptyString('1234'))
+        self.assertTrue(notEmptyString('    '))
+        self.assertTrue(notEmptyString('abc'))
+        self.assertFalse(notEmptyString(''))
+        self.assertRaises(TypeError, notEmptyString, None)
 
 if __name__ == '__main__':
     unittest.main()

From eef22bd2e207e6dc16b5373246e4128cf0ed1fb8 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:16:52 +0200
Subject: [PATCH 14/79] feat: Add function to build command line for jobs from
 the config file + companion functions

---
 cuesubmit/cuesubmit/Submission.py | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index dc5e64d0f..5fedda91f 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -31,6 +31,43 @@
 from cuesubmit import JobTypes
 
 
+def isSoloFlag(flag):
+    """ Check if the flag is solo, meaning it has no associated value
+     solo flags are marked with a ~ (ex: --background~)
+     """
+    return re.match('^-+\w+~$', flag)
+
+def isFlag(flag):
+    """ Check if the provided string is a flag (starts with a -)"""
+    return re.match('^-+\w+$', flag)
+
+def formatValue(flag, value, isPath, isMandatory):
+    """ Adds quotes around file/folder path variables
+     and provide an error value to display for missing mandatory values.
+    """
+    if isPath and value:
+        value = f'"{value}"'
+    if isMandatory and value in ('', None):
+        value = f'!!missing value for {flag}!!'
+    return value
+
+def buildDynamicCmd(layerData):
+    """From a layer, builds a customized render command."""
+    renderCommand = Constants.RENDER_CMDS[layerData.layerType].get('command')
+    for (flag, isPath, isMandatory), value in layerData.cmd.items():
+        if isSoloFlag(flag):
+            renderCommand += f' {flag[:-1]}'
+            continue
+        value = formatValue(flag, value, isPath, isMandatory)
+        if isFlag(flag):
+            # flag and value
+            renderCommand += f' {flag} {value}'
+            continue
+        # solo argument without flag
+        renderCommand += f' {value}'
+
+    return renderCommand
+
 def buildMayaCmd(layerData, silent=False):
     """From a layer, builds a Maya Render command."""
     camera = layerData.cmd.get('camera')

From 4ac65a7934f44b6603faecca927ca52958b8c7a9 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:21:48 +0200
Subject: [PATCH 15/79] feat: same optimisation as PR #1283 + recognize type
 from config files

---
 cuesubmit/cuesubmit/Submission.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index 5fedda91f..68c8c8823 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -151,7 +151,9 @@ def buildLayer(layerData, command, lastLayer=None):
 
 def buildLayerCommand(layerData, silent=False):
     """Builds the command to be sent per jobType"""
-    if layerData.layerType == JobTypes.JobTypes.MAYA:
+    if layerData.layerType in JobTypes.JobTypes.FROM_CONFIG_FILE:
+        command = buildDynamicCmd(layerData)
+    elif layerData.layerType == JobTypes.JobTypes.MAYA:
         command = buildMayaCmd(layerData, silent)
     elif layerData.layerType == JobTypes.JobTypes.SHELL:
         command = layerData.cmd.get('commandTextBox') if silent else layerData.cmd['commandTextBox']

From 3ccea488477dd94625307153e409fa6a04eeea60 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:26:39 +0200
Subject: [PATCH 16/79] feat: add `signals`, `getter` and `setter` attributes
 on `CueCommandWidget` used in `DynamicSettingsWidget`

---
 cuesubmit/cuesubmit/ui/Command.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cuesubmit/cuesubmit/ui/Command.py b/cuesubmit/cuesubmit/ui/Command.py
index ac0afb1a6..c57ccc7ce 100644
--- a/cuesubmit/cuesubmit/ui/Command.py
+++ b/cuesubmit/cuesubmit/ui/Command.py
@@ -36,6 +36,9 @@ def __init__(self, parent=None):
         super(CueCommandWidget, self).__init__(parent)
         self.commandTextBox = CueCommandTextBox(None)
         self.contentLayout.addWidget(self.commandTextBox)
+        self.signals = [self.textChanged]
+        self.getter = self.text
+        self.setter = self.setText
         self.setupConnections()
 
     def setupConnections(self):

From 3e603892d176667f14e29505afaf574ec4540aa1 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:27:18 +0200
Subject: [PATCH 17/79] feat: add `signals`, `getter` and `setter` attributes
 on `CueLabelLineEdit` used in `DynamicSettingsWidget`

---
 cuesubmit/cuesubmit/ui/Widgets.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index fb16400a9..3fefa6057 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -58,6 +58,9 @@ def __init__(self, labelText=None, defaultText='', tooltip=None, validators=None
         self.browseButton = QtWidgets.QPushButton(text='Browse')
         self.horizontalLine = CueHLine()
         self.validators = validators or []
+        self.signals = [self.lineEdit.textChanged,
+                        self.lineEdit.focusChange]
+        self.getter = self.lineEdit.text
         self.setter = self.setText
         self.setupUi()
         self.setupConnections()

From fd924ad667221bf6894ea8ef94653a715ae21650 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:32:37 +0200
Subject: [PATCH 18/79] feat: add `signals`, `getter` and `setter` attributes
 on `CueSelectPullDown` used in `DynamicSettingsWidget`

---
 cuesubmit/cuesubmit/ui/Widgets.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 3fefa6057..bf8cf01a5 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -225,6 +225,9 @@ def __init__(
         self.optionsMenu = QtWidgets.QMenu(self)
         self.optionsMenu.setStyleSheet(Style.PULLDOWN_LIST)
         self.setOptions(options)
+        self.signals = [self.optionsMenu.triggered]
+        self.getter = self.text
+        self.setter = self.setText
         if self.multiselect:
             self.toolButton.setText(self.emptyText)
         else:

From a254c9a28c7c36dcd9cefab17f648ce217be6920 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:42:10 +0200
Subject: [PATCH 19/79] feat: update `setter` attribute on `CueSelectPulldown`
 and add a function `setCheckedFromText`

---
 cuesubmit/cuesubmit/ui/Widgets.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index bf8cf01a5..01970c612 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -227,7 +227,7 @@ def __init__(
         self.setOptions(options)
         self.signals = [self.optionsMenu.triggered]
         self.getter = self.text
-        self.setter = self.setText
+        self.setter = self.setCheckedFromText
         if self.multiselect:
             self.toolButton.setText(self.emptyText)
         else:
@@ -286,6 +286,16 @@ def setChecked(self, actionNames):
                 self.optionsMenu.actions()[0].setChecked(True)
         self.updateLabelText()
 
+    def setCheckedFromText(self, actionsAstext):
+        """Set the given actionNames to be checked and update the label.
+        @type actionNames: str
+        @param actionNames: list of action names to set to checked separated by a comma and a space
+        """
+        if ', ' in text and self.multiselect:
+            self.setChecked(actionsAstext.split(', '))
+        else:
+            self.setChecked([actionsAstext])
+
     def text(self):
         """Return the tool button's current text value.
         @rtype: str

From e15233601b87701b4022fd09077725a920cac5e7 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:43:03 +0200
Subject: [PATCH 20/79] feat: add `signals`, `getter` and `setter` attributes
 on `CueLabelToggle` used in `DynamicSettingsWidget`

---
 cuesubmit/cuesubmit/ui/Widgets.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 01970c612..a57f24e97 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -429,6 +429,9 @@ def __init__(self, label=None, parent=None):
         self.label.setMinimumWidth(120)
         self.label.setAlignment(QtCore.Qt.AlignVCenter)
         self.toggle = CueToggle(parent=self)
+        self.signals = [self.toggle.valueChanged]
+        self.getter = self.toggle.value
+        self.setter = self.toggle.setValue
         self.setupUi()
         self.setupConnections()
 

From 17bc8d24b6ccc90281930bb061d4000dba82f637 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:55:39 +0200
Subject: [PATCH 21/79] feat!: add default value to `CueLabelToggle`

---
 cuesubmit/cuesubmit/ui/Widgets.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index a57f24e97..b2abebc62 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -422,13 +422,14 @@ class CueLabelToggle(QtWidgets.QWidget):
     actionTriggered = QtCore.Signal(int)
     rangeChanged = QtCore.Signal(int, int)
 
-    def __init__(self, label=None, parent=None):
+    def __init__(self, label=None, parent=None, default_value=False):
         super(CueLabelToggle, self).__init__(parent=parent)
         self.mainLayout = QtWidgets.QHBoxLayout()
         self.label = QtWidgets.QLabel(label, parent=self)
         self.label.setMinimumWidth(120)
         self.label.setAlignment(QtCore.Qt.AlignVCenter)
         self.toggle = CueToggle(parent=self)
+        self.toggle.setValue(default_value)
         self.signals = [self.toggle.valueChanged]
         self.getter = self.toggle.value
         self.setter = self.toggle.setValue

From 3bc307c0829223391d0eff1dc0fab8f8132c9b10 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 22:57:01 +0200
Subject: [PATCH 22/79] fix: test string widget during init, showing missing
 fields in red from the beginning

---
 cuesubmit/cuesubmit/ui/Widgets.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index b2abebc62..7f1301553 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -65,6 +65,7 @@ def __init__(self, labelText=None, defaultText='', tooltip=None, validators=None
         self.setupUi()
         self.setupConnections()
         self.setAutoFillBackground(True)
+        self.validateText()
 
     def setupUi(self):
         """Creates the widget layout."""

From 46ea2d87543e3df979e204731384250255ea7932 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 23:05:07 +0200
Subject: [PATCH 23/79] fix: skip optional options if they have no value

---
 cuesubmit/cuesubmit/Submission.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index 68c8c8823..015d2ef65 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -59,12 +59,13 @@ def buildDynamicCmd(layerData):
             renderCommand += f' {flag[:-1]}'
             continue
         value = formatValue(flag, value, isPath, isMandatory)
-        if isFlag(flag):
+        if isFlag(flag) and value not in ('', None):
             # flag and value
             renderCommand += f' {flag} {value}'
             continue
         # solo argument without flag
-        renderCommand += f' {value}'
+        if value not in ('', None):
+            renderCommand += f' {value}'
 
     return renderCommand
 

From 5d774b3aa7ef15bda6895fb8d9b9a747bc61bca4 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 23:38:40 +0200
Subject: [PATCH 24/79] fix: setChecked function was not receiving the right
 data type

---
 cuesubmit/cuesubmit/ui/Widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 7f1301553..28d426f50 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -232,7 +232,7 @@ def __init__(
         if self.multiselect:
             self.toolButton.setText(self.emptyText)
         else:
-            self.setChecked(options[0])
+            self.setChecked([options[0]])
         self.setupUi()
         self.setupConnections()
 

From dfb220dc7a23140568be39f65009246eeda7aa20 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 23:56:10 +0200
Subject: [PATCH 25/79] fix: change `FileExistsError` to a proper
 `FileNotFoundError`

---
 cuesubmit/cuesubmit/Config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/Config.py b/cuesubmit/cuesubmit/Config.py
index d2906d9a2..b68761120 100644
--- a/cuesubmit/cuesubmit/Config.py
+++ b/cuesubmit/cuesubmit/Config.py
@@ -54,7 +54,7 @@ def _loadYamlFile(yaml_file):
     """
     _yaml_file = os.path.expandvars(yaml_file)
     if not os.path.exists(_yaml_file):
-        raise FileExistsError(f'{_yaml_file=} not found')
+        raise FileNotFoundError(f'{_yaml_file=} not found')
     config_data = {}
     with open(_yaml_file, 'r') as data:
         try:
@@ -80,7 +80,7 @@ def _expandRenderConfigValues(RENDER_CMDS):
             continue
         try:
             RENDER_CMDS[job_type] = _loadYamlFile(yaml_file=_sub_config_file)
-        except FileExistsError as error:
+        except FileNotFoundError as error:
             RENDER_CMDS[job_type] = {
                 'command': 'error',
                 'options': {

From 7e6846c87983be029bd235ec60992e08cddda920 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Tue, 28 Mar 2023 23:59:39 +0200
Subject: [PATCH 26/79] feat: add `DynamicSettingsWidget`

---
 cuesubmit/cuesubmit/ui/SettingsWidgets.py | 120 ++++++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/cuesubmit/cuesubmit/ui/SettingsWidgets.py b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
index d3062c594..053b09794 100644
--- a/cuesubmit/cuesubmit/ui/SettingsWidgets.py
+++ b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
@@ -20,11 +20,15 @@
 from __future__ import division
 from __future__ import absolute_import
 
+from collections import OrderedDict
+
 from qtpy import QtCore, QtWidgets
 
 from cuesubmit import Constants
+from cuesubmit import Validators
 from cuesubmit.ui import Command
 from cuesubmit.ui import Widgets
+from cuesubmit.ui import Style
 
 
 class BaseSettingsWidget(QtWidgets.QWidget):
@@ -261,3 +265,119 @@ def getCommandData(self):
             'outputPath': self.outputPath.text(),
             'outputFormat': self.outputSelector.text()
         }
+
+class DynamicSettingsWidget(BaseSettingsWidget):
+    """Dynamic settings widget to be used with the cuesubmit_config.yaml file.
+    See `buildDynamicWidgets` for the widgets creation
+    """
+
+    def __init__(self, parent=None, tool_name=None, parameters=None, *args, **kwargs):
+        super(DynamicSettingsWidget, self).__init__(parent=parent)
+        self.groupBox.setTitle(f'{tool_name} options')
+        self.widgets = buildDynamicWidgets(parameters)
+        self.setupUi()
+        self.setupConnections()
+
+    def setupUi(self):
+        """Creates the custom widget layout."""
+        for eachWidget in self.widgets:
+            self.groupLayout.addWidget(eachWidget)
+
+    def setupConnections(self):
+        """Sets up widget signals."""
+        for eachWidget in self.widgets:
+            for eachSignal in eachWidget.signals:
+                if isinstance(eachWidget, Command.CueCommandWidget):
+                    eachSignal.connect(lambda: self.dataChanged.emit(None))
+                    continue
+                eachSignal.connect(self.dataChanged.emit)
+
+    def setCommandData(self, commandData):
+        """ Pass command data to each widget """
+        for eachWidget in self.widgets:
+            eachWidget.setter(commandData.get(eachWidget.command_id))
+
+    def getCommandData(self):
+        """ Query each widget's data """
+        options = OrderedDict()
+        for eachWidget in self.widgets:
+            options[eachWidget.command_id] = eachWidget.getter()
+        return options
+
+def buildDynamicWidgets(parameters):
+    """ Associates a widget to each parameter type
+    :param parameters: list of parameters (see Util.convertCommandOptions())
+    :type parameters: list<dict>
+    :returns: all newly created widgets
+    :rtype: list<QWidget>
+    """
+    widgets = []
+    for option in parameters:
+        label = option.get('label') or option.get('command_flag')
+        validators = None
+        if option.get('mandatory'):
+            validators = [Validators.notEmptyString]
+
+        if option['type'] is FileNotFoundError:
+            widget = Widgets.CueLabelLineEdit( labelText='Error:' )
+            widget.greyOut()
+            widget.setText(str(option.get('value')))
+            widget.label.setStyleSheet(Style.INVALID_TEXT)
+
+        elif option['type'] in (range, int):
+            widget = Widgets.CueLabelSlider(label=f'{label}:',
+                                            default_value=option.get('value', 0),
+                                            min_value=option.get('min', 0),
+                                            max_value=option.get('max', 999),
+                                            float_precision=option.get('float_precision'))
+
+        elif option['type'] == bool:
+            widget = Widgets.CueLabelToggle(label=f'{label}:',
+                                            default_value=option.get('value', False))
+
+        elif option.get('browsable'):
+            default_text = option['value']
+            if isinstance(option['value'], (list, tuple)):
+                default_text = ''
+            widget = Widgets.CueLabelLineEdit(labelText=f'{label}:',
+                                              defaultText=default_text,
+                                              validators=validators)
+            # Folder browser (ex: outputFolder/)
+            if option.get('browsable') == '/':
+                widget.setFolderBrowsable()
+            # File browser (ex: sceneFile*)
+            elif option.get('browsable') == '*':
+                widget.setFileBrowsable(fileFilter=option['value'])
+
+        elif option['type'] == str:
+            if option['value'] == '\n':
+                widget = Command.CueCommandWidget()
+            else:
+                widget = Widgets.CueLabelLineEdit(labelText=f'{label}:',
+                                                  defaultText=option.get('value', ''),
+                                                  validators=validators)
+            # Hide widgets containing opencue tokens (#IFRAME#, etc..) or solo flags
+            if option['hidden']:
+                widget.setDisabled(True)
+                widget.setHidden(True)
+
+        elif option['type'] in (list, tuple):
+            _options = option.get('value', ['No options'])
+            widget = Widgets.CueSelectPulldown(labelText=f'{label}:',
+                                               options=_options,
+                                               multiselect=False)
+        else:
+            continue
+
+        # Register widget common attributes
+        widget.mandatory = option.get('mandatory')
+        widget.default_value = option['value']
+        widget.command_flag = option.get('command_flag') # can be None for non flagged options
+        # command_id 3-tuple is used in Submission.buildDynamicCmd()
+        # it contains (flag, isPath, isMandatory)
+        widget.command_id = (option.get('command_flag') or option['option_line'],
+                             bool(option.get('browsable')),
+                             bool(option.get('mandatory')))
+        widgets.append(widget)
+
+    return widgets

From b9aa0e2fdb34934d6aea10bb020506993a16c29e Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Wed, 29 Mar 2023 00:09:22 +0200
Subject: [PATCH 27/79] fix: return early, passing tests when no config file is
 there

---
 cuesubmit/cuesubmit/Config.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/Config.py b/cuesubmit/cuesubmit/Config.py
index b68761120..bcfac61e3 100644
--- a/cuesubmit/cuesubmit/Config.py
+++ b/cuesubmit/cuesubmit/Config.py
@@ -35,9 +35,11 @@
 
 def getConfigValues():
     """Reads the config file from disk and returns the values it defines."""
-    configFile = os.environ.get(CONFIG_FILE_ENV_VAR)
+    configFile = os.environ.get(CONFIG_FILE_ENV_VAR)\
+                 or os.path.join(opencue.config.config_base_directory(),
+                                 'cuesubmit.yaml')
     if not configFile:
-        configFile = os.path.join(opencue.config.config_base_directory(), 'cuesubmit.yaml')
+        return {}
     configData = _loadYamlFile(yaml_file=configFile)
     if 'RENDER_CMDS' in configData:
         # look for any sub-config files and load them

From cb08c881483e42c5b1b5a0740bff11a403c37f33 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Wed, 29 Mar 2023 00:50:38 +0200
Subject: [PATCH 28/79] test: add 2 tests for sub config files when using
 RENDER_CMDS

---
 cuesubmit/tests/Config_tests.py | 46 +++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/cuesubmit/tests/Config_tests.py b/cuesubmit/tests/Config_tests.py
index 749d3e098..5530abfdd 100644
--- a/cuesubmit/tests/Config_tests.py
+++ b/cuesubmit/tests/Config_tests.py
@@ -37,6 +37,17 @@
 
 CONFIG_YAML_INVALID = b' " some text in an unclosed quote'
 
+CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE = b'''
+RENDER_CMDS:
+  Job From Env Var:
+    config_file: "$SUB_JOB_CONFIG_FILE"
+'''
+
+SUB_JOB_CONFIG_YAML = b'''
+command: "Render"
+options:
+  "-cam {camera}": "persp"
+'''
 
 class ConfigTests(pyfakefs.fake_filesystem_unittest.TestCase):
     def setUp(self):
@@ -80,6 +91,41 @@ def test__should_fail_on_invalid_yaml(self):
         with self.assertRaises(cuesubmit.Config.CuesubmitConfigError):
             cuesubmit.Config.getConfigValues()
 
+    def test__should_expand_sub_config_from_env_var(self):
+        config_file_path = '/path/to/config.yaml'
+        sub_config_file_path = '/path/to/sub_config.yaml'
+        self.fs.create_file(config_file_path, contents=CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE)
+        self.fs.create_file(sub_config_file_path, contents=SUB_JOB_CONFIG_YAML)
+        os.environ['CUESUBMIT_CONFIG_FILE'] = config_file_path
+        os.environ['SUB_JOB_CONFIG_FILE'] = sub_config_file_path
+
+        configData = cuesubmit.Config.getConfigValues()
+
+        self.assertTrue('Job From Env Var' in configData.get('RENDER_CMDS', {}).keys())
+        sub_job_config = configData.get('RENDER_CMDS', {}).get('Job From Env Var', {})
+        self.assertEqual('Render', sub_job_config.get('command'))
+        self.assertEqual(None, sub_job_config.get('config_file'),
+                         '"config_file" should be replaced by the sub_config values')
+        self.assertEqual(None, sub_job_config.get('SOME_UNKNOWN_SETTING'))
+
+    def test__should_feed_error_on_missing_sub_config_from_env_var(self):
+        config_file_path = '/path/to/config.yaml'
+        self.fs.create_file(config_file_path, contents=CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE)
+        os.environ['CUESUBMIT_CONFIG_FILE'] = config_file_path
+        if 'SUB_JOB_CONFIG_FILE' in os.environ:
+            del os.environ['SUB_JOB_CONFIG_FILE']
+
+        configData = cuesubmit.Config.getConfigValues()
+        sub_job_config = configData.get('RENDER_CMDS', {}).get('Job From Env Var', {})
+
+        self.assertTrue('Job From Env Var' in configData.get('RENDER_CMDS', {}).keys())
+        self.assertEqual('error', sub_job_config.get('command'))
+        self.assertEqual(None, sub_job_config.get('config_file'),
+                         '"config_file" should be replaced by the sub_config values')
+        self.assertTrue(isinstance(sub_job_config.get('options',{}).get('{ERROR}'),
+                                   FileNotFoundError))
+
+
 
 if __name__ == '__main__':
     unittest.main()

From 3e207cb60243138a1155cbda22f8d3909f164d68 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Wed, 29 Mar 2023 00:52:36 +0200
Subject: [PATCH 29/79] doc: add context to the test A missing sub config file
 will catch the error and forward it to the UI for feedback.

---
 cuesubmit/tests/Config_tests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cuesubmit/tests/Config_tests.py b/cuesubmit/tests/Config_tests.py
index 5530abfdd..ef65338ab 100644
--- a/cuesubmit/tests/Config_tests.py
+++ b/cuesubmit/tests/Config_tests.py
@@ -124,6 +124,7 @@ def test__should_feed_error_on_missing_sub_config_from_env_var(self):
                          '"config_file" should be replaced by the sub_config values')
         self.assertTrue(isinstance(sub_job_config.get('options',{}).get('{ERROR}'),
                                    FileNotFoundError))
+        # note: it does not raise, just feed it to the UI for feedback
 
 
 

From f873d55d6b513e247529c096dcf1a3662072d7a6 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Wed, 29 Mar 2023 00:53:36 +0200
Subject: [PATCH 30/79] fix: test if file exists

---
 cuesubmit/cuesubmit/Config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/Config.py b/cuesubmit/cuesubmit/Config.py
index bcfac61e3..69a43b30e 100644
--- a/cuesubmit/cuesubmit/Config.py
+++ b/cuesubmit/cuesubmit/Config.py
@@ -38,7 +38,7 @@ def getConfigValues():
     configFile = os.environ.get(CONFIG_FILE_ENV_VAR)\
                  or os.path.join(opencue.config.config_base_directory(),
                                  'cuesubmit.yaml')
-    if not configFile:
+    if not os.path.exists(configFile):
         return {}
     configData = _loadYamlFile(yaml_file=configFile)
     if 'RENDER_CMDS' in configData:

From 108670ac5393767121b39e430aebf9460faedf17 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Fri, 31 Mar 2023 22:22:30 +0200
Subject: [PATCH 31/79] fix: replace old variable name

---
 cuesubmit/cuesubmit/ui/Widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 28d426f50..63f2ed540 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -292,7 +292,7 @@ def setCheckedFromText(self, actionsAstext):
         @type actionNames: str
         @param actionNames: list of action names to set to checked separated by a comma and a space
         """
-        if ', ' in text and self.multiselect:
+        if ', ' in actionsAstext and self.multiselect:
             self.setChecked(actionsAstext.split(', '))
         else:
             self.setChecked([actionsAstext])

From a84707a8f8ddb0aea7e3bfe632a44884d5d319b2 Mon Sep 17 00:00:00 2001
From: Kern Attila Germain <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 1 Apr 2023 03:43:44 +0200
Subject: [PATCH 32/79] pep: add space between functions

---
 cuesubmit/cuesubmit/Validators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cuesubmit/cuesubmit/Validators.py b/cuesubmit/cuesubmit/Validators.py
index b4a1a13a8..c7bd82353 100644
--- a/cuesubmit/cuesubmit/Validators.py
+++ b/cuesubmit/cuesubmit/Validators.py
@@ -70,6 +70,7 @@ def moreThan3Chars(value):
     if len(value) >= 3:
         return True
     return False
+
 def notEmptyString(value):
     """String must contain at least 1 character."""
     if len(value) == 0:

From fe1a6d6a2657ca81297ef34e6d39b8de746d3689 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:13:59 +0200
Subject: [PATCH 33/79] doc: add example for hidden widget without flag adding
 a value

---
 cuesubmit/cuesubmit_config.example.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cuesubmit/cuesubmit_config.example.yaml b/cuesubmit/cuesubmit_config.example.yaml
index 90d3d123b..9d1b343e7 100644
--- a/cuesubmit/cuesubmit_config.example.yaml
+++ b/cuesubmit/cuesubmit_config.example.yaml
@@ -103,6 +103,10 @@ Help: >
        command uses blank space (no flag)
        UI displays `Nice Name`
   
+     "~{Nice Name}": "python"
+       command uses " python"
+       the widget is hidden
+  
      "-flagName~"
        command uses '-flagName'
        the widget is hidden

From 161f17b6b8402260a466dd8d165abc0edb1573d7 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+kernattila@users.noreply.github.com>
Date: Sat, 3 Jun 2023 00:17:07 +0200
Subject: [PATCH 34/79] fix: let parent argument at the end

---
 cuesubmit/cuesubmit/ui/Widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 63f2ed540..e3ea6287e 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -423,7 +423,7 @@ class CueLabelToggle(QtWidgets.QWidget):
     actionTriggered = QtCore.Signal(int)
     rangeChanged = QtCore.Signal(int, int)
 
-    def __init__(self, label=None, parent=None, default_value=False):
+    def __init__(self, label=None, default_value=False, parent=None):
         super(CueLabelToggle, self).__init__(parent=parent)
         self.mainLayout = QtWidgets.QHBoxLayout()
         self.label = QtWidgets.QLabel(label, parent=self)

From 1f86dc2c9511ea586ebba419758c0c7f6f120fb0 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:18:11 +0200
Subject: [PATCH 35/79] fix: the Raise here would not work in older versions of
 python not implementing the f-string "equals" feature yet.

---
 cuesubmit/cuesubmit/Config.py                        | 2 +-
 cuesubmit/cuesubmit/Util.py                          | 2 +-
 cuesubmit/cuesubmit_isolated_job_config.example.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cuesubmit/cuesubmit/Config.py b/cuesubmit/cuesubmit/Config.py
index 69a43b30e..c13b2b6ac 100644
--- a/cuesubmit/cuesubmit/Config.py
+++ b/cuesubmit/cuesubmit/Config.py
@@ -56,7 +56,7 @@ def _loadYamlFile(yaml_file):
     """
     _yaml_file = os.path.expandvars(yaml_file)
     if not os.path.exists(_yaml_file):
-        raise FileNotFoundError(f'{_yaml_file=} not found')
+        raise FileNotFoundError(f"yaml_file:{_yaml_file} not found")
     config_data = {}
     with open(_yaml_file, 'r') as data:
         try:
diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index a088f8927..d344c42cf 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -95,4 +95,4 @@ def convertCommandOptions(options):
                 'float_precision': value[3] if len(value)==4 else None
                 })
         parameters.append(options)
-    return parameters
\ No newline at end of file
+    return parameters
diff --git a/cuesubmit/cuesubmit_isolated_job_config.example.yaml b/cuesubmit/cuesubmit_isolated_job_config.example.yaml
index 394a74c02..b93d2286a 100644
--- a/cuesubmit/cuesubmit_isolated_job_config.example.yaml
+++ b/cuesubmit/cuesubmit_isolated_job_config.example.yaml
@@ -13,4 +13,4 @@ options:
   "{!mayaFile*}":
       - Maya Ascii file (*.ma)
       - Maya Binary file (*.mb)
-      - Maya file (*.ma *.mb)
\ No newline at end of file
+      - Maya file (*.ma *.mb)

From a8d563cbae2792904baf2deee9483e78e9bd2e5c Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 1 Aug 2024 00:29:15 +0200
Subject: [PATCH 36/79] CueGui, fix service edit (#1293)

---
 cuegui/cuegui/ServiceDialog.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cuegui/cuegui/ServiceDialog.py b/cuegui/cuegui/ServiceDialog.py
index f83dbb5c3..cb3994036 100644
--- a/cuegui/cuegui/ServiceDialog.py
+++ b/cuegui/cuegui/ServiceDialog.py
@@ -135,7 +135,6 @@ def setService(self, service):
         self.timeout.setValue(service.data.timeout)
         self.timeout_llu.setValue(service.data.timeout_llu)
         self.min_memory_increase.setValue(service.data.min_memory_increase // 1024)
-        self.__service = service.data
 
     def new(self):
         """

From ab69f7f65528b21c85980927e8b312487a7f2cf6 Mon Sep 17 00:00:00 2001
From: Jimmy Christensen <Lithorus@gmail.com>
Date: Thu, 1 Aug 2024 19:18:45 +0200
Subject: [PATCH 37/79] Abstract logging into seperate classes (RQDLogger and
 LogReader) (#1429)

**Link the Issue(s) this Pull Request is related to.**
#1401 #1427

**Summarize your change.**
This abstracts the reading of logs and writing log files. This makes it
simpler to do things like supporting other logging types and conversions
(eg. make sure things are ASCII) in a single class across all platforms.
This is a smaller version of #1401 with just the file logging
abstracted. It also implements the changes from #1427

Co-authored by @ramonfigueiredo and @lithorus

---------

Signed-off-by: Jimmy Christensen <Lithorus@gmail.com>
Co-authored-by: Ramon Figueiredo <rfigueiredo@imageworks.com>
---
 cuegui/cuegui/plugins/LogViewPlugin.py |  63 ++++++--
 rqd/rqd/rqcore.py                      | 216 +++++--------------------
 rqd/rqd/rqlogging.py                   | 133 +++++++++++++++
 3 files changed, 224 insertions(+), 188 deletions(-)
 create mode 100644 rqd/rqd/rqlogging.py

diff --git a/cuegui/cuegui/plugins/LogViewPlugin.py b/cuegui/cuegui/plugins/LogViewPlugin.py
index c2a7837a2..d69f5cf80 100644
--- a/cuegui/cuegui/plugins/LogViewPlugin.py
+++ b/cuegui/cuegui/plugins/LogViewPlugin.py
@@ -44,6 +44,42 @@
 PRINTABLE = set(string.printable)
 
 
+class LogReader(object):
+    """
+    Custom class to abstract reading log files from multiple backends
+    """
+    filepath = None
+    type = None
+
+    def __init__(self, filepath):
+        """LogReader class initialization
+           @type    filepath: string
+           @param   filepath: The filepath to log to
+        """
+        self.filepath = filepath
+
+    def size(self):
+        """Return the size of the file"""
+        return int(os.stat(self.filepath).st_size)
+
+    def getMtime(self):
+        """Return modification time of the file"""
+        return os.path.getmtime(self.filepath)
+
+    def exists(self):
+        """Check if the file exists"""
+        return os.path.exists(self.filepath)
+
+    def read(self):
+        """Read the data from the backend"""
+        content = None
+        if self.exists() is True:
+            with open(self.filepath, "r", encoding='utf-8') as fp:
+                content = fp.read()
+
+        return content
+
+
 class LineNumberArea(QtWidgets.QWidget):
     """
     Custom widget for the line numbers. This widget is designed to be attached
@@ -813,9 +849,10 @@ def _display_log_content(self):
         @postcondition: The _update_log method is scheduled to run again
                         after 5 seconds
         """
+        log_reader = LogReader(self._log_file)
 
         try:
-            if not os.path.exists(self._log_file):
+            if log_reader.exists() is not True:
                 self._log_file_exists = False
                 content = 'Log file does not exist: %s' % self._log_file
                 self._content_timestamp = time.time()
@@ -823,10 +860,9 @@ def _display_log_content(self):
             else:
                 # Creating the load logs process as qrunnables so
                 # that they don't block the ui while loading
-                log_loader = LogLoader(self._load_log, self._log_file,
-                    self._new_log, self._log_mtime)
-                log_loader.signals.SIG_LOG_LOAD_RESULT.connect(
-                    self._receive_log_results)
+                log_loader = LogLoader(self._load_log, log_reader,
+                                       self._new_log, self._log_mtime)
+                log_loader.signals.SIG_LOG_LOAD_RESULT.connect(self._receive_log_results)
                 log_loader.setAutoDelete(True)
                 self.log_thread_pool.start(log_loader)
                 self.log_thread_pool.waitForDone()
@@ -835,15 +871,15 @@ def _display_log_content(self):
             QtCore.QTimer.singleShot(5000, self._display_log_content)
 
     @QtCore.Slot()
-    def _load_log(self, log_file, new_log, curr_log_mtime):
+    def _load_log(self, log_reader, new_log, curr_log_mtime):
         content = None
-        log_size = int(os.stat(log_file).st_size)
+        log_size = log_reader.size()
         if log_size > 1 * 1e6:
             content = ('Log file size (%0.1f MB) exceeds the size '
-                        'threshold (1.0 MB).'
-                        % float(log_size / (1024 * 1024)))
-        elif not new_log and os.path.exists(log_file):
-            log_mtime = os.path.getmtime(log_file)
+                       'threshold (1.0 MB).'
+                       % float(log_size / (1024 * 1024)))
+        elif not new_log and log_reader.exists():
+            log_mtime = log_reader.getMtime()
             if log_mtime > curr_log_mtime:
                 curr_log_mtime = log_mtime  # no new updates
                 content = ''
@@ -851,10 +887,9 @@ def _load_log(self, log_file, new_log, curr_log_mtime):
         if content is None:
             content = ''
             try:
-                with open(log_file, 'r', encoding='utf-8') as f:
-                    content = f.read()
+                content = log_reader.read()
             except IOError:
-                content = 'Can not access log file: %s' % log_file
+                content = 'Can not access log file: %s' % log_reader.filepath
 
         return content, curr_log_mtime
 
diff --git a/rqd/rqd/rqcore.py b/rqd/rqd/rqcore.py
index 4ab224c09..c8dacdc8e 100644
--- a/rqd/rqd/rqcore.py
+++ b/rqd/rqd/rqcore.py
@@ -34,6 +34,7 @@
 import threading
 import time
 import traceback
+import select
 
 import rqd.compiled_proto.host_pb2
 import rqd.compiled_proto.report_pb2
@@ -43,7 +44,7 @@
 import rqd.rqnetwork
 import rqd.rqnimby
 import rqd.rqutil
-
+import rqd.rqlogging
 
 INT32_MAX = 2147483647
 INT32_MIN = -2147483648
@@ -171,8 +172,8 @@ def __writeHeader(self):
 
         try:
             print("="*59, file=self.rqlog)
-            print("RenderQ JobSpec     ", time.ctime(self.startTime), "\n", file=self.rqlog)
-            print("proxy               ", "rqd.rqnetwork.RunningFrame/%s -t:tcp -h %s -p 10021" % (
+            print("RenderQ JobSpec      %s" % time.ctime(self.startTime), "\n", file=self.rqlog)
+            print("proxy                rqd.rqnetwork.RunningFrame/%s -t:tcp -h %s -p 10021" % (
                 self.runFrame.frame_id,
                 self.rqCore.machine.getHostname()), file=self.rqlog)
             print("%-21s%s" % ("command", self.runFrame.command), file=self.rqlog)
@@ -335,17 +336,26 @@ def runLinux(self):
 
         if not self.rqCore.updateRssThread.is_alive():
             self.rqCore.updateRssThread = threading.Timer(rqd.rqconstants.RSS_UPDATE_INTERVAL,
-                                                           self.rqCore.updateRss)
+                                                          self.rqCore.updateRss)
             self.rqCore.updateRssThread.start()
 
-        if rqd.rqconstants.RQD_PREPEND_TIMESTAMP:
-            pipe_to_file(frameInfo.forkedCommand.stdout, frameInfo.forkedCommand.stderr, self.rqlog)
-        else:
-            # Convert to ASCII while discarding characters that can not be encoded
-            for line in frameInfo.forkedCommand.stdout:
-                self.rqlog.write(line.decode('ascii', errors='ignore'))
-            for line in frameInfo.forkedCommand.stderr:
-                self.rqlog.write(line.decode('ascii', errors='ignore'))
+        poller = select.poll()
+        poller.register(frameInfo.forkedCommand.stdout, select.POLLIN)
+        poller.register(frameInfo.forkedCommand.stderr, select.POLLIN)
+        while True:
+            for fd, event in poller.poll():
+                if event & select.POLLIN:
+                    if fd == frameInfo.forkedCommand.stdout.fileno():
+                        line = frameInfo.forkedCommand.stdout.readline()
+                    elif fd == frameInfo.forkedCommand.stderr.fileno():
+                        line = frameInfo.forkedCommand.stderr.readline()
+                    else:
+                        continue
+                    if not line:
+                        break
+                    self.rqlog.write(line, prependTimestamp=rqd.rqconstants.RQD_PREPEND_TIMESTAMP)
+            if frameInfo.forkedCommand.poll() is not None:
+                break
 
         returncode = frameInfo.forkedCommand.wait()
 
@@ -387,8 +397,8 @@ def runWindows(self):
             frameInfo.forkedCommand = subprocess.Popen(tempCommand,
                                                        env=self.frameEnv,
                                                        stdin=subprocess.PIPE,
-                                                       stdout=self.rqlog,
-                                                       stderr=self.rqlog)
+                                                       stdout=subprocess.PIPE,
+                                                       stderr=subprocess.STDOUT)
         # pylint: disable=broad-except
         except Exception:
             log.critical(
@@ -402,6 +412,13 @@ def runWindows(self):
                                                           self.rqCore.updateRss)
             self.rqCore.updateRssThread.start()
 
+        while True:
+            output = frameInfo.forkedCommand.stdout.readline()
+            if not output and frameInfo.forkedCommand.poll() is not None:
+                break
+            if output:
+                self.rqlog.write(output, prependTimestamp=rqd.rqconstants.RQD_PREPEND_TIMESTAMP)
+
         frameInfo.forkedCommand.wait()
 
         # Find exitStatus and exitSignal
@@ -437,8 +454,8 @@ def runDarwin(self):
                                                        env=self.frameEnv,
                                                        cwd=self.rqCore.machine.getTempPath(),
                                                        stdin=subprocess.PIPE,
-                                                       stdout=self.rqlog,
-                                                       stderr=self.rqlog,
+                                                       stdout=subprocess.PIPE,
+                                                       stderr=subprocess.STDOUT,
                                                        preexec_fn=os.setsid)
         finally:
             rqd.rqutil.permissionsLow()
@@ -450,6 +467,13 @@ def runDarwin(self):
                                                           self.rqCore.updateRss)
             self.rqCore.updateRssThread.start()
 
+        while True:
+            output = frameInfo.forkedCommand.stdout.readline()
+            if not output and frameInfo.forkedCommand.poll() is not None:
+                break
+            if output:
+                self.rqlog.write(output, prependTimestamp=rqd.rqconstants.RQD_PREPEND_TIMESTAMP)
+
         frameInfo.forkedCommand.wait()
 
         # Find exitStatus and exitSignal
@@ -464,17 +488,6 @@ def runDarwin(self):
         self.__writeFooter()
         self.__cleanup()
 
-    @staticmethod
-    def waitForFile(filepath, maxTries=5):
-        """Waits for a file to exist."""
-        tries = 0
-        while tries < maxTries:
-            if os.path.exists(filepath):
-                return
-            tries += 1
-            time.sleep(0.5 * tries)
-        raise IOError("Failed to create %s" % filepath)
-
     def runUnknown(self):
         """The steps required to handle a frame under an unknown OS."""
 
@@ -506,61 +519,13 @@ def run(self):
                     #
                     # Setup proc to allow launching of frame
                     #
-
-                    if not os.access(runFrame.log_dir, os.F_OK):
-                        # Attempting mkdir for missing logdir
-                        msg = "No Error"
-                        try:
-                            os.makedirs(runFrame.log_dir)
-                            os.chmod(runFrame.log_dir, 0o777)
-                        # pylint: disable=broad-except
-                        except Exception as e:
-                            # This is expected to fail when called in abq
-                            # But the directory should now be visible
-                            msg = e
-
-                        if not os.access(runFrame.log_dir, os.F_OK):
-                            err = "Unable to see log directory: %s, mkdir failed with: %s" % (
-                                runFrame.log_dir, msg)
-                            raise RuntimeError(err)
-
-                    if not os.access(runFrame.log_dir, os.W_OK):
-                        err = "Unable to write to log directory %s" % runFrame.log_dir
-                        raise RuntimeError(err)
-
                     try:
-                        # Rotate any old logs to a max of MAX_LOG_FILES:
-                        if os.path.isfile(runFrame.log_dir_file):
-                            rotateCount = 1
-                            while (os.path.isfile("%s.%s" % (runFrame.log_dir_file, rotateCount))
-                                   and rotateCount < rqd.rqconstants.MAX_LOG_FILES):
-                                rotateCount += 1
-                            os.rename(runFrame.log_dir_file,
-                                      "%s.%s" % (runFrame.log_dir_file, rotateCount))
-                    # pylint: disable=broad-except
-                    except Exception as e:
-                        err = "Unable to rotate previous log file due to %s" % e
-                        # Windows might fail while trying to rotate logs for checking if file is
-                        # being used by another process. Frame execution doesn't need to
-                        # be halted for this.
-                        if platform.system() == "Windows":
-                            log.warning(err)
-                        else:
-                            raise RuntimeError(err)
-                    try:
-                        # pylint: disable=consider-using-with
-                        self.rqlog = open(runFrame.log_dir_file, "w+", 1, encoding='utf-8')
-                        self.waitForFile(runFrame.log_dir_file)
+                        self.rqlog = rqd.rqlogging.RqdLogger(runFrame.log_dir_file)
+                        self.rqlog.waitForFile()
                     # pylint: disable=broad-except
                     except Exception as e:
                         err = "Unable to write to %s due to %s" % (runFrame.log_dir_file, e)
                         raise RuntimeError(err)
-                    try:
-                        os.chmod(runFrame.log_dir_file, 0o666)
-                    # pylint: disable=broad-except
-                    except Exception as e:
-                        err = "Failed to chmod log file! %s due to %s" % (runFrame.log_dir_file, e)
-                        log.warning(err)
 
                 finally:
                     rqd.rqutil.permissionsLow()
@@ -1123,100 +1088,3 @@ def sendStatusReport(self):
     def isWaitingForIdle(self):
         """Returns whether the host is waiting until idle to take some action."""
         return self.__whenIdle
-
-def pipe_to_file(stdout, stderr, outfile):
-    """
-    Prepend entries on stdout and stderr with a timestamp and write to outfile.
-
-    The logic to poll stdout/stderr is inspired by the Popen.communicate implementation.
-    This feature is linux specific
-    """
-    # Importing packages internally to avoid compatibility issues with Windows
-
-    if stdout is None or stderr is None:
-        return
-    outfile.flush()
-    os.fsync(outfile)
-
-    # pylint: disable=import-outside-toplevel
-    import select
-    import errno
-    # pylint: enable=import-outside-toplevel
-
-    fd2file = {}
-    fd2output = {}
-
-    poller = select.poll()
-
-    def register_and_append(file_ojb, eventmask):
-        poller.register(file_ojb, eventmask)
-        fd2file[file_ojb.fileno()] = file_ojb
-
-    def close_and_unregister_and_remove(fd, close=False):
-        poller.unregister(fd)
-        if close:
-            fd2file[fd].close()
-        fd2file.pop(fd)
-
-    def print_and_flush_ln(fd, last_timestamp):
-        txt = ''.join(fd2output[fd])
-        lines = txt.split('\n')
-        next_line_timestamp = None
-
-        # Save the timestamp of the first break
-        if last_timestamp is None:
-            curr_line_timestamp = datetime.datetime.now().strftime("%H:%M:%S")
-        else:
-            curr_line_timestamp = last_timestamp
-
-        # There are no line breaks
-        if len(lines) < 2:
-            return curr_line_timestamp
-        next_line_timestamp = datetime.datetime.now().strftime("%H:%M:%S")
-
-        remainder = lines[-1]
-        for line in lines[0:-1]:
-            # Convert to ASCII while discarding characters that can not be encoded
-            line = line.encode('ascii', 'ignore')
-            print("[%s] %s" % (curr_line_timestamp, line), file=outfile)
-        outfile.flush()
-        os.fsync(outfile)
-        fd2output[fd] = [remainder]
-
-        if next_line_timestamp is None:
-            return curr_line_timestamp
-        return next_line_timestamp
-
-    def translate_newlines(data):
-        data = data.decode("utf-8", "ignore")
-        return data.replace("\r\n", "\n").replace("\r", "\n")
-
-    select_POLLIN_POLLPRI = select.POLLIN | select.POLLPRI
-    # stdout
-    register_and_append(stdout, select_POLLIN_POLLPRI)
-    fd2output[stdout.fileno()] = []
-
-    # stderr
-    register_and_append(stderr, select_POLLIN_POLLPRI)
-    fd2output[stderr.fileno()] = []
-
-    while fd2file:
-        try:
-            ready = poller.poll()
-        except select.error as e:
-            if e.args[0] == errno.EINTR:
-                continue
-            raise
-
-        first_chunk_timestamp = None
-        for fd, mode in ready:
-            if mode & select_POLLIN_POLLPRI:
-                data = os.read(fd, 4096)
-                if not data:
-                    close_and_unregister_and_remove(fd)
-                if not isinstance(data, str):
-                    data = translate_newlines(data)
-                fd2output[fd].append(data)
-                first_chunk_timestamp = print_and_flush_ln(fd, first_chunk_timestamp)
-            else:
-                close_and_unregister_and_remove(fd)
diff --git a/rqd/rqd/rqlogging.py b/rqd/rqd/rqlogging.py
new file mode 100644
index 000000000..e8878c0d9
--- /dev/null
+++ b/rqd/rqd/rqlogging.py
@@ -0,0 +1,133 @@
+#  Copyright Contributors to the OpenCue Project
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+"""Logging module, handles logging to files and non-files"""
+
+
+import logging
+import time
+import os
+import datetime
+import platform
+
+import rqd.rqconstants
+
+log = logging.getLogger(__name__)
+log.setLevel(rqd.rqconstants.CONSOLE_LOG_LEVEL)
+
+
+class RqdLogger(object):
+    """Class to abstract file logging, this class tries to act as a file object"""
+    filepath = None
+    fd = None
+    type = 0
+
+    def __init__(self, filepath):
+        """RQDLogger class initialization
+           @type    filepath: string
+           @param   filepath: The filepath to log to
+        """
+
+        self.filepath = filepath
+
+        log_dir = os.path.dirname(self.filepath)
+        if not os.access(log_dir, os.F_OK):
+            # Attempting mkdir for missing logdir
+            msg = "No Error"
+            try:
+                os.makedirs(log_dir)
+                os.chmod(log_dir, 0o777)
+            # pylint: disable=broad-except
+            except Exception as e:
+                # This is expected to fail when called in abq
+                # But the directory should now be visible
+                msg = e
+
+            if not os.access(log_dir, os.F_OK):
+                err = "Unable to see log directory: %s, mkdir failed with: %s" % (
+                    log_dir, msg)
+                raise RuntimeError(err)
+
+        if not os.access(log_dir, os.W_OK):
+            err = "Unable to write to log directory %s" % log_dir
+            raise RuntimeError(err)
+
+        try:
+            # Rotate any old logs to a max of MAX_LOG_FILES:
+            if os.path.isfile(self.filepath):
+                rotateCount = 1
+                while (os.path.isfile("%s.%s" % (self.filepath, rotateCount))
+                       and rotateCount < rqd.rqconstants.MAX_LOG_FILES):
+                    rotateCount += 1
+                os.rename(self.filepath,
+                          "%s.%s" % (self.filepath, rotateCount))
+        # pylint: disable=broad-except
+        except Exception as e:
+            err = "Unable to rotate previous log file due to %s" % e
+            # Windows might fail while trying to rotate logs for checking if file is
+            # being used by another process. Frame execution doesn't need to
+            # be halted for this.
+            if platform.system() == "Windows":
+                log.warning(err)
+            else:
+                raise RuntimeError(err)
+        # pylint: disable=consider-using-with
+        self.fd = open(self.filepath, "w+", 1, encoding='utf-8')
+        try:
+            os.chmod(self.filepath, 0o666)
+        # pylint: disable=broad-except
+        except Exception as e:
+            err = "Failed to chmod log file! %s due to %s" % (self.filepath, e)
+            log.warning(err)
+
+    # pylint: disable=arguments-differ
+    def write(self, data, prependTimestamp=False):
+        """Abstract write function that will write to the correct backend"""
+        # Convert data to unicode
+        if isinstance(data, bytes):
+            data = data.decode('utf-8', errors='ignore')
+        if prependTimestamp is True:
+            lines = data.splitlines()
+            curr_line_timestamp = datetime.datetime.now().strftime("%H:%M:%S")
+            for line in lines:
+                print("[%s] %s" % (curr_line_timestamp, line), file=self)
+        else:
+            self.fd.write(data)
+
+    def writelines(self, __lines):
+        """Provides support for writing mutliple lines at a time"""
+        for line in __lines:
+            self.write(line)
+
+    def close(self):
+        """Closes the file if the backend is file based"""
+        self.fd.close()
+
+    def waitForFile(self, maxTries=5):
+        """Waits for the file to exist before continuing when using a file backend"""
+        # Waits for a file to exist
+        tries = 0
+        while tries < maxTries:
+            if os.path.exists(self.filepath):
+                return
+            tries += 1
+            time.sleep(0.5 * tries)
+        raise IOError("Failed to create %s" % self.filepath)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        pass

From 8c5a6edf6cecd5109459acf68a8302e6c33e5eb9 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 8 Aug 2024 11:50:10 +0200
Subject: [PATCH 38/79] fix: re-add RENDER_CMDS in Constants.py

---
 cuesubmit/cuesubmit/Constants.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cuesubmit/cuesubmit/Constants.py b/cuesubmit/cuesubmit/Constants.py
index 2f8f5d52f..f424d17de 100644
--- a/cuesubmit/cuesubmit/Constants.py
+++ b/cuesubmit/cuesubmit/Constants.py
@@ -41,6 +41,7 @@
 FRAME_TOKEN = config.get('FRAME_TOKEN', '#IFRAME#')
 FRAME_START_TOKEN = config.get('FRAME_START', '#FRAME_START#')
 FRAME_END_TOKEN = config.get('FRAME_END', '#FRAME_END#')
+RENDER_CMDS = config.get('RENDER_CMDS', {})
 
 # Tokens are replaced by cuebot during dispatch with their computed value.
 # see: cuebot/src/main/java/com/imageworks/spcue/dispatcher/DispatchSupportService.java

From cfb8fe3c5ef14f15167c617c9f6129a0fa30ab29 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 8 Aug 2024 11:50:40 +0200
Subject: [PATCH 39/79] fix: add frame tokens in the config example file

---
 cuesubmit/cuesubmit_config.example.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cuesubmit/cuesubmit_config.example.yaml b/cuesubmit/cuesubmit_config.example.yaml
index 9d1b343e7..bd5a2a60a 100644
--- a/cuesubmit/cuesubmit_config.example.yaml
+++ b/cuesubmit/cuesubmit_config.example.yaml
@@ -6,6 +6,10 @@
 UI_NAME : "OPENCUESUBMIT"
 SUBMIT_APP_WINDOW_TITLE : "OpenCue Submit"
 
+FRAME_TOKEN : "#IFRAME#"
+FRAME_START_TOKEN : "#FRAME_START#"
+FRAME_END_TOKEN : "#FRAME_END#"
+
 RENDER_CMDS:
   Shell:
     command: ""

From ff2bddab84ff5d7427d06336711a6d8758ea6529 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 8 Aug 2024 11:52:37 +0200
Subject: [PATCH 40/79] fix: remove double assignation, upgrade %s to f-string;
 add *args to _setBrowseFolderText(), fix docstring auto formatting

---
 cuesubmit/cuesubmit/ui/Widgets.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index e3ea6287e..19df2f128 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -348,7 +348,7 @@ def __init__(self, label=None, parent=None,
                  max_value=999,
                  float_precision=None):
         super(CueLabelSlider, self).__init__(parent=parent)
-        self._labelValue = "%s ({value})" % label
+        self._labelValue = f'{label} ({{value}})'
         self.float_mult = 1
         if float_precision:
             self.float_mult = 10**float_precision
@@ -591,14 +591,17 @@ def separatorLine():
 
 def getFile(fileFilter=None):
     """ Opens a file browser and returns the result
-    :param fileFilter: optional filters (ex: "Maya Ascii File (*.ma);;
-                       Maya Binary File (*.mb);;Maya Files (*.ma *.mb)")
+    :param fileFilter: optional filters
+      (ex: "Maya Ascii File (*.ma);;Maya Binary File (*.mb);;Maya Files (*.ma *.mb)")
     :type fileFilter: str
     :returns: Name of the file
     :rtype: str
     """
-    filename, _ = QtWidgets.QFileDialog.getOpenFileName(caption='Select file',
-                                                        dir='.', filter=fileFilter)
+    filename, _ = QtWidgets.QFileDialog.getOpenFileName(
+        caption='Select file',
+        dir='.',
+        filter=fileFilter
+    )
     return filename
 
 def getFolder():
@@ -606,22 +609,25 @@ def getFolder():
     :returns: Name of the folder
     :rtype: str
     """
-    folder = QtWidgets.QFileDialog.getExistingDirectory(caption='Select folder',
-                                                        dir='.', filter='')
+    folder = QtWidgets.QFileDialog.getExistingDirectory(
+        caption='Select folder',
+        dir='.',
+        filter=''
+    )
     return folder
 
 def _setBrowseFileText(widget_setter, fileFilter):
     """ wrapper function to open a fileBrowser and set its result back in the widget
     :param widget_setter: widget's function to set its text
     :type widget_setter: function
-    :param fileFilter: optional filters (ex: "Maya Ascii File (*.ma);;
-                       Maya Binary File (*.mb);;Maya Files (*.ma *.mb)")
+    :param fileFilter: optional filters
+       (ex: "Maya Ascii File (*.ma);;Maya Binary File (*.mb);;Maya Files (*.ma *.mb)")
     :type fileFilter: str
     """
     result = getFile(fileFilter)
     widget_setter(result)
 
-def _setBrowseFolderText(widget_setter):
+def _setBrowseFolderText(widget_setter, *args, **kwargs):
     """ wrapper function to open a folderBrowser and set its result back in the widget
     :param widget_setter: widget's function to set its text
     :type widget_setter: function

From 61fcd8de3ef9883359adc038790a03e325a80919 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 8 Aug 2024 12:49:23 +0200
Subject: [PATCH 41/79] chore: get back changes from master

---
 cuesubmit/cuesubmit/Config.py     | 2 +-
 cuesubmit/cuesubmit/Constants.py  | 2 +-
 cuesubmit/cuesubmit/Submission.py | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/Config.py b/cuesubmit/cuesubmit/Config.py
index c13b2b6ac..b06a07ec8 100644
--- a/cuesubmit/cuesubmit/Config.py
+++ b/cuesubmit/cuesubmit/Config.py
@@ -58,7 +58,7 @@ def _loadYamlFile(yaml_file):
     if not os.path.exists(_yaml_file):
         raise FileNotFoundError(f"yaml_file:{_yaml_file} not found")
     config_data = {}
-    with open(_yaml_file, 'r') as data:
+    with open(_yaml_file, 'r', encoding='utf-8') as data:
         try:
             config_data = yaml.load(data, Loader=yaml.SafeLoader)
         except yaml.YAMLError:
diff --git a/cuesubmit/cuesubmit/Constants.py b/cuesubmit/cuesubmit/Constants.py
index f424d17de..5379bed97 100644
--- a/cuesubmit/cuesubmit/Constants.py
+++ b/cuesubmit/cuesubmit/Constants.py
@@ -41,7 +41,6 @@
 FRAME_TOKEN = config.get('FRAME_TOKEN', '#IFRAME#')
 FRAME_START_TOKEN = config.get('FRAME_START', '#FRAME_START#')
 FRAME_END_TOKEN = config.get('FRAME_END', '#FRAME_END#')
-RENDER_CMDS = config.get('RENDER_CMDS', {})
 
 # Tokens are replaced by cuebot during dispatch with their computed value.
 # see: cuebot/src/main/java/com/imageworks/spcue/dispatcher/DispatchSupportService.java
@@ -65,6 +64,7 @@
 NUKE_FILE_FILTERS = ['Nuke script file (*.nk)']
 BLENDER_FILE_FILTERS = ['Blender file (*.blend)']
 
+
 BLENDER_FORMATS = ['', 'AVIJPEG', 'AVIRAW', 'BMP', 'CINEON', 'DPX', 'EXR', 'HDR', 'IRIS', 'IRIZ',
                    'JP2', 'JPEG', 'MPEG', 'MULTILAYER', 'PNG', 'RAWTGA', 'TGA', 'TIFF']
 BLENDER_OUTPUT_OPTIONS_URL = \
diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index 015d2ef65..478643d3c 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -37,10 +37,12 @@ def isSoloFlag(flag):
      """
     return re.match('^-+\w+~$', flag)
 
+
 def isFlag(flag):
     """ Check if the provided string is a flag (starts with a -)"""
     return re.match('^-+\w+$', flag)
 
+
 def formatValue(flag, value, isPath, isMandatory):
     """ Adds quotes around file/folder path variables
      and provide an error value to display for missing mandatory values.
@@ -51,6 +53,7 @@ def formatValue(flag, value, isPath, isMandatory):
         value = f'!!missing value for {flag}!!'
     return value
 
+
 def buildDynamicCmd(layerData):
     """From a layer, builds a customized render command."""
     renderCommand = Constants.RENDER_CMDS[layerData.layerType].get('command')
@@ -69,6 +72,7 @@ def buildDynamicCmd(layerData):
 
     return renderCommand
 
+
 def buildMayaCmd(layerData, silent=False):
     """From a layer, builds a Maya Render command."""
     camera = layerData.cmd.get('camera')
@@ -150,6 +154,7 @@ def buildLayer(layerData, command, lastLayer=None):
             layer.depend_on(lastLayer)
     return layer
 
+
 def buildLayerCommand(layerData, silent=False):
     """Builds the command to be sent per jobType"""
     if layerData.layerType in JobTypes.JobTypes.FROM_CONFIG_FILE:
@@ -169,6 +174,7 @@ def buildLayerCommand(layerData, silent=False):
             raise ValueError('unrecognized layer type {}'.format(layerData.layerType))
     return command
 
+
 def submitJob(jobData):
     """Submits the job using the PyOutline API."""
     ol = outline.Outline(

From 726a374f1e3ecdcf43551eac02b128fa957a43be Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:36:11 +0200
Subject: [PATCH 42/79] fix: expand widget on 2 rows so they align on the left

---
 cuesubmit/cuesubmit/ui/Widgets.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 19df2f128..fd0f8b79b 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -239,8 +239,8 @@ def __init__(
     def setupUi(self):
         """Creates the widget layout."""
         self.mainLayout.setVerticalSpacing(1)
-        self.mainLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.mainLayout.addWidget(self.toolButton, 1, 0, 1, 1)
+        self.mainLayout.addWidget(self.label, 0, 0, 1, 2)
+        self.mainLayout.addWidget(self.toolButton, 1, 0, 1, 2)
         self.toolButton.setMenu(self.optionsMenu)
         self.toolButton.setPopupMode(QtWidgets.QToolButton.InstantPopup)
 
@@ -627,7 +627,8 @@ def _setBrowseFileText(widget_setter, fileFilter):
     result = getFile(fileFilter)
     widget_setter(result)
 
-def _setBrowseFolderText(widget_setter, *args, **kwargs):
+# pylint: disable=keyword-arg-before-vararg,unused-argument
+def _setBrowseFolderText(widget_setter):
     """ wrapper function to open a folderBrowser and set its result back in the widget
     :param widget_setter: widget's function to set its text
     :type widget_setter: function

From 1d7383432838af3d029c634e5904e65727186a69 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:37:09 +0200
Subject: [PATCH 43/79] fix: fix layout order

---
 cuesubmit/cuesubmit/ui/Submit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index cd2cbc39f..47b6c11c8 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -280,11 +280,11 @@ def setupUi(self):
         self.coresLayout.addWidget(self.dependSelector)
         self.coresLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.HORIZONTAL))
         self.layerInfoLayout.addLayout(self.coresLayout)
+        self.layerInfoLayout.addLayout(self.settingsLayout)
         self.layerInfoLayout.addWidget(self.commandFeedback)
         self.scrollingLayout.addLayout(self.layerInfoLayout)
 
         self.settingsLayout.addWidget(self.settingsWidget)
-        self.layerInfoLayout.addLayout(self.settingsLayout)
 
         self.scrollingLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.VERTICAL))
         self.scrollingLayout.addWidget(Widgets.CueLabelLine('Submission Details'))

From 60551e82a803e880c9af0cc76d17c5441266ef89 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:49:50 +0200
Subject: [PATCH 44/79] fix: lint, remove unused args/kwargs

---
 cuesubmit/cuesubmit/ui/SettingsWidgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/SettingsWidgets.py b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
index 053b09794..defc25f99 100644
--- a/cuesubmit/cuesubmit/ui/SettingsWidgets.py
+++ b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
@@ -271,7 +271,7 @@ class DynamicSettingsWidget(BaseSettingsWidget):
     See `buildDynamicWidgets` for the widgets creation
     """
 
-    def __init__(self, parent=None, tool_name=None, parameters=None, *args, **kwargs):
+    def __init__(self, parent=None, tool_name=None, parameters=None):
         super(DynamicSettingsWidget, self).__init__(parent=parent)
         self.groupBox.setTitle(f'{tool_name} options')
         self.widgets = buildDynamicWidgets(parameters)

From 5556f11cad2d4303cde3b729a70fa7d533a19998 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 15:22:21 +0200
Subject: [PATCH 45/79] fix: use raw string for regex

---
 cuesubmit/cuesubmit/Submission.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index 478643d3c..db9b716ff 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -35,12 +35,12 @@ def isSoloFlag(flag):
     """ Check if the flag is solo, meaning it has no associated value
      solo flags are marked with a ~ (ex: --background~)
      """
-    return re.match('^-+\w+~$', flag)
+    return re.match(r"^-+\w+~$", flag)
 
 
 def isFlag(flag):
     """ Check if the provided string is a flag (starts with a -)"""
-    return re.match('^-+\w+$', flag)
+    return re.match(r"^-+\w+$", flag)
 
 
 def formatValue(flag, value, isPath, isMandatory):

From 5ae314503c06e2d13e4bc18b8fa76bd4882ff3c1 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 15:32:47 +0200
Subject: [PATCH 46/79] fix: lint, line too long

---
 cuesubmit/cuesubmit/Util.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index d344c42cf..82f6976c1 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -21,6 +21,7 @@
 from __future__ import absolute_import
 
 import os
+import re
 
 import opencue
 from cuesubmit import Constants
@@ -62,13 +63,13 @@ def getFacilities(allocations):
     return default_facilities + list(facilities)
 
 def convertCommandOptions(options):
-    """ Parse command options from the config file and return parameters to feed the UI (name, type, value)
+    """ Parse command options from the config file
+    and return parameters to feed the UI (name, type, value)
 
     :param options: All options for a given command (ex:{"-flag {Nice Name}": "default_value"})
     :type options: dict
     :return: list of dict of parameters
     """
-    import re
     parameters = []
     for option_line, value in options.items():
         parse_option = re.search(Constants.REGEX_COMMAND_OPTIONS,

From ed56fc5335bc09267e731fd73ac110ca7aef4567 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 15:40:09 +0200
Subject: [PATCH 47/79] fix: lint, lines too long

---
 cuesubmit/tests/Config_tests.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/cuesubmit/tests/Config_tests.py b/cuesubmit/tests/Config_tests.py
index ef65338ab..f0c84b74e 100644
--- a/cuesubmit/tests/Config_tests.py
+++ b/cuesubmit/tests/Config_tests.py
@@ -94,8 +94,14 @@ def test__should_fail_on_invalid_yaml(self):
     def test__should_expand_sub_config_from_env_var(self):
         config_file_path = '/path/to/config.yaml'
         sub_config_file_path = '/path/to/sub_config.yaml'
-        self.fs.create_file(config_file_path, contents=CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE)
-        self.fs.create_file(sub_config_file_path, contents=SUB_JOB_CONFIG_YAML)
+        self.fs.create_file(
+            config_file_path,
+            contents=CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE
+        )
+        self.fs.create_file(
+            sub_config_file_path,
+            contents=SUB_JOB_CONFIG_YAML
+        )
         os.environ['CUESUBMIT_CONFIG_FILE'] = config_file_path
         os.environ['SUB_JOB_CONFIG_FILE'] = sub_config_file_path
 
@@ -110,7 +116,10 @@ def test__should_expand_sub_config_from_env_var(self):
 
     def test__should_feed_error_on_missing_sub_config_from_env_var(self):
         config_file_path = '/path/to/config.yaml'
-        self.fs.create_file(config_file_path, contents=CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE)
+        self.fs.create_file(
+            config_file_path,
+            contents=CONFIG_YAML_WITH_RENDER_CMDS_AND_SUB_CONFIG_FILE
+        )
         os.environ['CUESUBMIT_CONFIG_FILE'] = config_file_path
         if 'SUB_JOB_CONFIG_FILE' in os.environ:
             del os.environ['SUB_JOB_CONFIG_FILE']

From ecc71a40f5dbbbb7bc8f0cbbd3b0202043173eb0 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Thu, 15 Aug 2024 15:57:12 +0200
Subject: [PATCH 48/79] chore: extract hide widget functionality from nested if

---
 cuesubmit/cuesubmit/ui/SettingsWidgets.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/SettingsWidgets.py b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
index defc25f99..837bfc417 100644
--- a/cuesubmit/cuesubmit/ui/SettingsWidgets.py
+++ b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
@@ -356,10 +356,6 @@ def buildDynamicWidgets(parameters):
                 widget = Widgets.CueLabelLineEdit(labelText=f'{label}:',
                                                   defaultText=option.get('value', ''),
                                                   validators=validators)
-            # Hide widgets containing opencue tokens (#IFRAME#, etc..) or solo flags
-            if option['hidden']:
-                widget.setDisabled(True)
-                widget.setHidden(True)
 
         elif option['type'] in (list, tuple):
             _options = option.get('value', ['No options'])
@@ -369,6 +365,11 @@ def buildDynamicWidgets(parameters):
         else:
             continue
 
+        # Hide widgets containing tokens (#IFRAME#, etc..) or solo flags
+        if option['hidden']:
+            widget.setDisabled(True)
+            widget.setHidden(True)
+
         # Register widget common attributes
         widget.mandatory = option.get('mandatory')
         widget.default_value = option['value']

From 04d3a063fa6b5c738d14f9119bab4f8ecd2631e6 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:13:10 +0200
Subject: [PATCH 49/79] doc: fix nuke example to be browsable

---
 cuesubmit/cuesubmit_config.example.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit_config.example.yaml b/cuesubmit/cuesubmit_config.example.yaml
index bd5a2a60a..8a22d71ee 100644
--- a/cuesubmit/cuesubmit_config.example.yaml
+++ b/cuesubmit/cuesubmit_config.example.yaml
@@ -50,7 +50,7 @@ RENDER_CMDS:
     options:
       "-X {!Write Nodes}": ""
       "-F {Frame Range}": "#FRAME_START#-#FRAME_END#"
-      "-x {!Nuke File}":
+      "-x {!Nuke File*}":
         - Nuke Script File (*.nk)
 
   Isolated Job Example:

From 288adda46801450be4a4af15df5b74fa334b35e0 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:13:39 +0200
Subject: [PATCH 50/79] doc: add "services" and "limits" presets for each job
 type.

---
 cuesubmit/cuesubmit_config.example.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cuesubmit/cuesubmit_config.example.yaml b/cuesubmit/cuesubmit_config.example.yaml
index 8a22d71ee..5fe79b878 100644
--- a/cuesubmit/cuesubmit_config.example.yaml
+++ b/cuesubmit/cuesubmit_config.example.yaml
@@ -18,6 +18,11 @@ RENDER_CMDS:
 
   Maya:
     command: "Render"
+    services:
+      - "maya"
+      - "arnold"
+    limits:
+        - "arnold license limit"
     options:
       "-r {Renderer}":
         - file
@@ -47,6 +52,10 @@ RENDER_CMDS:
 
   Nuke:
     command: "nuke"
+    services:
+      - "nuke"
+    limits:
+        - "nuke license limit"
     options:
       "-X {!Write Nodes}": ""
       "-F {Frame Range}": "#FRAME_START#-#FRAME_END#"
@@ -67,6 +76,12 @@ Help: >
   1) To configure a job directly:
     Command name:
       command: "path/to/executable"
+      services:
+        - "service1"
+        - "service2"
+      limits:
+        - "limit1"
+        - "limit2"
       options:
         "-strFlag": "default value"
         "-strFlagB {Nice Name}": "default value"

From 8f82fa50c7eb6a0e5bade14fd799c4929a83dc43 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 00:57:39 +0200
Subject: [PATCH 51/79] feat: add DEFAULT_SHOW to the cuesubmit config file and
 use it in the UI.

---
 cuesubmit/cuesubmit/Constants.py        | 2 ++
 cuesubmit/cuesubmit/Util.py             | 7 +++++++
 cuesubmit/cuesubmit/ui/Submit.py        | 3 ++-
 cuesubmit/cuesubmit_config.example.yaml | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/Constants.py b/cuesubmit/cuesubmit/Constants.py
index 5379bed97..832e8fe25 100644
--- a/cuesubmit/cuesubmit/Constants.py
+++ b/cuesubmit/cuesubmit/Constants.py
@@ -38,6 +38,8 @@
 BLENDER_RENDER_CMD = config.get('BLENDER_RENDER_CMD', 'blender')
 RENDER_CMDS = config.get('RENDER_CMDS', {})
 
+DEFAULT_SHOW = config.get('DEFAULT_SHOW') or os.environ.get('PROJECT', 'default')
+
 FRAME_TOKEN = config.get('FRAME_TOKEN', '#IFRAME#')
 FRAME_START_TOKEN = config.get('FRAME_START', '#FRAME_START#')
 FRAME_END_TOKEN = config.get('FRAME_END', '#FRAME_END#')
diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index 82f6976c1..861fd28ff 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -42,6 +42,13 @@ def getShows():
     return [show.name() for show in opencue.api.getShows()]
 
 
+def getDefaultShow():
+    default_show = next(iter([show for show in getShows()
+                              if re.match(show, Constants.DEFAULT_SHOW, re.IGNORECASE)]),
+                        'no default show')
+    return default_show
+
+
 def getAllocations():
     """Returns a list of Allocations from cuebot."""
     return opencue.api.getAllocations()
diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index 47b6c11c8..70d8ad066 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -137,7 +137,8 @@ def __init__(
                 "to create one!\nYou won't be able to submit a job for a non-existent show!\n")
             shows = ['']  # to allow building UI
         self.showSelector = Widgets.CueSelectPulldown(
-            'Show:', shows[0],
+            'Show:',
+            emptyText=Util.getDefaultShow(),
             options=shows,
             multiselect=False,
             parent=self)
diff --git a/cuesubmit/cuesubmit_config.example.yaml b/cuesubmit/cuesubmit_config.example.yaml
index 5fe79b878..886f67a0c 100644
--- a/cuesubmit/cuesubmit_config.example.yaml
+++ b/cuesubmit/cuesubmit_config.example.yaml
@@ -6,6 +6,8 @@
 UI_NAME : "OPENCUESUBMIT"
 SUBMIT_APP_WINDOW_TITLE : "OpenCue Submit"
 
+DEFAULT_SHOW : "MyProject" # Can also be set with the "PROJECT" env var
+
 FRAME_TOKEN : "#IFRAME#"
 FRAME_START_TOKEN : "#FRAME_START#"
 FRAME_END_TOKEN : "#FRAME_END#"

From c620039e7fa8229b40f55a9c0fd55083634a857e Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:00:48 +0200
Subject: [PATCH 52/79] feat: option to have services and limits preset for
 each job type directly from the config file.

---
 cuesubmit/cuesubmit/JobTypes.py  | 10 ++++++++++
 cuesubmit/cuesubmit/ui/Submit.py | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/JobTypes.py b/cuesubmit/cuesubmit/JobTypes.py
index 184a889f0..eeaa2b3a0 100644
--- a/cuesubmit/cuesubmit/JobTypes.py
+++ b/cuesubmit/cuesubmit/JobTypes.py
@@ -65,3 +65,13 @@ def build(cls, jobType, *args, **kwargs):
     def types(cls):
         """return a list of available types."""
         return list(cls.SETTINGS_MAP.keys())
+
+    @classmethod
+    def services(cls, jobType):
+        """return a list of services for a given jobType. (the "services" key in your yaml file)"""
+        return Constants.RENDER_CMDS[jobType].get('services', [])
+
+    @classmethod
+    def limits(cls, jobType):
+        """return a list of limits for a given jobType. (the "limits" key in your yaml file)"""
+        return Constants.RENDER_CMDS[jobType].get('limits', [])
diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index 70d8ad066..5eb0a09fd 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -367,7 +367,17 @@ def updateFeedbackCommand(self, layerData):
 
     def jobTypeChanged(self):
         """Action when the job type is changed."""
-        self.updateSettingsWidget(self.jobTypeSelector.text())
+        jobType = self.jobTypeSelector.text()
+        self.updateSettingsWidget(jobType)
+
+        # Add preset from config file
+        services = JobTypes.JobTypes.services(jobType)
+        limits = JobTypes.JobTypes.limits(jobType)
+        self.servicesSelector.clearChecked()
+        self.servicesSelector.setChecked(services)
+        self.limitsSelector.clearChecked()
+        self.limitsSelector.setChecked(limits)
+
         self.jobDataChanged()
 
     def updateJobTypeSelector(self, layerType):

From c4cd63eb8bad449d1f59ce29c7abd56d390779ce Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:03:18 +0200
Subject: [PATCH 53/79] feat: re-order buttons under the job layer list widget
 (put arrows together instead of each end). Also make the table expand
 vertically as it is the only widget that should expand in the UI.

---
 cuesubmit/cuesubmit/ui/Job.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Job.py b/cuesubmit/cuesubmit/ui/Job.py
index fc15d5536..005fdebe0 100644
--- a/cuesubmit/cuesubmit/ui/Job.py
+++ b/cuesubmit/cuesubmit/ui/Job.py
@@ -36,6 +36,7 @@ def __init__(self, parent=None):
         super(CueJobWidget, self).__init__(parent=parent)
 
         self.table = CueJobTree()
+        self.table.setSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
         self.model = CueJobModel()
         self.jobRow = QtGui.QStandardItem('')
         self.jobRow.setEditable(False)
@@ -64,9 +65,9 @@ def setupUi(self):
         header.setStyleSheet(Style.HEADER_VIEW)
         self.model.appendRow(self.jobRow)
         self.mainLayout.addWidget(self.table)
-        self.buttonLayout.addWidget(self.downButton)
-        self.buttonLayout.addWidget(self.deleteLayerButton)
         self.buttonLayout.addWidget(self.addLayerButton)
+        self.buttonLayout.addWidget(self.deleteLayerButton)
+        self.buttonLayout.addWidget(self.downButton)
         self.buttonLayout.addWidget(self.upButton)
         self.mainLayout.addLayout(self.buttonLayout)
         self.table.expandAll()

From 0a9501c20f75af7a9208f9286b68c3c095c108ba Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:04:22 +0200
Subject: [PATCH 54/79] feat: add validator to match any integer, even negative

---
 cuesubmit/cuesubmit/Validators.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cuesubmit/cuesubmit/Validators.py b/cuesubmit/cuesubmit/Validators.py
index c7bd82353..216ddad25 100644
--- a/cuesubmit/cuesubmit/Validators.py
+++ b/cuesubmit/cuesubmit/Validators.py
@@ -58,6 +58,13 @@ def matchNumbersOnly(value):
     return False
 
 
+def matchIntegers(value):
+    """Matches positive and negative integers."""
+    if re.match(r'^-?[0-9]+$', value):
+        return True
+    return False
+
+
 def matchPositiveIntegers(value):
     """Matches integers greater than 0."""
     if re.match(r'^[0-9]+$', value) and int(value) >= 1:

From 007650093638ca7ef18e60e619dd6a0717c197ec Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:06:33 +0200
Subject: [PATCH 55/79] refactor: only override job minCores if it is
 explicitly overridden

---
 pyoutline/outline/backend/cue.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
index 1bd34bfb5..78924fd4a 100644
--- a/pyoutline/outline/backend/cue.py
+++ b/pyoutline/outline/backend/cue.py
@@ -319,12 +319,15 @@ def _serialize(launcher, use_pycuerun):
 
         # opencue specific options
         # Keeping 'threads' for backward compatibility
-        if layer.get_arg("cores"):
-            if layer.get_arg("threads"):
+        cores = None
+        if layer.get_arg("overrideCores"):
+            logger.info("%s is set to override service cores.", layer.get_name())
+            if layer.is_arg_set("cores") and layer.is_arg_set("threads"):
                 logger.warning("%s has both cores and threads. Use cores.", layer.get_name())
-            sub_element(spec_layer, "cores", "%0.1f" % (layer.get_arg("cores")))
-        elif layer.get_arg("threads"):
-            sub_element(spec_layer, "cores", "%0.1f" % (layer.get_arg("threads")))
+            cores = "%0.1f" % float(layer.get_arg("cores") or layer.get_arg("threads", 0))
+            sub_element(spec_layer, "cores", cores)
+        else:
+            logger.warning("%s will use service cores.", layer.get_name())
 
         if layer.is_arg_set("threadable"):
             sub_element(spec_layer, "threadable",

From fb7967d24529415232db13ef735067a7f3ae7377 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:11:07 +0200
Subject: [PATCH 56/79] feat: rename greyOut() to disable(), add enable() and
 toggled() functions. Add textChanged signal

---
 cuesubmit/cuesubmit/ui/SettingsWidgets.py |  2 +-
 cuesubmit/cuesubmit/ui/Widgets.py         | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/SettingsWidgets.py b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
index 837bfc417..81f307f6d 100644
--- a/cuesubmit/cuesubmit/ui/SettingsWidgets.py
+++ b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
@@ -320,7 +320,7 @@ def buildDynamicWidgets(parameters):
 
         if option['type'] is FileNotFoundError:
             widget = Widgets.CueLabelLineEdit( labelText='Error:' )
-            widget.greyOut()
+            widget.disable()
             widget.setText(str(option.get('value')))
             widget.label.setStyleSheet(Style.INVALID_TEXT)
 
diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index fd0f8b79b..413f4bf37 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -45,6 +45,8 @@ class SpacerTypes(object):
 
 class CueLabelLineEdit(QtWidgets.QWidget):
     """Container widget that contains a lineedit and label."""
+    textChanged = QtCore.Signal()
+
     def __init__(self, labelText=None, defaultText='', tooltip=None, validators=None,
                  completers=None, parent=None):
         super(CueLabelLineEdit, self).__init__(parent)
@@ -80,6 +82,7 @@ def setupConnections(self):
         """Sets up widget signals."""
         # pylint: disable=no-member
         self.lineEdit.textChanged.connect(self.validateText)
+        self.lineEdit.textChanged.connect(self.textChanged)
         self.lineEdit.focusChange.connect(self.textFocusChange)
         # pylint: enable=no-member
 
@@ -141,11 +144,16 @@ def text(self):
         """
         return self.lineEdit.text()
 
-    def greyOut(self):
+    def disable(self):
         """Make widget grey and read-only"""
         self.lineEdit.setReadOnly(True)
         self.lineEdit.setStyleSheet(Style.DISABLED_LINE_EDIT)
 
+    def enable(self):
+        """Make widget editable"""
+        self.lineEdit.setReadOnly(False)
+        self.lineEdit.setStyleSheet(Style.LINE_EDIT)
+
 
 class CueLineEdit(QtWidgets.QLineEdit):
     """Wrapper around QLineEdit that allows for changing text with up/down arrow keys."""

From 4ef105d831f7285447a279b93eccd644a484c59a Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:12:43 +0200
Subject: [PATCH 57/79] feat: add option to make CueLineEdit toggleable (and
 optionally put the layout horizontal) Add stateChanged signal

---
 cuesubmit/cuesubmit/ui/Widgets.py | 35 ++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index 413f4bf37..b1e4c5208 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -46,19 +46,26 @@ class SpacerTypes(object):
 class CueLabelLineEdit(QtWidgets.QWidget):
     """Container widget that contains a lineedit and label."""
     textChanged = QtCore.Signal()
+    stateChanged = QtCore.Signal()
 
     def __init__(self, labelText=None, defaultText='', tooltip=None, validators=None,
+                 toggleable=False, toggleValue=False, horizontal=False,
                  completers=None, parent=None):
         super(CueLabelLineEdit, self).__init__(parent)
         self.mainLayout = QtWidgets.QGridLayout()
         self.mainLayout.setVerticalSpacing(0)
-        self.label = QtWidgets.QLabel(labelText)
-        self.label.setAlignment(QtCore.Qt.AlignLeft)
-        self.label.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        self.toggleable = toggleable
+        if self.toggleable:
+            self.label = CueLabelToggle(labelText, default_value=toggleValue, tooltip=tooltip, parent=self)
+        else:
+            self.label = QtWidgets.QLabel(labelText)
+            self.label.setAlignment(QtCore.Qt.AlignLeft)
         self.lineEdit = CueLineEdit(defaultText, completerStrings=completers)
+        self.lineEdit.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
         self.lineEdit.setToolTip(tooltip)
         self.browseButton = QtWidgets.QPushButton(text='Browse')
         self.horizontalLine = CueHLine()
+        self.horizontal = int(horizontal)
         self.validators = validators or []
         self.signals = [self.lineEdit.textChanged,
                         self.lineEdit.focusChange]
@@ -73,9 +80,9 @@ def setupUi(self):
         """Creates the widget layout."""
         self.setLayout(self.mainLayout)
         self.mainLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.mainLayout.addWidget(self.lineEdit, 1, 0, 1, 4)
+        self.mainLayout.addWidget(self.lineEdit, 1-self.horizontal, self.horizontal, 1, 4)
+        self.mainLayout.addWidget(self.horizontalLine, 2-self.horizontal, self.horizontal, 1, 4)
         self.browseButton.setVisible(False)
-        self.mainLayout.addWidget(self.horizontalLine, 2, 0, 1, 4)
         self.label.setStyleSheet(Style.LABEL_TEXT)
 
     def setupConnections(self):
@@ -84,8 +91,17 @@ def setupConnections(self):
         self.lineEdit.textChanged.connect(self.validateText)
         self.lineEdit.textChanged.connect(self.textChanged)
         self.lineEdit.focusChange.connect(self.textFocusChange)
+        if self.toggleable:
+            self.label.toggle.valueChanged.connect(self.toggled)
+            self.toggled(self.label.toggle.value())
         # pylint: enable=no-member
 
+    @property
+    def toggleValue(self):
+        if self.toggleable:
+            return self.label.toggle.value()
+        return True
+
     def setFileBrowsable(self, fileFilter=None):
         """ Displays the Browse button and hook it to a fileBrowser with optional file filters
 
@@ -148,11 +164,20 @@ def disable(self):
         """Make widget grey and read-only"""
         self.lineEdit.setReadOnly(True)
         self.lineEdit.setStyleSheet(Style.DISABLED_LINE_EDIT)
+        self.stateChanged.emit()
 
     def enable(self):
         """Make widget editable"""
         self.lineEdit.setReadOnly(False)
         self.lineEdit.setStyleSheet(Style.LINE_EDIT)
+        self.stateChanged.emit()
+
+    def toggled(self, value):
+        """Action when the toggle is clicked."""
+        if value:
+            self.enable()
+        else:
+            self.disable()
 
 
 class CueLineEdit(QtWidgets.QLineEdit):

From 5b6c204b05de7248748cb4830685af65eedb19b1 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:13:31 +0200
Subject: [PATCH 58/79] feat: CueSelectPulldown: add tooltip and select proper
 option.

---
 cuesubmit/cuesubmit/ui/Widgets.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index b1e4c5208..bfaffcf88 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -248,7 +248,7 @@ class CueSelectPulldown(QtWidgets.QWidget):
     """A button that acts like a dropdown and supports multiselect."""
 
     def __init__(
-            self, labelText=None, emptyText='[None]', options=None, multiselect=True, parent=None):
+            self, labelText=None, emptyText='[None]', options=None, tooltip=None, multiselect=True, parent=None):
         super(CueSelectPulldown, self).__init__(parent=parent)
         self.multiselect = multiselect
         self.emptyText = emptyText
@@ -259,13 +259,15 @@ def __init__(
         self.optionsMenu = QtWidgets.QMenu(self)
         self.optionsMenu.setStyleSheet(Style.PULLDOWN_LIST)
         self.setOptions(options)
+        self.setToolTip(tooltip)
         self.signals = [self.optionsMenu.triggered]
         self.getter = self.text
         self.setter = self.setCheckedFromText
         if self.multiselect:
             self.toolButton.setText(self.emptyText)
         else:
-            self.setChecked([options[0]])
+            default_option = self.emptyText if self.emptyText in options else options[0]
+            self.setChecked([default_option])
         self.setupUi()
         self.setupConnections()
 
@@ -364,6 +366,7 @@ def __init__(self, spacerType, width=20, height=40):
         """
         super(CueSpacerItem, self).__init__(width, height, spacerType[0], spacerType[1])
 
+
 class CueLabelSlider(QtWidgets.QWidget):
     """Container widget that holds a label and an int or float slider.
     Behaves as a float slider when providing a float_precision

From 9275e3a6f9f2b9475f87baea6f2053e99c39d04f Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:14:58 +0200
Subject: [PATCH 59/79] feat: CueLabelToggle: add tooltip, fix layout and make
 label clickable to trigger the toggle.

---
 cuesubmit/cuesubmit/ui/Widgets.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index bfaffcf88..a0f2ea2f0 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -459,14 +459,16 @@ class CueLabelToggle(QtWidgets.QWidget):
     actionTriggered = QtCore.Signal(int)
     rangeChanged = QtCore.Signal(int, int)
 
-    def __init__(self, label=None, default_value=False, parent=None):
+    def __init__(self, label=None, tooltip=None, default_value=False, parent=None):
         super(CueLabelToggle, self).__init__(parent=parent)
         self.mainLayout = QtWidgets.QHBoxLayout()
-        self.label = QtWidgets.QLabel(label, parent=self)
-        self.label.setMinimumWidth(120)
-        self.label.setAlignment(QtCore.Qt.AlignVCenter)
+        self.mainLayout.setContentsMargins(0, 0, 0, 0)
         self.toggle = CueToggle(parent=self)
         self.toggle.setValue(default_value)
+        self.label = QtWidgets.QLabel(label, parent=self)
+        self.label.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.label.setAlignment(QtCore.Qt.AlignVCenter)
+        self.setToolTip(tooltip)
         self.signals = [self.toggle.valueChanged]
         self.getter = self.toggle.value
         self.setter = self.toggle.setValue
@@ -476,9 +478,13 @@ def __init__(self, label=None, default_value=False, parent=None):
     def setupUi(self):
         """Creates the widget layout."""
         self.setLayout(self.mainLayout)
-        self.mainLayout.addWidget(self.label)
         self.mainLayout.addWidget(self.toggle)
-        self.mainLayout.addSpacerItem(CueSpacerItem(SpacerTypes.HORIZONTAL))
+        self.mainLayout.addWidget(self.label)
+        self.setSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+
+    def mousePressEvent(self, e):
+        """Passes any mousePressEvent to the toggle, this way we can click on the label."""
+        self.toggle.toggle()
 
     def setupConnections(self):
         """Sets up widget signals."""
@@ -502,6 +508,7 @@ def __init__(self, *args, **kwargs):
         self.setMaximum(1)
         self.setSingleStep(1)
         self.setFixedWidth(30)
+        self.setFixedHeight(20)
         self.setupConnections()
         self.setStyleSheet(Style.TOGGLE_DEFAULT)
 

From fe4d549323a2c5b93741b4bfc0f471c3ab37019c Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:15:34 +0200
Subject: [PATCH 60/79] chore: remove ghost spacer item in helpWidget

---
 cuesubmit/cuesubmit/ui/Widgets.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index a0f2ea2f0..be2179c41 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -557,7 +557,6 @@ def __init__(self, parent=None):
         self.mainLayout.addLayout(self.contentLayout, 0, 0, 1, 4)
         self.mainLayout.addWidget(self.helpButton, 0, 4, 1, 1)
         self.mainLayout.addWidget(self.helpTextField, 1, 0, 1, 5)
-        self.mainLayout.addItem(CueSpacerItem(SpacerTypes.VERTICAL), 3, 0, 1, 5)
         self.mainLayout.setVerticalSpacing(0)
         self.mainLayout.setRowStretch(3, 1)
 

From 23075d46b1a270bdd1119afe58d71f4c6b895e7a Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:16:08 +0200
Subject: [PATCH 61/79] chore: DynamicSettingsWidget: manage sizePolicy to
 avoid it expanding.

---
 cuesubmit/cuesubmit/ui/SettingsWidgets.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cuesubmit/cuesubmit/ui/SettingsWidgets.py b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
index 81f307f6d..ba377d394 100644
--- a/cuesubmit/cuesubmit/ui/SettingsWidgets.py
+++ b/cuesubmit/cuesubmit/ui/SettingsWidgets.py
@@ -276,6 +276,7 @@ def __init__(self, parent=None, tool_name=None, parameters=None):
         self.groupBox.setTitle(f'{tool_name} options')
         self.widgets = buildDynamicWidgets(parameters)
         self.setupUi()
+        self.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
         self.setupConnections()
 
     def setupUi(self):

From 4b97913290982d3ab6ed151fbc6455943f3817f7 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:18:24 +0200
Subject: [PATCH 62/79] feat: add option to override min cores.

---
 cuesubmit/cuesubmit/ui/Submit.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index 5eb0a09fd..9c8281685 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -110,6 +110,7 @@ def __init__(
         self.settingsLayout = QtWidgets.QHBoxLayout()
 
         self.coresLayout = QtWidgets.QHBoxLayout()
+        self.coresLayout.setSpacing(10)
         self.servicesLayout = QtWidgets.QHBoxLayout()
         self.showLayout = QtWidgets.QGridLayout()
         self.facilityLayout = QtWidgets.QGridLayout()
@@ -173,10 +174,17 @@ def __init__(
             options=Util.getLimits()
         )
         self.coresInput = Widgets.CueLabelLineEdit(
-            'Min Cores:',
+            'Override Cores:',
             '0',
-            tooltip='Minimum number of cores to run. 0 is any',
-            validators=[Validators.matchNumbersOnly]
+            tooltip='Override the number of cores for this layer\n'
+                    'If disabled, use the service settings.\n'
+                    '0: all cores.\n'
+                    '-2: all cores minus 2.\n'
+                    'Values <= 0 force a host to accept only one job.',
+            toggleable=True,
+            toggleValue=False,
+            horizontal=True,
+            validators=[Validators.matchIntegers]
         )
         self.chunkInput = Widgets.CueLabelLineEdit(
             'Chunk Size:',
@@ -190,6 +198,7 @@ def __init__(
             emptyText='',
             options=[Layer.DependType.Null, Layer.DependType.Layer, Layer.DependType.Frame],
             multiselect=False)
+        self.coresInput.lineEdit.setFixedWidth(103)
 
         allocations = Util.getAllocations()
         facilities = Util.getFacilities(allocations)
@@ -204,7 +213,7 @@ def __init__(
 
         self.settingsWidget = self.jobTypes.build(self.primaryWidgetType, *args, **kwargs)
         self.commandFeedback = Widgets.CueLabelLineEdit( labelText='Final command:' )
-        self.commandFeedback.greyOut()
+        self.commandFeedback.disable()
         self.jobTreeWidget = Job.CueJobWidget()
         self.submitButtons = CueSubmitButtons()
         self.setupUi()
@@ -238,8 +247,9 @@ def setupConnections(self):
         self.jobTypeSelector.optionsMenu.triggered.connect(self.jobTypeChanged)
         self.servicesSelector.optionsMenu.triggered.connect(self.jobDataChanged)
         self.limitsSelector.optionsMenu.triggered.connect(self.jobDataChanged)
-        self.coresInput.lineEdit.textChanged.connect(self.jobDataChanged)
         self.chunkInput.lineEdit.textChanged.connect(self.jobDataChanged)
+        self.coresInput.stateChanged.connect(self.jobDataChanged)
+        self.coresInput.textChanged.connect(self.jobDataChanged)
         self.dependSelector.optionsMenu.triggered.connect(self.dependencyChanged)
         # pylint: enable=no-member
 
@@ -330,6 +340,7 @@ def jobLayerSelectionChanged(self, layerObject):
         self.limitsSelector.clearChecked()
         self.limitsSelector.setChecked(layerObject.limits)
         self.coresInput.setText(str(layerObject.cores))
+        self.coresInput.label.toggle.setValue(bool(layerObject.overrideCores))
         self.chunkInput.setText(str(layerObject.chunk))
         self.dependSelector.clearChecked()
         self.dependSelector.setChecked([layerObject.dependType])
@@ -349,6 +360,7 @@ def jobDataChanged(self):
             cmd=self.settingsWidget.getCommandData(),
             layerRange=self.frameBox.frameSpecInput.text(),
             chunk=self.chunkInput.text(),
+            overrideCores=self.coresInput.toggleValue,
             cores=self.coresInput.text(),
             env=None,
             services=self.servicesSelector.getChecked(),

From 43ca5e95f6be449d3ddc34813310284059bb3f5a Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:20:40 +0200
Subject: [PATCH 63/79] chore: add tooltips and re-order UI to gather related
 widgets.

---
 cuesubmit/cuesubmit/ui/Submit.py | 79 ++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 29 deletions(-)

diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index 9c8281685..a30e7efa6 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -103,8 +103,13 @@ def __init__(
         self.mainLayout.addWidget(self.scrollArea)
         self.jobInfoLayout = QtWidgets.QVBoxLayout()
         self.layerInfoLayout = QtWidgets.QVBoxLayout()
+        self.layerLayout = QtWidgets.QHBoxLayout()
+        self.layerLayout.setSpacing(0)
+        self.framesLayout = QtWidgets.QHBoxLayout()
+        self.framesLayout.setSpacing(0)
         self.submissionDetailsLayout = QtWidgets.QVBoxLayout()
         self.jobInfoLayout.setContentsMargins(20, 0, 0, 0)
+        self.jobInfoLayout.setSpacing(0)
         self.layerInfoLayout.setContentsMargins(20, 0, 0, 0)
         self.submissionDetailsLayout.setContentsMargins(20, 0, 0, 0)
         self.settingsLayout = QtWidgets.QHBoxLayout()
@@ -157,7 +162,27 @@ def __init__(
             validators=[Validators.matchNoSpecialCharactersOnly, Validators.moreThan3Chars,
                         Validators.matchNoSpaces]
         )
+        self.layerNameInput.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
+        self.dependSelector = Widgets.CueSelectPulldown(
+            'Dependency Type:',
+            emptyText='',
+            tooltip='No dependency: start as soon as possible.\n'
+                    'Layer: start after the previous layer.\n'
+                    'Frame: start each frame after the previous layer\'s matching frame finished.',
+            options=[Layer.DependType.Null, Layer.DependType.Layer, Layer.DependType.Frame],
+            multiselect=False)
+
         self.frameBox = Frame.FrameSpecWidget()
+        self.frameBox.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        self.chunkInput = Widgets.CueLabelLineEdit(
+            'Chunk Size:',
+            '1',
+            tooltip='Chunk frames by this value. Integers equal or greater than 1.',
+            validators=[Validators.matchPositiveIntegers]
+        )
+        self.chunkInput.lineEdit.setFixedWidth(120)
+        self.chunkInput.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+
         jobTypes = self.jobTypes.types()
         self.jobTypeSelector = Widgets.CueSelectPulldown(
             'Job Type:',
@@ -167,10 +192,14 @@ def __init__(
         self.jobTypeSelector.setChecked(self.primaryWidgetType)
         self.servicesSelector = Widgets.CueSelectPulldown(
             'Services:',
+            tooltip='A service is a collection of resource requirements and tags that are associated with a layer.\n'
+                    'It is used to help the farm allocate proper resources to the job.',
             options=Util.getServices()
         )
         self.limitsSelector = Widgets.CueSelectPulldown(
             'Limits:',
+            tooltip='A limit is set to avoid running too many jobs.\n'
+                    'For instance it can be the number of licenses available on the farm.',
             options=Util.getLimits()
         )
         self.coresInput = Widgets.CueLabelLineEdit(
@@ -186,18 +215,6 @@ def __init__(
             horizontal=True,
             validators=[Validators.matchIntegers]
         )
-        self.chunkInput = Widgets.CueLabelLineEdit(
-            'Chunk Size:',
-            '1',
-            tooltip='Chunk frames by this value. Integers equal or greater than 1.',
-            validators=[Validators.matchPositiveIntegers]
-        )
-        self.chunkInput.lineEdit.setFixedWidth(120)
-        self.dependSelector = Widgets.CueSelectPulldown(
-            'Dependency Type:',
-            emptyText='',
-            options=[Layer.DependType.Null, Layer.DependType.Layer, Layer.DependType.Frame],
-            multiselect=False)
         self.coresInput.lineEdit.setFixedWidth(103)
 
         allocations = Util.getAllocations()
@@ -205,10 +222,13 @@ def __init__(
         preset_facility = Util.getPresetFacility()
         selected_facility = preset_facility if preset_facility else facilities[0]
         self.facilitySelector = Widgets.CueSelectPulldown(
-            'Facility:',
-            facilities[0],
+            labelText='Facility:',
+            emptyText=facilities[0],
             options=facilities,
-            multiselect=False)
+            multiselect=False,
+            tooltip='If you need to specify where your job is submitted.\n'
+                    f'{facilities[0]} means no specific facility.'
+        )
         self.facilitySelector.setChecked(selected_facility)
 
         self.settingsWidget = self.jobTypes.build(self.primaryWidgetType, *args, **kwargs)
@@ -240,16 +260,17 @@ def setupConnections(self):
         self.submitButtons.cancelled.connect(self.cancel)
         self.submitButtons.submitted.connect(self.submit)
         self.jobTreeWidget.selectionChanged.connect(self.jobLayerSelectionChanged)
-        self.jobNameInput.lineEdit.textChanged.connect(self.jobDataChanged)
-        self.layerNameInput.lineEdit.textChanged.connect(self.jobDataChanged)
-        self.frameBox.frameSpecInput.lineEdit.textChanged.connect(self.jobDataChanged)
+        self.jobNameInput.textChanged.connect(self.jobDataChanged)
+        self.shotInput.textChanged.connect(self.jobDataChanged)
+        self.layerNameInput.textChanged.connect(self.jobDataChanged)
+        self.frameBox.frameSpecInput.textChanged.connect(self.jobDataChanged)
         self.settingsWidget.dataChanged.connect(self.jobDataChanged)
         self.jobTypeSelector.optionsMenu.triggered.connect(self.jobTypeChanged)
         self.servicesSelector.optionsMenu.triggered.connect(self.jobDataChanged)
         self.limitsSelector.optionsMenu.triggered.connect(self.jobDataChanged)
-        self.chunkInput.lineEdit.textChanged.connect(self.jobDataChanged)
         self.coresInput.stateChanged.connect(self.jobDataChanged)
         self.coresInput.textChanged.connect(self.jobDataChanged)
+        self.chunkInput.textChanged.connect(self.jobDataChanged)
         self.dependSelector.optionsMenu.triggered.connect(self.dependencyChanged)
         # pylint: enable=no-member
 
@@ -260,7 +281,6 @@ def setupUi(self):
 
         self.scrollingLayout.addWidget(Widgets.CueLabelLine('Job Info'))
         self.jobInfoLayout.addWidget(self.jobNameInput)
-        self.jobInfoLayout.addWidget(self.userNameInput)
         self.showLayout.setHorizontalSpacing(20)
         self.showLayout.setColumnStretch(1, 1)
         self.showLayout.addWidget(self.showSelector, 0, 0, 1, 1, QtCore.Qt.AlignLeft)
@@ -270,25 +290,27 @@ def setupUi(self):
         self.facilityLayout.setHorizontalSpacing(20)
         self.facilityLayout.setColumnStretch(1, 1)
         self.facilityLayout.addWidget(self.facilitySelector, 0, 0, 1, 1, QtCore.Qt.AlignLeft)
+        self.facilityLayout.addWidget(self.userNameInput, 0, 1, 1, 2)
         self.jobInfoLayout.addLayout(self.facilityLayout, QtCore.Qt.AlignLeft)
 
         self.scrollingLayout.addLayout(self.jobInfoLayout)
-
-        self.scrollingLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.VERTICAL))
         self.scrollingLayout.addWidget(Widgets.CueLabelLine('Layer Info'))
-        self.layerInfoLayout.addWidget(self.layerNameInput)
-        self.layerInfoLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.VERTICAL))
-        self.layerInfoLayout.addWidget(self.frameBox)
+
+        self.layerInfoLayout.addLayout(self.layerLayout)
+        self.layerLayout.addWidget(self.layerNameInput)
+        self.layerLayout.addWidget(self.dependSelector)
+
+        self.framesLayout.addWidget(self.frameBox)
+        self.framesLayout.addWidget(self.chunkInput)
+        self.layerInfoLayout.addLayout(self.framesLayout)
 
         self.servicesLayout.addWidget(self.jobTypeSelector)
         self.servicesLayout.addWidget(self.servicesSelector)
         self.servicesLayout.addWidget(self.limitsSelector)
-        self.servicesLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.HORIZONTAL))
+        self.servicesLayout.addStretch(1)
         self.layerInfoLayout.addLayout(self.servicesLayout)
 
         self.coresLayout.addWidget(self.coresInput)
-        self.coresLayout.addWidget(self.chunkInput)
-        self.coresLayout.addWidget(self.dependSelector)
         self.coresLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.HORIZONTAL))
         self.layerInfoLayout.addLayout(self.coresLayout)
         self.layerInfoLayout.addLayout(self.settingsLayout)
@@ -297,7 +319,6 @@ def setupUi(self):
 
         self.settingsLayout.addWidget(self.settingsWidget)
 
-        self.scrollingLayout.addSpacerItem(Widgets.CueSpacerItem(Widgets.SpacerTypes.VERTICAL))
         self.scrollingLayout.addWidget(Widgets.CueLabelLine('Submission Details'))
 
         self.submissionDetailsLayout.addWidget(self.jobTreeWidget)

From f385cc06ea7685244a31996d805639e00bec16f5 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 01:21:41 +0200
Subject: [PATCH 64/79] feat: add overrideCores option during job submission.

---
 cuesubmit/cuesubmit/Layer.py      |  6 +++++-
 cuesubmit/cuesubmit/Submission.py | 12 ++++++++++--
 cuesubmit/cuesubmit/Util.py       | 10 ++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/cuesubmit/cuesubmit/Layer.py b/cuesubmit/cuesubmit/Layer.py
index ccb0e034f..ffeab9d54 100644
--- a/cuesubmit/cuesubmit/Layer.py
+++ b/cuesubmit/cuesubmit/Layer.py
@@ -41,6 +41,7 @@ def __init__(self):
         self.cmd = {}
         self.layerRange = ''
         self.chunk = '1'
+        self.overrideCores = False
         self.cores = '1'
         self.env = {}
         self.services = []
@@ -76,7 +77,8 @@ def buildFactory(name=None, layerType=None, cmd=None, layerRange=None, chunk=Non
                          dependType, dependsOn)
         return layerData
 
-    def update(self, name=None, layerType=None, cmd=None, layerRange=None, chunk=None, cores=None,
+    def update(self, name=None, layerType=None, cmd=None, layerRange=None, chunk=None,
+               overrideCores=None, cores=None,
                env=None, services=None, limits=None, dependType=None, dependsOn=None):
         """Update this Layer with the provided settings."""
         if name is not None:
@@ -91,6 +93,8 @@ def update(self, name=None, layerType=None, cmd=None, layerRange=None, chunk=Non
             self.chunk = chunk
         if cores is not None:
             self.cores = cores
+        if overrideCores is not None:
+            self.overrideCores = overrideCores
         if env is not None:
             self.env = env
         if services is not None:
diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index db9b716ff..c3cfc3160 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -29,6 +29,7 @@
 
 from cuesubmit import Constants
 from cuesubmit import JobTypes
+from cuesubmit import Util
 
 
 def isSoloFlag(flag):
@@ -139,10 +140,17 @@ def buildLayer(layerData, command, lastLayer=None):
     @type lastLayer: outline.layer.Layer
     @param lastLayer: layer that this new layer should be dependent on if dependType is set.
     """
-    threadable = float(layerData.cores) >= 2
+    threadable = False
+    if layerData.overrideCores:
+        threadable = float(layerData.cores) >= 2 or float(layerData.cores) <= 0
+    elif layerData.services and layerData.services[0] in Util.getServices():
+        threadable = Util.getServiceOption(layerData.services[0], 'threadable')
+
+    tags = []
     layer = outline.modules.shell.Shell(
         layerData.name, command=command.split(), chunk=layerData.chunk,
-        threads=float(layerData.cores), range=str(layerData.layerRange), threadable=threadable)
+        overrideCores=layerData.overrideCores, cores=layerData.cores,
+        range=str(layerData.layerRange), threadable=threadable)
     if layerData.services:
         layer.set_service(layerData.services[0])
     if layerData.limits:
diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index 861fd28ff..c5ad6814c 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -22,6 +22,7 @@
 
 import os
 import re
+import socket
 
 import opencue
 from cuesubmit import Constants
@@ -37,6 +38,14 @@ def getServices():
     return [service.name() for service in opencue.api.getDefaultServices()]
 
 
+def getServiceOption(serviceName, option):
+    """Returns the value of a service property."""
+    service = next(iter(service for service in opencue.api.getDefaultServices() if service.name() == serviceName))
+    if service and hasattr(service, option):
+        return getattr(service, option)()
+    print(f'{service.name()} service has no {option} option.')
+
+
 def getShows():
     """Returns a list of show names from cuebot."""
     return [show.name() for show in opencue.api.getShows()]
@@ -69,6 +78,7 @@ def getFacilities(allocations):
     facilities = set(alloc.data.facility for alloc in allocations)
     return default_facilities + list(facilities)
 
+
 def convertCommandOptions(options):
     """ Parse command options from the config file
     and return parameters to feed the UI (name, type, value)

From 47daaa631dee66c59a0a3230f621ee6713dde7e9 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 02:40:25 +0200
Subject: [PATCH 65/79] chores: fix pylint issues

---
 cuesubmit/cuesubmit/Submission.py |  1 -
 cuesubmit/cuesubmit/Util.py       |  6 ++++--
 cuesubmit/cuesubmit/ui/Job.py     |  3 ++-
 cuesubmit/cuesubmit/ui/Submit.py  |  6 ++++--
 cuesubmit/cuesubmit/ui/Widgets.py | 10 +++++++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index c3cfc3160..6e1785a5f 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -146,7 +146,6 @@ def buildLayer(layerData, command, lastLayer=None):
     elif layerData.services and layerData.services[0] in Util.getServices():
         threadable = Util.getServiceOption(layerData.services[0], 'threadable')
 
-    tags = []
     layer = outline.modules.shell.Shell(
         layerData.name, command=command.split(), chunk=layerData.chunk,
         overrideCores=layerData.overrideCores, cores=layerData.cores,
diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index c5ad6814c..ec841acef 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -22,7 +22,6 @@
 
 import os
 import re
-import socket
 
 import opencue
 from cuesubmit import Constants
@@ -40,10 +39,12 @@ def getServices():
 
 def getServiceOption(serviceName, option):
     """Returns the value of a service property."""
-    service = next(iter(service for service in opencue.api.getDefaultServices() if service.name() == serviceName))
+    service = next(iter(service for service in opencue.api.getDefaultServices()
+                        if service.name() == serviceName))
     if service and hasattr(service, option):
         return getattr(service, option)()
     print(f'{service.name()} service has no {option} option.')
+    return None
 
 
 def getShows():
@@ -52,6 +53,7 @@ def getShows():
 
 
 def getDefaultShow():
+    """Returns the default show defined via environment variable or config file, if set."""
     default_show = next(iter([show for show in getShows()
                               if re.match(show, Constants.DEFAULT_SHOW, re.IGNORECASE)]),
                         'no default show')
diff --git a/cuesubmit/cuesubmit/ui/Job.py b/cuesubmit/cuesubmit/ui/Job.py
index 005fdebe0..69c4193c5 100644
--- a/cuesubmit/cuesubmit/ui/Job.py
+++ b/cuesubmit/cuesubmit/ui/Job.py
@@ -36,7 +36,8 @@ def __init__(self, parent=None):
         super(CueJobWidget, self).__init__(parent=parent)
 
         self.table = CueJobTree()
-        self.table.setSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        self.table.setSizePolicy(QtWidgets.QSizePolicy.Preferred,
+                                 QtWidgets.QSizePolicy.MinimumExpanding)
         self.model = CueJobModel()
         self.jobRow = QtGui.QStandardItem('')
         self.jobRow.setEditable(False)
diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index a30e7efa6..f93fe82d1 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -162,7 +162,8 @@ def __init__(
             validators=[Validators.matchNoSpecialCharactersOnly, Validators.moreThan3Chars,
                         Validators.matchNoSpaces]
         )
-        self.layerNameInput.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
+        self.layerNameInput.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding,
+                                          QtWidgets.QSizePolicy.Maximum)
         self.dependSelector = Widgets.CueSelectPulldown(
             'Dependency Type:',
             emptyText='',
@@ -192,7 +193,8 @@ def __init__(
         self.jobTypeSelector.setChecked(self.primaryWidgetType)
         self.servicesSelector = Widgets.CueSelectPulldown(
             'Services:',
-            tooltip='A service is a collection of resource requirements and tags that are associated with a layer.\n'
+            tooltip='A service is a collection of resource requirements'
+                    ' and tags that are associated with a layer.\n'
                     'It is used to help the farm allocate proper resources to the job.',
             options=Util.getServices()
         )
diff --git a/cuesubmit/cuesubmit/ui/Widgets.py b/cuesubmit/cuesubmit/ui/Widgets.py
index be2179c41..e88240006 100644
--- a/cuesubmit/cuesubmit/ui/Widgets.py
+++ b/cuesubmit/cuesubmit/ui/Widgets.py
@@ -56,7 +56,8 @@ def __init__(self, labelText=None, defaultText='', tooltip=None, validators=None
         self.mainLayout.setVerticalSpacing(0)
         self.toggleable = toggleable
         if self.toggleable:
-            self.label = CueLabelToggle(labelText, default_value=toggleValue, tooltip=tooltip, parent=self)
+            self.label = CueLabelToggle(labelText, default_value=toggleValue,
+                                        tooltip=tooltip, parent=self)
         else:
             self.label = QtWidgets.QLabel(labelText)
             self.label.setAlignment(QtCore.Qt.AlignLeft)
@@ -98,6 +99,7 @@ def setupConnections(self):
 
     @property
     def toggleValue(self):
+        """ Return the current toggle value """
         if self.toggleable:
             return self.label.toggle.value()
         return True
@@ -248,7 +250,8 @@ class CueSelectPulldown(QtWidgets.QWidget):
     """A button that acts like a dropdown and supports multiselect."""
 
     def __init__(
-            self, labelText=None, emptyText='[None]', options=None, tooltip=None, multiselect=True, parent=None):
+            self, labelText=None, emptyText='[None]', options=None,
+            tooltip=None, multiselect=True, parent=None):
         super(CueSelectPulldown, self).__init__(parent=parent)
         self.multiselect = multiselect
         self.emptyText = emptyText
@@ -482,7 +485,8 @@ def setupUi(self):
         self.mainLayout.addWidget(self.label)
         self.setSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
 
-    def mousePressEvent(self, e):
+    # pylint: disable=unused-argument
+    def mousePressEvent(self, mouseEvent):
         """Passes any mousePressEvent to the toggle, this way we can click on the label."""
         self.toggle.toggle()
 

From fb91f2f53d7fdf5c721c527c626d61f8799dc566 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 02:41:30 +0200
Subject: [PATCH 66/79] test: update test with the override setting

---
 pyoutline/tests/backend/cue_test.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pyoutline/tests/backend/cue_test.py b/pyoutline/tests/backend/cue_test.py
index 89c7bcac7..2550dadec 100644
--- a/pyoutline/tests/backend/cue_test.py
+++ b/pyoutline/tests/backend/cue_test.py
@@ -103,7 +103,7 @@ def create(self):
         ol.add_layer(layer)
         return ol, layer
 
-    def assertCores(self, ol, v):
+    def assertCoresOverride(self, ol, v):
         launcher = outline.cuerun.OutlineLauncher(ol, user=TEST_USER)
         outlineXml = ET.fromstring(outline.backend.cue.serialize(launcher))
         job = outlineXml.find('job')
@@ -112,20 +112,34 @@ def assertCores(self, ol, v):
 
     def testCores(self):
         ol, layer = self.create()
+        layer.set_arg("overrideCores", True)
         layer.set_arg("cores", 42)
-        self.assertCores(ol, "42.0")
+        self.assertCoresOverride(ol, "42.0")
 
     def testThreads(self):
         ol, layer = self.create()
+        layer.set_arg("overrideCores", True)
         layer.set_arg("threads", 4)
-        self.assertCores(ol, "4.0")
+        self.assertCoresOverride(ol, "4.0")
 
     def testCoresAndThreads(self):
         ol, layer = self.create()
+        layer.set_arg("overrideCores", True)
         layer.set_arg("cores", 8)
         layer.set_arg("threads", 4)
         # cores overrides threads
-        self.assertCores(ol, "8.0")
+        self.assertCoresOverride(ol, "8.0")
+
+    def testNoCoreOverride(self):
+        ol, layer = self.create()
+        layer.set_arg("overrideCores", False)
+        layer.set_arg("cores", 8)
+
+        launcher = outline.cuerun.OutlineLauncher(ol, user=TEST_USER)
+        outlineXml = ET.fromstring(outline.backend.cue.serialize(launcher))
+        job = outlineXml.find('job')
+        layer = job.find('layers').find('layer')
+        self.assertIsNone(layer.find('cores'))
 
 
 class BuildCommandTest(unittest.TestCase):

From 82e98f118a1f1ffefecbdc5c19ba894560fadb15 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 02:58:38 +0200
Subject: [PATCH 67/79] fix: forgot overrideCore argument in the buildFactory.

---
 cuesubmit/cuesubmit/Layer.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cuesubmit/cuesubmit/Layer.py b/cuesubmit/cuesubmit/Layer.py
index ffeab9d54..1d7dfad01 100644
--- a/cuesubmit/cuesubmit/Layer.py
+++ b/cuesubmit/cuesubmit/Layer.py
@@ -69,12 +69,15 @@ def toDict(self):
         }
 
     @staticmethod
-    def buildFactory(name=None, layerType=None, cmd=None, layerRange=None, chunk=None, cores=None,
-                     env=None, services=None, limits=None, dependType=None, dependsOn=None):
+    def buildFactory(name=None, layerType=None, cmd=None, layerRange=None, chunk=None,
+                     overrideCores=None, cores=None, env=None, services=None, limits=None,
+                     dependType=None, dependsOn=None):
         """Build a new LayerData object with the given settings."""
         layerData = LayerData()
-        layerData.update(name, layerType, cmd, layerRange, chunk, cores, env, services, limits,
-                         dependType, dependsOn)
+        layerData.update(name=name, layerType=layerType, cmd=cmd, layerRange=layerRange,
+                         chunk=chunk, overrideCores=overrideCores, cores=cores, env=env,
+                         services=services, limits=limits,
+                         dependType=dependType, dependsOn=dependsOn)
         return layerData
 
     def update(self, name=None, layerType=None, cmd=None, layerRange=None, chunk=None,

From 06368ccbb6daa953a66fcc80125086dcbce00d51 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sat, 21 Sep 2024 03:24:30 +0200
Subject: [PATCH 68/79] test: handle connection error to pass the tests (no
 cuebot available during CI)

---
 cuesubmit/cuesubmit/Util.py         | 7 ++++++-
 cuesubmit/tests/Submission_tests.py | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/Util.py b/cuesubmit/cuesubmit/Util.py
index ec841acef..5b6680da8 100644
--- a/cuesubmit/cuesubmit/Util.py
+++ b/cuesubmit/cuesubmit/Util.py
@@ -34,7 +34,12 @@ def getLimits():
 
 def getServices():
     """Returns a list of service names from cuebot."""
-    return [service.name() for service in opencue.api.getDefaultServices()]
+    try:
+        services = opencue.api.getDefaultServices()
+    except opencue.exception.ConnectionException:
+        return []
+    else:
+        return [service.name() for service in services]
 
 
 def getServiceOption(serviceName, option):
diff --git a/cuesubmit/tests/Submission_tests.py b/cuesubmit/tests/Submission_tests.py
index 38e10bcab..1f91e97a5 100644
--- a/cuesubmit/tests/Submission_tests.py
+++ b/cuesubmit/tests/Submission_tests.py
@@ -36,6 +36,7 @@
     'layerType': cuesubmit.JobTypes.JobTypes.MAYA,
     'cmd': {'camera': 'renderCam', 'mayaFile': '/path/to/scene.ma'},
     'layerRange': '1-5',
+    'overrideCores': True,
     'cores': '6',
     'services': ['maya', 'foo'],
 }
@@ -45,6 +46,7 @@
     'layerType': cuesubmit.JobTypes.JobTypes.NUKE,
     'cmd': {'writeNodes': 'Write1,Write2', 'nukeFile': '/path/to/script.nk'},
     'layerRange': '17-124',
+    'overrideCores': False,
     'cores': '1',
     'services': ['nuke'],
 }
@@ -56,6 +58,7 @@
             'blenderFile': '/path/to/scene.blend',
             'outputFormat': 'PNG'},
     'layerRange': '3-9',
+    'overrideCores': True,
     'cores': '2',
     'services': ['blender']
 }
@@ -66,6 +69,7 @@
     'cmd': {'outputPath': '/path/to/output',
             'blenderFile': '/path/to/scene.blend',
             'outputFormat': 'PNG'},
+    'overrideCores': True,
     'cores': '2',
     'services': ['blender']
 }

From 3c0a053fcf83b650adaa8f083b38347bfa6145e8 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 00:12:45 +0200
Subject: [PATCH 69/79] fix: for backward compatibility, check if we override
 cores by testing if "cores" is not None. If it has an explicit value (like in
 existing implementations), this means we want to override the value, which is
 the default behavior. Otherwise, we let the server assign the value of
 selected service.

---
 pyoutline/outline/backend/cue.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
index 78924fd4a..718f3f93e 100644
--- a/pyoutline/outline/backend/cue.py
+++ b/pyoutline/outline/backend/cue.py
@@ -319,15 +319,14 @@ def _serialize(launcher, use_pycuerun):
 
         # opencue specific options
         # Keeping 'threads' for backward compatibility
-        cores = None
-        if layer.get_arg("overrideCores"):
+        if layer.get_arg("cores") is None:
+            logger.info("%s will use service cores.", layer.get_name())
+        else:
             logger.info("%s is set to override service cores.", layer.get_name())
             if layer.is_arg_set("cores") and layer.is_arg_set("threads"):
                 logger.warning("%s has both cores and threads. Use cores.", layer.get_name())
             cores = "%0.1f" % float(layer.get_arg("cores") or layer.get_arg("threads", 0))
             sub_element(spec_layer, "cores", cores)
-        else:
-            logger.warning("%s will use service cores.", layer.get_name())
 
         if layer.is_arg_set("threadable"):
             sub_element(spec_layer, "threadable",

From 731bf80507bf8c5f8869069b7653abea1a0fd684 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 00:18:05 +0200
Subject: [PATCH 70/79] fix: revert to default behavior, we do not override
 only if the "cores" value is None.

---
 pyoutline/tests/backend/cue_test.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pyoutline/tests/backend/cue_test.py b/pyoutline/tests/backend/cue_test.py
index 2550dadec..7dfcfe1aa 100644
--- a/pyoutline/tests/backend/cue_test.py
+++ b/pyoutline/tests/backend/cue_test.py
@@ -112,19 +112,16 @@ def assertCoresOverride(self, ol, v):
 
     def testCores(self):
         ol, layer = self.create()
-        layer.set_arg("overrideCores", True)
         layer.set_arg("cores", 42)
         self.assertCoresOverride(ol, "42.0")
 
     def testThreads(self):
         ol, layer = self.create()
-        layer.set_arg("overrideCores", True)
         layer.set_arg("threads", 4)
         self.assertCoresOverride(ol, "4.0")
 
     def testCoresAndThreads(self):
         ol, layer = self.create()
-        layer.set_arg("overrideCores", True)
         layer.set_arg("cores", 8)
         layer.set_arg("threads", 4)
         # cores overrides threads
@@ -132,8 +129,7 @@ def testCoresAndThreads(self):
 
     def testNoCoreOverride(self):
         ol, layer = self.create()
-        layer.set_arg("overrideCores", False)
-        layer.set_arg("cores", 8)
+        layer.set_arg("cores", None)
 
         launcher = outline.cuerun.OutlineLauncher(ol, user=TEST_USER)
         outlineXml = ET.fromstring(outline.backend.cue.serialize(launcher))

From f7062afc99f48f188f63c1e864c355154eee07bd Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 00:20:13 +0200
Subject: [PATCH 71/79] fix: revert to default behavior, we do not override
 only if the "cores" value is None.

---
 cuesubmit/tests/Submission_tests.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cuesubmit/tests/Submission_tests.py b/cuesubmit/tests/Submission_tests.py
index 1f91e97a5..38e10bcab 100644
--- a/cuesubmit/tests/Submission_tests.py
+++ b/cuesubmit/tests/Submission_tests.py
@@ -36,7 +36,6 @@
     'layerType': cuesubmit.JobTypes.JobTypes.MAYA,
     'cmd': {'camera': 'renderCam', 'mayaFile': '/path/to/scene.ma'},
     'layerRange': '1-5',
-    'overrideCores': True,
     'cores': '6',
     'services': ['maya', 'foo'],
 }
@@ -46,7 +45,6 @@
     'layerType': cuesubmit.JobTypes.JobTypes.NUKE,
     'cmd': {'writeNodes': 'Write1,Write2', 'nukeFile': '/path/to/script.nk'},
     'layerRange': '17-124',
-    'overrideCores': False,
     'cores': '1',
     'services': ['nuke'],
 }
@@ -58,7 +56,6 @@
             'blenderFile': '/path/to/scene.blend',
             'outputFormat': 'PNG'},
     'layerRange': '3-9',
-    'overrideCores': True,
     'cores': '2',
     'services': ['blender']
 }
@@ -69,7 +66,6 @@
     'cmd': {'outputPath': '/path/to/output',
             'blenderFile': '/path/to/scene.blend',
             'outputFormat': 'PNG'},
-    'overrideCores': True,
     'cores': '2',
     'services': ['blender']
 }

From 01d3fb2b3c3a3417a6bc49657806a809f826fc36 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 00:52:20 +0200
Subject: [PATCH 72/79] fix: only send "cores" to pyoutline, "overrideCores" is
 only set in cuesubmit.

---
 cuesubmit/cuesubmit/Submission.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py
index 6e1785a5f..33a547d2c 100644
--- a/cuesubmit/cuesubmit/Submission.py
+++ b/cuesubmit/cuesubmit/Submission.py
@@ -146,9 +146,10 @@ def buildLayer(layerData, command, lastLayer=None):
     elif layerData.services and layerData.services[0] in Util.getServices():
         threadable = Util.getServiceOption(layerData.services[0], 'threadable')
 
+    cores = layerData.cores if layerData.overrideCores else None
     layer = outline.modules.shell.Shell(
         layerData.name, command=command.split(), chunk=layerData.chunk,
-        overrideCores=layerData.overrideCores, cores=layerData.cores,
+        cores=cores,
         range=str(layerData.layerRange), threadable=threadable)
     if layerData.services:
         layer.set_service(layerData.services[0])

From b3408cc9a291913c3e0bc0b1da9cacfb42f74ef2 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 00:52:44 +0200
Subject: [PATCH 73/79] fix: better UI scaling

---
 cuesubmit/cuesubmit/ui/Submit.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index f93fe82d1..dfec9f08d 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -237,6 +237,7 @@ def __init__(
         self.commandFeedback = Widgets.CueLabelLineEdit( labelText='Final command:' )
         self.commandFeedback.disable()
         self.jobTreeWidget = Job.CueJobWidget()
+        self.jobTreeWidget.setSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
         self.submitButtons = CueSubmitButtons()
         self.setupUi()
         self.setupConnections()
@@ -293,7 +294,7 @@ def setupUi(self):
         self.facilityLayout.setColumnStretch(1, 1)
         self.facilityLayout.addWidget(self.facilitySelector, 0, 0, 1, 1, QtCore.Qt.AlignLeft)
         self.facilityLayout.addWidget(self.userNameInput, 0, 1, 1, 2)
-        self.jobInfoLayout.addLayout(self.facilityLayout, QtCore.Qt.AlignLeft)
+        self.jobInfoLayout.addLayout(self.facilityLayout)
 
         self.scrollingLayout.addLayout(self.jobInfoLayout)
         self.scrollingLayout.addWidget(Widgets.CueLabelLine('Layer Info'))

From 1bb0b7af2ea40db656e5895dde3ccb0f64a5bdc6 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 02:21:33 +0200
Subject: [PATCH 74/79] fix: lint line too long

---
 cuesubmit/cuesubmit/ui/Submit.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cuesubmit/cuesubmit/ui/Submit.py b/cuesubmit/cuesubmit/ui/Submit.py
index dfec9f08d..9b05ce1ef 100644
--- a/cuesubmit/cuesubmit/ui/Submit.py
+++ b/cuesubmit/cuesubmit/ui/Submit.py
@@ -237,7 +237,8 @@ def __init__(
         self.commandFeedback = Widgets.CueLabelLineEdit( labelText='Final command:' )
         self.commandFeedback.disable()
         self.jobTreeWidget = Job.CueJobWidget()
-        self.jobTreeWidget.setSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
+        self.jobTreeWidget.setSizePolicy(QtWidgets.QSizePolicy.Preferred,
+                                         QtWidgets.QSizePolicy.Expanding)
         self.submitButtons = CueSubmitButtons()
         self.setupUi()
         self.setupConnections()

From 02fac677192756a5f0b66483b162faf5d04bddf8 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 02:22:40 +0200
Subject: [PATCH 75/79] fix: Make sure we use threads for backward
 compatibility. We check if the args are set, because checking their value
 would be False for 0 (all cores)

---
 pyoutline/outline/backend/cue.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
index 718f3f93e..38f6e0d69 100644
--- a/pyoutline/outline/backend/cue.py
+++ b/pyoutline/outline/backend/cue.py
@@ -319,14 +319,18 @@ def _serialize(launcher, use_pycuerun):
 
         # opencue specific options
         # Keeping 'threads' for backward compatibility
-        if layer.get_arg("cores") is None:
+        cores = None
+        if layer.is_arg_set("cores"):
+            cores = layer.get_arg("cores")
+        elif layer.is_arg_set("threads"):
+            cores = layer.get_arg("threads")
+        if cores is None:
             logger.info("%s will use service cores.", layer.get_name())
         else:
             logger.info("%s is set to override service cores.", layer.get_name())
             if layer.is_arg_set("cores") and layer.is_arg_set("threads"):
                 logger.warning("%s has both cores and threads. Use cores.", layer.get_name())
-            cores = "%0.1f" % float(layer.get_arg("cores") or layer.get_arg("threads", 0))
-            sub_element(spec_layer, "cores", cores)
+            sub_element(spec_layer, "cores", "%0.1f" % cores)
 
         if layer.is_arg_set("threadable"):
             sub_element(spec_layer, "threadable",

From 936f368857ba9be51dd15401e51682276fd92ccf Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 14:46:07 +0200
Subject: [PATCH 76/79] fix: cast str to float

---
 pyoutline/outline/backend/cue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
index 38f6e0d69..5eec12462 100644
--- a/pyoutline/outline/backend/cue.py
+++ b/pyoutline/outline/backend/cue.py
@@ -330,7 +330,7 @@ def _serialize(launcher, use_pycuerun):
             logger.info("%s is set to override service cores.", layer.get_name())
             if layer.is_arg_set("cores") and layer.is_arg_set("threads"):
                 logger.warning("%s has both cores and threads. Use cores.", layer.get_name())
-            sub_element(spec_layer, "cores", "%0.1f" % cores)
+            sub_element(spec_layer, "cores", "%0.1f" % float(cores))
 
         if layer.is_arg_set("threadable"):
             sub_element(spec_layer, "threadable",

From 73a66eb13e0caaf5c1e6f4de2131fedd5722ea45 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:01:44 +0200
Subject: [PATCH 77/79] feat: add opencue icon to cuesubmit window

---
 cuesubmit/cuesubmit/__main__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cuesubmit/cuesubmit/__main__.py b/cuesubmit/cuesubmit/__main__.py
index d712f30a7..a07871c4d 100644
--- a/cuesubmit/cuesubmit/__main__.py
+++ b/cuesubmit/cuesubmit/__main__.py
@@ -38,6 +38,8 @@ class CueSubmitApp(QtWidgets.QApplication):
     def __init__(self, args):
         super(CueSubmitApp, self).__init__(args)
         self.mainWindow = CueSubmitMainWindow(Constants.SUBMIT_APP_WINDOW_TITLE)
+        self.icon = QtGui.QPixmap('{}/images/OpenCue.png'.format(Constants.DIR_PATH))
+        self.setWindowIcon(self.icon)
 
     def startup(self):
         """Initializes the application and makes it appear on screen."""

From 134fd5d7d489c2ddfb565348adf4b2d32453b3c3 Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:39:17 +0200
Subject: [PATCH 78/79] fix: add `overrideCores` attribute in
 `LayerData.toDict()`

---
 cuesubmit/cuesubmit/Layer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cuesubmit/cuesubmit/Layer.py b/cuesubmit/cuesubmit/Layer.py
index 1d7dfad01..8b6b44ce7 100644
--- a/cuesubmit/cuesubmit/Layer.py
+++ b/cuesubmit/cuesubmit/Layer.py
@@ -60,6 +60,7 @@ def toDict(self):
             'cmd': self.cmd,
             'layerRange': self.layerRange,
             'chunk': self.chunk,
+            'overrideCores': self.overrideCores,
             'cores': self.cores,
             'env': self.env,
             'services': self.services,

From 261db2ffaa0cb5301fd74ccbf20eee72daafefab Mon Sep 17 00:00:00 2001
From: Kern Attila GERMAIN <5556461+KernAttila@users.noreply.github.com>
Date: Sun, 29 Sep 2024 20:11:55 +0200
Subject: [PATCH 79/79] test: add overrideCores param

---
 cuesubmit/tests/Layer_tests.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cuesubmit/tests/Layer_tests.py b/cuesubmit/tests/Layer_tests.py
index 7ba737530..b49a2f71d 100644
--- a/cuesubmit/tests/Layer_tests.py
+++ b/cuesubmit/tests/Layer_tests.py
@@ -31,6 +31,7 @@
     'cmd': 'echo #IFRAME#',
     'layerRange': '1-5',
     'limits': [],
+    'overrideCores': True,
     'cores': '6',
     'env': {'fooKey': 'barVal'},
     'services': ['shell', 'maya'],
@@ -47,6 +48,7 @@ def testFactoryAndUpdate(self):
         self.assertEqual('randomType', layer.layerType)
         self.assertEqual('echo #IFRAME#', layer.cmd)
         self.assertEqual('1-5', layer.layerRange)
+        self.assertEqual(True, layer.overrideCores)
         self.assertEqual('6', layer.cores)
         self.assertEqual('1', layer.chunk)
         self.assertEqual(None, layer.dependsOn)