General: Direct settings imports

openpype/hosts/flame/api/plugin.py

@@ -6,9 +6,9 @@
 
 from Qt import QtCore, QtWidgets
 
-import openpype.api as openpype
 import qargparse
 from openpype import style
+from openpype.settings import get_current_project_settings
 from openpype.lib import Logger
 from openpype.pipeline import LegacyCreator, LoaderPlugin
 
@@ -306,7 +306,7 @@ class Creator(LegacyCreator):
 
  def __init__(self, *args, **kwargs):
  super(Creator, self).__init__(*args, **kwargs)
- self.presets = openpype.get_current_project_settings()[
+ self.presets = get_current_project_settings()[
  "flame"]["create"].get(self.__class__.__name__, {})
 
  # adding basic current context flame objects

openpype/hosts/hiero/api/plugin.py

@@ -8,7 +8,7 @@
 from Qt import QtWidgets, QtCore
 import qargparse
 
-import openpype.api as openpype
+from openpype.settings import get_current_project_settings
 from openpype.lib import Logger
 from openpype.pipeline import LoaderPlugin, LegacyCreator
 from openpype.pipeline.context_tools import get_current_project_asset
@@ -606,7 +606,7 @@ class Creator(LegacyCreator):
  def __init__(self, *args, **kwargs):
  super(Creator, self).__init__(*args, **kwargs)
  import openpype.hosts.hiero.api as phiero
- self.presets = openpype.get_current_project_settings()[
+ self.presets = get_current_project_settings()[
  "hiero"]["create"].get(self.__class__.__name__, {})
 
  # adding basic current context resolve objects

openpype/hosts/maya/api/lib.py

@@ -23,7 +23,7 @@
  get_last_versions,
  get_representation_by_name
 )
-from openpype.api import get_anatomy_settings
+from openpype.settings import get_anatomy_settings
 from openpype.pipeline import (
  legacy_io,
  discover_loader_plugins,

openpype/hosts/maya/api/lib_rendersettings.py

@@ -6,7 +6,7 @@
 import sys
 
 from openpype.lib import Logger
-from openpype.api import (
+from openpype.settings import (
  get_project_settings,
  get_current_project_settings
 )

openpype/hosts/maya/plugins/create/create_render.py

@@ -9,7 +9,7 @@
 from maya import cmds
 from maya.app.renderSetup.model import renderSetup
 
-from openpype.api import (
+from openpype.settings import (
  get_system_settings,
  get_project_settings,
 )

openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Creator for Unreal Static Meshes."""
 from openpype.hosts.maya.api import plugin, lib
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import legacy_io
 from maya import cmds # noqa
 

openpype/hosts/maya/plugins/create/create_vrayscene.py

@@ -12,7 +12,7 @@
  lib,
  plugin
 )
-from openpype.api import (
+from openpype.settings import (
  get_system_settings,
  get_project_settings
 )

openpype/hosts/maya/plugins/load/load_ass.py

@@ -1,7 +1,7 @@
 import os
 import clique
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_gpucache.py

@@ -4,7 +4,7 @@
  load,
  get_representation_path
 )
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 
 
 class GpuCacheLoader(load.LoaderPlugin):

openpype/hosts/maya/plugins/load/load_redshift_proxy.py

@@ -5,7 +5,7 @@
 
 import maya.cmds as cmds
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_reference.py

@@ -1,7 +1,7 @@
 import os
 from maya import cmds
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import legacy_io
 from openpype.pipeline.create import (
  legacy_create,

openpype/hosts/maya/plugins/load/load_vdb_to_arnold.py

@@ -1,6 +1,6 @@
 import os
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_vdb_to_redshift.py

@@ -1,6 +1,6 @@
 import os
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_vdb_to_vray.py

@@ -1,6 +1,6 @@
 import os
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_vrayproxy.py

@@ -10,7 +10,7 @@
 import maya.cmds as cmds
 
 from openpype.client import get_representation_by_name
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  legacy_io,
  load,

openpype/hosts/maya/plugins/load/load_vrayscene.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 import maya.cmds as cmds # noqa
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_yeti_cache.py

@@ -6,7 +6,7 @@
 import clique
 from maya import cmds
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import (
  load,
  get_representation_path

openpype/hosts/maya/plugins/load/load_yeti_rig.py

@@ -1,7 +1,7 @@
 import os
 from collections import defaultdict
 
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 import openpype.hosts.maya.api.plugin
 from openpype.hosts.maya.api import lib
 

openpype/hosts/maya/plugins/publish/submit_maya_muster.py

@@ -11,7 +11,7 @@
 from openpype.lib import requests_post
 from openpype.hosts.maya.api import lib
 from openpype.pipeline import legacy_io
-from openpype.api import get_system_settings
+from openpype.settings import get_system_settings
 
 
 # mapping between Maya renderer names and Muster template ids

openpype/hosts/maya/startup/userSetup.py

@@ -1,5 +1,5 @@
 import os
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import install_host
 from openpype.hosts.maya.api import MayaHost
 from maya import cmds

openpype/hosts/nuke/api/pipeline.py

@@ -7,9 +7,7 @@
 import pyblish.api
 
 import openpype
-from openpype.api import (
- get_current_project_settings
-)
+from openpype.settings import get_current_project_settings
 from openpype.lib import register_event_callback, Logger
 from openpype.pipeline import (
  register_loader_plugin_path,

openpype/hosts/nuke/api/plugin.py

@@ -6,7 +6,7 @@
 
 import nuke
 
-from openpype.api import get_current_project_settings
+from openpype.settings import get_current_project_settings
 from openpype.pipeline import (
  LegacyCreator,
  LoaderPlugin,

openpype/hosts/resolve/api/plugin.py

@@ -504,7 +504,7 @@ class Creator(LegacyCreator):
 
  def __init__(self, *args, **kwargs):
  super(Creator, self).__init__(*args, **kwargs)
- from openpype.api import get_current_project_settings
+ from openpype.settings import get_current_project_settings
  resolve_p_settings = get_current_project_settings().get("resolve")
  self.presets = {}
  if resolve_p_settings:

openpype/hosts/traypublisher/plugins/create/create_from_settings.py

@@ -1,6 +1,6 @@
 import os
 from openpype.lib import Logger
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 
 log = Logger.get_logger(__name__)
 

openpype/hosts/tvpaint/api/pipeline.py

@@ -10,7 +10,7 @@
 
 from openpype.client import get_project, get_asset_by_name
 from openpype.hosts import tvpaint
-from openpype.api import get_current_project_settings
+from openpype.settings import get_current_project_settings
 from openpype.lib import register_event_callback
 from openpype.pipeline import (
  legacy_io,

openpype/hosts/unreal/plugins/load/load_layout.py

@@ -24,7 +24,7 @@
  legacy_io,
 )
 from openpype.pipeline.context_tools import get_current_project_asset
-from openpype.api import get_current_project_settings
+from openpype.settings import get_current_project_settings
 from openpype.hosts.unreal.api import plugin
 from openpype.hosts.unreal.api import pipeline as unreal_pipeline
 

openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py

@@ -18,7 +18,7 @@
  tool_definitions_from_app_manager
 )
 
-from openpype.api import get_system_settings
+from openpype.settings import get_system_settings
 from openpype.lib import ApplicationManager
 
 """

openpype/modules/ftrack/launch_hooks/post_ftrack_changes.py

@@ -1,7 +1,7 @@
 import os
 
 import ftrack_api
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.lib import PostLaunchHook
 
 

openpype/modules/job_queue/module.py

@@ -43,7 +43,7 @@
 
 import click
 from openpype.modules import OpenPypeModule
-from openpype.api import get_system_settings
+from openpype.settings import get_system_settings
 
 
 class JobQueueModule(OpenPypeModule):

openpype/modules/kitsu/utils/update_zou_with_op.py

@@ -12,7 +12,7 @@
  get_assets,
 )
 from openpype.pipeline import AvalonMongoDB
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.modules.kitsu.utils.credentials import validate_credentials
 
 

openpype/modules/shotgrid/lib/settings.py

@@ -1,4 +1,4 @@
-from openpype.api import get_system_settings, get_project_settings
+from openpype.settings import get_system_settings, get_project_settings
 from openpype.modules.shotgrid.lib.const import MODULE_NAME
 
 

openpype/plugins/publish/collect_settings.py

@@ -1,5 +1,8 @@
 from pyblish import api
-from openpype.api import get_current_project_settings, get_system_settings
+from openpype.settings import (
+ get_current_project_settings,
+ get_system_settings,
+)
 
 
 class CollectSettings(api.ContextPlugin):

openpype/tools/creator/window.py

@@ -6,7 +6,7 @@
 
 from openpype.client import get_asset_by_name, get_subsets
 from openpype import style
-from openpype.api import get_current_project_settings
+from openpype.settings import get_current_project_settings
 from openpype.tools.utils.lib import qt_app_context
 from openpype.pipeline import legacy_io
 from openpype.pipeline.create import (

openpype/tools/pyblish_pype/control.py

@@ -22,7 +22,7 @@
 from . import util
 from .constants import InstanceStates
 
-from openpype.api import get_project_settings
+from openpype.settings import get_current_project_settings
 
 
 class IterationBreak(Exception):
@@ -204,7 +204,7 @@ def current_state(self):
 
  def presets_by_hosts(self):
  # Get global filters as base
- presets = get_project_settings(os.environ['AVALON_PROJECT']) or {}
+ presets = get_current_project_settings()
  if not presets:
  return {}
 

openpype/tools/pyblish_pype/model.py

@@ -34,7 +34,7 @@
 from six import text_type
 from .constants import PluginStates, InstanceStates, GroupStates, Roles
 
-from openpype.api import get_system_settings
+from openpype.settings import get_system_settings
 
 
 # ItemTypes

openpype/tools/settings/local_settings/window.py

@@ -2,17 +2,17 @@
 
 from openpype import style
 
+from openpype.settings import (
+ SystemSettings,
+ ProjectSettings
+)
 from openpype.settings.lib import (
  get_local_settings,
  save_local_settings
 )
 from openpype.lib import Logger
 from openpype.tools.settings import CHILD_OFFSET
 from openpype.tools.utils import MessageOverlayObject
-from openpype.api import (
- SystemSettings,
- ProjectSettings
-)
 from openpype.modules import ModulesManager
 
 from .widgets import (

openpype/tools/utils/lib.py

@@ -17,7 +17,7 @@
 )
 from openpype.resources import get_image_path
 from openpype.lib import filter_profiles, Logger
-from openpype.api import get_project_settings
+from openpype.settings import get_project_settings
 from openpype.pipeline import registered_host
 
 log = Logger.get_logger(__name__)

openpype/widgets/password_dialog.py

@@ -3,7 +3,7 @@
 from openpype import style
 from openpype.resources import get_resource
 
-from openpype.api import get_system_settings
+from openpype.settings import get_system_settings
 from openpype.settings.lib import (
  get_local_settings,
  save_local_settings