From 3483a7bd0ed9a4c3d9e1f99832ddb9524db3a8b6 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Mon, 5 May 2025 12:02:22 +0200
Subject: [PATCH 01/37] Updates plugin families

Removes "circuit" from plugin families and adds "batchdelivery" to align with current project needs.

This change ensures that the collect, extract, and review processes are correctly associated with the appropriate families, streamlining publishing workflows.
---
 client/ayon_core/plugins/publish/collect_audio.py     | 2 +-
 client/ayon_core/plugins/publish/extract_burnin.py    | 2 +-
 client/ayon_core/plugins/publish/extract_review.py    | 2 +-
 client/ayon_core/plugins/publish/extract_thumbnail.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/plugins/publish/collect_audio.py b/client/ayon_core/plugins/publish/collect_audio.py
index 57c69ef2b2..069082af37 100644
--- a/client/ayon_core/plugins/publish/collect_audio.py
+++ b/client/ayon_core/plugins/publish/collect_audio.py
@@ -39,7 +39,7 @@ class CollectAudio(pyblish.api.ContextPlugin):
         "blender",
         "houdini",
         "max",
-        "circuit",
+        "batchdelivery",
     ]
 
     audio_product_name = "audioMain"
diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py
index 3f7c2f4cba..4b285d9990 100644
--- a/client/ayon_core/plugins/publish/extract_burnin.py
+++ b/client/ayon_core/plugins/publish/extract_burnin.py
@@ -55,7 +55,7 @@ class ExtractBurnin(publish.Extractor):
         "max",
         "blender",
         "unreal",
-        "circuit",
+        "batchdelivery",
     ]
 
     optional = True
diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index a15886451b..7a0627d05c 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -92,7 +92,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         "aftereffects",
         "flame",
         "unreal",
-        "circuit",
+        "batchdelivery",
     ]
 
     # Supported extensions
diff --git a/client/ayon_core/plugins/publish/extract_thumbnail.py b/client/ayon_core/plugins/publish/extract_thumbnail.py
index 3a428c46a7..b4309a6038 100644
--- a/client/ayon_core/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/plugins/publish/extract_thumbnail.py
@@ -40,7 +40,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         "aftereffects",
         "unreal",
         "houdini",
-        "circuit",
+        "batchdelivery",
     ]
     enabled = False
 

From 539be6c5270dbdfe739df9d2ccda8b59cc7b7340 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 9 May 2025 17:51:51 +0200
Subject: [PATCH 02/37] Handles OCIO shared view token

The OCIO config can return a special token ""
as the colorspace name for a display view. This commit
implements handling for this token, replacing it with the display
name if found.
---
 client/ayon_core/pipeline/colorspace.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 8c4f97ab1c..79aea391eb 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1403,7 +1403,12 @@ def _get_display_view_colorspace_name(config_path, display, view):
 
     """
     config = _get_ocio_config(config_path)
-    return config.getDisplayViewColorSpaceName(display, view)
+    colorspace = config.getDisplayViewColorSpaceName(display, view)
+    # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views # noqa
+    if colorspace == "<USE_DISPLAY_NAME>":
+        colorspace = display
+
+    return colorspace
 
 
 def _get_ocio_config_colorspaces(config_path):

From ea3b4524d405f63a698d34bac7d15fafff42831b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:31:46 +0200
Subject: [PATCH 03/37] capture 'ItemNotFoundException' error if possible

---
 client/ayon_core/lib/local_settings.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 91b881cf57..a582a6c1b9 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -124,6 +124,10 @@ def get_addons_resources_dir(addon_name: str, *args) -> str:
     return os.path.join(addons_resources_dir, addon_name, *args)
 
 
+class _FakeException(Exception):
+    """Placeholder exception used if real exception is not available."""
+
+
 class AYONSecureRegistry:
     """Store information using keyring.
 
@@ -195,7 +199,17 @@ class AYONSecureRegistry:
         """
         import keyring
 
-        value = keyring.get_password(self._name, name)
+        # Capture 'ItemNotFoundException' exception (on linux)
+        try:
+            from secretstorage.exceptions import ItemNotFoundException
+        except ImportError:
+            ItemNotFoundException = _FakeException
+
+        try:
+            value = keyring.get_password(self._name, name)
+        except ItemNotFoundException:
+            value = None
+
         if value is not None:
             return value
 

From 97a3ab142c291ced73aef586bad8e6c3b62d5ab4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:46:37 +0200
Subject: [PATCH 04/37] raise dedicated exception if item is not available

---
 client/ayon_core/lib/local_settings.py | 41 +++++++++++++++-----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 91b881cf57..7c6459fad6 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -15,6 +15,11 @@ import ayon_api
 _PLACEHOLDER = object()
 
 
+# TODO should use 'KeyError' or 'Exception' as base
+class RegistryItemNotFound(ValueError):
+    """Raised when the item is not found in keyring."""
+
+
 class _Cache:
     username = None
 
@@ -187,7 +192,7 @@ class AYONSecureRegistry:
             value (str): Value of the item.
 
         Raises:
-            ValueError: If item doesn't exist and default is not defined.
+            RegistryItemNotFound: If item doesn't exist and default is not defined.
 
         .. _Keyring module:
             https://github.com/jaraco/keyring
@@ -202,9 +207,8 @@ class AYONSecureRegistry:
         if default is not _PLACEHOLDER:
             return default
 
-        # NOTE Should raise `KeyError`
-        raise ValueError(
-            "Item {}:{} does not exist in keyring.".format(self._name, name)
+        raise RegistryItemNotFound(
+            f"Item {self._name}:{name} not found in keyring."
         )
 
     def delete_item(self, name):
@@ -277,7 +281,7 @@ class ASettingRegistry(ABC):
             value (str): Value of the item.
 
         Raises:
-            ValueError: If item doesn't exist.
+            RegistryItemNotFound: If the item doesn't exist.
 
         """
         return self._get_item(name)
@@ -388,7 +392,7 @@ class IniSettingRegistry(ASettingRegistry):
             str: Value of item.
 
         Raises:
-            ValueError: If value doesn't exist.
+            RegistryItemNotFound: If value doesn't exist.
 
         """
         return super(IniSettingRegistry, self).get_item(name)
@@ -399,8 +403,8 @@ class IniSettingRegistry(ASettingRegistry):
         """Get item from section of ini file.
 
         This will read ini file and try to get item value from specified
-        section. If that section or item doesn't exist, :exc:`ValueError`
-        is risen.
+        section. If that section or item doesn't exist,
+        :exc:`RegistryItemNotFound` is risen.
 
         Args:
             section (str): Name of ini section.
@@ -410,7 +414,7 @@ class IniSettingRegistry(ASettingRegistry):
             str: Item value.
 
         Raises:
-            ValueError: If value doesn't exist.
+            RegistryItemNotFound: If value doesn't exist.
 
         """
         config = configparser.ConfigParser()
@@ -418,8 +422,9 @@ class IniSettingRegistry(ASettingRegistry):
         try:
             value = config[section][name]
         except KeyError:
-            raise ValueError(
-                "Registry doesn't contain value {}:{}".format(section, name))
+            raise RegistryItemNotFound(
+                f"Registry doesn't contain value {section}:{name}"
+            )
         return value
 
     def _get_item(self, name):
@@ -435,7 +440,7 @@ class IniSettingRegistry(ASettingRegistry):
             name (str): Name of the item.
 
         Raises:
-            ValueError: If item doesn't exist.
+            RegistryItemNotFound: If the item doesn't exist.
 
         """
         self.get_item_from_section.cache_clear()
@@ -444,8 +449,9 @@ class IniSettingRegistry(ASettingRegistry):
         try:
             _ = config[section][name]
         except KeyError:
-            raise ValueError(
-                "Registry doesn't contain value {}:{}".format(section, name))
+            raise RegistryItemNotFound(
+                f"Registry doesn't contain value {section}:{name}"
+            )
         config.remove_option(section, name)
 
         # if section is empty, delete it
@@ -494,8 +500,9 @@ class JSONSettingRegistry(ASettingRegistry):
             try:
                 value = data["registry"][name]
             except KeyError:
-                raise ValueError(
-                    "Registry doesn't contain value {}".format(name))
+                raise RegistryItemNotFound(
+                    f"Registry doesn't contain value {name}"
+                )
         return value
 
     def get_item(self, name):
@@ -509,7 +516,7 @@ class JSONSettingRegistry(ASettingRegistry):
             value of the item
 
         Raises:
-            ValueError: If item is not found in registry file.
+            RegistryItemNotFound: If the item is not found in registry file.
 
         """
         return self._get_item(name)

From 88b01a2797c39e9b19d5808f475c3ecb49ce885f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:54:26 +0200
Subject: [PATCH 05/37] added type-hints

---
 client/ayon_core/lib/local_settings.py | 101 ++++++++++---------------
 1 file changed, 38 insertions(+), 63 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 7c6459fad6..19ffffd63f 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -8,6 +8,7 @@ import warnings
 from datetime import datetime
 from abc import ABC, abstractmethod
 from functools import lru_cache
+from typing import Optional, Any
 
 import platformdirs
 import ayon_api
@@ -24,14 +25,14 @@ class _Cache:
     username = None
 
 
-def _get_ayon_appdirs(*args):
+def _get_ayon_appdirs(*args: str) -> str:
     return os.path.join(
         platformdirs.user_data_dir("AYON", "Ynput"),
         *args
     )
 
 
-def get_ayon_appdirs(*args):
+def get_ayon_appdirs(*args: str) -> str:
     """Local app data directory of AYON client.
 
     Deprecated:
@@ -141,7 +142,7 @@ class AYONSecureRegistry:
     Args:
         name(str): Name of registry used as identifier for data.
     """
-    def __init__(self, name):
+    def __init__(self, name: str) -> None:
         try:
             import keyring
 
@@ -159,8 +160,7 @@ class AYONSecureRegistry:
         # Force "AYON" prefix
         self._name = "/".join(("AYON", name))
 
-    def set_item(self, name, value):
-        # type: (str, str) -> None
+    def set_item(self, name: str, value: str) -> None:
         """Set sensitive item into system's keyring.
 
         This uses `Keyring module`_ to save sensitive stuff into system's
@@ -179,7 +179,9 @@ class AYONSecureRegistry:
         keyring.set_password(self._name, name, value)
 
     @lru_cache(maxsize=32)
-    def get_item(self, name, default=_PLACEHOLDER):
+    def get_item(
+        self, name: str, default: Any = _PLACEHOLDER
+    ) -> Optional[str]:
         """Get value of sensitive item from system's keyring.
 
         See also `Keyring module`_
@@ -211,8 +213,7 @@ class AYONSecureRegistry:
             f"Item {self._name}:{name} not found in keyring."
         )
 
-    def delete_item(self, name):
-        # type: (str) -> None
+    def delete_item(self, name: str) -> None:
         """Delete value stored in system's keyring.
 
         See also `Keyring module`_
@@ -241,16 +242,13 @@ class ASettingRegistry(ABC):
         _name (str): Registry names.
 
     """
-
-    def __init__(self, name):
-        # type: (str) -> ASettingRegistry
+    def __init__(self, name: str) -> None:
         super(ASettingRegistry, self).__init__()
 
         self._name = name
         self._items = {}
 
-    def set_item(self, name, value):
-        # type: (str, str) -> None
+    def set_item(self, name: str, value: str) -> None:
         """Set item to settings registry.
 
         Args:
@@ -261,17 +259,14 @@ class ASettingRegistry(ABC):
         self._set_item(name, value)
 
     @abstractmethod
-    def _set_item(self, name, value):
-        # type: (str, str) -> None
-        # Implement it
-        pass
+    def _set_item(self, name: str, value: str) -> None:
+        """Set item value to registry."""
 
-    def __setitem__(self, name, value):
+    def __setitem__(self, name: str, value: str) -> None:
         self._items[name] = value
         self._set_item(name, value)
 
-    def get_item(self, name):
-        # type: (str) -> str
+    def get_item(self, name: str) -> str:
         """Get item from settings registry.
 
         Args:
@@ -287,16 +282,13 @@ class ASettingRegistry(ABC):
         return self._get_item(name)
 
     @abstractmethod
-    def _get_item(self, name):
-        # type: (str) -> str
-        # Implement it
-        pass
+    def _get_item(self, name: str) -> str:
+        """Get item value from registry."""
 
-    def __getitem__(self, name):
+    def __getitem__(self, name: str) -> Any:
         return self._get_item(name)
 
-    def delete_item(self, name):
-        # type: (str) -> None
+    def delete_item(self, name: str) -> None:
         """Delete item from settings registry.
 
         Args:
@@ -306,12 +298,10 @@ class ASettingRegistry(ABC):
         self._delete_item(name)
 
     @abstractmethod
-    def _delete_item(self, name):
-        # type: (str) -> None
-        """Delete item from settings."""
-        pass
+    def _delete_item(self, name: str) -> None:
+        """Delete item from registry."""
 
-    def __delitem__(self, name):
+    def __delitem__(self, name: str) -> None:
         del self._items[name]
         self._delete_item(name)
 
@@ -322,9 +312,7 @@ class IniSettingRegistry(ASettingRegistry):
     This class is using :mod:`configparser` (ini) files to store items.
 
     """
-
-    def __init__(self, name, path):
-        # type: (str, str) -> IniSettingRegistry
+    def __init__(self, name: str, path: str) -> None:
         super(IniSettingRegistry, self).__init__(name)
         # get registry file
         self._registry_file = os.path.join(path, "{}.ini".format(name))
@@ -334,8 +322,7 @@ class IniSettingRegistry(ASettingRegistry):
                 now = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
                 print("# {}".format(now), cfg)
 
-    def set_item_section(self, section, name, value):
-        # type: (str, str, str) -> None
+    def set_item_section(self, section: str, name: str, value: str) -> None:
         """Set item to specific section of ini registry.
 
         If section doesn't exists, it is created.
@@ -358,12 +345,10 @@ class IniSettingRegistry(ASettingRegistry):
         with open(self._registry_file, mode="w") as cfg:
             config.write(cfg)
 
-    def _set_item(self, name, value):
-        # type: (str, str) -> None
+    def _set_item(self, name: str, value: str) -> None:
         self.set_item_section("MAIN", name, value)
 
-    def set_item(self, name, value):
-        # type: (str, str) -> None
+    def set_item(self, name: str, value: str) -> None:
         """Set item to settings ini file.
 
         This saves item to ``DEFAULT`` section of ini as each item there
@@ -378,8 +363,7 @@ class IniSettingRegistry(ASettingRegistry):
         # we cast value to str as ini options values must be strings.
         super(IniSettingRegistry, self).set_item(name, str(value))
 
-    def get_item(self, name):
-        # type: (str) -> str
+    def get_item(self, name: str) -> str:
         """Gets item from settings ini file.
 
         This gets settings from ``DEFAULT`` section of ini file as each item
@@ -398,8 +382,7 @@ class IniSettingRegistry(ASettingRegistry):
         return super(IniSettingRegistry, self).get_item(name)
 
     @lru_cache(maxsize=32)
-    def get_item_from_section(self, section, name):
-        # type: (str, str) -> str
+    def get_item_from_section(self, section: str, name: str) -> str:
         """Get item from section of ini file.
 
         This will read ini file and try to get item value from specified
@@ -427,12 +410,10 @@ class IniSettingRegistry(ASettingRegistry):
             )
         return value
 
-    def _get_item(self, name):
-        # type: (str) -> str
+    def _get_item(self, name: str) -> str:
         return self.get_item_from_section("MAIN", name)
 
-    def delete_item_from_section(self, section, name):
-        # type: (str, str) -> None
+    def delete_item_from_section(self, section: str, name: str) -> None:
         """Delete item from section in ini file.
 
         Args:
@@ -469,8 +450,7 @@ class IniSettingRegistry(ASettingRegistry):
 class JSONSettingRegistry(ASettingRegistry):
     """Class using json file as storage."""
 
-    def __init__(self, name, path):
-        # type: (str, str) -> JSONSettingRegistry
+    def __init__(self, name: str, path: str) -> None:
         super(JSONSettingRegistry, self).__init__(name)
         #: str: name of registry file
         self._registry_file = os.path.join(path, "{}.json".format(name))
@@ -487,8 +467,7 @@ class JSONSettingRegistry(ASettingRegistry):
                 json.dump(header, cfg, indent=4)
 
     @lru_cache(maxsize=32)
-    def _get_item(self, name):
-        # type: (str) -> object
+    def _get_item(self, name: str) -> Any:
         """Get item value from registry json.
 
         Note:
@@ -505,8 +484,7 @@ class JSONSettingRegistry(ASettingRegistry):
                 )
         return value
 
-    def get_item(self, name):
-        # type: (str) -> object
+    def get_item(self, name: str) -> Any:
         """Get item value from registry json.
 
         Args:
@@ -521,8 +499,7 @@ class JSONSettingRegistry(ASettingRegistry):
         """
         return self._get_item(name)
 
-    def _set_item(self, name, value):
-        # type: (str, object) -> None
+    def _set_item(self, name: str, value: Any) -> None:
         """Set item value to registry json.
 
         Note:
@@ -536,8 +513,7 @@ class JSONSettingRegistry(ASettingRegistry):
             cfg.seek(0)
             json.dump(data, cfg, indent=4)
 
-    def set_item(self, name, value):
-        # type: (str, object) -> None
+    def set_item(self, name: str, value: Any) -> None:
         """Set item and its value into json registry file.
 
         Args:
@@ -547,8 +523,7 @@ class JSONSettingRegistry(ASettingRegistry):
         """
         self._set_item(name, value)
 
-    def _delete_item(self, name):
-        # type: (str) -> None
+    def _delete_item(self, name: str) -> None:
         self._get_item.cache_clear()
         with open(self._registry_file, "r+") as cfg:
             data = json.load(cfg)
@@ -563,9 +538,9 @@ class AYONSettingsRegistry(JSONSettingRegistry):
 
     Args:
         name (Optional[str]): Name of the registry.
-    """
 
-    def __init__(self, name=None):
+    """
+    def __init__(self, name: Optional[str] = None) -> None:
         if not name:
             name = "AYON_settings"
         path = get_launcher_storage_dir()

From d431956963c55bb60405142649efd636011b89ca Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:55:34 +0200
Subject: [PATCH 06/37] simplified super calls

---
 client/ayon_core/lib/local_settings.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 19ffffd63f..26db587835 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -243,7 +243,7 @@ class ASettingRegistry(ABC):
 
     """
     def __init__(self, name: str) -> None:
-        super(ASettingRegistry, self).__init__()
+        super().__init__()
 
         self._name = name
         self._items = {}
@@ -313,7 +313,7 @@ class IniSettingRegistry(ASettingRegistry):
 
     """
     def __init__(self, name: str, path: str) -> None:
-        super(IniSettingRegistry, self).__init__(name)
+        super().__init__(name)
         # get registry file
         self._registry_file = os.path.join(path, "{}.ini".format(name))
         if not os.path.exists(self._registry_file):
@@ -361,7 +361,7 @@ class IniSettingRegistry(ASettingRegistry):
         """
         # this does the some, overridden just for different docstring.
         # we cast value to str as ini options values must be strings.
-        super(IniSettingRegistry, self).set_item(name, str(value))
+        super().set_item(name, str(value))
 
     def get_item(self, name: str) -> str:
         """Gets item from settings ini file.
@@ -379,7 +379,7 @@ class IniSettingRegistry(ASettingRegistry):
             RegistryItemNotFound: If value doesn't exist.
 
         """
-        return super(IniSettingRegistry, self).get_item(name)
+        return super().get_item(name)
 
     @lru_cache(maxsize=32)
     def get_item_from_section(self, section: str, name: str) -> str:
@@ -451,7 +451,7 @@ class JSONSettingRegistry(ASettingRegistry):
     """Class using json file as storage."""
 
     def __init__(self, name: str, path: str) -> None:
-        super(JSONSettingRegistry, self).__init__(name)
+        super().__init__(name)
         #: str: name of registry file
         self._registry_file = os.path.join(path, "{}.json".format(name))
         now = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
@@ -544,7 +544,7 @@ class AYONSettingsRegistry(JSONSettingRegistry):
         if not name:
             name = "AYON_settings"
         path = get_launcher_storage_dir()
-        super(AYONSettingsRegistry, self).__init__(name, path)
+        super().__init__(name, path)
 
 
 def get_local_site_id():

From 08c242edefe4b11046a589fca10a7e8e7f969177 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:55:59 +0200
Subject: [PATCH 07/37] use f-strings

---
 client/ayon_core/lib/local_settings.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 26db587835..36abeb4283 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -158,7 +158,7 @@ class AYONSecureRegistry:
             keyring.set_keyring(Windows.WinVaultKeyring())
 
         # Force "AYON" prefix
-        self._name = "/".join(("AYON", name))
+        self._name = f"AYON/{name}"
 
     def set_item(self, name: str, value: str) -> None:
         """Set sensitive item into system's keyring.
@@ -315,12 +315,12 @@ class IniSettingRegistry(ASettingRegistry):
     def __init__(self, name: str, path: str) -> None:
         super().__init__(name)
         # get registry file
-        self._registry_file = os.path.join(path, "{}.ini".format(name))
+        self._registry_file = os.path.join(path, f"{name}.ini")
         if not os.path.exists(self._registry_file):
             with open(self._registry_file, mode="w") as cfg:
                 print("# Settings registry", cfg)
                 now = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-                print("# {}".format(now), cfg)
+                print(f"# {now}", cfg)
 
     def set_item_section(self, section: str, name: str, value: str) -> None:
         """Set item to specific section of ini registry.
@@ -452,8 +452,7 @@ class JSONSettingRegistry(ASettingRegistry):
 
     def __init__(self, name: str, path: str) -> None:
         super().__init__(name)
-        #: str: name of registry file
-        self._registry_file = os.path.join(path, "{}.json".format(name))
+        self._registry_file = os.path.join(path, f"{name}.json")
         now = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
         header = {
             "__metadata__": {"generated": now},

From d1fce584fa577d209feff5c91867eda12399acec Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:56:25 +0200
Subject: [PATCH 08/37] remove unncessary variable

---
 client/ayon_core/lib/local_settings.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 36abeb4283..a52539a4dd 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -238,15 +238,11 @@ class ASettingRegistry(ABC):
     mechanism for storing common items must be implemented in abstract
     methods.
 
-    Attributes:
-        _name (str): Registry names.
-
     """
     def __init__(self, name: str) -> None:
         super().__init__()
 
         self._name = name
-        self._items = {}
 
     def set_item(self, name: str, value: str) -> None:
         """Set item to settings registry.
@@ -263,7 +259,6 @@ class ASettingRegistry(ABC):
         """Set item value to registry."""
 
     def __setitem__(self, name: str, value: str) -> None:
-        self._items[name] = value
         self._set_item(name, value)
 
     def get_item(self, name: str) -> str:
@@ -302,7 +297,6 @@ class ASettingRegistry(ABC):
         """Delete item from registry."""
 
     def __delitem__(self, name: str) -> None:
-        del self._items[name]
         self._delete_item(name)
 
 

From d88a8678729fc2e51c9e49e7f798499e5e74cdcd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:56:39 +0200
Subject: [PATCH 09/37] reset cache on set item

---
 client/ayon_core/lib/local_settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index a52539a4dd..162e17fd94 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -177,6 +177,7 @@ class AYONSecureRegistry:
         import keyring
 
         keyring.set_password(self._name, name, value)
+        self.get_item.cache_clear()
 
     @lru_cache(maxsize=32)
     def get_item(

From 41228915eca2c0b29fdc7d7c5eb208ecda0fd568 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:58:08 +0200
Subject: [PATCH 10/37] more explicit dir creation

---
 client/ayon_core/lib/local_settings.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 162e17fd94..98eec3af4f 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -454,8 +454,10 @@ class JSONSettingRegistry(ASettingRegistry):
             "registry": {}
         }
 
-        if not os.path.exists(os.path.dirname(self._registry_file)):
-            os.makedirs(os.path.dirname(self._registry_file), exist_ok=True)
+        # Use 'os.path.dirname' in case someone uses slashes in 'name'
+        dirpath = os.path.dirname(self._registry_file)
+        if not os.path.exists(dirpath):
+            os.makedirs(dirpath, exist_ok=True)
         if not os.path.exists(self._registry_file):
             with open(self._registry_file, mode="w") as cfg:
                 json.dump(header, cfg, indent=4)

From 2013eea5c4cc52942f79c371032f7c9b6126870a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:58:21 +0200
Subject: [PATCH 11/37] formatting change

---
 client/ayon_core/lib/local_settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 98eec3af4f..b06b890992 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -141,6 +141,7 @@ class AYONSecureRegistry:
 
     Args:
         name(str): Name of registry used as identifier for data.
+
     """
     def __init__(self, name: str) -> None:
         try:

From 1a46f2c027b60e03ac35a25d231bf034042bcb1c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:00:51 +0200
Subject: [PATCH 12/37] remove unnecessary super call

---
 client/ayon_core/lib/local_settings.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index b06b890992..79e0e24307 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -242,8 +242,6 @@ class ASettingRegistry(ABC):
 
     """
     def __init__(self, name: str) -> None:
-        super().__init__()
-
         self._name = name
 
     def set_item(self, name: str, value: str) -> None:

From b403db76e6626b450dad91d489e20bc997284746 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:01:52 +0200
Subject: [PATCH 13/37] better order of methods

---
 client/ayon_core/lib/local_settings.py | 46 ++++++++++++++------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 79e0e24307..4b85a76b2d 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -244,23 +244,31 @@ class ASettingRegistry(ABC):
     def __init__(self, name: str) -> None:
         self._name = name
 
-    def set_item(self, name: str, value: str) -> None:
-        """Set item to settings registry.
-
-        Args:
-            name (str): Name of the item.
-            value (str): Value of the item.
-
-        """
-        self._set_item(name, value)
+    @abstractmethod
+    def _get_item(self, name: str) -> Any:
+        """Get item value from registry."""
 
     @abstractmethod
     def _set_item(self, name: str, value: str) -> None:
         """Set item value to registry."""
 
+    @abstractmethod
+    def _delete_item(self, name: str) -> None:
+        """Delete item from registry."""
+
+    def __getitem__(self, name: str) -> Any:
+        return self._get_item(name)
+
     def __setitem__(self, name: str, value: str) -> None:
         self._set_item(name, value)
 
+    def __delitem__(self, name: str) -> None:
+        self._delete_item(name)
+
+    @property
+    def name(self) -> str:
+        return self._name
+
     def get_item(self, name: str) -> str:
         """Get item from settings registry.
 
@@ -276,12 +284,15 @@ class ASettingRegistry(ABC):
         """
         return self._get_item(name)
 
-    @abstractmethod
-    def _get_item(self, name: str) -> str:
-        """Get item value from registry."""
+    def set_item(self, name: str, value: str) -> None:
+        """Set item to settings registry.
 
-    def __getitem__(self, name: str) -> Any:
-        return self._get_item(name)
+        Args:
+            name (str): Name of the item.
+            value (str): Value of the item.
+
+        """
+        self._set_item(name, value)
 
     def delete_item(self, name: str) -> None:
         """Delete item from settings registry.
@@ -292,13 +303,6 @@ class ASettingRegistry(ABC):
         """
         self._delete_item(name)
 
-    @abstractmethod
-    def _delete_item(self, name: str) -> None:
-        """Delete item from registry."""
-
-    def __delitem__(self, name: str) -> None:
-        self._delete_item(name)
-
 
 class IniSettingRegistry(ASettingRegistry):
     """Class using :mod:`configparser`.

From d4092c8e314eb5e02cf004e07ac8a5f69f39a36c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:02:12 +0200
Subject: [PATCH 14/37] deprecated not passed name in 'AYONSettingsRegistry'

---
 client/ayon_core/lib/local_settings.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 4b85a76b2d..8511c8d15e 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -536,12 +536,21 @@ class AYONSettingsRegistry(JSONSettingRegistry):
     """Class handling AYON general settings registry.
 
     Args:
-        name (Optional[str]): Name of the registry.
+        name (Optional[str]): Name of the registry. Using 'None' or not
+            passing name is deprecated.
 
     """
     def __init__(self, name: Optional[str] = None) -> None:
         if not name:
             name = "AYON_settings"
+            warnings.warn(
+                (
+                    "Used 'AYONSettingsRegistry' without 'name' argument."
+                    " The argument will be required in future versions."
+                ),
+                DeprecationWarning,
+                stacklevel=2,
+            )
         path = get_launcher_storage_dir()
         super().__init__(name, path)
 

From 473cf8b0c13f19d4763d2d9bea4f0b376ca85f77 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:19:39 +0200
Subject: [PATCH 15/37] grammar fixes

---
 client/ayon_core/lib/local_settings.py | 37 +++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 8511c8d15e..19381b18e0 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -18,7 +18,7 @@ _PLACEHOLDER = object()
 
 # TODO should use 'KeyError' or 'Exception' as base
 class RegistryItemNotFound(ValueError):
-    """Raised when the item is not found in keyring."""
+    """Raised when the item is not found in the keyring."""
 
 
 class _Cache:
@@ -37,10 +37,10 @@ def get_ayon_appdirs(*args: str) -> str:
 
     Deprecated:
         Use 'get_launcher_local_dir' or 'get_launcher_storage_dir' based on
-            use-case. Deprecation added 24/08/09 (0.4.4-dev.1).
+            a use-case. Deprecation added 24/08/09 (0.4.4-dev.1).
 
     Args:
-        *args (Iterable[str]): Subdirectories/files in local app data dir.
+        *args (Iterable[str]): Subdirectories/files in the local app data dir.
 
     Returns:
         str: Path to directory/file in local app data dir.
@@ -58,7 +58,7 @@ def get_ayon_appdirs(*args: str) -> str:
 
 
 def get_launcher_storage_dir(*subdirs: str) -> str:
-    """Get storage directory for launcher.
+    """Get a storage directory for launcher.
 
     Storage directory is used for storing shims, addons, dependencies, etc.
 
@@ -83,14 +83,14 @@ def get_launcher_storage_dir(*subdirs: str) -> str:
 
 
 def get_launcher_local_dir(*subdirs: str) -> str:
-    """Get local directory for launcher.
+    """Get a local directory for launcher.
 
-    Local directory is used for storing machine or user specific data.
+    Local directory is used for storing machine or user-specific data.
 
-    The location is user specific.
+    The location is user-specific.
 
     Note:
-        This function should be called at least once on bootstrap.
+        This function should be called at least once on the bootstrap.
 
     Args:
         *subdirs (str): Subdirectories relative to local dir.
@@ -107,7 +107,7 @@ def get_launcher_local_dir(*subdirs: str) -> str:
 
 
 def get_addons_resources_dir(addon_name: str, *args) -> str:
-    """Get directory for storing resources for addons.
+    """Get a directory for storing resources for addons.
 
     Some addons might need to store ad-hoc resources that are not part of
         addon client package (e.g. because of size). Studio might define
@@ -117,7 +117,7 @@ def get_addons_resources_dir(addon_name: str, *args) -> str:
 
     Args:
         addon_name (str): Addon name.
-        *args (str): Subfolders in resources directory.
+        *args (str): Subfolders in the resources directory.
 
     Returns:
         str: Path to resources directory.
@@ -140,7 +140,7 @@ class AYONSecureRegistry:
     identify which data were created by AYON.
 
     Args:
-        name(str): Name of registry used as identifier for data.
+        name(str): Name of registry used as the identifier for data.
 
     """
     def __init__(self, name: str) -> None:
@@ -162,9 +162,9 @@ class AYONSecureRegistry:
         self._name = f"AYON/{name}"
 
     def set_item(self, name: str, value: str) -> None:
-        """Set sensitive item into system's keyring.
+        """Set sensitive item into the system's keyring.
 
-        This uses `Keyring module`_ to save sensitive stuff into system's
+        This uses `Keyring module`_ to save sensitive stuff into the system's
         keyring.
 
         Args:
@@ -184,19 +184,20 @@ class AYONSecureRegistry:
     def get_item(
         self, name: str, default: Any = _PLACEHOLDER
     ) -> Optional[str]:
-        """Get value of sensitive item from system's keyring.
+        """Get value of sensitive item from the system's keyring.
 
         See also `Keyring module`_
 
         Args:
             name (str): Name of the item.
-            default (Any): Default value if item is not available.
+            default (Any): Default value if the item is not available.
 
         Returns:
             value (str): Value of the item.
 
         Raises:
-            RegistryItemNotFound: If item doesn't exist and default is not defined.
+            RegistryItemNotFound: If the item doesn't exist and default
+                is not defined.
 
         .. _Keyring module:
             https://github.com/jaraco/keyring
@@ -216,7 +217,7 @@ class AYONSecureRegistry:
         )
 
     def delete_item(self, name: str) -> None:
-        """Delete value stored in system's keyring.
+        """Delete value stored in the system's keyring.
 
         See also `Keyring module`_
 
@@ -446,7 +447,7 @@ class IniSettingRegistry(ASettingRegistry):
 
 
 class JSONSettingRegistry(ASettingRegistry):
-    """Class using json file as storage."""
+    """Class using a json file as storage."""
 
     def __init__(self, name: str, path: str) -> None:
         super().__init__(name)

From 3c867c517c4773b75aae84d049a1edf5e8323512 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:20:08 +0200
Subject: [PATCH 16/37] change value of json registry to 'str'

---
 client/ayon_core/lib/local_settings.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 19381b18e0..09855c6075 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -467,8 +467,8 @@ class JSONSettingRegistry(ASettingRegistry):
                 json.dump(header, cfg, indent=4)
 
     @lru_cache(maxsize=32)
-    def _get_item(self, name: str) -> Any:
-        """Get item value from registry json.
+    def _get_item(self, name: str) -> str:
+        """Get item value from the registry.
 
         Note:
             See :meth:`ayon_core.lib.JSONSettingRegistry.get_item`
@@ -499,8 +499,8 @@ class JSONSettingRegistry(ASettingRegistry):
         """
         return self._get_item(name)
 
-    def _set_item(self, name: str, value: Any) -> None:
-        """Set item value to registry json.
+    def _set_item(self, name: str, value: str) -> None:
+        """Set item value to the registry.
 
         Note:
             See :meth:`ayon_core.lib.JSONSettingRegistry.set_item`

From 6433ada42c78a586899c9329b91838a5ade936e7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:20:50 +0200
Subject: [PATCH 17/37] remove unnecessary overriden methods

---
 client/ayon_core/lib/local_settings.py | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 09855c6075..7982a2797e 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -484,21 +484,6 @@ class JSONSettingRegistry(ASettingRegistry):
                 )
         return value
 
-    def get_item(self, name: str) -> Any:
-        """Get item value from registry json.
-
-        Args:
-            name (str): Name of the item.
-
-        Returns:
-            value of the item
-
-        Raises:
-            RegistryItemNotFound: If the item is not found in registry file.
-
-        """
-        return self._get_item(name)
-
     def _set_item(self, name: str, value: str) -> None:
         """Set item value to the registry.
 
@@ -513,18 +498,7 @@ class JSONSettingRegistry(ASettingRegistry):
             cfg.seek(0)
             json.dump(data, cfg, indent=4)
 
-    def set_item(self, name: str, value: Any) -> None:
-        """Set item and its value into json registry file.
-
-        Args:
-            name (str): name of the item.
-            value (Any): value of the item.
-
-        """
-        self._set_item(name, value)
-
     def _delete_item(self, name: str) -> None:
-        self._get_item.cache_clear()
         with open(self._registry_file, "r+") as cfg:
             data = json.load(cfg)
             del data["registry"][name]

From 83b109be28602958e1fa0b666fc3e10188ad7cae Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:21:11 +0200
Subject: [PATCH 18/37] fix cache again

---
 client/ayon_core/lib/local_settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 7982a2797e..4cfe059e2a 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -497,6 +497,7 @@ class JSONSettingRegistry(ASettingRegistry):
             cfg.truncate(0)
             cfg.seek(0)
             json.dump(data, cfg, indent=4)
+        self._get_item.cache_clear()
 
     def _delete_item(self, name: str) -> None:
         with open(self._registry_file, "r+") as cfg:
@@ -505,6 +506,7 @@ class JSONSettingRegistry(ASettingRegistry):
             cfg.truncate(0)
             cfg.seek(0)
             json.dump(data, cfg, indent=4)
+        self._get_item.cache_clear()
 
 
 class AYONSettingsRegistry(JSONSettingRegistry):

From 1017becebd118f5cdd3bd021ed7fbe5891bf954e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 11:21:26 +0200
Subject: [PATCH 19/37] changed abstract class docstring

---
 client/ayon_core/lib/local_settings.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/ayon_core/lib/local_settings.py b/client/ayon_core/lib/local_settings.py
index 4cfe059e2a..85ece54d6f 100644
--- a/client/ayon_core/lib/local_settings.py
+++ b/client/ayon_core/lib/local_settings.py
@@ -235,11 +235,7 @@ class AYONSecureRegistry:
 
 
 class ASettingRegistry(ABC):
-    """Abstract class defining structure of **SettingRegistry** class.
-
-    It is implementing methods to store secure items into keyring, otherwise
-    mechanism for storing common items must be implemented in abstract
-    methods.
+    """Abstract class to defining structure of registry class.
 
     """
     def __init__(self, name: str) -> None:

From 47af183d04f82ccc5d27af20143ee03ddf8eeb49 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 12:12:00 +0200
Subject: [PATCH 20/37] check for availability that don't live in workdir

---
 client/ayon_core/host/interfaces/workfiles.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/host/interfaces/workfiles.py b/client/ayon_core/host/interfaces/workfiles.py
index b6c33337e9..693aac5fe5 100644
--- a/client/ayon_core/host/interfaces/workfiles.py
+++ b/client/ayon_core/host/interfaces/workfiles.py
@@ -1155,12 +1155,15 @@ class IWorkfileHost:
                 comment = parsed_data.comment
 
             filepath = list_workfiles_context.anatomy.fill_root(rootless_path)
+            available = False
+            if filepath != rootless_path:
+                available = os.path.exists(filepath)
             items.append(WorkfileInfo.new(
                 filepath,
                 rootless_path,
                 version=version,
                 comment=comment,
-                available=False,
+                available=available,
                 workfile_entity=workfile_entity,
             ))
 

From 4f296e0ed78138cef63791605c40e1a6b82e7ebf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 12:41:33 +0200
Subject: [PATCH 21/37] simplified

---
 client/ayon_core/host/interfaces/workfiles.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/ayon_core/host/interfaces/workfiles.py b/client/ayon_core/host/interfaces/workfiles.py
index 693aac5fe5..14e60bda20 100644
--- a/client/ayon_core/host/interfaces/workfiles.py
+++ b/client/ayon_core/host/interfaces/workfiles.py
@@ -1155,9 +1155,7 @@ class IWorkfileHost:
                 comment = parsed_data.comment
 
             filepath = list_workfiles_context.anatomy.fill_root(rootless_path)
-            available = False
-            if filepath != rootless_path:
-                available = os.path.exists(filepath)
+            available = os.path.exists(filepath)
             items.append(WorkfileInfo.new(
                 filepath,
                 rootless_path,

From b247762806f3e9f4dfa38afdb812d3da461d34d8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:44:02 +0200
Subject: [PATCH 22/37] make 'get_plugin_paths' optional

---
 client/ayon_core/addon/interfaces.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/addon/interfaces.py b/client/ayon_core/addon/interfaces.py
index 232c056fb4..b0f2d25c08 100644
--- a/client/ayon_core/addon/interfaces.py
+++ b/client/ayon_core/addon/interfaces.py
@@ -48,14 +48,23 @@ class IPluginPaths(AYONInterface):
     }
     """
 
-    @abstractmethod
     def get_plugin_paths(self) -> dict[str, list[str]]:
         """Return plugin paths for addon.
 
+        This method was abstract (required) in the past, so raise the required
+            'core' addon version when 'get_plugin_paths' is removed from
+            addon.
+
+        Deprecated:
+            Please implement specific methods 'get_create_plugin_paths',
+                'get_load_plugin_paths', 'get_inventory_action_paths' and
+                'get_publish_plugin_paths' to return plugin paths.
+
         Returns:
             dict[str, list[str]]: Plugin paths for addon.
 
         """
+        return {}
 
     def _get_plugin_paths_by_type(
             self, plugin_type: str) -> list[str]:

From 67f039bf5dc102b3da3c97e1010efe0639745a84 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:44:36 +0200
Subject: [PATCH 23/37] warn about using deprecated method

---
 client/ayon_core/addon/interfaces.py | 29 ++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/addon/interfaces.py b/client/ayon_core/addon/interfaces.py
index b0f2d25c08..010a5aaca1 100644
--- a/client/ayon_core/addon/interfaces.py
+++ b/client/ayon_core/addon/interfaces.py
@@ -1,6 +1,7 @@
 """Addon interfaces for AYON."""
 from __future__ import annotations
 
+import warnings
 from abc import ABCMeta, abstractmethod
 from typing import TYPE_CHECKING, Callable, Optional, Type
 
@@ -39,14 +40,7 @@ class AYONInterface(metaclass=_AYONInterfaceMeta):
 
 
 class IPluginPaths(AYONInterface):
-    """Addon has plugin paths to return.
-
-    Expected result is dictionary with keys "publish", "create", "load",
-    "actions" or "inventory" and values as list or string.
-    {
-        "publish": ["path/to/publish_plugins"]
-    }
-    """
+    """Addon wants to register plugin paths."""
 
     def get_plugin_paths(self) -> dict[str, list[str]]:
         """Return plugin paths for addon.
@@ -87,6 +81,25 @@ class IPluginPaths(AYONInterface):
 
         if not isinstance(paths, (list, tuple, set)):
             paths = [paths]
+
+        new_function_name = "get_launcher_action_paths"
+        if plugin_type == "create":
+            new_function_name = "get_create_plugin_paths"
+        elif plugin_type == "load":
+            new_function_name = "get_load_plugin_paths"
+        elif plugin_type == "publish":
+            new_function_name = "get_publish_plugin_paths"
+        elif plugin_type == "inventory":
+            new_function_name = "get_inventory_action_paths"
+
+        warnings.warn(
+            f"Addon '{self.name}' returns '{plugin_type}' paths using"
+            " 'get_plugin_paths' method. Please implement"
+            f" '{new_function_name}' instead.",
+            DeprecationWarning,
+            stacklevel=2
+
+        )
         return paths
 
     def get_launcher_action_paths(self) -> list[str]:

From 487b5dda98a3ff19084d0c6143de7da0708209b5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:44:45 +0200
Subject: [PATCH 24/37] small formatting change

---
 client/ayon_core/addon/interfaces.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/addon/interfaces.py b/client/ayon_core/addon/interfaces.py
index 010a5aaca1..9f2a14a264 100644
--- a/client/ayon_core/addon/interfaces.py
+++ b/client/ayon_core/addon/interfaces.py
@@ -61,7 +61,8 @@ class IPluginPaths(AYONInterface):
         return {}
 
     def _get_plugin_paths_by_type(
-            self, plugin_type: str) -> list[str]:
+        self, plugin_type: str
+    ) -> list[str]:
         """Get plugin paths by type.
 
         Args:

From ba4412577bafaf5e759e39d942133d03a7a0392b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:45:12 +0200
Subject: [PATCH 25/37] mark 'collect_plugin_paths' as deprecated

---
 client/ayon_core/addon/base.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index 72270fa585..80e1ceaa1e 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -8,6 +8,7 @@ import inspect
 import logging
 import threading
 import collections
+import warnings
 from uuid import uuid4
 from abc import ABC, abstractmethod
 from typing import Optional
@@ -815,10 +816,26 @@ class AddonsManager:
 
         Unknown keys are logged out.
 
+        Deprecated:
+            Use targeted methods 'collect_launcher_action_paths',
+                'collect_create_plugin_paths', 'collect_load_plugin_paths',
+                'collect_publish_plugin_paths' and
+                 'collect_inventory_action_paths' to collect plugin paths.
+
         Returns:
             dict: Output is dictionary with keys "publish", "create", "load",
                 "actions" and "inventory" each containing list of paths.
+
         """
+        warnings.warn(
+            "Used deprecated method 'collect_plugin_paths'. Please use"
+            " targeted methods 'collect_launcher_action_paths',"
+            " 'collect_create_plugin_paths', 'collect_load_plugin_paths'"
+            " 'collect_publish_plugin_paths' and"
+            " 'collect_inventory_action_paths'",
+            DeprecationWarning,
+            stacklevel=2
+        )
         # Output structure
         output = {
             "publish": [],

From 5e8dece22e2fbae722f83f45d74d30cad04708cf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:46:03 +0200
Subject: [PATCH 26/37] warn about having string as output from plugin getter
 method

---
 client/ayon_core/addon/base.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index 80e1ceaa1e..57968b0e09 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -891,24 +891,28 @@ class AddonsManager:
             if not isinstance(addon, IPluginPaths):
                 continue
 
+            paths = None
             method = getattr(addon, method_name)
             try:
                 paths = method(*args, **kwargs)
             except Exception:
                 self.log.warning(
-                    (
-                        "Failed to get plugin paths from addon"
-                        " '{}' using '{}'."
-                    ).format(addon.__class__.__name__, method_name),
+                    "Failed to get plugin paths from addon"
+                    f" '{addon.name}' using '{method_name}'.",
                     exc_info=True
                 )
+
+            if not paths:
                 continue
 
-            if paths:
-                # Convert to list if value is not list
-                if not isinstance(paths, (list, tuple, set)):
-                    paths = [paths]
-                output.extend(paths)
+            if isinstance(paths, str):
+                paths = [paths]
+                self.log.warning(
+                    f"Addon '{addon.name}' returned invalid output type"
+                    f" from '{method_name}'."
+                    f" Got 'str' expected 'list[str]'."
+                )
+            output.extend(paths)
         return output
 
     def collect_launcher_action_paths(self):

From 8e2f33d483791c606cdbc4230e04be2ad88f6889 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 1 Aug 2025 11:23:44 +0200
Subject: [PATCH 27/37] use filepath instead of rootless path for workfile
 entity mapping

---
 client/ayon_core/host/interfaces/workfiles.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/host/interfaces/workfiles.py b/client/ayon_core/host/interfaces/workfiles.py
index 14e60bda20..b519751ba2 100644
--- a/client/ayon_core/host/interfaces/workfiles.py
+++ b/client/ayon_core/host/interfaces/workfiles.py
@@ -1072,10 +1072,13 @@ class IWorkfileHost:
             prepared_data=prepared_data,
         )
 
-        workfile_entities_by_path = {
-            workfile_entity["path"]: workfile_entity
-            for workfile_entity in list_workfiles_context.workfile_entities
-        }
+        workfile_entities_by_path = {}
+        for workfile_entity in list_workfiles_context.workfile_entities:
+            rootless_path = workfile_entity["path"]
+            path = os.path.normpath(
+                list_workfiles_context.anatomy.fill_root(rootless_path)
+            )
+            workfile_entities_by_path[path] = workfile_entity
 
         workdir_data = get_template_data(
             list_workfiles_context.project_entity,
@@ -1114,10 +1117,10 @@ class IWorkfileHost:
 
             rootless_path = f"{rootless_workdir}/{filename}"
             workfile_entity = workfile_entities_by_path.pop(
-                rootless_path, None
+                filepath, None
             )
             version = comment = None
-            if workfile_entity:
+            if workfile_entity is not None:
                 _data = workfile_entity["data"]
                 version = _data.get("version")
                 comment = _data.get("comment")
@@ -1137,7 +1140,7 @@ class IWorkfileHost:
             )
             items.append(item)
 
-        for workfile_entity in workfile_entities_by_path.values():
+        for filepath, workfile_entity in workfile_entities_by_path.items():
             # Workfile entity is not in the filesystem
             #   but it is in the database
             rootless_path = workfile_entity["path"]
@@ -1154,7 +1157,6 @@ class IWorkfileHost:
                 version = parsed_data.version
                 comment = parsed_data.comment
 
-            filepath = list_workfiles_context.anatomy.fill_root(rootless_path)
             available = os.path.exists(filepath)
             items.append(WorkfileInfo.new(
                 filepath,

From e7ea930d557d5e8264beb09a94b39044178fee33 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Fri, 1 Aug 2025 10:23:24 +0000
Subject: [PATCH 28/37] [Automated] Add generated package files from main

---
 client/ayon_core/version.py | 2 +-
 package.py                  | 2 +-
 pyproject.toml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index 7f55a17a01..c16b31f2fc 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'core' version."""
-__version__ = "1.5.0+dev"
+__version__ = "1.5.1"
diff --git a/package.py b/package.py
index 807e4e4b35..9c131794d7 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "1.5.0+dev"
+version = "1.5.1"
 
 client_dir = "ayon_core"
 
diff --git a/pyproject.toml b/pyproject.toml
index e7977a5579..686cc1e3f8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@
 
 [tool.poetry]
 name = "ayon-core"
-version = "1.5.0+dev"
+version = "1.5.1"
 description = ""
 authors = ["Ynput Team <team@ynput.io>"]
 readme = "README.md"

From 302619176bbc651642dbe847d98eda76f543bd29 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Fri, 1 Aug 2025 10:24:02 +0000
Subject: [PATCH 29/37] [Automated] Update version in package.py for develop

---
 client/ayon_core/version.py | 2 +-
 package.py                  | 2 +-
 pyproject.toml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index c16b31f2fc..784105572b 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'core' version."""
-__version__ = "1.5.1"
+__version__ = "1.5.1+dev"
diff --git a/package.py b/package.py
index 9c131794d7..a0d7b26703 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "1.5.1"
+version = "1.5.1+dev"
 
 client_dir = "ayon_core"
 
diff --git a/pyproject.toml b/pyproject.toml
index 686cc1e3f8..b544afa346 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@
 
 [tool.poetry]
 name = "ayon-core"
-version = "1.5.1"
+version = "1.5.1+dev"
 description = ""
 authors = ["Ynput Team <team@ynput.io>"]
 readme = "README.md"

From 745a394cdddd688a054870c2ae08559683850d82 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 10:24:54 +0000
Subject: [PATCH 30/37] chore(): update bug report / version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9202190f8b..364d1709e0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to AYON Tray
       options:
+        - 1.5.1
         - 1.5.0
         - 1.4.1
         - 1.4.0

From 9f456f7cb8b3afa3c32ba605ca7ed22276b47c6d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:37:21 +0200
Subject: [PATCH 31/37] added safe importing of otio

---
 .../publish/collect_otio_frame_ranges.py        | 17 +++++++++++------
 .../publish/extract_otio_audio_tracks.py        |  2 +-
 .../plugins/publish/extract_otio_review.py      |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py b/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py
index 0a4efc2172..d68970d428 100644
--- a/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py
+++ b/client/ayon_core/plugins/publish/collect_otio_frame_ranges.py
@@ -8,13 +8,7 @@ This module contains a unified plugin that handles:
 
 from pprint import pformat
 
-import opentimelineio as otio
 import pyblish.api
-from ayon_core.pipeline.editorial import (
-    get_media_range_with_retimes,
-    otio_range_to_frame_range,
-    otio_range_with_handles,
-)
 
 
 def validate_otio_clip(instance, logger):
@@ -74,6 +68,8 @@ class CollectOtioRanges(pyblish.api.InstancePlugin):
         if not validate_otio_clip(instance, self.log):
             return
 
+        import opentimelineio as otio
+
         otio_clip = instance.data["otioClip"]
 
         # Collect timeline ranges if workfile start frame is available
@@ -100,6 +96,11 @@ class CollectOtioRanges(pyblish.api.InstancePlugin):
 
     def _collect_timeline_ranges(self, instance, otio_clip):
         """Collect basic timeline frame ranges."""
+        from ayon_core.pipeline.editorial import (
+            otio_range_to_frame_range,
+            otio_range_with_handles,
+        )
+
         workfile_start = instance.data["workfileFrameStart"]
 
         # Get timeline ranges
@@ -129,6 +130,8 @@ class CollectOtioRanges(pyblish.api.InstancePlugin):
 
     def _collect_source_ranges(self, instance, otio_clip):
         """Collect source media frame ranges."""
+        import opentimelineio as otio
+
         # Get source ranges
         otio_src_range = otio_clip.source_range
         otio_available_range = otio_clip.available_range()
@@ -178,6 +181,8 @@ class CollectOtioRanges(pyblish.api.InstancePlugin):
 
     def _collect_retimed_ranges(self, instance, otio_clip):
         """Handle retimed clip frame ranges."""
+        from ayon_core.pipeline.editorial import get_media_range_with_retimes
+
         retimed_attributes = get_media_range_with_retimes(otio_clip, 0, 0)
         self.log.debug(f"Retimed attributes: {retimed_attributes}")
 
diff --git a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
index 2aec4a5415..86d18ed147 100644
--- a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
+++ b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
@@ -7,7 +7,6 @@ from ayon_core.lib import (
     get_ffmpeg_tool_args,
     run_subprocess
 )
-from ayon_core.pipeline import editorial
 
 
 class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
@@ -159,6 +158,7 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
         """
         # Not all hosts can import this module.
         import opentimelineio as otio
+        from ayon_core.pipeline.editorial import OTIO_EPSILON
 
         output = []
         # go trough all audio tracks
diff --git a/client/ayon_core/plugins/publish/extract_otio_review.py b/client/ayon_core/plugins/publish/extract_otio_review.py
index 74cf45e474..28452bc0e9 100644
--- a/client/ayon_core/plugins/publish/extract_otio_review.py
+++ b/client/ayon_core/plugins/publish/extract_otio_review.py
@@ -25,7 +25,6 @@ from ayon_core.lib import (
 )
 from ayon_core.pipeline import (
     KnownPublishError,
-    editorial,
     publish,
 )
 
@@ -359,6 +358,7 @@ class ExtractOTIOReview(
         import opentimelineio as otio
         from ayon_core.pipeline.editorial import (
             trim_media_range,
+            OTIO_EPSILON,
         )
 
         def _round_to_frame(rational_time):
@@ -380,7 +380,7 @@ class ExtractOTIOReview(
         # Avoid rounding issue on media available range.
         if start.almost_equal(
             avl_start,
-            editorial.OTIO_EPSILON
+            OTIO_EPSILON
         ):
             avl_start = start
 

From 798b281e6731947cd4700591632f4e4c4134b73b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:42:16 +0200
Subject: [PATCH 32/37] fix OTIO_EPSILON usage

---
 client/ayon_core/plugins/publish/extract_otio_audio_tracks.py | 2 +-
 client/ayon_core/plugins/publish/extract_otio_review.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
index 86d18ed147..3a450a4f33 100644
--- a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
+++ b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
@@ -177,7 +177,7 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
                     # Avoid rounding issue on media available range.
                     if clip_start.almost_equal(
                         conformed_av_start,
-                        editorial.OTIO_EPSILON
+                        OTIO_EPSILON
                     ):
                         conformed_av_start = clip_start
 
diff --git a/client/ayon_core/plugins/publish/extract_otio_review.py b/client/ayon_core/plugins/publish/extract_otio_review.py
index 28452bc0e9..90215bd2c9 100644
--- a/client/ayon_core/plugins/publish/extract_otio_review.py
+++ b/client/ayon_core/plugins/publish/extract_otio_review.py
@@ -406,7 +406,7 @@ class ExtractOTIOReview(
         # Avoid rounding issue on media available range.
         if end_point.almost_equal(
             avl_end_point,
-            editorial.OTIO_EPSILON
+            OTIO_EPSILON
         ):
             avl_end_point = end_point
 

From 8bcc4a3939d4e52cce731a0e712b87b283fee37d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 1 Aug 2025 18:23:15 +0200
Subject: [PATCH 33/37] Make sure workdir exists when workfile is being saved

---
 client/ayon_core/host/interfaces/workfiles.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/host/interfaces/workfiles.py b/client/ayon_core/host/interfaces/workfiles.py
index b519751ba2..82d71d152a 100644
--- a/client/ayon_core/host/interfaces/workfiles.py
+++ b/client/ayon_core/host/interfaces/workfiles.py
@@ -944,6 +944,8 @@ class IWorkfileHost:
         self._emit_workfile_save_event(event_data, after_save=False)
 
         workdir = os.path.dirname(filepath)
+        if not os.path.exists(workdir):
+            os.makedirs(workdir, exist_ok=True)
 
         # Set 'AYON_WORKDIR' environment variable
         os.environ["AYON_WORKDIR"] = workdir

From 955d8166a5fc4d216368db6ee0a7bf80710f7b32 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Fri, 1 Aug 2025 16:36:08 +0000
Subject: [PATCH 34/37] [Automated] Add generated package files from main

---
 client/ayon_core/version.py | 2 +-
 package.py                  | 2 +-
 pyproject.toml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index 784105572b..b6958f1be5 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'core' version."""
-__version__ = "1.5.1+dev"
+__version__ = "1.5.2"
diff --git a/package.py b/package.py
index a0d7b26703..79fe4f83b1 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "1.5.1+dev"
+version = "1.5.2"
 
 client_dir = "ayon_core"
 
diff --git a/pyproject.toml b/pyproject.toml
index b544afa346..73fa4336f1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@
 
 [tool.poetry]
 name = "ayon-core"
-version = "1.5.1+dev"
+version = "1.5.2"
 description = ""
 authors = ["Ynput Team <team@ynput.io>"]
 readme = "README.md"

From 8cd7037c6f0910ff4ae789dd2b1213b5b5307e85 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Fri, 1 Aug 2025 16:36:43 +0000
Subject: [PATCH 35/37] [Automated] Update version in package.py for develop

---
 client/ayon_core/version.py | 2 +-
 package.py                  | 2 +-
 pyproject.toml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index b6958f1be5..9f1bac6805 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'core' version."""
-__version__ = "1.5.2"
+__version__ = "1.5.2+dev"
diff --git a/package.py b/package.py
index 79fe4f83b1..7bd806159f 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "1.5.2"
+version = "1.5.2+dev"
 
 client_dir = "ayon_core"
 
diff --git a/pyproject.toml b/pyproject.toml
index 73fa4336f1..e67fcc2138 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@
 
 [tool.poetry]
 name = "ayon-core"
-version = "1.5.2"
+version = "1.5.2+dev"
 description = ""
 authors = ["Ynput Team <team@ynput.io>"]
 readme = "README.md"

From 55f5551b31b1ad2aef3ca801207ad458a19d153e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Aug 2025 16:37:35 +0000
Subject: [PATCH 36/37] chore(): update bug report / version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 364d1709e0..933448a6a9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to AYON Tray
       options:
+        - 1.5.2
         - 1.5.1
         - 1.5.0
         - 1.4.1

From 4f0e18b42ed081370bc7d5279a2a91159a7b139f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:17:50 +0200
Subject: [PATCH 37/37] Remove unnecessary line

---
 client/ayon_core/addon/interfaces.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/addon/interfaces.py b/client/ayon_core/addon/interfaces.py
index 9f2a14a264..bf08ccd48c 100644
--- a/client/ayon_core/addon/interfaces.py
+++ b/client/ayon_core/addon/interfaces.py
@@ -99,7 +99,6 @@ class IPluginPaths(AYONInterface):
             f" '{new_function_name}' instead.",
             DeprecationWarning,
             stacklevel=2
-
         )
         return paths