From a526260b461a85e951a1fc87697a56df70afa7d3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 17:57:09 +0200
Subject: [PATCH 01/29] 'get_assets' function can find folders by path and by
 name

---
 openpype/client/server/entities.py | 57 ++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/openpype/client/server/entities.py b/openpype/client/server/entities.py
index 16223d3d91..c1e27eabb9 100644
--- a/openpype/client/server/entities.py
+++ b/openpype/client/server/entities.py
@@ -183,6 +183,20 @@ def get_asset_by_name(project_name, asset_name, fields=None):
     return None
 
 
+
+def _folders_query(project_name, con, fields, **kwargs):
+    if fields is None or "tasks" in fields:
+        folders = get_folders_with_tasks(
+            con, project_name, fields=fields, **kwargs
+        )
+
+    else:
+        folders = con.get_folders(project_name, fields=fields, **kwargs)
+
+    for folder in folders:
+        yield folder
+
+
 def get_assets(
     project_name,
     asset_ids=None,
@@ -199,22 +213,51 @@ def get_assets(
         active = None
 
     con = get_server_api_connection()
+
     fields = folder_fields_v3_to_v4(fields, con)
     kwargs = dict(
         folder_ids=asset_ids,
-        folder_names=asset_names,
         parent_ids=parent_ids,
         active=active,
-        fields=fields
     )
+    if not asset_names:
+        for folder in _folders_query(project_name, con, fields, **kwargs):
+            yield convert_v4_folder_to_v3(folder, project_name)
+        return
 
-    if fields is None or "tasks" in fields:
-        folders = get_folders_with_tasks(con, project_name, **kwargs)
+    new_asset_names = set()
+    folder_paths = set()
+    if asset_names:
+        for name in asset_names:
+            if "/" in name:
+                folder_paths.add(name)
+            else:
+                new_asset_names.add(name)
 
-    else:
-        folders = con.get_folders(project_name, **kwargs)
+    if folder_paths:
+        for folder in _folders_query(
+            project_name, con, fields, folder_paths=folder_paths, **kwargs
+        ):
+            yield convert_v4_folder_to_v3(folder, project_name)
 
-    for folder in folders:
+    if not new_asset_names:
+        return
+
+    folders_by_name = collections.defaultdict(list)
+    for folder in _folders_query(
+        project_name, con, fields, folder_names=new_asset_names, **kwargs
+    ):
+        folders_by_name[folder["name"]].append(folder)
+
+    for name, folders in folders_by_name.items():
+        folder = next(
+            (
+                folder
+                for folder in folders
+                if folder["path"] == name
+            ),
+            folders[0]
+        )
         yield convert_v4_folder_to_v3(folder, project_name)
 
 

From 331c4833ade7acf5ab0db7952e9821b817354d2d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 17:58:34 +0200
Subject: [PATCH 02/29] added helper function 'get_asset_name_identifier' to
 receive folder path in AYON mode and asset name in openpype

---
 openpype/client/__init__.py |  4 ++++
 openpype/client/entities.py | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/openpype/client/__init__.py b/openpype/client/__init__.py
index 7831afd8ad..a313d6b3cc 100644
--- a/openpype/client/__init__.py
+++ b/openpype/client/__init__.py
@@ -43,6 +43,8 @@ from .entities import (
     get_thumbnail_id_from_source,
 
     get_workfile_info,
+
+    get_asset_name_identifier,
 )
 
 from .entity_links import (
@@ -105,4 +107,6 @@ __all__ = (
     "get_linked_representation_id",
 
     "create_project",
+
+    "get_asset_name_identifier",
 )
diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 5d9654c611..d085f90028 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -4,3 +4,22 @@ if not AYON_SERVER_ENABLED:
     from .mongo.entities import *
 else:
     from .server.entities import *
+
+
+def get_asset_name_identifier(asset_doc):
+    """Get asset name identifier by asset document.
+
+    This function is added because of AYON implementation where name
+        identifier is not just a name but full path.
+
+    Asset document must have "name" key, and "data.parents" when in AYON mode.
+
+    Args:
+        asset_doc (dict[str, Any]): Asset document.
+    """
+
+    if not AYON_SERVER_ENABLED:
+        return asset_doc["name"]
+    parents = list(asset_doc["data"]["parents"])
+    parents.append(asset_doc["name"])
+    return "/".join(parents)

From 4c6ec4b9bcb245892421b14bee26d7564f33f971 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:00:58 +0200
Subject: [PATCH 03/29] instances in AYON mode have 'folderPath' instead of
 'asset'

---
 openpype/pipeline/create/context.py           | 37 ++++++++++++++++---
 .../publish/collect_from_create_context.py    |  3 ++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 25f03ddd3b..333ab25f54 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -11,7 +11,12 @@ from contextlib import contextmanager
 import pyblish.logic
 import pyblish.api
 
-from openpype.client import get_assets, get_asset_by_name
+from openpype import AYON_SERVER_ENABLED
+from openpype.client import (
+    get_assets,
+    get_asset_by_name,
+    get_asset_name_identifier,
+)
 from openpype.settings import (
     get_system_settings,
     get_project_settings
@@ -922,9 +927,19 @@ class CreatedInstance:
         self._orig_data = copy.deepcopy(data)
 
         # Pop family and subset to prevent unexpected changes
+        # TODO change to 'productType' and 'productName' in AYON
         data.pop("family", None)
         data.pop("subset", None)
 
+        if AYON_SERVER_ENABLED:
+            asset_name = data.pop("asset", None)
+            if "folderPath" not in data:
+                data["folderPath"] = asset_name
+
+        elif "folderPath" in data:
+            asset_name = data.pop("folderPath").split("/")[-1]
+            if "asset" not in data:
+                data["asset"] = asset_name
 
         # QUESTION Does it make sense to have data stored as ordered dict?
         self._data = collections.OrderedDict()
@@ -1268,6 +1283,8 @@ class CreatedInstance:
     def has_set_asset(self):
         """Asset name is set in data."""
 
+        if AYON_SERVER_ENABLED:
+            return "folderPath" in self._data
         return "asset" in self._data
 
     @property
@@ -2229,7 +2246,10 @@ class CreateContext:
         task_names_by_asset_name = {}
         for instance in instances:
             task_name = instance.get("task")
-            asset_name = instance.get("asset")
+            if AYON_SERVER_ENABLED:
+                asset_name = instance.get("folderPath")
+            else:
+                asset_name = instance.get("asset")
             if asset_name:
                 task_names_by_asset_name[asset_name] = set()
                 if task_name:
@@ -2240,15 +2260,18 @@ class CreateContext:
             for asset_name in task_names_by_asset_name.keys()
             if asset_name is not None
         ]
+        fields = {"name", "data.tasks"}
+        if AYON_SERVER_ENABLED:
+            fields |= {"data.parents"}
         asset_docs = list(get_assets(
             self.project_name,
             asset_names=asset_names,
-            fields=["name", "data.tasks"]
+            fields=fields
         ))
 
         task_names_by_asset_name = {}
         for asset_doc in asset_docs:
-            asset_name = asset_doc["name"]
+            asset_name = get_asset_name_identifier(asset_doc)
             tasks = asset_doc.get("data", {}).get("tasks") or {}
             task_names_by_asset_name[asset_name] = set(tasks.keys())
 
@@ -2256,7 +2279,11 @@ class CreateContext:
             if not instance.has_valid_asset or not instance.has_valid_task:
                 continue
 
-            asset_name = instance["asset"]
+            if AYON_SERVER_ENABLED:
+                asset_name = instance["folderPath"]
+            else:
+                asset_name = instance["asset"]
+
             if asset_name not in task_names_by_asset_name:
                 instance.set_asset_invalid(True)
                 continue
diff --git a/openpype/plugins/publish/collect_from_create_context.py b/openpype/plugins/publish/collect_from_create_context.py
index 8806a13ca0..84f6141069 100644
--- a/openpype/plugins/publish/collect_from_create_context.py
+++ b/openpype/plugins/publish/collect_from_create_context.py
@@ -4,6 +4,7 @@
 import os
 import pyblish.api
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.host import IPublishHost
 from openpype.pipeline import legacy_io, registered_host
 from openpype.pipeline.create import CreateContext
@@ -38,6 +39,8 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
 
         for created_instance in create_context.instances:
             instance_data = created_instance.data_to_store()
+            if AYON_SERVER_ENABLED:
+                instance_data["asset"] = instance_data.pop("folderPath")
             if instance_data["active"]:
                 thumbnail_path = thumbnail_paths_by_instance_id.get(
                     created_instance.id

From 0ddd95eacf0fda0b058fccc3388d0816aa9d4145 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:02:41 +0200
Subject: [PATCH 04/29] use 'get_asset_name_identifier' in pipeline logic

---
 openpype/pipeline/context_tools.py |  5 ++---
 openpype/pipeline/create/utils.py  | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/openpype/pipeline/context_tools.py b/openpype/pipeline/context_tools.py
index 13630ae7ca..e20099759a 100644
--- a/openpype/pipeline/context_tools.py
+++ b/openpype/pipeline/context_tools.py
@@ -17,6 +17,7 @@ from openpype.client import (
     get_asset_by_id,
     get_asset_by_name,
     version_is_latest,
+    get_asset_name_identifier,
 )
 from openpype.lib.events import emit_event
 from openpype.modules import load_modules, ModulesManager
@@ -568,14 +569,12 @@ def compute_session_changes(
         Dict[str, str]: Changes in the Session dictionary.
     """
 
-    changes = {}
-
     # Get asset document and asset
     if not asset_doc:
         task_name = None
         asset_name = None
     else:
-        asset_name = asset_doc["name"]
+        asset_name = get_asset_name_identifier(asset_doc)
 
     # Detect any changes compared session
     mapping = {
diff --git a/openpype/pipeline/create/utils.py b/openpype/pipeline/create/utils.py
index 2ef1f02bd6..ce4af8f474 100644
--- a/openpype/pipeline/create/utils.py
+++ b/openpype/pipeline/create/utils.py
@@ -1,6 +1,11 @@
 import collections
 
-from openpype.client import get_assets, get_subsets, get_last_versions
+from openpype.client import (
+    get_assets,
+    get_subsets,
+    get_last_versions,
+    get_asset_name_identifier,
+)
 
 
 def get_last_versions_for_instances(
@@ -52,10 +57,10 @@ def get_last_versions_for_instances(
     asset_docs = get_assets(
         project_name,
         asset_names=subset_names_by_asset_name.keys(),
-        fields=["name", "_id"]
+        fields=["name", "_id", "data.parents"]
     )
     asset_names_by_id = {
-        asset_doc["_id"]: asset_doc["name"]
+        asset_doc["_id"]: get_asset_name_identifier(asset_doc)
         for asset_doc in asset_docs
     }
     if not asset_names_by_id:

From 922c481d95b6e377a8d7433819360c45179fcffa Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:03:02 +0200
Subject: [PATCH 05/29] use 'get_asset_name_identifier' for 'AVALON_ASSET' on
 app start

---
 openpype/lib/applications.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index ff5e27c122..4d75a01e1d 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -12,6 +12,7 @@ from abc import ABCMeta, abstractmethod
 import six
 
 from openpype import AYON_SERVER_ENABLED, PACKAGE_DIR
+from openpype.client import get_asset_name_identifier
 from openpype.settings import (
     get_system_settings,
     get_project_settings,
@@ -1728,7 +1729,9 @@ def prepare_context_environments(data, env_group=None, modules_manager=None):
         "AVALON_APP_NAME": app.full_name
     }
     if asset_doc:
-        context_env["AVALON_ASSET"] = asset_doc["name"]
+        asset_name = get_asset_name_identifier(asset_doc)
+        context_env["AVALON_ASSET"] = asset_name
+
         if task_name:
             context_env["AVALON_TASK"] = task_name
 

From f38c3f395e68df0a33a3b1ba135dbbcf0cf7f899 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:03:20 +0200
Subject: [PATCH 06/29] use 'get_asset_name_identifier' in global plugins

---
 .../publish/collect_anatomy_instance_data.py  | 20 +++++++++++--------
 openpype/plugins/publish/collect_audio.py     | 10 ++++++----
 .../publish/extract_hierarchy_to_ayon.py      |  4 ++--
 .../publish/validate_editorial_asset_name.py  |  9 ++++++---
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/openpype/plugins/publish/collect_anatomy_instance_data.py b/openpype/plugins/publish/collect_anatomy_instance_data.py
index b4f4d6a16a..cc6da9b2c3 100644
--- a/openpype/plugins/publish/collect_anatomy_instance_data.py
+++ b/openpype/plugins/publish/collect_anatomy_instance_data.py
@@ -30,7 +30,8 @@ import pyblish.api
 from openpype.client import (
     get_assets,
     get_subsets,
-    get_last_versions
+    get_last_versions,
+    get_asset_name_identifier,
 )
 from openpype.pipeline.version_start import get_versioning_start
 
@@ -60,6 +61,9 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
         self.log.debug("Querying asset documents for instances.")
 
         context_asset_doc = context.data.get("assetEntity")
+        context_asset_name = None
+        if context_asset_doc:
+            context_asset_name = get_asset_name_identifier(context_asset_doc)
 
         instances_with_missing_asset_doc = collections.defaultdict(list)
         for instance in context:
@@ -68,15 +72,15 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
 
             # There is possibility that assetEntity on instance is already set
             # which can happen in standalone publisher
-            if (
-                instance_asset_doc
-                and instance_asset_doc["name"] == _asset_name
-            ):
-                continue
+            if instance_asset_doc:
+                instance_asset_name = get_asset_name_identifier(
+                    instance_asset_doc)
+                if instance_asset_name == _asset_name:
+                    continue
 
             # Check if asset name is the same as what is in context
             # - they may be different, e.g. in NukeStudio
-            if context_asset_doc and context_asset_doc["name"] == _asset_name:
+            if context_asset_name and context_asset_name == _asset_name:
                 instance.data["assetEntity"] = context_asset_doc
 
             else:
@@ -93,7 +97,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
 
         asset_docs = get_assets(project_name, asset_names=asset_names)
         asset_docs_by_name = {
-            asset_doc["name"]: asset_doc
+            get_asset_name_identifier(asset_doc): asset_doc
             for asset_doc in asset_docs
         }
 
diff --git a/openpype/plugins/publish/collect_audio.py b/openpype/plugins/publish/collect_audio.py
index 6aaadfc568..734a625852 100644
--- a/openpype/plugins/publish/collect_audio.py
+++ b/openpype/plugins/publish/collect_audio.py
@@ -6,6 +6,7 @@ from openpype.client import (
     get_subsets,
     get_last_versions,
     get_representations,
+    get_asset_name_identifier,
 )
 from openpype.pipeline.load import get_representation_path_with_anatomy
 
@@ -121,12 +122,13 @@ class CollectAudio(pyblish.api.ContextPlugin):
         asset_docs = get_assets(
             project_name,
             asset_names=asset_names,
-            fields=["_id", "name"]
+            fields=["_id", "name", "data.parents"]
         )
 
-        asset_id_by_name = {}
-        for asset_doc in asset_docs:
-            asset_id_by_name[asset_doc["name"]] = asset_doc["_id"]
+        asset_id_by_name = {
+            get_asset_name_identifier(asset_doc): asset_doc["_id"]
+            for asset_doc in asset_docs
+        }
         asset_ids = set(asset_id_by_name.values())
 
         # Query subsets with name define by 'audio_subset_name' attr
diff --git a/openpype/plugins/publish/extract_hierarchy_to_ayon.py b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
index 0d9131718b..fe8cb40ad2 100644
--- a/openpype/plugins/publish/extract_hierarchy_to_ayon.py
+++ b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
@@ -8,7 +8,7 @@ from ayon_api import slugify_string
 from ayon_api.entity_hub import EntityHub
 
 from openpype import AYON_SERVER_ENABLED
-from openpype.client import get_assets
+from openpype.client import get_assets, get_asset_name_identifier
 from openpype.pipeline.template_data import (
     get_asset_template_data,
     get_task_template_data,
@@ -58,7 +58,7 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
             project_name, asset_names=instances_by_asset_name.keys()
         )
         asset_docs_by_name = {
-            asset_doc["name"]: asset_doc
+            get_asset_name_identifier(asset_doc): asset_doc
             for asset_doc in asset_docs
         }
         for asset_name, instances in instances_by_asset_name.items():
diff --git a/openpype/plugins/publish/validate_editorial_asset_name.py b/openpype/plugins/publish/validate_editorial_asset_name.py
index fca0d8e7f5..b5afc49f2e 100644
--- a/openpype/plugins/publish/validate_editorial_asset_name.py
+++ b/openpype/plugins/publish/validate_editorial_asset_name.py
@@ -2,7 +2,7 @@ from pprint import pformat
 
 import pyblish.api
 
-from openpype.client import get_assets
+from openpype.client import get_assets, get_asset_name_identifier
 
 
 class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
@@ -34,8 +34,11 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
         self.log.debug("__ db_assets: {}".format(db_assets))
 
         asset_db_docs = {
-            str(e["name"]): [str(p) for p in e["data"]["parents"]]
-            for e in db_assets}
+            get_asset_name_identifier(asset_doc): list(
+                asset_doc["data"]["parents"]
+            )
+            for asset_doc in db_assets
+        }
 
         self.log.debug("__ project_entities: {}".format(
             pformat(asset_db_docs)))

From c505513b056e092ac8dd8c3652776a238046980c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:04:31 +0200
Subject: [PATCH 07/29] use folder path in ayon tools to define current context

---
 openpype/tools/ayon_launcher/models/actions.py |  6 +++---
 openpype/tools/ayon_loader/control.py          |  2 +-
 openpype/tools/ayon_sceneinventory/control.py  | 11 ++---------
 openpype/tools/ayon_workfiles/control.py       |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/openpype/tools/ayon_launcher/models/actions.py b/openpype/tools/ayon_launcher/models/actions.py
index 93ec115734..d7c4219dc2 100644
--- a/openpype/tools/ayon_launcher/models/actions.py
+++ b/openpype/tools/ayon_launcher/models/actions.py
@@ -402,12 +402,12 @@ class ActionsModel:
         )
 
     def _prepare_session(self, project_name, folder_id, task_id):
-        folder_name = None
+        folder_path = None
         if folder_id:
             folder = self._controller.get_folder_entity(
                 project_name, folder_id)
             if folder:
-                folder_name = folder["name"]
+                folder_path = folder["path"]
 
         task_name = None
         if task_id:
@@ -417,7 +417,7 @@ class ActionsModel:
 
         return {
             "AVALON_PROJECT": project_name,
-            "AVALON_ASSET": folder_name,
+            "AVALON_ASSET": folder_path,
             "AVALON_TASK": task_name,
         }
 
diff --git a/openpype/tools/ayon_loader/control.py b/openpype/tools/ayon_loader/control.py
index 2b779f5c2e..d2fae35f32 100644
--- a/openpype/tools/ayon_loader/control.py
+++ b/openpype/tools/ayon_loader/control.py
@@ -289,7 +289,7 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
         project_name = context.get("project_name")
         asset_name = context.get("asset_name")
         if project_name and asset_name:
-            folder = ayon_api.get_folder_by_name(
+            folder = ayon_api.get_folder_by_path(
                 project_name, asset_name, fields=["id"]
             )
             if folder:
diff --git a/openpype/tools/ayon_sceneinventory/control.py b/openpype/tools/ayon_sceneinventory/control.py
index e98b0e307b..6111d7e43b 100644
--- a/openpype/tools/ayon_sceneinventory/control.py
+++ b/openpype/tools/ayon_sceneinventory/control.py
@@ -70,19 +70,12 @@ class SceneInventoryController:
 
         context = self.get_current_context()
         project_name = context["project_name"]
-        folder_path = context.get("folder_path")
         folder_name = context.get("asset_name")
         folder_id = None
-        if folder_path:
-            folder = ayon_api.get_folder_by_path(project_name, folder_path)
+        if folder_name:
+            folder = ayon_api.get_folder_by_path(project_name, folder_name)
             if folder:
                 folder_id = folder["id"]
-        elif folder_name:
-            for folder in ayon_api.get_folders(
-                project_name, folder_names=[folder_name]
-            ):
-                folder_id = folder["id"]
-                break
 
         self._current_folder_id = folder_id
         self._current_folder_set = True
diff --git a/openpype/tools/ayon_workfiles/control.py b/openpype/tools/ayon_workfiles/control.py
index 3784959caf..d86b04badb 100644
--- a/openpype/tools/ayon_workfiles/control.py
+++ b/openpype/tools/ayon_workfiles/control.py
@@ -427,7 +427,7 @@ class BaseWorkfileController(
         task_name = context["task_name"]
         folder_id = None
         if folder_name:
-            folder = ayon_api.get_folder_by_name(project_name, folder_name)
+            folder = ayon_api.get_folder_by_path(project_name, folder_name)
             if folder:
                 folder_id = folder["id"]
 

From 1ac66764d49af599915a592de0917a4b67977358 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:05:16 +0200
Subject: [PATCH 08/29] use folder path in publisher

---
 openpype/tools/publisher/control.py           |  6 ++-
 .../tools/publisher/widgets/assets_widget.py  | 42 ++++++++++++++++---
 openpype/tools/publisher/widgets/widgets.py   | 17 ++++++--
 openpype/tools/utils/assets_widget.py         |  1 +
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index a6264303d5..ad87bdf607 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -12,10 +12,12 @@ from abc import ABCMeta, abstractmethod
 import six
 import pyblish.api
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import (
     get_assets,
     get_asset_by_id,
     get_subsets,
+    get_asset_name_identifier,
 )
 from openpype.lib.events import EventSystem
 from openpype.lib.attribute_definitions import (
@@ -73,6 +75,8 @@ class AssetDocsCache:
         "data.visualParent": True,
         "data.tasks": True
     }
+    if AYON_SERVER_ENABLED:
+        projection["data.parents"] = True
 
     def __init__(self, controller):
         self._controller = controller
@@ -105,7 +109,7 @@ class AssetDocsCache:
             elif "tasks" not in asset_doc["data"]:
                 asset_doc["data"]["tasks"] = {}
 
-            asset_name = asset_doc["name"]
+            asset_name = get_asset_name_identifier(asset_doc)
             asset_tasks = asset_doc["data"]["tasks"]
             task_names_by_asset_name[asset_name] = list(asset_tasks.keys())
             asset_docs_by_name[asset_name] = asset_doc
diff --git a/openpype/tools/publisher/widgets/assets_widget.py b/openpype/tools/publisher/widgets/assets_widget.py
index c536f93c9b..5f74b79c99 100644
--- a/openpype/tools/publisher/widgets/assets_widget.py
+++ b/openpype/tools/publisher/widgets/assets_widget.py
@@ -11,7 +11,8 @@ from openpype.tools.utils import (
 from openpype.tools.utils.assets_widget import (
     SingleSelectAssetsWidget,
     ASSET_ID_ROLE,
-    ASSET_NAME_ROLE
+    ASSET_NAME_ROLE,
+    ASSET_PATH_ROLE,
 )
 
 
@@ -31,6 +32,15 @@ class CreateWidgetAssetsWidget(SingleSelectAssetsWidget):
 
         self._last_filter_height = None
 
+    def get_selected_asset_name(self):
+        if AYON_SERVER_ENABLED:
+            selection_model = self._view.selectionModel()
+            indexes = selection_model.selectedRows()
+            for index in indexes:
+                return index.data(ASSET_PATH_ROLE)
+            return None
+        return super(CreateWidgetAssetsWidget, self).get_selected_asset_name()
+
     def _check_header_height(self):
         """Catch header height changes.
 
@@ -100,21 +110,24 @@ class AssetsHierarchyModel(QtGui.QStandardItemModel):
         self._controller = controller
 
         self._items_by_name = {}
+        self._items_by_path = {}
         self._items_by_asset_id = {}
 
     def reset(self):
         self.clear()
 
         self._items_by_name = {}
+        self._items_by_path = {}
         self._items_by_asset_id = {}
         assets_by_parent_id = self._controller.get_asset_hierarchy()
 
         items_by_name = {}
+        items_by_path = {}
         items_by_asset_id = {}
         _queue = collections.deque()
-        _queue.append((self.invisibleRootItem(), None))
+        _queue.append((self.invisibleRootItem(), None, None))
         while _queue:
-            parent_item, parent_id = _queue.popleft()
+            parent_item, parent_id, parent_path = _queue.popleft()
             children = assets_by_parent_id.get(parent_id)
             if not children:
                 continue
@@ -127,6 +140,9 @@ class AssetsHierarchyModel(QtGui.QStandardItemModel):
             for name in sorted(children_by_name.keys()):
                 child = children_by_name[name]
                 child_id = child["_id"]
+                child_path = name
+                if parent_path:
+                    child_path = "{}/{}".format(parent_path, child_path)
                 has_children = bool(assets_by_parent_id.get(child_id))
                 icon = get_asset_icon(child, has_children)
 
@@ -138,15 +154,18 @@ class AssetsHierarchyModel(QtGui.QStandardItemModel):
                 item.setData(icon, QtCore.Qt.DecorationRole)
                 item.setData(child_id, ASSET_ID_ROLE)
                 item.setData(name, ASSET_NAME_ROLE)
+                item.setData(child_path, ASSET_PATH_ROLE)
 
                 items_by_name[name] = item
+                items_by_path[child_path] = item
                 items_by_asset_id[child_id] = item
                 items.append(item)
-                _queue.append((item, child_id))
+                _queue.append((item, child_id, child_path))
 
             parent_item.appendRows(items)
 
         self._items_by_name = items_by_name
+        self._items_by_path = items_by_path
         self._items_by_asset_id = items_by_asset_id
 
     def get_index_by_asset_id(self, asset_id):
@@ -156,12 +175,20 @@ class AssetsHierarchyModel(QtGui.QStandardItemModel):
         return QtCore.QModelIndex()
 
     def get_index_by_asset_name(self, asset_name):
-        item = self._items_by_name.get(asset_name)
+        item = None
+        if AYON_SERVER_ENABLED:
+            item = self._items_by_path.get(asset_name)
+
+        if item is None:
+            item = self._items_by_name.get(asset_name)
+
         if item is None:
             return QtCore.QModelIndex()
         return item.index()
 
     def name_is_valid(self, item_name):
+        if AYON_SERVER_ENABLED and item_name in self._items_by_path:
+            return True
         return item_name in self._items_by_name
 
 
@@ -296,7 +323,10 @@ class AssetsDialog(QtWidgets.QDialog):
         index = self._asset_view.currentIndex()
         asset_name = None
         if index.isValid():
-            asset_name = index.data(ASSET_NAME_ROLE)
+            if AYON_SERVER_ENABLED:
+                asset_name = index.data(ASSET_PATH_ROLE)
+            else:
+                asset_name = index.data(ASSET_NAME_ROLE)
         self._selected_asset = asset_name
         self.done(1)
 
diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py
index 1bbe73381f..cc0f7a9f97 100644
--- a/openpype/tools/publisher/widgets/widgets.py
+++ b/openpype/tools/publisher/widgets/widgets.py
@@ -538,6 +538,7 @@ class AssetsField(BaseClickableFrame):
         Does not change selected items (assets).
         """
         self._name_input.setText(text)
+        self._name_input.end(False)
 
     def set_selected_items(self, asset_names=None):
         """Set asset names for selection of instances.
@@ -1162,7 +1163,10 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         invalid_tasks = False
         for instance in self._current_instances:
             new_variant_value = instance.get("variant")
-            new_asset_name = instance.get("asset")
+            if AYON_SERVER_ENABLED:
+                new_asset_name = instance.get("folderPath")
+            else:
+                new_asset_name = instance.get("asset")
             new_task_name = instance.get("task")
             if variant_value is not None:
                 new_variant_value = variant_value
@@ -1193,7 +1197,11 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
                 instance["variant"] = variant_value
 
             if asset_name is not None:
-                instance["asset"] = asset_name
+                if AYON_SERVER_ENABLED:
+                    instance["folderPath"] = asset_name
+                else:
+                    instance["asset"] = asset_name
+
                 instance.set_asset_invalid(False)
 
             if task_name is not None:
@@ -1282,7 +1290,10 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
 
             variants.add(instance.get("variant") or self.unknown_value)
             families.add(instance.get("family") or self.unknown_value)
-            asset_name = instance.get("asset") or self.unknown_value
+            if AYON_SERVER_ENABLED:
+                asset_name = instance.get("folderPath") or self.unknown_value
+            else:
+                asset_name = instance.get("asset") or self.unknown_value
             task_name = instance.get("task") or ""
             asset_names.add(asset_name)
             asset_task_combinations.append((asset_name, task_name))
diff --git a/openpype/tools/utils/assets_widget.py b/openpype/tools/utils/assets_widget.py
index a45d762c73..b83f4dfcaf 100644
--- a/openpype/tools/utils/assets_widget.py
+++ b/openpype/tools/utils/assets_widget.py
@@ -36,6 +36,7 @@ ASSET_ID_ROLE = QtCore.Qt.UserRole + 1
 ASSET_NAME_ROLE = QtCore.Qt.UserRole + 2
 ASSET_LABEL_ROLE = QtCore.Qt.UserRole + 3
 ASSET_UNDERLINE_COLORS_ROLE = QtCore.Qt.UserRole + 4
+ASSET_PATH_ROLE = QtCore.Qt.UserRole + 5
 
 
 class AssetsView(TreeViewSpinner, DeselectableTreeView):

From 69792a5c64446bf4c5b17333f2da14a2b9368e3a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:07:06 +0200
Subject: [PATCH 09/29] use 'get_asset_name_identifier' in aftereffecs

---
 .../plugins/create/workfile_creator.py        | 22 ++++++++++++++++---
 .../plugins/publish/collect_workfile.py       |  6 ++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/workfile_creator.py b/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
index 2e7b9d4a7e..5dc3d6592d 100644
--- a/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
+++ b/openpype/hosts/aftereffects/plugins/create/workfile_creator.py
@@ -1,3 +1,4 @@
+from openpype import AYON_SERVER_ENABLED
 import openpype.hosts.aftereffects.api as api
 from openpype.client import get_asset_by_name
 from openpype.pipeline import (
@@ -43,6 +44,14 @@ class AEWorkfileCreator(AutoCreator):
         task_name = context.get_current_task_name()
         host_name = context.host_name
 
+        existing_asset_name = None
+        if existing_instance is not None:
+            if AYON_SERVER_ENABLED:
+                existing_asset_name = existing_instance.get("folderPath")
+
+            if existing_asset_name is None:
+                existing_asset_name = existing_instance["asset"]
+
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
@@ -50,10 +59,13 @@ class AEWorkfileCreator(AutoCreator):
                 project_name, host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": self.default_variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
             data.update(self.get_dynamic_data(
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name, None
@@ -68,7 +80,7 @@ class AEWorkfileCreator(AutoCreator):
                                    new_instance.data_to_store())
 
         elif (
-            existing_instance["asset"] != asset_name
+            existing_asset_name != asset_name
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -76,6 +88,10 @@ class AEWorkfileCreator(AutoCreator):
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name
             )
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
+
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py b/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py
index dc557f67fc..58d2757840 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_workfile.py
@@ -1,6 +1,8 @@
 import os
 
 import pyblish.api
+
+from openpype.client import get_asset_name_identifier
 from openpype.pipeline.create import get_subset_name
 
 
@@ -48,9 +50,11 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
         asset_entity = context.data["assetEntity"]
         project_entity = context.data["projectEntity"]
 
+        asset_name = get_asset_name_identifier(asset_entity)
+
         instance_data = {
             "active": True,
-            "asset": asset_entity["name"],
+            "asset": asset_name,
             "task": task,
             "frameStart": context.data['frameStart'],
             "frameEnd": context.data['frameEnd'],

From 18fcfa4a4133ac71873ed5ac67e498891b514f96 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:07:17 +0200
Subject: [PATCH 10/29] use 'get_asset_name_identifier' in fusion

---
 .../fusion/plugins/create/create_workfile.py  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py
index 8acaaa172f..8063e56413 100644
--- a/openpype/hosts/fusion/plugins/create/create_workfile.py
+++ b/openpype/hosts/fusion/plugins/create/create_workfile.py
@@ -1,6 +1,7 @@
 from openpype.hosts.fusion.api import (
     get_current_comp
 )
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import get_asset_by_name
 from openpype.pipeline import (
     AutoCreator,
@@ -68,6 +69,15 @@ class FusionWorkfileCreator(AutoCreator):
         task_name = self.create_context.get_current_task_name()
         host_name = self.create_context.host_name
 
+        existing_instance_asset = None
+        if existing_instance is not None:
+            if AYON_SERVER_ENABLED:
+                existing_instance_asset = existing_instance.data.get(
+                    "folderPath")
+
+            if not existing_instance_asset:
+                existing_instance_asset = existing_instance.data.get("asset")
+
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
@@ -75,10 +85,13 @@ class FusionWorkfileCreator(AutoCreator):
                 project_name, host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": self.default_variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
             data.update(self.get_dynamic_data(
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name, None
@@ -91,7 +104,7 @@ class FusionWorkfileCreator(AutoCreator):
             self._add_instance_to_context(new_instance)
 
         elif (
-            existing_instance["asset"] != asset_name
+            existing_instance_asset != asset_name
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -99,6 +112,9 @@ class FusionWorkfileCreator(AutoCreator):
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name
             )
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name

From 279ab08dfacf6f0916d0162f35c11e72567565e1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:07:27 +0200
Subject: [PATCH 11/29] use 'get_asset_name_identifier' in celaction

---
 .../plugins/publish/collect_celaction_instances.py          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/celaction/plugins/publish/collect_celaction_instances.py b/openpype/hosts/celaction/plugins/publish/collect_celaction_instances.py
index c815c1edd4..875f15fcc5 100644
--- a/openpype/hosts/celaction/plugins/publish/collect_celaction_instances.py
+++ b/openpype/hosts/celaction/plugins/publish/collect_celaction_instances.py
@@ -1,6 +1,8 @@
 import os
 import pyblish.api
 
+from openpype.client import get_asset_name_identifier
+
 
 class CollectCelactionInstances(pyblish.api.ContextPlugin):
     """ Adds the celaction render instances """
@@ -17,8 +19,10 @@ class CollectCelactionInstances(pyblish.api.ContextPlugin):
         asset_entity = context.data["assetEntity"]
         project_entity = context.data["projectEntity"]
 
+        asset_name = get_asset_name_identifier(asset_entity)
+
         shared_instance_data = {
-            "asset": asset_entity["name"],
+            "asset": asset_name,
             "frameStart": asset_entity["data"]["frameStart"],
             "frameEnd": asset_entity["data"]["frameEnd"],
             "handleStart": asset_entity["data"]["handleStart"],

From a5056ea3fbca99c74f63ccafe409bbc650ec612b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:09:43 +0200
Subject: [PATCH 12/29] modified maya to follow new usage of 'asset' value

---
 openpype/hosts/maya/api/plugin.py             | 11 ++++++----
 .../maya/plugins/create/create_review.py      |  7 +++++-
 .../maya/plugins/create/create_workfile.py    | 22 +++++++++++++++----
 .../validate_unreal_staticmesh_naming.py      |  3 ++-
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/maya/api/plugin.py b/openpype/hosts/maya/api/plugin.py
index 3b54954c8a..6c8b5b6b78 100644
--- a/openpype/hosts/maya/api/plugin.py
+++ b/openpype/hosts/maya/api/plugin.py
@@ -7,6 +7,7 @@ import six
 from maya import cmds
 from maya.app.renderSetup.model import renderSetup
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.lib import BoolDef, Logger
 from openpype.settings import get_project_settings
 from openpype.pipeline import (
@@ -463,14 +464,16 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
                 # this instance will not have the `instance_node` data yet
                 # until it's been saved/persisted at least once.
                 project_name = self.create_context.get_current_project_name()
-
+                asset_name = self.create_context.get_current_asset_name()
                 instance_data = {
-                    "asset": self.create_context.get_current_asset_name(),
                     "task": self.create_context.get_current_task_name(),
                     "variant": layer.name(),
                 }
-                asset_doc = get_asset_by_name(project_name,
-                                              instance_data["asset"])
+                if AYON_SERVER_ENABLED:
+                    instance_data["folderPath"] = asset_name
+                else:
+                    instance_data["asset"] = asset_name
+                asset_doc = get_asset_by_name(project_name, asset_name)
                 subset_name = self.get_subset_name(
                     layer.name(),
                     instance_data["task"],
diff --git a/openpype/hosts/maya/plugins/create/create_review.py b/openpype/hosts/maya/plugins/create/create_review.py
index f60e2406bc..18d661b186 100644
--- a/openpype/hosts/maya/plugins/create/create_review.py
+++ b/openpype/hosts/maya/plugins/create/create_review.py
@@ -2,6 +2,7 @@ import json
 
 from maya import cmds
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.hosts.maya.api import (
     lib,
     plugin
@@ -43,7 +44,11 @@ class CreateReview(plugin.MayaCreator):
             members = cmds.ls(selection=True)
 
         project_name = self.project_name
-        asset_doc = get_asset_by_name(project_name, instance_data["asset"])
+        if AYON_SERVER_ENABLED:
+            asset_name = instance_data["folderPath"]
+        else:
+            asset_name = instance_data["asset"]
+        asset_doc = get_asset_by_name(project_name, asset_name)
         task_name = instance_data["task"]
         preset = lib.get_capture_preset(
             task_name,
diff --git a/openpype/hosts/maya/plugins/create/create_workfile.py b/openpype/hosts/maya/plugins/create/create_workfile.py
index d84753cd7f..74629776af 100644
--- a/openpype/hosts/maya/plugins/create/create_workfile.py
+++ b/openpype/hosts/maya/plugins/create/create_workfile.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 """Creator plugin for creating workfiles."""
+from openpype import AYON_SERVER_ENABLED
 from openpype.pipeline import CreatedInstance, AutoCreator
-from openpype.client import get_asset_by_name
+from openpype.client import get_asset_by_name, get_asset_name_identifier
 from openpype.hosts.maya.api import plugin
 from maya import cmds
 
@@ -29,16 +30,27 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
         task_name = self.create_context.get_current_task_name()
         host_name = self.create_context.host_name
 
+        current_instance_asset = None
+        if current_instance is not None:
+            if AYON_SERVER_ENABLED:
+                current_instance_asset = current_instance.get("folderPath")
+            if not current_instance_asset:
+                current_instance_asset = current_instance.get("asset")
+
         if current_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
+
             data.update(
                 self.get_dynamic_data(
                     variant, task_name, asset_doc,
@@ -50,14 +62,16 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
             )
             self._add_instance_to_context(current_instance)
         elif (
-                current_instance["asset"] != asset_name
-                or current_instance["task"] != task_name
+            current_instance_asset != asset_name
+            or current_instance["task"] != task_name
         ):
             # Update instance context if is not the same
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )
+            asset_name = get_asset_name_identifier(asset_doc)
+
             current_instance["asset"] = asset_name
             current_instance["task"] = task_name
             current_instance["subset"] = subset_name
diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
index 58fa9d02bd..42d3dc3ac8 100644
--- a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -102,7 +102,8 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin,
 
             cl_r = re.compile(regex_collision)
 
-            mesh_name = "{}{}".format(instance.data["asset"],
+            asset_name = instance.data["assetEntity"]["name"]
+            mesh_name = "{}{}".format(asset_name,
                                       instance.data.get("variant", []))
 
             for obj in collision_set:

From 82b1e0b205428dd0496be71bb269bd7d179b67c1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:12:08 +0200
Subject: [PATCH 13/29] modified houdini to follow new asset naming

---
 .../houdini/plugins/create/create_workfile.py | 23 +++++++++---
 .../plugins/publish/collect_usd_bootstrap.py  | 35 ++++++++++++-------
 .../plugins/publish/validate_subset_name.py   | 10 +++---
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/openpype/hosts/houdini/plugins/create/create_workfile.py b/openpype/hosts/houdini/plugins/create/create_workfile.py
index cc45a6c2a8..04a844bdf5 100644
--- a/openpype/hosts/houdini/plugins/create/create_workfile.py
+++ b/openpype/hosts/houdini/plugins/create/create_workfile.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """Creator plugin for creating workfiles."""
+from openpype import AYON_SERVER_ENABLED
 from openpype.hosts.houdini.api import plugin
 from openpype.hosts.houdini.api.lib import read, imprint
 from openpype.hosts.houdini.api.pipeline import CONTEXT_CONTAINER
@@ -30,16 +31,27 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
         task_name = self.create_context.get_current_task_name()
         host_name = self.host_name
 
+        current_instance_asset = None
+        if current_instance is not None:
+            if AYON_SERVER_ENABLED:
+                current_instance_asset = current_instance.get("folderPath")
+            if not current_instance_asset:
+                current_instance_asset = current_instance.get("asset")
+
         if current_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderpath"] = asset_name
+            else:
+                data["asset"] = asset_name
+
             data.update(
                 self.get_dynamic_data(
                     variant, task_name, asset_doc,
@@ -51,15 +63,18 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
             )
             self._add_instance_to_context(current_instance)
         elif (
-                current_instance["asset"] != asset_name
-                or current_instance["task"] != task_name
+            current_instance_asset != asset_name
+            or current_instance["task"] != task_name
         ):
             # Update instance context if is not the same
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )
-            current_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                current_instance["folderPath"] = asset_name
+            else:
+                current_instance["asset"] = asset_name
             current_instance["task"] = task_name
             current_instance["subset"] = subset_name
 
diff --git a/openpype/hosts/houdini/plugins/publish/collect_usd_bootstrap.py b/openpype/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
index 14a8e3c056..462cf99b9c 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
@@ -1,6 +1,10 @@
 import pyblish.api
 
-from openpype.client import get_subset_by_name, get_asset_by_name
+from openpype.client import (
+    get_subset_by_name,
+    get_asset_by_name,
+    get_asset_name_identifier,
+)
 import openpype.lib.usdlib as usdlib
 
 
@@ -51,8 +55,9 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
         self.log.debug("Add bootstrap for: %s" % bootstrap)
 
         project_name = instance.context.data["projectName"]
-        asset = get_asset_by_name(project_name, instance.data["asset"])
-        assert asset, "Asset must exist: %s" % asset
+        asset_name = instance.data["asset"]
+        asset_doc = get_asset_by_name(project_name, asset_name)
+        assert asset_doc, "Asset must exist: %s" % asset_name
 
         # Check which are not about to be created and don't exist yet
         required = {"shot": ["usdShot"], "asset": ["usdAsset"]}.get(bootstrap)
@@ -67,19 +72,21 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
                 required += list(layers)
 
         self.log.debug("Checking required bootstrap: %s" % required)
-        for subset in required:
-            if self._subset_exists(project_name, instance, subset, asset):
+        for subset_name in required:
+            if self._subset_exists(
+                project_name, instance, subset_name, asset_doc
+            ):
                 continue
 
             self.log.debug(
                 "Creating {0} USD bootstrap: {1} {2}".format(
-                    bootstrap, asset["name"], subset
+                    bootstrap, asset_name, subset_name
                 )
             )
 
-            new = instance.context.create_instance(subset)
-            new.data["subset"] = subset
-            new.data["label"] = "{0} ({1})".format(subset, asset["name"])
+            new = instance.context.create_instance(subset_name)
+            new.data["subset"] = subset_name
+            new.data["label"] = "{0} ({1})".format(subset_name, asset_name)
             new.data["family"] = "usd.bootstrap"
             new.data["comment"] = "Automated bootstrap USD file."
             new.data["publishFamilies"] = ["usd"]
@@ -91,21 +98,23 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
             for key in ["asset"]:
                 new.data[key] = instance.data[key]
 
-    def _subset_exists(self, project_name, instance, subset, asset):
+    def _subset_exists(self, project_name, instance, subset_name, asset_doc):
         """Return whether subset exists in current context or in database."""
         # Allow it to be created during this publish session
         context = instance.context
+
+        asset_doc_name = get_asset_name_identifier(asset_doc)
         for inst in context:
             if (
-                inst.data["subset"] == subset
-                and inst.data["asset"] == asset["name"]
+                inst.data["subset"] == subset_name
+                and inst.data["asset"] == asset_doc_name
             ):
                 return True
 
         # Or, if they already exist in the database we can
         # skip them too.
         if get_subset_by_name(
-            project_name, subset, asset["_id"], fields=["_id"]
+            project_name, subset_name, asset_doc["_id"], fields=["_id"]
         ):
             return True
         return False
diff --git a/openpype/hosts/houdini/plugins/publish/validate_subset_name.py b/openpype/hosts/houdini/plugins/publish/validate_subset_name.py
index bb3648f361..7bed74ebb1 100644
--- a/openpype/hosts/houdini/plugins/publish/validate_subset_name.py
+++ b/openpype/hosts/houdini/plugins/publish/validate_subset_name.py
@@ -54,12 +54,13 @@ class ValidateSubsetName(pyblish.api.InstancePlugin,
         rop_node = hou.node(instance.data["instance_node"])
 
         # Check subset name
+        asset_doc = instance.data["assetEntity"]
         subset_name = get_subset_name(
             family=instance.data["family"],
             variant=instance.data["variant"],
             task_name=instance.data["task"],
-            asset_doc=instance.data["assetEntity"],
-            dynamic_data={"asset": instance.data["asset"]}
+            asset_doc=asset_doc,
+            dynamic_data={"asset": asset_doc["name"]}
         )
 
         if instance.data.get("subset") != subset_name:
@@ -76,12 +77,13 @@ class ValidateSubsetName(pyblish.api.InstancePlugin,
         rop_node = hou.node(instance.data["instance_node"])
 
         # Check subset name
+        asset_doc = instance.data["assetEntity"]
         subset_name = get_subset_name(
             family=instance.data["family"],
             variant=instance.data["variant"],
             task_name=instance.data["task"],
-            asset_doc=instance.data["assetEntity"],
-            dynamic_data={"asset": instance.data["asset"]}
+            asset_doc=asset_doc,
+            dynamic_data={"asset": asset_doc["name"]}
         )
 
         instance.data["subset"] = subset_name

From 23c41fe12aedeedd567cd9d290e243a5871c07bf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:13:00 +0200
Subject: [PATCH 14/29] modified photoshop to follow new 'asset' name usage

---
 openpype/hosts/photoshop/lib.py               | 22 ++++++++++++++++---
 .../plugins/create/create_flatten_image.py    | 22 +++++++++++++++----
 .../plugins/publish/collect_auto_image.py     |  3 ++-
 .../plugins/publish/collect_auto_review.py    |  4 +++-
 .../plugins/publish/collect_auto_workfile.py  |  3 ++-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/photoshop/lib.py b/openpype/hosts/photoshop/lib.py
index 9f603a70d2..654528410a 100644
--- a/openpype/hosts/photoshop/lib.py
+++ b/openpype/hosts/photoshop/lib.py
@@ -1,5 +1,6 @@
 import re
 
+from openpype import AYON_SERVER_ENABLED
 import openpype.hosts.photoshop.api as api
 from openpype.client import get_asset_by_name
 from openpype.lib import prepare_template_data
@@ -43,6 +44,15 @@ class PSAutoCreator(AutoCreator):
         asset_name = context.get_current_asset_name()
         task_name = context.get_current_task_name()
         host_name = context.host_name
+
+        existing_instance_asset = None
+        if existing_instance is not None:
+            if AYON_SERVER_ENABLED:
+                existing_instance_asset = existing_instance.get("folderPath")
+
+            if not existing_instance_asset:
+                existing_instance_asset = existing_instance.get("asset")
+
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
@@ -50,10 +60,13 @@ class PSAutoCreator(AutoCreator):
                 project_name, host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": self.default_variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
             data.update(self.get_dynamic_data(
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name, None
@@ -70,7 +83,7 @@ class PSAutoCreator(AutoCreator):
                                new_instance.data_to_store())
 
         elif (
-            existing_instance["asset"] != asset_name
+            existing_instance_asset != asset_name
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -78,7 +91,10 @@ class PSAutoCreator(AutoCreator):
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name
             )
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
 
diff --git a/openpype/hosts/photoshop/plugins/create/create_flatten_image.py b/openpype/hosts/photoshop/plugins/create/create_flatten_image.py
index afde77fdb4..942f8f4989 100644
--- a/openpype/hosts/photoshop/plugins/create/create_flatten_image.py
+++ b/openpype/hosts/photoshop/plugins/create/create_flatten_image.py
@@ -1,5 +1,6 @@
 from openpype.pipeline import CreatedInstance
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.lib import BoolDef
 import openpype.hosts.photoshop.api as api
 from openpype.hosts.photoshop.lib import PSAutoCreator, clean_subset_name
@@ -37,6 +38,14 @@ class AutoImageCreator(PSAutoCreator):
         host_name = context.host_name
         asset_doc = get_asset_by_name(project_name, asset_name)
 
+        existing_instance_asset = None
+        if existing_instance is not None:
+            if AYON_SERVER_ENABLED:
+                existing_instance_asset = existing_instance.get("folderPath")
+
+            if not existing_instance_asset:
+                existing_instance_asset = existing_instance.get("asset")
+
         if existing_instance is None:
             subset_name = self.get_subset_name(
                 self.default_variant, task_name, asset_doc,
@@ -44,9 +53,12 @@ class AutoImageCreator(PSAutoCreator):
             )
 
             data = {
-                "asset": asset_name,
                 "task": task_name,
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
 
             if not self.active_on_create:
                 data["active"] = False
@@ -62,15 +74,17 @@ class AutoImageCreator(PSAutoCreator):
                                new_instance.data_to_store())
 
         elif (  # existing instance from different context
-            existing_instance["asset"] != asset_name
+            existing_instance_asset != asset_name
             or existing_instance["task"] != task_name
         ):
             subset_name = self.get_subset_name(
                 self.default_variant, task_name, asset_doc,
                 project_name, host_name
             )
-
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
 
diff --git a/openpype/hosts/photoshop/plugins/publish/collect_auto_image.py b/openpype/hosts/photoshop/plugins/publish/collect_auto_image.py
index 77f1a3e91f..038ae9ff6c 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_auto_image.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_auto_image.py
@@ -1,5 +1,6 @@
 import pyblish.api
 
+from openpype.client import get_asset_name_identifier
 from openpype.hosts.photoshop import api as photoshop
 from openpype.pipeline.create import get_subset_name
 
@@ -27,7 +28,7 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
         task_name = context.data["anatomyData"]["task"]["name"]
         host_name = context.data["hostName"]
         asset_doc = context.data["assetEntity"]
-        asset_name = asset_doc["name"]
+        asset_name = get_asset_name_identifier(asset_doc)
 
         auto_creator = proj_settings.get(
             "photoshop", {}).get(
diff --git a/openpype/hosts/photoshop/plugins/publish/collect_auto_review.py b/openpype/hosts/photoshop/plugins/publish/collect_auto_review.py
index 82ba0ac09c..37e9e8bae8 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_auto_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_auto_review.py
@@ -7,6 +7,7 @@ Provides:
 """
 import pyblish.api
 
+from openpype.client import get_asset_name_identifier
 from openpype.hosts.photoshop import api as photoshop
 from openpype.pipeline.create import get_subset_name
 
@@ -65,7 +66,8 @@ class CollectAutoReview(pyblish.api.ContextPlugin):
         task_name = context.data["anatomyData"]["task"]["name"]
         host_name = context.data["hostName"]
         asset_doc = context.data["assetEntity"]
-        asset_name = asset_doc["name"]
+
+        asset_name = get_asset_name_identifier(asset_doc)
 
         subset_name = get_subset_name(
             family,
diff --git a/openpype/hosts/photoshop/plugins/publish/collect_auto_workfile.py b/openpype/hosts/photoshop/plugins/publish/collect_auto_workfile.py
index 01dc50af40..be5a641d51 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_auto_workfile.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_auto_workfile.py
@@ -1,6 +1,7 @@
 import os
 import pyblish.api
 
+from openpype.client import get_asset_name_identifier
 from openpype.hosts.photoshop import api as photoshop
 from openpype.pipeline.create import get_subset_name
 
@@ -69,8 +70,8 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
         task_name = context.data["anatomyData"]["task"]["name"]
         host_name = context.data["hostName"]
         asset_doc = context.data["assetEntity"]
-        asset_name = asset_doc["name"]
 
+        asset_name = get_asset_name_identifier(asset_doc)
         subset_name = get_subset_name(
             family,
             variant,

From 7c7f9f175c041292e8a11306763a0863cc6bae95 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:13:23 +0200
Subject: [PATCH 15/29] modified substance to follow new 'asset' usage

---
 .../plugins/create/create_workfile.py         | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/substancepainter/plugins/create/create_workfile.py b/openpype/hosts/substancepainter/plugins/create/create_workfile.py
index d7f31f9dcf..8aa696f11d 100644
--- a/openpype/hosts/substancepainter/plugins/create/create_workfile.py
+++ b/openpype/hosts/substancepainter/plugins/create/create_workfile.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """Creator plugin for creating workfiles."""
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.pipeline import CreatedInstance, AutoCreator
 from openpype.client import get_asset_by_name
 
@@ -41,6 +42,13 @@ class CreateWorkfile(AutoCreator):
                 if instance.creator_identifier == self.identifier
             ), None)
 
+        current_instance_asset = None
+        if current_instance is not None:
+            if AYON_SERVER_ENABLED:
+                current_instance_asset = current_instance.get("folderPath")
+            if not current_instance_asset:
+                current_instance_asset = current_instance.get("asset")
+
         if current_instance is None:
             self.log.info("Auto-creating workfile instance...")
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -48,22 +56,28 @@ class CreateWorkfile(AutoCreator):
                 variant, task_name, asset_doc, project_name, host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
             current_instance = self.create_instance_in_context(subset_name,
                                                                data)
         elif (
-                current_instance["asset"] != asset_name
-                or current_instance["task"] != task_name
+            current_instance_asset != asset_name
+            or current_instance["task"] != task_name
         ):
             # Update instance context if is not the same
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
                 variant, task_name, asset_doc, project_name, host_name
             )
-            current_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                current_instance["folderPath"] = asset_name
+            else:
+                current_instance["asset"] = asset_name
             current_instance["task"] = task_name
             current_instance["subset"] = subset_name
 

From 7d366371a5eec266083721b1ac651813103978fb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:17:35 +0200
Subject: [PATCH 16/29] modified most of code in traypublisher to follow new
 asset usage

---
 openpype/hosts/traypublisher/api/plugin.py            | 11 ++++++++---
 .../plugins/create/create_colorspace_look.py          |  7 ++++++-
 .../traypublisher/plugins/create/create_editorial.py  |  6 +++++-
 .../plugins/create/create_movie_batch.py              |  9 ++++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 36e041a32c..14c66fa08f 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -1,7 +1,9 @@
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import (
     get_assets,
     get_subsets,
     get_last_versions,
+    get_asset_name_identifier,
 )
 from openpype.lib.attribute_definitions import (
     FileDef,
@@ -114,7 +116,10 @@ class SettingsCreator(TrayPublishCreator):
 
         # Fill 'version_to_use' if version control is enabled
         if self.allow_version_control:
-            asset_name = data["asset"]
+            if AYON_SERVER_ENABLED:
+                asset_name = data["folderPath"]
+            else:
+                asset_name = data["asset"]
             subset_docs_by_asset_id = self._prepare_next_versions(
                 [asset_name], [subset_name])
             version = subset_docs_by_asset_id[asset_name].get(subset_name)
@@ -162,10 +167,10 @@ class SettingsCreator(TrayPublishCreator):
         asset_docs = get_assets(
             self.project_name,
             asset_names=asset_names,
-            fields=["_id", "name"]
+            fields=["_id", "name", "data.parents"]
         )
         asset_names_by_id = {
-            asset_doc["_id"]: asset_doc["name"]
+            asset_doc["_id"]: get_asset_name_identifier(asset_doc)
             for asset_doc in asset_docs
         }
         subset_docs = list(get_subsets(
diff --git a/openpype/hosts/traypublisher/plugins/create/create_colorspace_look.py b/openpype/hosts/traypublisher/plugins/create/create_colorspace_look.py
index 5628d0973f..ac4c72a0ce 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_colorspace_look.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_colorspace_look.py
@@ -6,6 +6,7 @@ production type `ociolook`. All files are published as representation.
 """
 from pathlib import Path
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import get_asset_by_name
 from openpype.lib.attribute_definitions import (
     FileDef, EnumDef, TextDef, UISeparatorDef
@@ -54,8 +55,12 @@ This creator publishes color space look file (LUT).
             # this should never happen
             raise CreatorError("Missing files from representation")
 
+        if AYON_SERVER_ENABLED:
+            asset_name = instance_data["folderPath"]
+        else:
+            asset_name = instance_data["asset"]
         asset_doc = get_asset_by_name(
-            self.project_name, instance_data["asset"])
+            self.project_name, asset_name)
 
         subset_name = self.get_subset_name(
             variant=instance_data["variant"],
diff --git a/openpype/hosts/traypublisher/plugins/create/create_editorial.py b/openpype/hosts/traypublisher/plugins/create/create_editorial.py
index 8640500b18..23cf066362 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_editorial.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_editorial.py
@@ -1,6 +1,7 @@
 import os
 from copy import deepcopy
 import opentimelineio as otio
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import (
     get_asset_by_name,
     get_project
@@ -215,7 +216,10 @@ or updating already created. Publishing will create OTIO file.
             ]
         }
         # Create otio editorial instance
-        asset_name = instance_data["asset"]
+        if AYON_SERVER_ENABLED:
+            asset_name = instance_data["folderPath"]
+        else:
+            asset_name = instance_data["asset"]
         asset_doc = get_asset_by_name(self.project_name, asset_name)
 
         if pre_create_data["fps"] == "from_selection":
diff --git a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
index 3454b6e135..8fa65c7fff 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
@@ -2,6 +2,8 @@ import copy
 import os
 import re
 
+from openpype import AYON_SERVER_ENABLED
+from openpype.client import get_asset_name_identifier
 from openpype.lib import (
     FileDef,
     BoolDef,
@@ -64,8 +66,13 @@ class BatchMovieCreator(TrayPublishCreator):
             subset_name, task_name = self._get_subset_and_task(
                 asset_doc, data["variant"], self.project_name)
 
+            asset_name = get_asset_name_identifier(asset_doc)
+
             instance_data["task"] = task_name
-            instance_data["asset"] = asset_doc["name"]
+            if AYON_SERVER_ENABLED:
+                instance_data["folderPath"] = asset_name
+            else:
+                instance_data["asset"] = asset_name
 
             # Create new instance
             new_instance = CreatedInstance(self.family, subset_name,

From 8360c321bdf3713df75a7b0225d4cb59ac22b02f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:39:04 +0200
Subject: [PATCH 17/29] modified tvpaint to use new 'asset' handling

---
 .../tvpaint/plugins/create/create_render.py   | 54 +++++++++++++++----
 .../tvpaint/plugins/create/create_review.py   | 21 ++++++--
 .../tvpaint/plugins/create/create_workfile.py | 20 +++++--
 .../plugins/publish/validate_asset_name.py    | 12 ++++-
 4 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py
index b7a7c208d9..667103432e 100644
--- a/openpype/hosts/tvpaint/plugins/create/create_render.py
+++ b/openpype/hosts/tvpaint/plugins/create/create_render.py
@@ -37,7 +37,8 @@ Todos:
 import collections
 from typing import Any, Optional, Union
 
-from openpype.client import get_asset_by_name
+from openpype import AYON_SERVER_ENABLED
+from openpype.client import get_asset_by_name, get_asset_name_identifier
 from openpype.lib import (
     prepare_template_data,
     AbstractAttrDef,
@@ -784,18 +785,25 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
             project_name,
             host_name=self.create_context.host_name,
         )
+        asset_name = get_asset_name_identifier(asset_doc)
         if existing_instance is not None:
-            existing_instance["asset"] = asset_doc["name"]
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
             return existing_instance
 
         instance_data: dict[str, str] = {
-            "asset": asset_doc["name"],
             "task": task_name,
             "family": creator.family,
             "variant": variant
         }
+        if AYON_SERVER_ENABLED:
+            instance_data["folderPath"] = asset_name
+        else:
+            instance_data["asset"] = asset_name
         pre_create_data: dict[str, str] = {
             "group_id": group_id,
             "mark_for_review": mark_for_review
@@ -820,6 +828,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
             for layer_name in render_pass["layer_names"]:
                 render_pass_by_layer_name[layer_name] = render_pass
 
+        asset_name = get_asset_name_identifier(asset_doc)
+
         for layer in layers:
             layer_name = layer["name"]
             variant = layer_name
@@ -838,17 +848,25 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
             )
 
             if render_pass is not None:
-                render_pass["asset"] = asset_doc["name"]
+                if AYON_SERVER_ENABLED:
+                    render_pass["folderPath"] = asset_name
+                else:
+                    render_pass["asset"] = asset_name
+
                 render_pass["task"] = task_name
                 render_pass["subset"] = subset_name
                 continue
 
             instance_data: dict[str, str] = {
-                "asset": asset_doc["name"],
                 "task": task_name,
                 "family": creator.family,
                 "variant": variant
             }
+            if AYON_SERVER_ENABLED:
+                instance_data["folderPath"] = asset_name
+            else:
+                instance_data["asset"] = asset_name
+
             pre_create_data: dict[str, Any] = {
                 "render_layer_instance_id": render_layer_instance.id,
                 "layer_names": [layer_name],
@@ -882,9 +900,13 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
 
     def create(self, subset_name, instance_data, pre_create_data):
         project_name: str = self.create_context.get_current_project_name()
-        asset_name: str = instance_data["asset"]
+        if AYON_SERVER_ENABLED:
+            asset_name: str = instance_data["folderPath"]
+        else:
+            asset_name: str = instance_data["asset"]
         task_name: str = instance_data["task"]
-        asset_doc: dict[str, Any] = get_asset_by_name(project_name, asset_name)
+        asset_doc: dict[str, Any] = get_asset_by_name(
+            project_name, asset_name)
 
         render_layers_by_group_id: dict[int, CreatedInstance] = {}
         render_passes_by_render_layer_id: dict[int, list[CreatedInstance]] = (
@@ -1061,7 +1083,6 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
             host_name
         )
         data = {
-            "asset": asset_name,
             "task": task_name,
             "variant": self.default_variant,
             "creator_attributes": {
@@ -1073,6 +1094,10 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
                 self.default_pass_name
             )
         }
+        if AYON_SERVER_ENABLED:
+            data["folderPath"] = asset_name
+        else:
+            data["asset"] = asset_name
         if not self.active_on_create:
             data["active"] = False
 
@@ -1101,8 +1126,14 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
         asset_name = create_context.get_current_asset_name()
         task_name = create_context.get_current_task_name()
 
+        existing_name = None
+        if AYON_SERVER_ENABLED:
+            existing_name = existing_instance.get("folderPath")
+        if existing_name is None:
+            existing_name = existing_instance["asset"]
+
         if (
-            existing_instance["asset"] != asset_name
+            existing_name != asset_name
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -1114,7 +1145,10 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
                 host_name,
                 existing_instance
             )
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
 
diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py
index 7bb7510a8e..265cef00ef 100644
--- a/openpype/hosts/tvpaint/plugins/create/create_review.py
+++ b/openpype/hosts/tvpaint/plugins/create/create_review.py
@@ -1,3 +1,4 @@
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import get_asset_by_name
 from openpype.pipeline import CreatedInstance
 from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator
@@ -33,6 +34,13 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
         asset_name = create_context.get_current_asset_name()
         task_name = create_context.get_current_task_name()
 
+        existing_asset_name = None
+        if existing_instance is not None:
+            if AYON_SERVER_ENABLED:
+                existing_asset_name = existing_instance.get("folderPath")
+            if existing_asset_name is None:
+                existing_asset_name = existing_instance.get("asset")
+
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
@@ -43,10 +51,14 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
                 host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": self.default_variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
+
             if not self.active_on_create:
                 data["active"] = False
 
@@ -59,7 +71,7 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
             self._add_instance_to_context(new_instance)
 
         elif (
-            existing_instance["asset"] != asset_name
+            existing_asset_name != asset_name
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -71,6 +83,9 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
                 host_name,
                 existing_instance
             )
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py
index c3982c0eca..eec0f8483f 100644
--- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py
+++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py
@@ -1,3 +1,4 @@
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import get_asset_by_name
 from openpype.pipeline import CreatedInstance
 from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator
@@ -29,6 +30,13 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
         asset_name = create_context.get_current_asset_name()
         task_name = create_context.get_current_task_name()
 
+        existing_asset_name = None
+        if existing_instance is not None:
+            if AYON_SERVER_ENABLED:
+                existing_asset_name = existing_instance.get("folderPath")
+            if existing_asset_name is None:
+                existing_asset_name = existing_instance.get("asset")
+
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
             subset_name = self.get_subset_name(
@@ -39,10 +47,13 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
                 host_name
             )
             data = {
-                "asset": asset_name,
                 "task": task_name,
                 "variant": self.default_variant
             }
+            if AYON_SERVER_ENABLED:
+                data["folderPath"] = asset_name
+            else:
+                data["asset"] = asset_name
 
             new_instance = CreatedInstance(
                 self.family, subset_name, data, self
@@ -53,7 +64,7 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
             self._add_instance_to_context(new_instance)
 
         elif (
-            existing_instance["asset"] != asset_name
+            existing_asset_name != asset_name
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
@@ -65,6 +76,9 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
                 host_name,
                 existing_instance
             )
-            existing_instance["asset"] = asset_name
+            if AYON_SERVER_ENABLED:
+                existing_instance["folderPath"] = asset_name
+            else:
+                existing_instance["asset"] = asset_name
             existing_instance["task"] = task_name
             existing_instance["subset"] = subset_name
diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_asset_name.py b/openpype/hosts/tvpaint/plugins/publish/validate_asset_name.py
index 9347960d3f..dc29e6c278 100644
--- a/openpype/hosts/tvpaint/plugins/publish/validate_asset_name.py
+++ b/openpype/hosts/tvpaint/plugins/publish/validate_asset_name.py
@@ -1,4 +1,5 @@
 import pyblish.api
+from openpype import AYON_SERVER_ENABLED
 from openpype.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin,
@@ -24,12 +25,19 @@ class FixAssetNames(pyblish.api.Action):
         old_instance_items = list_instances()
         new_instance_items = []
         for instance_item in old_instance_items:
-            instance_asset_name = instance_item.get("asset")
+            if AYON_SERVER_ENABLED:
+                instance_asset_name = instance_item.get("folderPath")
+            else:
+                instance_asset_name = instance_item.get("asset")
+
             if (
                 instance_asset_name
                 and instance_asset_name != context_asset_name
             ):
-                instance_item["asset"] = context_asset_name
+                if AYON_SERVER_ENABLED:
+                    instance_item["folderPath"] = context_asset_name
+                else:
+                    instance_item["asset"] = context_asset_name
             new_instance_items.append(instance_item)
         write_instances(new_instance_items)
 

From 5ada46f2a05dc71b621a7cffe077cb9dcff0e997 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:41:37 +0200
Subject: [PATCH 18/29] modified some parts of hiero to follow new 'asset'
 handling

---
 openpype/hosts/hiero/api/plugin.py             |  6 ++----
 .../publish/collect_frame_tag_instances.py     |  7 ++++++-
 .../plugins/publish/precollect_instances.py    |  1 -
 .../plugins/publish/precollect_workfile.py     | 17 ++++++++++-------
 .../collect_assetbuilds.py                     | 18 ++++++++++--------
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/openpype/hosts/hiero/api/plugin.py b/openpype/hosts/hiero/api/plugin.py
index 52f96261b2..0e0632e032 100644
--- a/openpype/hosts/hiero/api/plugin.py
+++ b/openpype/hosts/hiero/api/plugin.py
@@ -11,7 +11,6 @@ import qargparse
 from openpype.settings import get_current_project_settings
 from openpype.lib import Logger
 from openpype.pipeline import LoaderPlugin, LegacyCreator
-from openpype.pipeline.context_tools import get_current_project_asset
 from openpype.pipeline.load import get_representation_path_from_context
 from . import lib
 
@@ -494,9 +493,8 @@ class ClipLoader:
         joint `data` key with asset.data dict into the representation
 
         """
-        asset_name = self.context["representation"]["context"]["asset"]
-        asset_doc = get_current_project_asset(asset_name)
-        log.debug("__ asset_doc: {}".format(pformat(asset_doc)))
+
+        asset_doc = self.context["asset"]
         self.data["assetData"] = asset_doc["data"]
 
     def _make_track_item(self, source_bin_item, audio=False):
diff --git a/openpype/hosts/hiero/plugins/publish/collect_frame_tag_instances.py b/openpype/hosts/hiero/plugins/publish/collect_frame_tag_instances.py
index 982a34efd6..79bf67b336 100644
--- a/openpype/hosts/hiero/plugins/publish/collect_frame_tag_instances.py
+++ b/openpype/hosts/hiero/plugins/publish/collect_frame_tag_instances.py
@@ -5,6 +5,8 @@ import json
 
 import pyblish.api
 
+from openpype.client import get_asset_name_identifier
+
 
 class CollectFrameTagInstances(pyblish.api.ContextPlugin):
     """Collect frames from tags.
@@ -99,6 +101,9 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
 
         # 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)
+
         for tag_data in sequence_tags:
             frame = int(tag_data["start"])
 
@@ -115,7 +120,7 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
                 subset_data[subset] = {
                     "frames": [frame],
                     "format": tag_data["format"],
-                    "asset": context.data["assetEntity"]["name"]
+                    "asset": context_asset_name
                 }
         return subset_data
 
diff --git a/openpype/hosts/hiero/plugins/publish/precollect_instances.py b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
index 3f9da2cf60..65b8fed49c 100644
--- a/openpype/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
@@ -178,7 +178,6 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
     def create_shot_instance(self, context, **data):
         master_layer = data.get("heroTrack")
         hierarchy_data = data.get("hierarchyData")
-        asset = data.get("asset")
         item = data.get("item")
         clip_name = item.name()
 
diff --git a/openpype/hosts/hiero/plugins/publish/precollect_workfile.py b/openpype/hosts/hiero/plugins/publish/precollect_workfile.py
index 5a66581531..1d6bdc0257 100644
--- a/openpype/hosts/hiero/plugins/publish/precollect_workfile.py
+++ b/openpype/hosts/hiero/plugins/publish/precollect_workfile.py
@@ -7,6 +7,7 @@ from qtpy.QtGui import QPixmap
 
 import hiero.ui
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.hosts.hiero.api.otio import hiero_export
 
 
@@ -17,9 +18,10 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder - 0.491
 
     def process(self, context):
+        asset_name = context.data["asset"]
+        if AYON_SERVER_ENABLED:
+            asset_name = asset_name.split("/")[-1]
 
-        asset = context.data["asset"]
-        subset = "workfile"
         active_timeline = hiero.ui.activeSequence()
         project = active_timeline.project()
         fps = active_timeline.framerate().toFloat()
@@ -59,13 +61,14 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
             'files': base_name,
             "stagingDir": staging_dir,
         }
-
+        family = "workfile"
         instance_data = {
-            "name": "{}_{}".format(asset, subset),
-            "asset": asset,
-            "subset": "{}{}".format(asset, subset.capitalize()),
+            "name": "{}_{}".format(asset_name, family),
+            "asset": context.data["asset"],
+            # TODO use 'get_subset_name'
+            "subset": "{}{}".format(asset_name, family.capitalize()),
             "item": project,
-            "family": "workfile",
+            "family": family,
             "families": [],
             "representations": [workfile_representation, thumb_representation]
         }
diff --git a/openpype/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py b/openpype/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
index 767f7c30f7..37370497a5 100644
--- a/openpype/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
+++ b/openpype/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
@@ -1,5 +1,6 @@
 from pyblish import api
-from openpype.client import get_assets
+
+from openpype.client import get_assets, get_asset_name_identifier
 
 
 class CollectAssetBuilds(api.ContextPlugin):
@@ -19,10 +20,13 @@ class CollectAssetBuilds(api.ContextPlugin):
     def process(self, context):
         project_name = context.data["projectName"]
         asset_builds = {}
-        for asset in get_assets(project_name):
-            if asset["data"]["entityType"] == "AssetBuild":
-                self.log.debug("Found \"{}\" in database.".format(asset))
-                asset_builds[asset["name"]] = asset
+        for asset_doc in get_assets(project_name):
+            if asset_doc["data"].get("entityType") != "AssetBuild":
+                continue
+
+            asset_name = get_asset_name_identifier(asset_doc)
+            self.log.debug("Found \"{}\" in database.".format(asset_doc))
+            asset_builds[asset_name] = asset_doc
 
         for instance in context:
             if instance.data["family"] != "clip":
@@ -50,9 +54,7 @@ class CollectAssetBuilds(api.ContextPlugin):
             # Collect asset builds.
             data = {"assetbuilds": []}
             for name in asset_names:
-                data["assetbuilds"].append(
-                    asset_builds[name]
-                )
+                data["assetbuilds"].append(asset_builds[name])
             self.log.debug(
                 "Found asset builds: {}".format(data["assetbuilds"])
             )

From 51bebd0f1e24264e72358d58ef55f77062aaba3b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:42:14 +0200
Subject: [PATCH 19/29] modified part of flame to follow new 'asset' naming

---
 .../hosts/flame/plugins/publish/collect_timeline_otio.py     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/flame/plugins/publish/collect_timeline_otio.py b/openpype/hosts/flame/plugins/publish/collect_timeline_otio.py
index f8cfa9e963..20ac048986 100644
--- a/openpype/hosts/flame/plugins/publish/collect_timeline_otio.py
+++ b/openpype/hosts/flame/plugins/publish/collect_timeline_otio.py
@@ -1,5 +1,6 @@
 import pyblish.api
 
+from openpype.client import get_asset_name_identifier
 import openpype.hosts.flame.api as opfapi
 from openpype.hosts.flame.otio import flame_export
 from openpype.pipeline.create import get_subset_name
@@ -33,13 +34,15 @@ class CollecTimelineOTIO(pyblish.api.ContextPlugin):
             project_settings=context.data["project_settings"]
         )
 
+        asset_name = 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_doc["name"],
+                "asset": asset_name,
                 "subset": subset_name,
                 "family": "workfile",
                 "families": []

From 9d617db64cac3e06ea373e05511bce4fc0728c19 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:46:35 +0200
Subject: [PATCH 20/29] use only folder name to create instance name

---
 .../hosts/resolve/plugins/publish/precollect_workfile.py    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/resolve/plugins/publish/precollect_workfile.py b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
index a2f3eaed7a..28b2350f01 100644
--- a/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
+++ b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
@@ -15,6 +15,8 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
     def process(self, context):
 
         asset = get_current_asset_name()
+        # AYON compatibility split name and use last piece
+        _asset_name = asset.split("/")[-1]
         subset = "workfile"
         project = rapi.get_current_project()
         fps = project.GetSetting("timelineFrameRate")
@@ -24,9 +26,9 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
         otio_timeline = davinci_export.create_otio_timeline(project)
 
         instance_data = {
-            "name": "{}_{}".format(asset, subset),
+            "name": "{}_{}".format(_asset_name, subset),
             "asset": asset,
-            "subset": "{}{}".format(asset, subset.capitalize()),
+            "subset": "{}{}".format(_asset_name, subset.capitalize()),
             "item": project,
             "family": "workfile",
             "families": []

From e34c0b9ecd1505657969676bb0d9a062498c6c52 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 24 Oct 2023 18:50:54 +0200
Subject: [PATCH 21/29] avoid unnecessary call to database

---
 openpype/hosts/resolve/api/plugin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 8381f81acb..a3d533d3d7 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -1,10 +1,11 @@
 import re
 import uuid
+import copy
+
 import qargparse
 from qtpy import QtWidgets, QtCore
 
 from openpype.settings import get_current_project_settings
-from openpype.pipeline.context_tools import get_current_project_asset
 from openpype.pipeline import (
     LegacyCreator,
     LoaderPlugin,
@@ -379,8 +380,8 @@ class ClipLoader:
         joint `data` key with asset.data dict into the representation
 
         """
-        asset_name = self.context["representation"]["context"]["asset"]
-        self.data["assetData"] = get_current_project_asset(asset_name)["data"]
+
+        self.data["assetData"] = copy.deepcopy(self.context["asset"]["data"])
 
     def load(self, files):
         """Load clip into timeline

From 053cc44891343624d73de6a03ed3c560103ff118 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 25 Oct 2023 11:40:26 +0200
Subject: [PATCH 22/29] removed unnecessary line

---
 openpype/client/server/entities.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/client/server/entities.py b/openpype/client/server/entities.py
index c1e27eabb9..c735c558d5 100644
--- a/openpype/client/server/entities.py
+++ b/openpype/client/server/entities.py
@@ -183,7 +183,6 @@ def get_asset_by_name(project_name, asset_name, fields=None):
     return None
 
 
-
 def _folders_query(project_name, con, fields, **kwargs):
     if fields is None or "tasks" in fields:
         folders = get_folders_with_tasks(

From 7942e33a117e487d5d86c15e8d919fc5dc947ff6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 25 Oct 2023 12:01:58 +0200
Subject: [PATCH 23/29] be expicit about source of asset and folder path

---
 .../hosts/fusion/plugins/create/create_workfile.py | 14 ++++++--------
 .../houdini/plugins/create/create_workfile.py      | 12 ++++++------
 .../hosts/maya/plugins/create/create_workfile.py   | 12 ++++++------
 .../plugins/create/create_flatten_image.py         | 13 ++++++-------
 .../plugins/create/create_workfile.py              | 12 ++++++------
 5 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py
index 8063e56413..4092086ea4 100644
--- a/openpype/hosts/fusion/plugins/create/create_workfile.py
+++ b/openpype/hosts/fusion/plugins/create/create_workfile.py
@@ -69,14 +69,12 @@ class FusionWorkfileCreator(AutoCreator):
         task_name = self.create_context.get_current_task_name()
         host_name = self.create_context.host_name
 
-        existing_instance_asset = None
-        if existing_instance is not None:
-            if AYON_SERVER_ENABLED:
-                existing_instance_asset = existing_instance.data.get(
-                    "folderPath")
-
-            if not existing_instance_asset:
-                existing_instance_asset = existing_instance.data.get("asset")
+        if existing_instance is None:
+            existing_instance_asset = None
+        elif AYON_SERVER_ENABLED:
+            existing_instance_asset = existing_instance["folderPath"]
+        else:
+            existing_instance_asset = existing_instance["asset"]
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
diff --git a/openpype/hosts/houdini/plugins/create/create_workfile.py b/openpype/hosts/houdini/plugins/create/create_workfile.py
index 04a844bdf5..f8ee68ebc9 100644
--- a/openpype/hosts/houdini/plugins/create/create_workfile.py
+++ b/openpype/hosts/houdini/plugins/create/create_workfile.py
@@ -31,12 +31,12 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
         task_name = self.create_context.get_current_task_name()
         host_name = self.host_name
 
-        current_instance_asset = None
-        if current_instance is not None:
-            if AYON_SERVER_ENABLED:
-                current_instance_asset = current_instance.get("folderPath")
-            if not current_instance_asset:
-                current_instance_asset = current_instance.get("asset")
+        if current_instance is None:
+            current_instance_asset = None
+        elif AYON_SERVER_ENABLED:
+            current_instance_asset = current_instance["folderPath"]
+        else:
+            current_instance_asset = current_instance["asset"]
 
         if current_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
diff --git a/openpype/hosts/maya/plugins/create/create_workfile.py b/openpype/hosts/maya/plugins/create/create_workfile.py
index 74629776af..7282fc6b8b 100644
--- a/openpype/hosts/maya/plugins/create/create_workfile.py
+++ b/openpype/hosts/maya/plugins/create/create_workfile.py
@@ -30,12 +30,12 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
         task_name = self.create_context.get_current_task_name()
         host_name = self.create_context.host_name
 
-        current_instance_asset = None
-        if current_instance is not None:
-            if AYON_SERVER_ENABLED:
-                current_instance_asset = current_instance.get("folderPath")
-            if not current_instance_asset:
-                current_instance_asset = current_instance.get("asset")
+        if current_instance is None:
+            current_instance_asset = None
+        elif AYON_SERVER_ENABLED:
+            current_instance_asset = current_instance["folderPath"]
+        else:
+            current_instance_asset = current_instance["asset"]
 
         if current_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
diff --git a/openpype/hosts/photoshop/plugins/create/create_flatten_image.py b/openpype/hosts/photoshop/plugins/create/create_flatten_image.py
index 942f8f4989..24be9df0e0 100644
--- a/openpype/hosts/photoshop/plugins/create/create_flatten_image.py
+++ b/openpype/hosts/photoshop/plugins/create/create_flatten_image.py
@@ -38,13 +38,12 @@ class AutoImageCreator(PSAutoCreator):
         host_name = context.host_name
         asset_doc = get_asset_by_name(project_name, asset_name)
 
-        existing_instance_asset = None
-        if existing_instance is not None:
-            if AYON_SERVER_ENABLED:
-                existing_instance_asset = existing_instance.get("folderPath")
-
-            if not existing_instance_asset:
-                existing_instance_asset = existing_instance.get("asset")
+        if existing_instance is None:
+            existing_instance_asset = None
+        elif AYON_SERVER_ENABLED:
+            existing_instance_asset = existing_instance["folderPath"]
+        else:
+            existing_instance_asset = existing_instance["asset"]
 
         if existing_instance is None:
             subset_name = self.get_subset_name(
diff --git a/openpype/hosts/substancepainter/plugins/create/create_workfile.py b/openpype/hosts/substancepainter/plugins/create/create_workfile.py
index 8aa696f11d..c73277e405 100644
--- a/openpype/hosts/substancepainter/plugins/create/create_workfile.py
+++ b/openpype/hosts/substancepainter/plugins/create/create_workfile.py
@@ -42,12 +42,12 @@ class CreateWorkfile(AutoCreator):
                 if instance.creator_identifier == self.identifier
             ), None)
 
-        current_instance_asset = None
-        if current_instance is not None:
-            if AYON_SERVER_ENABLED:
-                current_instance_asset = current_instance.get("folderPath")
-            if not current_instance_asset:
-                current_instance_asset = current_instance.get("asset")
+        if current_instance is None:
+            current_instance_asset = None
+        elif AYON_SERVER_ENABLED:
+            current_instance_asset = current_instance["folderPath"]
+        else:
+            current_instance_asset = current_instance["asset"]
 
         if current_instance is None:
             self.log.info("Auto-creating workfile instance...")

From c3ae2a3a09bdd72824f950682faf418931651ff7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 25 Oct 2023 15:20:28 +0200
Subject: [PATCH 24/29] be expicit about source of asset and folder path in
 photoshop

---
 openpype/hosts/photoshop/lib.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/photoshop/lib.py b/openpype/hosts/photoshop/lib.py
index 654528410a..5c8dff947d 100644
--- a/openpype/hosts/photoshop/lib.py
+++ b/openpype/hosts/photoshop/lib.py
@@ -45,13 +45,12 @@ class PSAutoCreator(AutoCreator):
         task_name = context.get_current_task_name()
         host_name = context.host_name
 
-        existing_instance_asset = None
-        if existing_instance is not None:
-            if AYON_SERVER_ENABLED:
-                existing_instance_asset = existing_instance.get("folderPath")
-
-            if not existing_instance_asset:
-                existing_instance_asset = existing_instance.get("asset")
+        if existing_instance is None:
+            existing_instance_asset = None
+        elif AYON_SERVER_ENABLED:
+            existing_instance_asset = existing_instance["folderPath"]
+        else:
+            existing_instance_asset = existing_instance["asset"]
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)

From b6694606876eba68f3e0cb24928f93f7093e1c70 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:06:47 +0200
Subject: [PATCH 25/29] Removed unnecessary condition.

---
 openpype/client/server/entities.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/openpype/client/server/entities.py b/openpype/client/server/entities.py
index c735c558d5..fcb5ec2383 100644
--- a/openpype/client/server/entities.py
+++ b/openpype/client/server/entities.py
@@ -226,12 +226,11 @@ def get_assets(
 
     new_asset_names = set()
     folder_paths = set()
-    if asset_names:
-        for name in asset_names:
-            if "/" in name:
-                folder_paths.add(name)
-            else:
-                new_asset_names.add(name)
+    for name in asset_names:
+        if "/" in name:
+            folder_paths.add(name)
+        else:
+            new_asset_names.add(name)
 
     if folder_paths:
         for folder in _folders_query(

From 130693b798be8c53e18ec02bcacde7b8b6f45fdd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 26 Oct 2023 18:24:42 +0200
Subject: [PATCH 26/29] use 'AYON_SERVER_ENABLED' in resolve plugin

---
 .../plugins/publish/precollect_workfile.py       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/resolve/plugins/publish/precollect_workfile.py b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
index 28b2350f01..39c28e29f5 100644
--- a/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
+++ b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
@@ -1,6 +1,7 @@
 import pyblish.api
 from pprint import pformat
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.pipeline import get_current_asset_name
 from openpype.hosts.resolve import api as rapi
 from openpype.hosts.resolve.otio import davinci_export
@@ -13,10 +14,13 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder - 0.5
 
     def process(self, context):
+        current_asset = get_current_asset_name()
+        if AYON_SERVER_ENABLED:
+            # AYON compatibility split name and use last piece
+            asset_name = current_asset.split("/")[-1]
+        else:
+            asset_name = current_asset
 
-        asset = get_current_asset_name()
-        # AYON compatibility split name and use last piece
-        _asset_name = asset.split("/")[-1]
         subset = "workfile"
         project = rapi.get_current_project()
         fps = project.GetSetting("timelineFrameRate")
@@ -26,9 +30,9 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
         otio_timeline = davinci_export.create_otio_timeline(project)
 
         instance_data = {
-            "name": "{}_{}".format(_asset_name, subset),
-            "asset": asset,
-            "subset": "{}{}".format(_asset_name, subset.capitalize()),
+            "name": "{}_{}".format(asset_name, subset),
+            "asset": current_asset,
+            "subset": "{}{}".format(asset_name, subset.capitalize()),
             "item": project,
             "family": "workfile",
             "families": []

From e920c014307e0fcb543f129b6e72b4ba49433cfb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 26 Oct 2023 18:41:47 +0200
Subject: [PATCH 27/29] unify conditions

---
 .../hosts/tvpaint/plugins/create/create_review.py    | 12 ++++++------
 .../hosts/tvpaint/plugins/create/create_workfile.py  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py
index 265cef00ef..5caf20f27d 100644
--- a/openpype/hosts/tvpaint/plugins/create/create_review.py
+++ b/openpype/hosts/tvpaint/plugins/create/create_review.py
@@ -34,12 +34,12 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
         asset_name = create_context.get_current_asset_name()
         task_name = create_context.get_current_task_name()
 
-        existing_asset_name = None
-        if existing_instance is not None:
-            if AYON_SERVER_ENABLED:
-                existing_asset_name = existing_instance.get("folderPath")
-            if existing_asset_name is None:
-                existing_asset_name = existing_instance.get("asset")
+        if existing_instance is None:
+            existing_asset_name = None
+        elif AYON_SERVER_ENABLED:
+            existing_asset_name = existing_instance["folderPath"]
+        else:
+            existing_asset_name = existing_instance["asset"]
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py
index eec0f8483f..4ce5d7fc96 100644
--- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py
+++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py
@@ -30,12 +30,12 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
         asset_name = create_context.get_current_asset_name()
         task_name = create_context.get_current_task_name()
 
-        existing_asset_name = None
-        if existing_instance is not None:
-            if AYON_SERVER_ENABLED:
-                existing_asset_name = existing_instance.get("folderPath")
-            if existing_asset_name is None:
-                existing_asset_name = existing_instance.get("asset")
+        if existing_instance is None:
+            existing_asset_name = None
+        elif AYON_SERVER_ENABLED:
+            existing_asset_name = existing_instance["folderPath"]
+        else:
+            existing_asset_name = existing_instance["asset"]
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)

From 0b0cfb4116ed6067b0416bb34ecd8a3dd7e19805 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 27 Oct 2023 14:24:37 +0200
Subject: [PATCH 28/29] add slash at the beginning of path

---
 openpype/client/entities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index d085f90028..cbaa943743 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -22,4 +22,4 @@ def get_asset_name_identifier(asset_doc):
         return asset_doc["name"]
     parents = list(asset_doc["data"]["parents"])
     parents.append(asset_doc["name"])
-    return "/".join(parents)
+    return "/" + "/".join(parents)

From dd72d45ce7881b46c90c6972f27cc101b02f7696 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 27 Oct 2023 14:36:22 +0200
Subject: [PATCH 29/29] fix path in assets widget

---
 openpype/tools/publisher/widgets/assets_widget.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/publisher/widgets/assets_widget.py b/openpype/tools/publisher/widgets/assets_widget.py
index 5f74b79c99..32be514dd7 100644
--- a/openpype/tools/publisher/widgets/assets_widget.py
+++ b/openpype/tools/publisher/widgets/assets_widget.py
@@ -140,9 +140,11 @@ class AssetsHierarchyModel(QtGui.QStandardItemModel):
             for name in sorted(children_by_name.keys()):
                 child = children_by_name[name]
                 child_id = child["_id"]
-                child_path = name
                 if parent_path:
-                    child_path = "{}/{}".format(parent_path, child_path)
+                    child_path = "{}/{}".format(parent_path, name)
+                else:
+                    child_path = "/{}".format(name)
+
                 has_children = bool(assets_by_parent_id.get(child_id))
                 icon = get_asset_icon(child, has_children)