From be20a9f69626240bbb941e7661d5866a97b736cc Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Nov 2024 10:14:47 +0100
Subject: [PATCH 01/22] Add ShapeFX Loki support

---
 client/ayon_core/hooks/pre_add_last_workfile_arg.py     | 3 ++-
 client/ayon_core/hooks/pre_ocio_hook.py                 | 3 ++-
 client/ayon_core/plugins/publish/validate_file_saved.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/hooks/pre_add_last_workfile_arg.py b/client/ayon_core/hooks/pre_add_last_workfile_arg.py
index d5914c2352..0652e7c5aa 100644
--- a/client/ayon_core/hooks/pre_add_last_workfile_arg.py
+++ b/client/ayon_core/hooks/pre_add_last_workfile_arg.py
@@ -29,7 +29,8 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
         "aftereffects",
         "wrap",
         "openrv",
-        "cinema4d"
+        "cinema4d",
+        "loki"
     }
     launch_types = {LaunchTypes.local}
 
diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py
index 7406aa42cf..6462d1a3ae 100644
--- a/client/ayon_core/hooks/pre_ocio_hook.py
+++ b/client/ayon_core/hooks/pre_ocio_hook.py
@@ -20,7 +20,8 @@ class OCIOEnvHook(PreLaunchHook):
         "hiero",
         "resolve",
         "openrv",
-        "cinema4d"
+        "cinema4d",
+        "loki"
     }
     launch_types = set()
 
diff --git a/client/ayon_core/plugins/publish/validate_file_saved.py b/client/ayon_core/plugins/publish/validate_file_saved.py
index f52998cef3..78c243d5aa 100644
--- a/client/ayon_core/plugins/publish/validate_file_saved.py
+++ b/client/ayon_core/plugins/publish/validate_file_saved.py
@@ -37,7 +37,7 @@ class ValidateCurrentSaveFile(pyblish.api.ContextPlugin):
     label = "Validate File Saved"
     order = pyblish.api.ValidatorOrder - 0.1
     hosts = ["fusion", "houdini", "max", "maya", "nuke", "substancepainter",
-             "cinema4d"]
+             "cinema4d", "loki"]
     actions = [SaveByVersionUpAction, ShowWorkfilesAction]
 
     def process(self, context):

From 32ea97af45bef30951c65e235f541cc2f2827e46 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:04:03 +0200
Subject: [PATCH 02/22] define settings category on core plugins

---
 client/ayon_core/plugins/publish/cleanup.py                 | 2 ++
 client/ayon_core/plugins/publish/cleanup_farm.py            | 2 ++
 client/ayon_core/plugins/publish/collect_audio.py           | 1 +
 client/ayon_core/plugins/publish/collect_frames_fix.py      | 1 +
 client/ayon_core/plugins/publish/collect_scene_version.py   | 3 ++-
 client/ayon_core/plugins/publish/extract_burnin.py          | 1 +
 client/ayon_core/plugins/publish/extract_color_transcode.py | 2 ++
 client/ayon_core/plugins/publish/extract_review.py          | 1 +
 client/ayon_core/plugins/publish/extract_thumbnail.py       | 1 +
 .../plugins/publish/extract_usd_layer_contributions.py      | 6 +++++-
 client/ayon_core/plugins/publish/integrate_hero_version.py  | 2 ++
 client/ayon_core/plugins/publish/integrate_product_group.py | 2 ++
 .../publish/preintegrate_thumbnail_representation.py        | 2 ++
 client/ayon_core/plugins/publish/validate_containers.py     | 1 +
 client/ayon_core/plugins/publish/validate_intent.py         | 2 ++
 client/ayon_core/plugins/publish/validate_version.py        | 1 +
 16 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/plugins/publish/cleanup.py b/client/ayon_core/plugins/publish/cleanup.py
index 681fe700a3..03eaaf9c6e 100644
--- a/client/ayon_core/plugins/publish/cleanup.py
+++ b/client/ayon_core/plugins/publish/cleanup.py
@@ -38,6 +38,8 @@ class CleanUp(pyblish.api.InstancePlugin):
         "webpublisher",
         "shell"
     ]
+    settings_category = "core"
+
     exclude_families = ["clip"]
     optional = True
     active = True
diff --git a/client/ayon_core/plugins/publish/cleanup_farm.py b/client/ayon_core/plugins/publish/cleanup_farm.py
index e655437ced..8d1c8de425 100644
--- a/client/ayon_core/plugins/publish/cleanup_farm.py
+++ b/client/ayon_core/plugins/publish/cleanup_farm.py
@@ -13,6 +13,8 @@ class CleanUpFarm(pyblish.api.ContextPlugin):
 
     order = pyblish.api.IntegratorOrder + 11
     label = "Clean Up Farm"
+
+    settings_category = "core"
     enabled = True
 
     # Keep "filesequence" for backwards compatibility of older jobs
diff --git a/client/ayon_core/plugins/publish/collect_audio.py b/client/ayon_core/plugins/publish/collect_audio.py
index 57c69ef2b2..c0b263fa6f 100644
--- a/client/ayon_core/plugins/publish/collect_audio.py
+++ b/client/ayon_core/plugins/publish/collect_audio.py
@@ -41,6 +41,7 @@ class CollectAudio(pyblish.api.ContextPlugin):
         "max",
         "circuit",
     ]
+    settings_category = "core"
 
     audio_product_name = "audioMain"
 
diff --git a/client/ayon_core/plugins/publish/collect_frames_fix.py b/client/ayon_core/plugins/publish/collect_frames_fix.py
index 0f7d5b692a..4270af5541 100644
--- a/client/ayon_core/plugins/publish/collect_frames_fix.py
+++ b/client/ayon_core/plugins/publish/collect_frames_fix.py
@@ -23,6 +23,7 @@ class CollectFramesFixDef(
     targets = ["local"]
     hosts = ["nuke"]
     families = ["render", "prerender"]
+    settings_category = "core"
 
     rewrite_version_enable = False
 
diff --git a/client/ayon_core/plugins/publish/collect_scene_version.py b/client/ayon_core/plugins/publish/collect_scene_version.py
index 7979b66abe..e6e81ea074 100644
--- a/client/ayon_core/plugins/publish/collect_scene_version.py
+++ b/client/ayon_core/plugins/publish/collect_scene_version.py
@@ -12,9 +12,10 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
     """
 
     order = pyblish.api.CollectorOrder
-    label = 'Collect Scene Version'
+    label = "Collect Scene Version"
     # configurable in Settings
     hosts = ["*"]
+    settings_category = "core"
 
     # in some cases of headless publishing (for example webpublisher using PS)
     # you want to ignore version from name and let integrate use next version
diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py
index fa7fd4e504..f962032680 100644
--- a/client/ayon_core/plugins/publish/extract_burnin.py
+++ b/client/ayon_core/plugins/publish/extract_burnin.py
@@ -57,6 +57,7 @@ class ExtractBurnin(publish.Extractor):
         "unreal",
         "circuit",
     ]
+    settings_category = "core"
 
     optional = True
 
diff --git a/client/ayon_core/plugins/publish/extract_color_transcode.py b/client/ayon_core/plugins/publish/extract_color_transcode.py
index 8a276cf608..bbb6f9585b 100644
--- a/client/ayon_core/plugins/publish/extract_color_transcode.py
+++ b/client/ayon_core/plugins/publish/extract_color_transcode.py
@@ -55,6 +55,8 @@ class ExtractOIIOTranscode(publish.Extractor):
     label = "Transcode color spaces"
     order = pyblish.api.ExtractorOrder + 0.019
 
+    settings_category = "core"
+
     optional = True
 
     # Supported extensions
diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index 1e4997cfb4..377010d9e0 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -165,6 +165,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         "photoshop"
     ]
 
+    settings_category = "core"
     # Supported extensions
     image_exts = {"exr", "jpg", "jpeg", "png", "dpx", "tga", "tiff", "tif"}
     video_exts = {"mov", "mp4"}
diff --git a/client/ayon_core/plugins/publish/extract_thumbnail.py b/client/ayon_core/plugins/publish/extract_thumbnail.py
index 66acb15312..5d9f83fb42 100644
--- a/client/ayon_core/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/plugins/publish/extract_thumbnail.py
@@ -43,6 +43,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         "houdini",
         "circuit",
     ]
+    settings_category = "core"
     enabled = False
 
     integrate_thumbnail = False
diff --git a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
index ec1fddc6b1..c2fa61e1fe 100644
--- a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
+++ b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
@@ -255,7 +255,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin,
     order = pyblish.api.CollectorOrder + 0.35
     label = "Collect USD Layer Contributions (Asset/Shot)"
     families = ["usd"]
-    enabled = True
+    settings_category = "core"
 
     # A contribution defines a contribution into a (department) layer which
     # will get layered into the target product, usually the asset or shot.
@@ -633,6 +633,8 @@ class ExtractUSDLayerContribution(publish.Extractor):
     label = "Extract USD Layer Contributions (Asset/Shot)"
     order = pyblish.api.ExtractorOrder + 0.45
 
+    settings_category = "core"
+
     use_ayon_entity_uri = False
 
     def process(self, instance):
@@ -795,6 +797,8 @@ class ExtractUSDAssetContribution(publish.Extractor):
     label = "Extract USD Asset/Shot Contributions"
     order = ExtractUSDLayerContribution.order + 0.01
 
+    settings_category = "core"
+
     use_ayon_entity_uri = False
 
     def process(self, instance):
diff --git a/client/ayon_core/plugins/publish/integrate_hero_version.py b/client/ayon_core/plugins/publish/integrate_hero_version.py
index 43f93da293..90e6f15568 100644
--- a/client/ayon_core/plugins/publish/integrate_hero_version.py
+++ b/client/ayon_core/plugins/publish/integrate_hero_version.py
@@ -61,6 +61,8 @@ class IntegrateHeroVersion(
     # Must happen after IntegrateNew
     order = pyblish.api.IntegratorOrder + 0.1
 
+    settings_category = "core"
+
     optional = True
     active = True
 
diff --git a/client/ayon_core/plugins/publish/integrate_product_group.py b/client/ayon_core/plugins/publish/integrate_product_group.py
index 90887a359d..8904d21d69 100644
--- a/client/ayon_core/plugins/publish/integrate_product_group.py
+++ b/client/ayon_core/plugins/publish/integrate_product_group.py
@@ -24,6 +24,8 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
     order = pyblish.api.IntegratorOrder - 0.1
     label = "Product Group"
 
+    settings_category = "core"
+
     # Attributes set by settings
     product_grouping_profiles = None
 
diff --git a/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py b/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py
index 8bd67c0183..900febc236 100644
--- a/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py
+++ b/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py
@@ -22,6 +22,8 @@ class PreIntegrateThumbnails(pyblish.api.InstancePlugin):
     label = "Override Integrate Thumbnail Representations"
     order = pyblish.api.IntegratorOrder - 0.1
 
+    settings_category = "core"
+
     integrate_profiles = []
 
     def process(self, instance):
diff --git a/client/ayon_core/plugins/publish/validate_containers.py b/client/ayon_core/plugins/publish/validate_containers.py
index 520e7a7ce9..fda3d93627 100644
--- a/client/ayon_core/plugins/publish/validate_containers.py
+++ b/client/ayon_core/plugins/publish/validate_containers.py
@@ -31,6 +31,7 @@ class ValidateOutdatedContainers(
 
     label = "Validate Outdated Containers"
     order = pyblish.api.ValidatorOrder
+    settings_category = "core"
 
     optional = True
     actions = [ShowInventory]
diff --git a/client/ayon_core/plugins/publish/validate_intent.py b/client/ayon_core/plugins/publish/validate_intent.py
index 71df652e92..fa5e5af093 100644
--- a/client/ayon_core/plugins/publish/validate_intent.py
+++ b/client/ayon_core/plugins/publish/validate_intent.py
@@ -14,6 +14,8 @@ class ValidateIntent(pyblish.api.ContextPlugin):
     order = pyblish.api.ValidatorOrder
 
     label = "Validate Intent"
+    settings_category = "core"
+
     enabled = False
 
     # Can be modified by settings
diff --git a/client/ayon_core/plugins/publish/validate_version.py b/client/ayon_core/plugins/publish/validate_version.py
index 0359f8fb53..d63c4e1f03 100644
--- a/client/ayon_core/plugins/publish/validate_version.py
+++ b/client/ayon_core/plugins/publish/validate_version.py
@@ -17,6 +17,7 @@ class ValidateVersion(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin):
     order = pyblish.api.ValidatorOrder
 
     label = "Validate Version"
+    settings_category = "core"
 
     optional = False
     active = True

From 2e345fb297604b9bff86c8c124e50eb723b1b04e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:35:59 +0200
Subject: [PATCH 03/22] warn if 'settings_category' is not filled but settings
 are received

---
 client/ayon_core/pipeline/publish/lib.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index fb84417730..cd6a7bca75 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -354,12 +354,17 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
     # Use project settings based on a category name
     if category:
         try:
-            return (
+            output = (
                 project_settings
                 [category]
                 ["publish"]
                 [plugin.__name__]
             )
+            warnings.warn(
+                f"Please fill 'settings_category' for plugin '{plugin.__name__}'.",
+                DeprecationWarning
+            )
+            return output
         except KeyError:
             pass
 
@@ -384,12 +389,17 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
         category_from_file = "core"
 
     try:
-        return (
+        output = (
             project_settings
             [category_from_file]
             [plugin_kind]
             [plugin.__name__]
         )
+        warnings.warn(
+            f"Please fill 'settings_category' for plugin '{plugin.__name__}'.",
+            DeprecationWarning
+        )
+        return output
     except KeyError:
         pass
     return {}

From feece4a7c30f32603c58d11d201aa73d494ed040 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Jul 2025 17:29:12 +0200
Subject: [PATCH 04/22] fix line length

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

diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index cd6a7bca75..dfaba0e7a9 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -361,7 +361,8 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
                 [plugin.__name__]
             )
             warnings.warn(
-                f"Please fill 'settings_category' for plugin '{plugin.__name__}'.",
+                "Please fill 'settings_category'"
+                f" for plugin '{plugin.__name__}'.",
                 DeprecationWarning
             )
             return output
@@ -396,7 +397,8 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
             [plugin.__name__]
         )
         warnings.warn(
-            f"Please fill 'settings_category' for plugin '{plugin.__name__}'.",
+            "Please fill 'settings_category'"
+            f" for plugin '{plugin.__name__}'.",
             DeprecationWarning
         )
         return output

From 4e39e86037d878eed6e5359f1891587b5d909ec5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 28 Jul 2025 10:28:29 +0200
Subject: [PATCH 05/22] Add 'enabled' attribute back

---
 .../ayon_core/plugins/publish/extract_usd_layer_contributions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
index c2fa61e1fe..0dc9a5e34d 100644
--- a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
+++ b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py
@@ -255,6 +255,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin,
     order = pyblish.api.CollectorOrder + 0.35
     label = "Collect USD Layer Contributions (Asset/Shot)"
     families = ["usd"]
+    enabled = True
     settings_category = "core"
 
     # A contribution defines a contribution into a (department) layer which

From 74ad2e2c7ed451807934f9e640e1f2be2aab350c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 29 Jul 2025 17:39:54 +0200
Subject: [PATCH 06/22] add settings category to CollectAnatomyInstanceData

---
 .../ayon_core/plugins/publish/collect_anatomy_instance_data.py  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
index 2fcf562dd0..2cb2297bf7 100644
--- a/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
+++ b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
@@ -46,6 +46,8 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder + 0.49
     label = "Collect Anatomy Instance data"
 
+    settings_category = "core"
+
     follow_workfile_version = False
 
     def process(self, context):

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 07/22] 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 08/22] 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 09/22] 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 10/22] 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 11/22] 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 12/22] 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 13/22] 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 14/22] 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 15/22] 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 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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: