[Automated] Merged develop into main

openpype/hosts/maya/api/plugin.py

@@ -10,7 +10,8 @@ from openpype.pipeline import (
     get_representation_path,
     AVALON_CONTAINER_ID,
 )
-
+from openpype.api import Anatomy
+from openpype.settings import get_project_settings
 from .pipeline import containerise
 from . import lib
 
@@ -230,6 +231,10 @@ class ReferenceLoader(Loader):
                 self.log.debug("No alembic nodes found in {}".format(members))
 
         try:
+            path = self.prepare_root_value(path,
+                                           representation["context"]
+                                                         ["project"]
+                                                         ["code"])
             content = cmds.file(path,
                                 loadReference=reference_node,
                                 type=file_type,
@@ -319,6 +324,29 @@ class ReferenceLoader(Loader):
         except RuntimeError:
             pass
 
+    def prepare_root_value(self, file_url, project_name):
+        """Replace root value with env var placeholder.
+
+        Use ${OPENPYPE_ROOT_WORK} (or any other root) instead of proper root
+        value when storing referenced url into a workfile.
+        Useful for remote workflows with SiteSync.
+
+        Args:
+            file_url (str)
+            project_name (dict)
+        Returns:
+            (str)
+        """
+        settings = get_project_settings(project_name)
+        use_env_var_as_root = (settings["maya"]
+                                       ["maya-dirmap"]
+                                       ["use_env_var_as_root"])
+        if use_env_var_as_root:
+            anatomy = Anatomy(project_name)
+            file_url = anatomy.replace_root_with_env_key(file_url, '${{{}}}')
+
+        return file_url
+
     @staticmethod
     def _organize_containers(nodes, container):
         # type: (list, str) -> None

openpype/hosts/maya/plugins/load/_load_animation.py

@@ -35,8 +35,9 @@ class AbcLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
 
         # hero_001 (abc)
         # asset_counter{optional}
-
-        nodes = cmds.file(self.fname,
+        file_url = self.prepare_root_value(self.fname,
+                                           context["project"]["code"])
+        nodes = cmds.file(file_url,
                           namespace=namespace,
                           sharedReferenceFile=False,
                           groupReference=True,

openpype/hosts/maya/plugins/load/load_ass.py

@@ -64,9 +64,11 @@ class AssProxyLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
                     path = os.path.join(publish_folder, filename)
 
             proxyPath = proxyPath_base + ".ma"
-            self.log.info
 
-            nodes = cmds.file(proxyPath,
+            file_url = self.prepare_root_value(proxyPath,
+                                               context["project"]["code"])
+
+            nodes = cmds.file(file_url,
                               namespace=namespace,
                               reference=True,
                               returnNewNodes=True,
@@ -123,7 +125,11 @@ class AssProxyLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
         assert os.path.exists(proxyPath), "%s does not exist." % proxyPath
 
         try:
-            content = cmds.file(proxyPath,
+            file_url = self.prepare_root_value(proxyPath,
+                                               representation["context"]
+                                                             ["project"]
+                                                             ["code"])
+            content = cmds.file(file_url,
                                 loadReference=reference_node,
                                 type="mayaAscii",
                                 returnNewNodes=True)

openpype/hosts/maya/plugins/load/load_look.py

@@ -31,7 +31,9 @@ class LookLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
         import maya.cmds as cmds
 
         with lib.maintained_selection():
-            nodes = cmds.file(self.fname,
+            file_url = self.prepare_root_value(self.fname,
+                                               context["project"]["code"])
+            nodes = cmds.file(file_url,
                               namespace=namespace,
                               reference=True,
                               returnNewNodes=True)

openpype/hosts/maya/plugins/load/load_reference.py

@@ -51,7 +51,9 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
 
         with maintained_selection():
             cmds.loadPlugin("AbcImport.mll", quiet=True)
-            nodes = cmds.file(self.fname,
+            file_url = self.prepare_root_value(self.fname,
+                                               context["project"]["code"])
+            nodes = cmds.file(file_url,
                               namespace=namespace,
                               sharedReferenceFile=False,
                               reference=True,

openpype/hosts/maya/plugins/load/load_yeti_rig.py

@@ -53,7 +53,9 @@ class YetiRigLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
 
         # load rig
         with lib.maintained_selection():
-            nodes = cmds.file(self.fname,
+            file_url = self.prepare_root_value(self.fname,
+                                               context["project"]["code"])
+            nodes = cmds.file(file_url,
                               namespace=namespace,
                               reference=True,
                               returnNewNodes=True,

openpype/hosts/maya/plugins/publish/collect_review.py

@@ -77,15 +77,14 @@ class CollectReview(pyblish.api.InstancePlugin):
                 instance.data['remove'] = True
                 self.log.debug('isntance data {}'.format(instance.data))
         else:
-            if self.legacy:
-                instance.data['subset'] = task + 'Review'
-            else:
-                subset = "{}{}{}".format(
-                    task,
-                    instance.data["subset"][0].upper(),
-                    instance.data["subset"][1:]
-                )
-                instance.data['subset'] = subset
+            legacy_subset_name = task + 'Review'
+            asset_doc_id = instance.context.data['assetEntity']["_id"]
+            subsets = legacy_io.find({"type": "subset",
+                                      "name": legacy_subset_name,
+                                      "parent": asset_doc_id}).distinct("_id")
+            if len(list(subsets)) > 0:
+                self.log.debug("Existing subsets found, keep legacy name.")
+                instance.data['subset'] = legacy_subset_name
 
             instance.data['review_camera'] = camera
             instance.data['frameStartFtrack'] = \

openpype/hosts/maya/plugins/publish/help/validate_review_subset_uniqueness.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+    <error id="main">
+        <title>Review subsets not unique</title>
+        <description>
+            ## Non unique subset name found
+
+            Non unique subset names: '{non_unique}'
+            <detail>
+                ### __Detailed Info__ (optional)
+
+                This might happen if you already published for this asset
+                review subset with legacy name {task}Review.
+                This legacy name limits possibility of publishing of multiple
+                reviews from a single workfile. Proper review subset name should
+                now
+                contain variant also (as 'Main', 'Default' etc.). That would
+                result in completely new subset though, so this situation must
+                be handled manually.
+            </detail>
+            ### How to repair?
+
+            Legacy subsets must be removed from Openpype DB, please ask admin
+            to do that. Please provide them asset and subset names.
+
+        </description>
+    </error>
+</root>

openpype/hosts/maya/plugins/publish/validate_review_subset_uniqueness.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import collections
+import pyblish.api
+import openpype.api
+from openpype.pipeline import PublishXmlValidationError
+
+
+class ValidateReviewSubsetUniqueness(pyblish.api.ContextPlugin):
+    """Validates that nodes has common root."""
+
+    order = openpype.api.ValidateContentsOrder
+    hosts = ["maya"]
+    families = ["review"]
+    label = "Validate Review Subset Unique"
+
+    def process(self, context):
+        subset_names = []
+
+        for instance in context:
+            self.log.info("instance:: {}".format(instance.data))
+            if instance.data.get('publish'):
+                subset_names.append(instance.data.get('subset'))
+
+        non_unique = \
+            [item
+             for item, count in collections.Counter(subset_names).items()
+             if count > 1]
+        msg = ("Instance subset names {} are not unique. ".format(non_unique) +
+               "Ask admin to remove subset from DB for multiple reviews.")
+        formatting_data = {
+            "non_unique": ",".join(non_unique)
+        }
+
+        if non_unique:
+            raise PublishXmlValidationError(self, msg,
+                                            formatting_data=formatting_data)

openpype/hosts/webpublisher/webserver_service/webpublish_routes.py

@@ -71,16 +71,12 @@ class ProjectsEndpoint(_RestApiEndpoint):
     """Returns list of dict with project info (id, name)."""
     async def get(self) -> Response:
         output = []
-        for project_name in self.dbcon.database.collection_names():
-            project_doc = self.dbcon.database[project_name].find_one({
-                "type": "project"
-            })
-            if project_doc:
-                ret_val = {
-                    "id": project_doc["_id"],
-                    "name": project_doc["name"]
-                }
-                output.append(ret_val)
+        for project_doc in self.dbcon.projects():
+            ret_val = {
+                "id": project_doc["_id"],
+                "name": project_doc["name"]
+            }
+            output.append(ret_val)
         return Response(
             status=200,
             body=self.resource.encode(output),

openpype/settings/defaults/project_settings/maya.json

@@ -8,6 +8,7 @@
         "yetiRig": "ma"
     },
     "maya-dirmap": {
+        "use_env_var_as_root": false,
         "enabled": false,
         "paths": {
             "source-path": [],

openpype/settings/entities/schemas/projects_schema/schema_project_maya.json

@@ -22,6 +22,12 @@
             "label": "Maya Directory Mapping",
             "is_group": true,
             "children": [
+                {
+                    "type": "boolean",
+                    "key": "use_env_var_as_root",
+                    "label": "Use env var placeholder in referenced paths",
+                    "docstring": "Use ${} placeholder instead of absolute value of a root in referenced filepaths."
+                },
                 {
                     "type": "boolean",
                     "key": "enabled",