Merge pull request #2291 from pypeclub/bugfix/rr-plugin-order-fixes

Royal Render: Fix plugin order and OpenPype auto-detection

openpype/modules/default_modules/royal_render/plugins/publish/collect_default_rr_path.py

@@ -6,7 +6,7 @@ import pyblish.api
 class CollectDefaultRRPath(pyblish.api.ContextPlugin):
     """Collect default Royal Render path."""
 
-    order = pyblish.api.CollectorOrder + 0.01
+    order = pyblish.api.CollectorOrder
     label = "Default Royal Render Path"
 
     def process(self, context):

openpype/modules/default_modules/royal_render/plugins/publish/collect_rr_path_from_instance.py

@@ -5,7 +5,7 @@ import pyblish.api
 class CollectRRPathFromInstance(pyblish.api.InstancePlugin):
     """Collect RR Path from instance."""
 
-    order = pyblish.api.CollectorOrder
+    order = pyblish.api.CollectorOrder + 0.01
     label = "Royal Render Path from the Instance"
     families = ["rendering"]
 
@@ -38,8 +38,8 @@ class CollectRRPathFromInstance(pyblish.api.InstancePlugin):
                 if k in default_servers
             }
 
-        except AttributeError:
-            # Handle situation were we had only one url for deadline.
+        except (AttributeError, KeyError):
+            # Handle situation were we had only one url for royal render.
             return render_instance.context.data["defaultRRPath"]
 
         return rr_servers[

openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py

@@ -168,9 +168,6 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin):
                 start = data.get("frameStart", indices[0])
                 end = data.get("frameEnd", indices[-1])
 
-                # root = os.path.normpath(root)
-                # self.log.info("Source: {}}".format(data.get("source", "")))
-
                 ext = list(collection)[0].split('.')[-1]
 
                 instance.data.update({
@@ -195,6 +192,8 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin):
                     'name': ext,
                     'ext': '{}'.format(ext),
                     'files': list(collection),
+                    "frameStart": start,
+                    "frameEnd": end,
                     "stagingDir": root,
                     "anatomy_template": "render",
                     "fps": fps,

openpype/modules/default_modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py

@@ -38,28 +38,20 @@ class OpenPypeContextSelector:
                     os.environ.get("PROGRAMFILES"),
                     "OpenPype", "openpype_console.exe"
                 )
-                if os.path.exists(op_path):
-                    print("  - found OpenPype installation {}".format(op_path))
-                else:
+                if not os.path.exists(op_path):
                     # try to find in user local context
                     op_path = os.path.join(
                         os.environ.get("LOCALAPPDATA"),
                         "Programs",
                         "OpenPype", "openpype_console.exe"
                     )
-                    if os.path.exists(op_path):
-                        print(
-                            "  - found OpenPype installation {}".format(
-                                op_path))
-                    else:
+                    if not os.path.exists(op_path):
                         raise Exception("Error: OpenPype was not found.")
 
-        self.openpype_root = op_path
+                op_path = os.path.dirname(op_path)
+                print("  - found OpenPype installation {}".format(op_path))
 
-        # TODO: this should try to find metadata file. Either using
-        #       jobs custom attributes or using environment variable
-        #       or just using plain existence of file.
-        # self.context = self._process_metadata_file()
+        self.openpype_root = op_path
 
     def _process_metadata_file(self):
         """Find and process metadata file.
@@ -86,8 +78,8 @@ class OpenPypeContextSelector:
         automatically, no UI will be show and publishing will directly
         proceed.
         """
-        if not self.context:
-            self.show()
+        if not self.context and not self.show():
+            return
 
         self.context["user"] = self.job.userName
         self.run_publish()
@@ -120,10 +112,15 @@ class OpenPypeContextSelector:
                 not self.context.get("asset") or \
                 not self.context.get("task"):
             self._show_rr_warning("Context selection failed.")
-            return
+            return False
 
         # self.context["app_name"] = self.job.renderer.name
+        # there should be mapping between OpenPype and Royal Render
+        # app names and versions, but since app_name is not used
+        # currently down the line (but it is required by OP publish command
+        # right now).
         self.context["app_name"] = "maya/2020"
+        return True
 
     @staticmethod
     def _show_rr_warning(text):

poetry.lock

@@ -219,16 +219,16 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "clique"
-version = "1.5.0"
+version = "1.6.1"
 description = "Manage collections with common numerical component"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=2.7, <4.0"
 
 [package.extras]
-dev = ["lowdown (>=0.1.0,<1)", "pytest (>=2.3.5,<3)", "pytest-cov (>=2,<3)", "pytest-runner (>=2.7,<3)", "sphinx (>=1.2.2,<2)", "sphinx-rtd-theme (>=0.1.6,<1)"]
-doc = ["lowdown (>=0.1.0,<1)", "sphinx (>=1.2.2,<2)", "sphinx-rtd-theme (>=0.1.6,<1)"]
-test = ["pytest (>=2.3.5,<3)", "pytest-cov (>=2,<3)", "pytest-runner (>=2.7,<3)"]
+dev = ["sphinx (>=2,<4)", "sphinx-rtd-theme (>=0.1.6,<1)", "lowdown (>=0.2.0,<1)", "pytest-runner (>=2.7,<3)", "pytest (>=2.3.5,<5)", "pytest-cov (>=2,<3)"]
+doc = ["sphinx (>=2,<4)", "sphinx-rtd-theme (>=0.1.6,<1)", "lowdown (>=0.2.0,<1)"]
+test = ["pytest-runner (>=2.7,<3)", "pytest (>=2.3.5,<5)", "pytest-cov (>=2,<3)"]
 
 [[package]]
 name = "colorama"
@@ -1580,7 +1580,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
 [metadata]
 lock-version = "1.1"
 python-versions = "3.7.*"
-content-hash = "fb6db80d126fe7ef2d1d06d0381b6d11445d6d3e54b33585f6b0a0b6b0b9d372"
+content-hash = "877c1c6292735f495d915fc6aa85450eb20fc63f266a9c6bf7ba1125af3579a5"
 
 [metadata.files]
 acre = []
@@ -1749,8 +1749,8 @@ click = [
     {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"},
 ]
 clique = [
-    {file = "clique-1.5.0-py2-none-any.whl", hash = "sha256:77efbf5d99a398a50ca4591373def45c9c70fb43232cdc32f521cf5257ce4330"},
-    {file = "clique-1.5.0.tar.gz", hash = "sha256:c34a4eac30187a5b7d75bc8cf600ddc50ceef50a423772a4c96f1dc8440af5fa"},
+    {file = "clique-1.6.1-py2.py3-none-any.whl", hash = "sha256:8619774fa035661928dd8c93cd805acf2d42533ccea1b536c09815ed426c9858"},
+    {file = "clique-1.6.1.tar.gz", hash = "sha256:90165c1cf162d4dd1baef83ceaa1afc886b453e379094fa5b60ea470d1733e66"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
@@ -2180,9 +2180,13 @@ protobuf = [
     {file = "protobuf-3.17.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2ae692bb6d1992afb6b74348e7bb648a75bb0d3565a3f5eea5bec8f62bd06d87"},
     {file = "protobuf-3.17.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:99938f2a2d7ca6563c0ade0c5ca8982264c484fdecf418bd68e880a7ab5730b1"},
     {file = "protobuf-3.17.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6902a1e4b7a319ec611a7345ff81b6b004b36b0d2196ce7a748b3493da3d226d"},
+    {file = "protobuf-3.17.3-cp38-cp38-win32.whl", hash = "sha256:59e5cf6b737c3a376932fbfb869043415f7c16a0cf176ab30a5bbc419cd709c1"},
+    {file = "protobuf-3.17.3-cp38-cp38-win_amd64.whl", hash = "sha256:ebcb546f10069b56dc2e3da35e003a02076aaa377caf8530fe9789570984a8d2"},
     {file = "protobuf-3.17.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4ffbd23640bb7403574f7aff8368e2aeb2ec9a5c6306580be48ac59a6bac8bde"},
     {file = "protobuf-3.17.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:26010f693b675ff5a1d0e1bdb17689b8b716a18709113288fead438703d45539"},
     {file = "protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e76d9686e088fece2450dbc7ee905f9be904e427341d289acbe9ad00b78ebd47"},
+    {file = "protobuf-3.17.3-cp39-cp39-win32.whl", hash = "sha256:a38bac25f51c93e4be4092c88b2568b9f407c27217d3dd23c7a57fa522a17554"},
+    {file = "protobuf-3.17.3-cp39-cp39-win_amd64.whl", hash = "sha256:85d6303e4adade2827e43c2b54114d9a6ea547b671cb63fafd5011dc47d0e13d"},
     {file = "protobuf-3.17.3-py2.py3-none-any.whl", hash = "sha256:2bfb815216a9cd9faec52b16fd2bfa68437a44b67c56bee59bc3926522ecb04e"},
     {file = "protobuf-3.17.3.tar.gz", hash = "sha256:72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b"},
 ]

pyproject.toml

@@ -36,7 +36,7 @@ opentimelineio = { version = "0.14.0.dev1", source = "openpype" }
 appdirs = "^1.4.3"
 blessed = "^1.17" # openpype terminal formatting
 coolname = "*"
-clique = "1.5.*"
+clique = "1.6.*"
 Click = "^7"
 dnspython = "^2.1.0"
 ftrack-python-api = "2.0.*"