Refactor lib.generate_ids, lib.set_id logic

colorbleed/action.py

@@ -198,6 +198,5 @@ class GenerateUUIDsOnInvalidAction(pyblish.api.Action):
         asset_id = io.find_one({"name": asset, "type": "asset"},
                                projection={"_id": True})['_id']
         for node in nodes:
-            lib.remove_id(node)
+            lib.set_id(node, asset_id, overwrite=True)
-            lib.set_id(asset_id, node)
 

colorbleed/maya/__init__.py

@@ -70,4 +70,5 @@ def on_save(_):
 
     # Generate ids of the current context on nodes in the scene
     nodes = lib.get_id_required_nodes(referenced_nodes=False)
-    lib.generate_ids(nodes)
+    for node, new_id in lib.generate_ids(nodes):
+        lib.set_id(node, new_id, overwrite=False)

colorbleed/maya/lib.py

@@ -667,46 +667,89 @@ def get_id(node):
     return cmds.getAttr("{}.cbId".format(node))
 
 
-def generate_ids(nodes):
+def generate_ids(nodes, asset_id=None):
-    """Assign a new id of the current active context to the nodes"""
+    """Returns new unique ids for the given nodes.
+    
+    Note: This does not assign the new ids, it only generates the values.
+    
+    To assign new ids using this method:
+    >>> nodes = ["a", "b", "c"]
+    >>> for node, id in generate_ids(nodes):
+    >>>     set_id(node, id)
+    
+    To also override any existing values (and assign regenerated ids):
+    >>> nodes = ["a", "b", "c"]
+    >>> for node, id in generate_ids(nodes):
+    >>>     set_id(node, id, overwrite=True)
+    
+    Args:
+        nodes (list): List of nodes.
+        asset_id (str or bson.ObjectId): The database id for the *asset* to
+            generate for. When None provided the current asset in the 
+            active session is used.
+            
+    Returns:
+        list: A list of (node, id) tuples.
+    
+    """
 
-    # Get the asset ID from the database for the asset of current context
+    if asset_id is None:
-    asset_data = io.find_one({"type": "asset",
+        # Get the asset ID from the database for the asset of current context
-                              "name": api.Session["AVALON_ASSET"]},
+        asset_data = io.find_one({"type": "asset",
-                              projection={"_id": True})
+                                  "name": api.Session["AVALON_ASSET"]},
-    asset_id = asset_data["_id"]
+                                 projection={"_id": True})
+        assert asset_data, "No current asset found in Session"
+        asset_id = asset_data['_id']
+
+    node_ids = []
     for node in nodes:
-        set_id(asset_id, node)
+        _, uid = str(uuid.uuid4()).rsplit("-", 1)
+        unique_id = "{}:{}".format(asset_id, uid)
+        node_ids.append((node, unique_id))
+
+    return node_ids
 
 
-def set_id(unique_id, node, force=False):
+def set_id(node, unique_id, overwrite=False):
     """Add cbId to `node` unless one already exists.
 
     Args:
-        unique_id (str): the unique asset code from the database
         node (str): the node to add the "cbId" on
-        force (bool): if True sets the given unique_id as attribute value
+        unique_id (str): the unique asset code from the database
+        overwrite (bool, optional): When True overrides the current value even 
+            if `node` already has an id. Defaults to False.
 
     Returns:
         None
+        
     """
 
     attr = "{0}.cbId".format(node)
-    if not cmds.attributeQuery("cbId", node=node, exists=True):
+    exists = cmds.attributeQuery("cbId", node=node, exists=True)
-
-        if not force:
-            _, uid = str(uuid.uuid4()).rsplit("-", 1)
-            unique_id = "{}:{}".format(unique_id, uid)
-        else:
-            unique_id = unique_id
 
+    # Add the attribute if it does not exist yet
+    if not exists:
         cmds.addAttr(node, longName="cbId", dataType="string")
+
+    # Set the value
+    if not exists or overwrite:
         cmds.setAttr(attr, unique_id, type="string")
 
 
 def remove_id(node):
+    """Remove the id attribute from the input node.
+    
+    Args:
+        node (str): The node name 
+
+    Returns:
+        bool: Whether an id attribute was deleted
+
+    """
     if cmds.attributeQuery("cbId", node=node, exists=True):
         cmds.deleteAttr("{}.cbId".format(node))
+        return True
+    return False
 
 
 # endregion ID

colorbleed/plugins/maya/publish/validate_animation_out_set_related_node_ids.py

@@ -120,5 +120,4 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin):
                 cls.log.error("Could not find root ID for '%s'", node)
                 continue
 
-            lib.remove_id(node)  # remove the cbId attr if it exists
+            lib.set_id(node, root_id, overwrite=True)  # set root_id as cbId
-            lib.set_id(root_id, node, force=True)  # set root_id as cbId