deadline shortcut added to settings with type error

openpype/modules/deadline/actions/launcher_deadline.py

@@ -0,0 +1,46 @@
+import subprocess
+import os
+import platform
+import acre
+from openpype.pipeline import LauncherAction
+from openpype.modules import ModulesManager
+from openpype.client import get_project, get_asset_by_name
+from openpype.lib.applications import parse_environments, _merge_env
+from openpype.settings import (
+    get_system_settings,
+    get_general_environments
+)
+class LaunchDeadline(LauncherAction):
+    name = "launchdeadline"
+    label = "Launch Deadline"
+    icon = "/prod/softprod/apps/deadline/10.1.23.6/linux/icons/Deadline_Monitor.png"
+    color = "#e0e1e1"
+    order = 10
+
+    @staticmethod
+    def get_deadline_module():
+        return ModulesManager().modules_by_name.get("deadline")
+
+    def is_compatible(self, session):
+        if not session.get("AVALON_PROJECT"):
+            return False
+
+        return True
+
+    def process(self, session, **kwargs):
+        print("Launching Deadline")
+        # Get deadline settings
+        deadline_settings = get_system_settings()["modules"]["deadline"]
+        env_variables = deadline_settings[0]["environment"]
+        deadline_paths = deadline_settings[0]["deadline_paths"]
+        deadline_urls = deadline_settings[0]["deadline_urls"]
+        print(deadline_urls)
+
+        merge_envs = acre.merge(env_variables, os.environ)
+        parsed_env_variables = acre.compute(merge_envs, cleanup=False)
+
+        for key, value in parsed_env_variables.items():
+            os.environ[key] = value
+
+        # Call the method to open the app
+        process = subprocess.Popen(["xterm", "-e", deadline_paths["linux"][0]])

openpype/modules/deadline/deadline_module.py

@@ -23,12 +23,13 @@ def __init__(self, manager, settings):
     def initialize(self, modules_settings):
         # This module is always enabled
         deadline_settings = modules_settings[self.name]
-        self.enabled = deadline_settings["enabled"]
-        deadline_url = deadline_settings.get("DEADLINE_REST_URL")
+        self.enabled = deadline_settings[0]['enabled']
+        deadline_url = deadline_settings[0].get("DEADLINE_REST_URL")
+
         if deadline_url:
             self.deadline_urls = {"default": deadline_url}
         else:
-            self.deadline_urls = deadline_settings.get("deadline_urls")  # noqa: E501
+            self.deadline_urls = deadline_settings[0].get("deadline_urls")  # noqa: E501
 
         if not self.deadline_urls:
             self.enabled = False
@@ -40,7 +41,8 @@ def get_plugin_paths(self):
         """Deadline plugin paths."""
         current_dir = os.path.dirname(os.path.abspath(__file__))
         return {
-            "publish": [os.path.join(current_dir, "plugins", "publish")]
+            "publish": [os.path.join(current_dir, "plugins", "publish")],
+            "actions": [os.path.join(current_dir, "actions")],
         }
 
     @staticmethod

openpype/settings/defaults/system_settings/modules.json

@@ -158,12 +158,20 @@
         "enabled": false,
         "sites": {}
     },
-    "deadline": {
-        "enabled": true,
-        "deadline_urls": {
-            "default": "http://127.0.0.1:8082"
+    "deadline": [
+        {
+            "default":{
+                "enabled": true,
+                "deadline_urls": "http://127.0.0.1:8082",
+                "deadline_paths": {
+                    "windows": [],
+                    "darwin": [],
+                    "linux": []
+                },
+                "environment": {}
+            }
         }
-    },
+    ],
     "muster": {
         "enabled": false,
         "MUSTER_REST_URL": "http://127.0.0.1:9890",

openpype/settings/entities/list_entity.py

@@ -49,6 +49,7 @@ def __contains__(self, item):
         return False
 
     def __getitem__(self, idx):
+        print("ListEntity.__getitem__ : ", idx)
         if not isinstance(idx, int):
             idx = int(idx)
         return self.children[idx]

openpype/settings/entities/schemas/system_schema/schema_modules.json

@@ -186,26 +186,40 @@
             ]
         },
         {
-            "type": "dict",
+            "type": "list",
             "key": "deadline",
             "label": "Deadline",
-            "require_restart": true,
-            "collapsible": true,
+            "is_group": true,
+            "use_label_wrap": true,
             "checkbox_key": "enabled",
-            "children": [
-                {
-                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
-                },
-                {
-                    "type": "dict-modifiable",
-                    "object_type": "text",
-                    "key": "deadline_urls",
-                    "required_keys": ["default"],
-                    "label": "Deadline Webservice URLs"
-                }
-            ]
+            "required_keys": ["default"],
+            "object_type":{
+                "type": "dict",
+                "children": [
+                    {
+                        "type": "boolean",
+                        "key": "enabled",
+                        "label": "Enabled"
+                    },
+                    {
+                        "type": "text",
+                        "key": "deadline_urls",
+                        "label": "Deadline Webservice URLs"
+                    },
+                    {
+                        "type": "path",
+                        "key": "deadline_paths",
+                        "label": "Deadline Paths",
+                        "multipath": true,
+                        "multiplatform": true
+                    },
+                    {
+                        "type":"raw-json",
+                        "key": "environment",
+                        "label": "Environment"
+                    }
+                ]
+            }
         },
         {
             "type": "dict",