Chore: Use 'folderPath' instead of 'asset' during publishing

client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py

@@ -98,7 +98,7 @@ def get_instances(self, context):
                 source=current_file,
                 label="{} - {}".format(subset_name, family),
                 subset=subset_name,
-                asset=inst.data["asset"],
+                folderPath=inst.data["folderPath"],
                 task=task_name,
                 attachTo=False,
                 setMembers='',
@@ -175,7 +175,7 @@ def get_expected_files(self, render_instance):
             version_str = "v{:03d}".format(render_instance.version)
             if "#" not in file_name:  # single frame (mov)W
                 path = os.path.join(base_dir, "{}_{}_{}.{}".format(
-                    render_instance.asset,
+                    render_instance.folderPath,
                     render_instance.subset,
                     version_str,
                     ext
@@ -184,7 +184,7 @@ def get_expected_files(self, render_instance):
             else:
                 for frame in range(start, end + 1):
                     path = os.path.join(base_dir, "{}_{}_{}.{}.{}".format(
-                        render_instance.asset,
+                        render_instance.folderPath,
                         render_instance.subset,
                         version_str,
                         str(frame).zfill(self.padding_width),

client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py

@@ -50,11 +50,11 @@ def _get_new_instance(self, context, scene_file):
         asset_entity = context.data["assetEntity"]
         project_entity = context.data["projectEntity"]
 
-        asset_name = get_asset_name_identifier(asset_entity)
+        folder_path = get_asset_name_identifier(asset_entity)
 
         instance_data = {
             "active": True,
-            "asset": asset_name,
+            "folderPath": folder_path,
             "task": task,
             "frameStart": context.data['frameStart'],
             "frameEnd": context.data['frameEnd'],

client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py

@@ -30,7 +30,7 @@ def process(self, context, plugin):
         for instance in instances:
             data = stub.read(instance[0])
 
-            data["asset"] = get_current_asset_name()
+            data["folderPath"] = get_current_asset_name()
             stub.imprint(instance[0].instance_id, data)
 
 
@@ -53,7 +53,7 @@ class ValidateInstanceAsset(pyblish.api.InstancePlugin):
     order = ValidateContentsOrder
 
     def process(self, instance):
-        instance_asset = instance.data["asset"]
+        instance_asset = instance.data["folderPath"]
         current_asset = get_current_asset_name()
         msg = (
             f"Instance asset {instance_asset} is not the same "

client/ayon_core/hosts/blender/plugins/create/create_action.py

@@ -22,7 +22,9 @@ def create(
         )
 
         # Get instance name
-        name = plugin.prepare_scene_name(instance_data["asset"], subset_name)
+        name = plugin.prepare_scene_name(
+            instance_data["folderPath"], subset_name
+        )
 
         if pre_create_data.get("use_selection"):
             for obj in lib.get_selection():

client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py

@@ -22,7 +22,7 @@ def process(self, context):
         asset_name = get_asset_name_identifier(asset_entity)
 
         shared_instance_data = {
-            "asset": asset_name,
+            "folderPath": asset_name,
             "frameStart": asset_entity["data"]["frameStart"],
             "frameEnd": asset_entity["data"]["frameEnd"],
             "handleStart": asset_entity["data"]["handleStart"],

client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py

@@ -34,15 +34,15 @@ def process(self, context):
             project_settings=context.data["project_settings"]
         )
 
-        asset_name = get_asset_name_identifier(asset_doc)
+        folder_path = get_asset_name_identifier(asset_doc)
 
         # adding otio timeline to context
         with opfapi.maintained_segment_selection(sequence) as selected_seg:
             otio_timeline = flame_export.create_otio_timeline(sequence)
 
             instance_data = {
                 "name": subset_name,
-                "asset": asset_name,
+                "folderPath": folder_path,
                 "subset": subset_name,
                 "family": "workfile",
                 "families": []

client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py

@@ -55,7 +55,7 @@ def process(self, instance):
 
         # flame objects
         segment = instance.data["item"]
-        asset_name = instance.data["asset"]
+        folder_path = instance.data["folderPath"]
         segment_name = segment.name.get_value()
         clip_path = instance.data["path"]
         sequence_clip = instance.context.data["flameSequence"]
@@ -249,7 +249,7 @@ def process(self, instance):
                 out_mark = in_mark + source_duration_handles
                 exporting_clip = self.import_clip(clip_path)
                 exporting_clip.name.set_value("{}_{}".format(
-                    asset_name, segment_name))
+                    folder_path, segment_name))
 
             # add xml tags modifications
             modify_xml_data.update({

client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py

@@ -168,10 +168,10 @@ def _get_batch_group(self, instance, task_data):
         handle_start = instance.data["handleStart"]
         handle_end = instance.data["handleEnd"]
         frame_duration = (frame_end - frame_start) + 1
-        asset_name = instance.data["asset"]
+        folder_path = instance.data["folderPath"]
 
         task_name = task_data["name"]
-        batchgroup_name = "{}_{}".format(asset_name, task_name)
+        batchgroup_name = "{}_{}".format(folder_path, task_name)
 
         batch_data = {
             "shematic_reels": [

client/ayon_core/hosts/fusion/plugins/publish/collect_render.py

@@ -68,7 +68,7 @@ def get_instances(self, context):
                 source=current_file,
                 label=inst.data["label"],
                 subset=subset_name,
-                asset=inst.data["asset"],
+                folderPath=inst.data["folderPath"],
                 task=task_name,
                 attachTo=False,
                 setMembers='',

client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py

@@ -72,7 +72,7 @@ def process(self, instance):
         self.log.info(
             "Rendered '{nm}' for asset '{ast}' under the task '{tsk}'".format(
                 nm=instance.data["name"],
-                ast=instance.data["asset"],
+                ast=instance.data["folderPath"],
                 tsk=instance.data["task"],
             )
         )

client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py

@@ -21,7 +21,9 @@ def get_invalid(cls, context):
         # Collect instances per subset per asset
         instances_per_subset_asset = defaultdict(lambda: defaultdict(list))
         for instance in context:
-            asset = instance.data.get("asset", context.data.get("asset"))
+            asset = instance.data.get(
+                "folderPath", context.data.get("folderPath")
+            )
             subset = instance.data.get("subset", context.data.get("subset"))
             instances_per_subset_asset[asset][subset].append(instance)
 

client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py

@@ -98,7 +98,7 @@ def get_instances(self, context):
 
         self_name = self.__class__.__name__
 
-        asset_name = context.data["asset"]
+        folder_path = context.data["folderPath"]
 
         for node in context.data["allNodes"]:
             data = harmony.read(node)
@@ -142,7 +142,7 @@ def get_instances(self, context):
                 source=context.data["currentFile"],
                 label=node.split("/")[1],
                 subset=subset_name,
-                asset=asset_name,
+                folderPath=folder_path,
                 task=task_name,
                 attachTo=False,
                 setMembers=[node],

client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py

@@ -31,15 +31,15 @@ def process(self, context):
             if (not any([re.search(pattern, task_name)
                          for pattern in self.allowed_tasks])):
                 return
-        asset_name = context.data["asset"]
+        folder_path = context.data["folderPath"]
 
         for name, id in palettes.items():
             instance = context.create_instance(name)
             instance.data.update({
                 "id": id,
                 "family": "harmony.palette",
                 'families': [],
-                "asset": asset_name,
+                "folderPath": folder_path,
                 "subset": "{}{}".format("palette", name)
             })
             self.log.info(

client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py

@@ -36,5 +36,5 @@ def process(self, context):
             "family": family,
             "families": [family],
             "representations": [],
-            "asset": context.data["asset"]
+            "folderPath": context.data["folderPath"]
         })

client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py

@@ -27,9 +27,10 @@ def process(self, context, plugin):
         # Apply pyblish.logic to get the instances for the plug-in
         instances = pyblish.api.instances_by_plugin(failed, plugin)
 
+        folder_path = get_current_asset_name()
         for instance in instances:
             data = harmony.read(instance.data["setMembers"][0])
-            data["asset"] = get_current_asset_name()
+            data["folderPath"] = folder_path
             harmony.imprint(instance.data["setMembers"][0], data)
 
 
@@ -42,7 +43,7 @@ class ValidateInstance(pyblish.api.InstancePlugin):
     order = ValidateContentsOrder
 
     def process(self, instance):
-        instance_asset = instance.data["asset"]
+        instance_asset = instance.data["folderPath"]
         current_asset = get_current_asset_name()
         msg = (
             "Instance asset is not the same as current asset:"

client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py

@@ -118,9 +118,9 @@ def process(self, instance):
             data["subset"] = name
             data["family"] = family
             data["families"] = [family]
-            data["name"] = data["subset"] + "_" + data["asset"]
+            data["name"] = data["subset"] + "_" + data["folderPath"]
             data["label"] = "{} - {}".format(
-                data['asset'], data["subset"]
+                data["folderPath"], data["subset"]
             )
             data["effects"] = effects
 

client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py

@@ -102,7 +102,7 @@ def _create_frame_subset_data_sequence(self, context):
         # first collect all available subset tag frames
         subset_data = {}
         context_asset_doc = context.data["assetEntity"]
-        context_asset_name = get_asset_name_identifier(context_asset_doc)
+        context_folder_path = get_asset_name_identifier(context_asset_doc)
 
         for tag_data in sequence_tags:
             frame = int(tag_data["start"])
@@ -120,7 +120,7 @@ def _create_frame_subset_data_sequence(self, context):
                 subset_data[subset] = {
                     "frames": [frame],
                     "format": tag_data["format"],
-                    "asset": context_asset_name
+                    "folderPath": context_folder_path
                 }
         return subset_data
 
@@ -133,7 +133,7 @@ def _create_instances(self, subset_data):
                 "label": "{} {}".format(name, subset_data["frames"]),
                 "family": "image",
                 "families": ["frame"],
-                "asset": subset_data["asset"],
+                "folderPath": subset_data["folderPath"],
                 "subset": name,
                 "format": subset_data["format"],
                 "frames": subset_data["frames"]

client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py

@@ -57,7 +57,7 @@ def process(self, instance):
             "sourceStart", "sourceStartH", "sourceEnd", "sourceEndH",
             "frameStart", "frameEnd",
             "clipIn", "clipOut", "clipInH", "clipOutH",
-            "asset", "version"
+            "folderPath", "version"
         ]
 
         # pass data to version

client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py

@@ -98,7 +98,7 @@ def process(self, context):
             data.update({
                 "name": "{}_{}".format(asset, subset),
                 "label": label,
-                "asset": asset,
+                "folderPath": asset,
                 "asset_name": asset_name,
                 "item": track_item,
                 "families": families,
@@ -189,7 +189,7 @@ def create_shot_instance(self, context, **data):
         if not hierarchy_data:
             return
 
-        asset = data["asset"]
+        asset = data["folderPath"]
         asset_name = data["asset_name"]
 
         # insert family into families
@@ -241,15 +241,14 @@ def create_audio_instance(self, context, **data):
         if not master_layer:
             return
 
-        asset = data.get("asset")
         item = data.get("item")
         clip_name = item.name()
 
         # test if any audio clips
         if not self.test_any_audio(item):
             return
 
-        asset = data["asset"]
+        asset = data["folferPath"]
         asset_name = data["asset_name"]
 
         # insert family into families

client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py

@@ -17,7 +17,7 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder - 0.491
 
     def process(self, context):
-        asset = context.data["asset"]
+        asset = context.data["folderPath"]
         asset_name = asset.split("/")[-1]
 
         active_timeline = hiero.ui.activeSequence()
@@ -64,7 +64,7 @@ def process(self, context):
             "label": "{} - {}Main".format(
                 asset, family),
             "name": "{}_{}".format(asset_name, family),
-            "asset": context.data["asset"],
+            "folderPath": context.data["folderPath"],
             # TODO use 'get_subset_name'
             "subset": "{}{}Main".format(asset_name, family.capitalize()),
             "item": project,

client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py

@@ -72,7 +72,7 @@ def process(self, context):
 
             # Create nice name if the instance has a frame range.
             label = data.get("name", node.name())
-            label += " (%s)" % data["asset"]  # include asset in name
+            label += " (%s)" % data["folderPath"]  # include folder in name
 
             instance = context.create_instance(label)
 

client/ayon_core/hosts/max/plugins/publish/collect_render.py

@@ -94,7 +94,7 @@ def process(self, instance):
         renderer = str(renderer_class).split(":")[0]
         # also need to get the render dir for conversion
         data = {
-            "asset": instance.data["asset"],
+            "folderPath": instance.data["folderPath"],
             "subset": str(instance.name),
             "publish": True,
             "maxversion": str(get_max_version()),

client/ayon_core/hosts/max/plugins/publish/collect_workfile.py

@@ -35,7 +35,7 @@ def process(self, context):
 
         data.update({
             "subset": subset,
-            "asset": context.data["asset"],
+            "folderPath": context.data["folderPath"],
             "label": subset,
             "publish": True,
             "family": 'workfile',

client/ayon_core/hosts/maya/api/action.py

@@ -15,7 +15,7 @@ class GenerateUUIDsOnInvalidAction(pyblish.api.Action):
     receive new UUIDs are actually invalid.
 
     Requires:
-        - instance.data["asset"]
+        - instance.data["folderPath"]
 
     """
 
@@ -78,7 +78,7 @@ def _update_id_attribute(self, instance, nodes):
         #   should be always available, but kept a way to query it by name.
         asset_doc = instance.data.get("assetEntity")
         if not asset_doc:
-            asset_name = instance.data["asset"]
+            asset_name = instance.data["folderPath"]
             project_name = instance.context.data["projectName"]
             self.log.info((
                 "Asset is not stored on instance."

client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py

@@ -67,14 +67,14 @@ def is_group(group_name):
         r = re.compile(regex)
         m = r.match(top_group)
         project_name = instance.context.data["projectName"]
-        current_asset_name = instance.context.data["asset"]
+        current_folder_path = instance.context.data["folderPath"]
         if m is None:
             cls.log.error("invalid name on: {}".format(top_group))
             cls.log.error("name doesn't match regex {}".format(regex))
             invalid.append(top_group)
         else:
             if "asset" in r.groupindex:
-                if m.group("asset") != current_asset_name:
+                if m.group("folderPath") != current_folder_path:
                     cls.log.error("Invalid asset name in top level group.")
                     return top_group
             if "subset" in r.groupindex: