Feature #664 3.0 lib refactor

docs/source/pype.rst

@@ -11,7 +11,6 @@ Subpackages
 
 .. toctree::
 
- pype.aport
  pype.avalon_apps
  pype.clockify
  pype.ftrack

pype/api.py

@@ -39,13 +39,9 @@
 from .lib import (
  version_up,
  get_asset,
- get_project,
  get_hierarchy,
- get_subsets,
  get_version_from_path,
  get_last_version_from_path,
- modified_environ,
- add_tool_to_environment,
  source_hash,
  get_latest_version
 )
@@ -88,14 +84,10 @@
 
  # get contextual data
  "version_up",
- "get_project",
  "get_hierarchy",
  "get_asset",
- "get_subsets",
  "get_version_from_path",
  "get_last_version_from_path",
- "modified_environ",
- "add_tool_to_environment",
  "source_hash",
 
  "subprocess",

pype/hosts/fusion/lib.py

@@ -2,7 +2,7 @@
 
 from avalon.vendor.Qt import QtGui
 import avalon.fusion
-
+from avalon import io
 
 self = sys.modules[__name__]
 self._project = None
@@ -59,3 +59,84 @@ def get_additional_data(container):
  return {"color": QtGui.QColor.fromRgbF(tile_color["R"],
  tile_color["G"],
  tile_color["B"])}
+
+
+def switch_item(container,
+ asset_name=None,
+ subset_name=None,
+ representation_name=None):
+ """Switch container asset, subset or representation of a container by name.
+
+ It'll always switch to the latest version - of course a different
+ approach could be implemented.
+
+ Args:
+ container (dict): data of the item to switch with
+ asset_name (str): name of the asset
+ subset_name (str): name of the subset
+ representation_name (str): name of the representation
+
+ Returns:
+ dict
+
+ """
+
+ if all(not x for x in [asset_name, subset_name, representation_name]):
+ raise ValueError("Must have at least one change provided to switch.")
+
+ # Collect any of current asset, subset and representation if not provided
+ # so we can use the original name from those.
+ if any(not x for x in [asset_name, subset_name, representation_name]):
+ _id = io.ObjectId(container["representation"])
+ representation = io.find_one({"type": "representation", "_id": _id})
+ version, subset, asset, project = io.parenthood(representation)
+
+ if asset_name is None:
+ asset_name = asset["name"]
+
+ if subset_name is None:
+ subset_name = subset["name"]
+
+ if representation_name is None:
+ representation_name = representation["name"]
+
+ # Find the new one
+ asset = io.find_one({
+ "name": asset_name,
+ "type": "asset"
+ })
+ assert asset, ("Could not find asset in the database with the name "
+ "'%s'" % asset_name)
+
+ subset = io.find_one({
+ "name": subset_name,
+ "type": "subset",
+ "parent": asset["_id"]
+ })
+ assert subset, ("Could not find subset in the database with the name "
+ "'%s'" % subset_name)
+
+ version = io.find_one(
+ {
+ "type": "version",
+ "parent": subset["_id"]
+ },
+ sort=[('name', -1)]
+ )
+
+ assert version, "Could not find a version for {}.{}".format(
+ asset_name, subset_name
+ )
+
+ representation = io.find_one({
+ "name": representation_name,
+ "type": "representation",
+ "parent": version["_id"]}
+ )
+
+ assert representation, ("Could not find representation in the database "
+ "with the name '%s'" % representation_name)
+
+ avalon.api.switch(container, representation)
+
+ return representation

pype/hosts/fusion/scripts/fusion_switch_shot.py

@@ -234,7 +234,7 @@ def switch(asset_name, filepath=None, new=True):
  representations = []
  for container in containers:
  try:
- representation = pype.switch_item(
+ representation = fusion_lib.switch_item(
  container,
  asset_name=asset_name)
  representations.append(representation)

pype/hosts/hiero/lib.py

@@ -4,6 +4,7 @@
 import hiero
 import pyblish.api
 import avalon.api as avalon
+import avalon.io
 from avalon.vendor.Qt import (QtWidgets, QtGui)
 import pype.api as pype
 from pype.api import Logger, Anatomy
@@ -58,7 +59,8 @@ def sync_avalon_data_to_workfile():
  project.setProjectRoot(active_project_root)
 
  # get project data from avalon db
- project_data = pype.get_project()["data"]
+ project_doc = avalon.io.find_one({"type": "project"})
+ project_data = project_doc["data"]
 
  log.debug("project_data: {}".format(project_data))
 

pype/hosts/maya/lib.py

@@ -8,6 +8,7 @@
 import bson
 import json
 import logging
+import itertools
 import contextlib
 from collections import OrderedDict, defaultdict
 from math import ceil
@@ -122,6 +123,12 @@ def float_round(num, places=0, direction=ceil):
  return direction(num * (10**places)) / float(10**places)
 
 
+def pairwise(iterable):
+ """s -> (s0,s1), (s2,s3), (s4, s5), ..."""
+ a = iter(iterable)
+ return itertools.izip(a, a)
+
+
 def unique(name):
  assert isinstance(name, string_types), "`name` must be string"
 
@@ -419,12 +426,12 @@ def empty_sets(sets, force=False):
  plugs=True,
  connections=True) or []
  original_connections.extend(connections)
- for dest, src in lib.pairwise(connections):
+ for dest, src in pairwise(connections):
  cmds.disconnectAttr(src, dest)
  yield
  finally:
 
- for dest, src in lib.pairwise(original_connections):
+ for dest, src in pairwise(original_connections):
  cmds.connectAttr(src, dest)
 
  # Restore original members
@@ -1857,8 +1864,8 @@ def set_context_settings():
  """
 
  # Todo (Wijnand): apply renderer and resolution of project
-
- project_data = lib.get_project()["data"]
+ project_doc = io.find_one({"type": "project"})
+ project_data = project_doc["data"]
  asset_data = lib.get_asset()["data"]
 
  # Set project fps

pype/hosts/nuke/lib.py

@@ -195,7 +195,7 @@ def format_anatomy(data):
  if not version:
  file = script_name()
  data["version"] = pype.get_version_from_path(file)
- project_document = pype.get_project()
+ project_document = io.find_one({"type": "project"})
  data.update({
  "subset": data["avalon"]["subset"],
  "asset": data["avalon"]["asset"],