Merge pull request #83 from ynput/enhancement/OP-8271_Remove-local-settings-function

Chore: Remove local settings function

client/ayon_core/host/dirmap.py

@@ -181,6 +181,10 @@ class HostDirmap(object):
                 exclude_locals=False,
                 cached=False)
 
+            # TODO implement
+            # Dirmap is dependent on 'get_site_local_overrides' which
+            #   is not implemented in AYON. The mapping should be received
+            #   from sitesync addon.
             active_overrides = get_site_local_overrides(
                 project_name, active_site)
             remote_overrides = get_site_local_overrides(

client/ayon_core/lib/applications.py

@@ -16,7 +16,6 @@ from ayon_core.client import get_asset_name_identifier
 from ayon_core.settings import (
     get_system_settings,
     get_project_settings,
-    get_local_settings
 )
 from ayon_core.settings.constants import (
     METADATA_KEYS,
@@ -1528,16 +1527,17 @@ def prepare_app_environments(
 
     # Use environments from local settings
     filtered_local_envs = {}
-    system_settings = data["system_settings"]
-    whitelist_envs = system_settings["general"].get("local_env_white_list")
-    if whitelist_envs:
-        local_settings = get_local_settings()
-        local_envs = local_settings.get("environments") or {}
-        filtered_local_envs = {
-            key: value
-            for key, value in local_envs.items()
-            if key in whitelist_envs
-        }
+    # NOTE Overrides for environment variables are not implemented in AYON.
+    # system_settings = data["system_settings"]
+    # whitelist_envs = system_settings["general"].get("local_env_white_list")
+    # if whitelist_envs:
+    #     local_settings = get_local_settings()
+    #     local_envs = local_settings.get("environments") or {}
+    #     filtered_local_envs = {
+    #         key: value
+    #         for key, value in local_envs.items()
+    #         if key in whitelist_envs
+    #     }
 
     # Apply local environment variables for already existing values
     for key, value in filtered_local_envs.items():

client/ayon_core/lib/ayon_info.py

@@ -5,7 +5,6 @@ import platform
 import getpass
 import socket
 
-from ayon_core.settings.lib import get_local_settings
 from .execute import get_ayon_launcher_args
 from .local_settings import get_local_site_id
 
@@ -96,7 +95,6 @@ def get_all_current_info():
     return {
         "workstation": get_workstation_info(),
         "env": os.environ.copy(),
-        "local_settings": get_local_settings(),
         "ayon": get_ayon_info(),
     }
 

client/ayon_core/pipeline/anatomy.py

@@ -8,9 +8,6 @@ import numbers
 import six
 import time
 
-from ayon_core.settings.lib import (
-    get_local_settings,
-)
 from ayon_core.client import get_project, get_ayon_server_api_connection
 from ayon_core.lib import Logger, get_local_site_id
 from ayon_core.lib.path_templates import (
@@ -453,7 +450,7 @@ class Anatomy(BaseAnatomy):
         return cls._sync_server_addon_cache.data
 
     @classmethod
-    def _get_studio_roots_overrides(cls, project_name, local_settings=None):
+    def _get_studio_roots_overrides(cls, project_name):
         """This would return 'studio' site override by local settings.
 
         Notes:
@@ -465,7 +462,6 @@ class Anatomy(BaseAnatomy):
 
         Args:
             project_name (str): Name of project.
-            local_settings (Optional[dict[str, Any]]): Prepared local settings.
 
         Returns:
             Union[Dict[str, str], None]): Local root overrides.
@@ -488,11 +484,6 @@ class Anatomy(BaseAnatomy):
                 should be returned.
         """
 
-        # Local settings may be used more than once or may not be used at all
-        # - to avoid slowdowns 'get_local_settings' is not called until it's
-        #   really needed
-        local_settings = None
-
         # First check if sync server is available and enabled
         sync_server = cls.get_sync_server_addon()
         if sync_server is None or not sync_server.enabled:
@@ -503,11 +494,8 @@ class Anatomy(BaseAnatomy):
             # Use sync server to receive active site name
             project_cache = cls._default_site_id_cache[project_name]
             if project_cache.is_outdated:
-                local_settings = get_local_settings()
                 project_cache.update_data(
-                    sync_server.get_active_site_type(
-                        project_name, local_settings
-                    )
+                    sync_server.get_active_site_type(project_name)
                 )
             site_name = project_cache.data
 
@@ -517,12 +505,12 @@ class Anatomy(BaseAnatomy):
                 # Handle studio root overrides without sync server
                 # - studio root overrides can be done even without sync server
                 roots_overrides = cls._get_studio_roots_overrides(
-                    project_name, local_settings
+                    project_name
                 )
             else:
                 # Ask sync server to get roots overrides
                 roots_overrides = sync_server.get_site_root_overrides(
-                    project_name, site_name, local_settings
+                    project_name, site_name
                 )
             site_cache.update_data(roots_overrides)
         return site_cache.data

client/ayon_core/settings/__init__.py

@@ -7,7 +7,6 @@ from .lib import (
     get_system_settings,
     get_project_settings,
     get_current_project_settings,
-    get_local_settings,
 )
 from .ayon_settings import get_ayon_settings
 
@@ -20,7 +19,6 @@ __all__ = (
     "get_system_settings",
     "get_project_settings",
     "get_current_project_settings",
-    "get_local_settings",
 
     "get_ayon_settings",
 )

client/ayon_core/settings/lib.py

@@ -48,11 +48,6 @@ def clear_metadata_from_settings(values):
             clear_metadata_from_settings(item)
 
 
-def get_local_settings():
-    # TODO implement ayon implementation
-    return {}
-
-
 def load_openpype_default_settings():
     """Load openpype default settings."""
     return load_jsons_from_dir(DEFAULTS_DIR)
@@ -203,39 +198,17 @@ def merge_overrides(source_dict, override_dict):
 def get_site_local_overrides(project_name, site_name, local_settings=None):
     """Site overrides from local settings for passet project and site name.
 
+    Deprecated:
+        This function is not implemented for AYON and will be removed.
+
     Args:
         project_name (str): For which project are overrides.
         site_name (str): For which site are overrides needed.
         local_settings (dict): Preloaded local settings. They are loaded
             automatically if not passed.
     """
-    # Check if local settings were passed
-    if local_settings is None:
-        local_settings = get_local_settings()
 
-    output = {}
-
-    # Skip if local settings are empty
-    if not local_settings:
-        return output
-
-    local_project_settings = local_settings.get("projects") or {}
-
-    # Prepare overrides for entered project and for default project
-    project_locals = None
-    if project_name:
-        project_locals = local_project_settings.get(project_name)
-    default_project_locals = local_project_settings.get(DEFAULT_PROJECT_KEY)
-
-    # First load and use local settings from default project
-    if default_project_locals and site_name in default_project_locals:
-        output.update(default_project_locals[site_name])
-
-    # Apply project specific local settings if there are any
-    if project_locals and site_name in project_locals:
-        output.update(project_locals[site_name])
-
-    return output
+    return {}
 
 
 def get_current_project_settings():

client/ayon_core/tools/experimental_tools/tools_def.py

@@ -1,5 +1,4 @@
 import os
-from ayon_core.settings import get_local_settings
 
 # Constant key under which local settings are stored
 LOCAL_EXPERIMENTAL_KEY = "experimental_tools"
@@ -155,7 +154,10 @@ class ExperimentalTools:
 
     def refresh_availability(self):
         """Reload local settings and check if any tool changed ability."""
-        local_settings = get_local_settings()
+
+        # NOTE AYON does not have implemented settings for experimental
+        #   tools.
+        local_settings = {}
         experimental_settings = (
             local_settings.get(LOCAL_EXPERIMENTAL_KEY)
         ) or {}