Cleanup multiple lib imports + reduce importing of specific functions

Author: BigRoy

avalon/tools/creator/app.py

@@ -1,11 +1,11 @@
-
 import sys
 import inspect
 
 from ...vendor.Qt import QtWidgets, QtCore, QtGui
 from ...vendor import qtawesome
 from ...vendor import six
 from ... import api, io, style
+
 from .. import lib
 
 module = sys.modules[__name__]

avalon/tools/loader/app.py

@@ -1,19 +1,13 @@
 import sys
 import time
 
-from ..models import AssetModel
-from ..widgets import AssetWidget
-from ..lib import preserve_selection
-
 from ...vendor.Qt import QtWidgets, QtCore
 from ... import api, io, style
+
+from ..models import AssetModel
+from ..widgets import AssetWidget
 from .. import lib
 
-from ..lib import (
-    refresh_family_config_cache,
-    refresh_group_config_cache,
-    get_active_group_config
-)
 from .widgets import SubsetWidget, VersionWidget, FamilyListWidget
 
 module = sys.modules[__name__]
@@ -356,8 +350,8 @@ def _build_menu(self):
         if group:
             group.deleteLater()
 
-        active_groups = get_active_group_config(self.asset_id,
-                                                include_predefined=True)
+        active_groups = lib.get_active_group_config(self.asset_id,
+                                                    include_predefined=True)
         # Build new action group
         group = QtWidgets.QActionGroup(button)
         for data in sorted(active_groups, key=lambda x: x["order"]):
@@ -378,8 +372,8 @@ def on_group(self):
         name = self.name.text().strip()
         self.subsets.group_subsets(name, self.asset_id, self.items)
 
-        with preserve_selection(tree_view=self.subsets.view,
-                                current_index=False):
+        with lib.preserve_selection(tree_view=self.subsets.view,
+                                    current_index=False):
             self.grouped.emit()
             self.close()
 
@@ -433,8 +427,8 @@ def show(debug=False, parent=None, use_context=False):
     with lib.application():
 
         # TODO: Global state, remove these
-        refresh_family_config_cache()
-        refresh_group_config_cache()
+        lib.refresh_family_config_cache()
+        lib.refresh_group_config_cache()
 
         window = Window(parent)
         window.setStyleSheet(style.load_stylesheet())

avalon/tools/loader/model.py

@@ -3,7 +3,7 @@
 from ...vendor import qtawesome
 
 from ..models import TreeModel, Item
-from .. import lib as tools_lib
+from .. import lib
 
 
 def is_filtering_recursible():
@@ -112,7 +112,7 @@ def set_version(self, index, version):
 
         families = version_data.get("families", [None])
         family = families[0]
-        family_config = tools_lib.get_family_cached_config(family)
+        family_config = lib.get_family_cached_config(family)
 
         item.update({
             "version": version["name"],
@@ -141,7 +141,7 @@ def refresh(self):
 
         asset_id = self._asset_id
 
-        active_groups = tools_lib.get_active_group_config(asset_id)
+        active_groups = lib.get_active_group_config(asset_id)
 
         # Generate subset group nodes
         group_items = dict()
@@ -344,7 +344,7 @@ def filterAcceptsRow(self, row=0, parent=QtCore.QModelIndex()):
 
         filterable_families = set()
         for name in families:
-            family_config = tools_lib.get_family_cached_config(name)
+            family_config = lib.get_family_cached_config(name)
             if not family_config.get("hideFilter"):
                 filterable_families.add(name)
 

avalon/tools/loader/widgets.py

@@ -8,7 +8,6 @@
 from ... import api
 from ... import pipeline
 
-from ..lib import preserve_selection
 from .. import lib as tools_lib
 from ..delegates import VersionDelegate
 
@@ -122,8 +121,8 @@ def is_groupable(self):
         return self.data["state"]["groupable"].checkState()
 
     def set_grouping(self, state):
-        with preserve_selection(tree_view=self.view,
-                                current_index=False):
+        with tools_lib.preserve_selection(tree_view=self.view,
+                                          current_index=False):
             self.model.set_grouping(state)
 
     def on_context_menu(self, point):

avalon/tools/projectmanager/app.py

@@ -3,7 +3,7 @@
 from ...vendor.Qt import QtWidgets, QtCore
 from ... import io, schema, api, style
 
-from .. import lib as parentlib
+from .. import lib as tools_lib
 from ..widgets import AssetWidget
 from ..models import TasksModel
 
@@ -231,7 +231,7 @@ def show(root=None, debug=False, parent=None):
     if debug is True:
         io.install()
 
-    with parentlib.application():
+    with tools_lib.application():
         window = Window(parent)
         window.setStyleSheet(style.load_stylesheet())
         window.show()

avalon/tools/sceneinventory/app.py

@@ -8,12 +8,6 @@
 from ... import io, api, style
 
 from .. import lib as tools_lib
-from ..lib import (
-    iter_model_rows,
-    preserve_expanded_rows,
-    preserve_selection,
-    refresh_family_config_cache
-)
 from ..delegates import VersionDelegate
 
 from .proxy import FilterProxyModel
@@ -248,7 +242,7 @@ def select_items_by_action(self, object_names, options=None):
             "toggle": selection_model.Toggle,
         }[options.get("mode", "select")]
 
-        for item in iter_model_rows(model, 0):
+        for item in tools_lib.iter_model_rows(model, 0):
             node = item.data(InventoryModel.ItemRole)
             if node.get("isGroupNode"):
                 continue
@@ -903,14 +897,14 @@ def __init__(self, parent=None):
         self.view.setColumnWidth(3, 150)  # family
         self.view.setColumnWidth(4, 100)  # namespace
 
-        refresh_family_config_cache()
+        tools_lib.refresh_family_config_cache()
 
     def refresh(self):
-        with preserve_expanded_rows(tree_view=self.view,
-                                    role=self.model.UniqueRole):
-            with preserve_selection(tree_view=self.view,
-                                    role=self.model.UniqueRole,
-                                    current_index=False):
+        with tools_lib.preserve_expanded_rows(tree_view=self.view,
+                                              role=self.model.UniqueRole):
+            with tools_lib.preserve_selection(tree_view=self.view,
+                                              role=self.model.UniqueRole,
+                                              current_index=False):
                 if self.view._hierarchy_view:
                     self.model.refresh(selected=self.view._selected)
                 else:

avalon/tools/sceneinventory/lib.py

@@ -74,8 +74,7 @@ def switch_item(container,
 
 
 def walk_hierarchy(node):
-    """Recursively yield group node
-    """
+    """Recursively yield group node"""
     for child in node.children():
         if child.get("isGroupNode"):
             yield child

avalon/tools/sceneinventory/model.py

@@ -9,7 +9,7 @@
 from .. import lib as tools_lib
 from ..models import TreeModel, Item
 
-from .lib import walk_hierarchy
+from . import lib
 
 
 class InventoryModel(TreeModel):
@@ -56,15 +56,15 @@ def data(self, index, role):
                     if self._hierarchy_view:
                         # If current group is not outdated, check if any
                         # outdated children.
-                        for _node in walk_hierarchy(item):
+                        for _node in lib.walk_hierarchy(item):
                             if outdated(_node):
                                 return self.CHILD_OUTDATED_COLOR
                 else:
 
                     if self._hierarchy_view:
                         # Although this is not a group item, we still need
                         # to distinguish which one contain outdated child.
-                        for _node in walk_hierarchy(item):
+                        for _node in lib.walk_hierarchy(item):
                             if outdated(_node):
                                 return self.CHILD_OUTDATED_COLOR.darker(150)
 

avalon/tools/sceneinventory/proxy.py

@@ -2,7 +2,7 @@
 
 from ...vendor.Qt import QtCore
 
-from .lib import walk_hierarchy
+from . import lib
 
 
 class FilterProxyModel(QtCore.QSortFilterProxyModel):
@@ -99,7 +99,7 @@ def outdated(node):
             return True
 
         elif self._hierarchy_view:
-            for _node in walk_hierarchy(node):
+            for _node in lib.walk_hierarchy(node):
                 if outdated(_node):
                     return True
             return False

avalon/tools/widgets.py

@@ -1,10 +1,7 @@
 import logging
 
-from .lib import (
-    preserve_expanded_rows,
-    preserve_selection,
-    iter_model_rows
-)
+from . import lib
+
 from .models import AssetModel, RecursiveSortFilterProxyModel
 from .views import DeselectableTreeView
 from ..vendor import qtawesome
@@ -97,12 +94,12 @@ def _on_silo_changed(self):
     def _refresh_model(self):
 
         silo = self.get_current_silo()
-        with preserve_expanded_rows(self.view,
-                                    column=0,
-                                    role=self.model.ObjectIdRole):
-            with preserve_selection(self.view,
-                                    column=0,
-                                    role=self.model.ObjectIdRole):
+        with lib.preserve_expanded_rows(self.view,
+                                        column=0,
+                                        role=self.model.ObjectIdRole):
+            with lib.preserve_selection(self.view,
+                                        column=0,
+                                        role=self.model.ObjectIdRole):
                 self.model.set_silo(silo)
 
         self.assets_refreshed.emit()
@@ -158,9 +155,9 @@ def select_assets(self, assets, expand=True):
 
         # Select
         mode = selection_model.Select | selection_model.Rows
-        for index in iter_model_rows(self.proxy,
-                                     column=0,
-                                     include_root=False):
+        for index in lib.iter_model_rows(self.proxy,
+                                         column=0,
+                                         include_root=False):
             data = index.data(self.model.ItemRole)
             name = data["name"]
             if name in assets: