removed get_project/asset_data methods

pype/api.py

@@ -22,14 +22,11 @@ from .lib import (
     version_up,
     get_handle_irregular,
     get_asset,
-    get_asset_data,
     get_project,
-    get_project_data,
     get_hierarchy,
     get_version_from_path,
     modified_environ,
-    add_tool_to_environment,
-    get_data_hierarchical_attr
+    add_tool_to_environment
 )
 
 __all__ = [
@@ -50,13 +47,10 @@ __all__ = [
 
     # get contextual data
     "get_handle_irregular",
-    "get_project_data",
-    "get_asset_data",
     "get_project",
     "get_hierarchy",
     "get_asset",
     "get_version_from_path"
     "modified_environ",
-    "add_tool_to_environment",
-    "get_data_hierarchical_attr"
+    "add_tool_to_environment"
 ]

pype/lib.py

@@ -15,14 +15,6 @@ import avalon
 log = logging.getLogger(__name__)
 
 
-def get_handle_irregular(asset):
-    data = asset["data"]
-    handle_start = data.get("handle_start", 0)
-    handle_end = data.get("handle_end", 0)
-    return (handle_start, handle_end)
-
-
-
 def get_hierarchy(asset_name=None):
     """
     Obtain asset hierarchy path string from mongo db
@@ -302,29 +294,6 @@ def _get_host_name():
     return _host.__name__.rsplit(".", 1)[-1]
 
 
-def get_project_data():
-    """Get the data of the current project
-
-    The data of the project can contain things like:
-        resolution
-        fps
-        renderer
-
-    Returns:
-        dict:
-
-    """
-
-    project_name = io.active_project()
-    project = io.find_one({"name": project_name,
-                           "type": "project"},
-                          projection={"data": True})
-
-    data = project.get("data", {})
-
-    return data
-
-
 def get_asset(asset_name=None):
     entity_data_keys_from_project_when_miss = [
         "fstart", "fend", "handle_start", "handle_end", "fps",
@@ -406,23 +375,6 @@ def get_project():
     return io.find_one({"type": "project"})
 
 
-def get_asset_data(asset=None):
-    """Get the data from the current asset
-
-    Args:
-        asset(str, Optional): name of the asset, eg:
-
-    Returns:
-        dict
-    """
-    asset_name = asset or avalon.api.Session["AVALON_ASSET"]
-    document = io.find_one({"name": asset_name,
-                            "type": "asset"})
-    data = document.get("data", {})
-
-    return data
-
-
 def get_version_from_path(file):
     """
     Finds version number in file path string
@@ -445,23 +397,6 @@ def get_version_from_path(file):
         )
 
 
-def get_data_hierarchical_attr(entity, attr_name):
-    vp_attr = 'visualParent'
-    data = entity['data']
-    value = data.get(attr_name, None)
-    if value is not None:
-        return value
-    elif vp_attr in data:
-        if data[vp_attr] is None:
-            parent_id = entity['parent']
-        else:
-            parent_id = data[vp_attr]
-        parent = io.find_one({"_id": parent_id})
-        return get_data_hierarchical_attr(parent, attr_name)
-    else:
-        return None
-
-
 def get_avalon_database():
     if io._database is None:
         set_io_database()

pype/maya/lib.py

@@ -1858,8 +1858,8 @@ def set_context_settings():
 
     # Todo (Wijnand): apply renderer and resolution of project
 
-    project_data = lib.get_project_data()
-    asset_data = lib.get_asset_data()
+    project_data = lib.get_project()["data"]
+    asset_data = lib.get_asset()["data"]
 
     # Set project fps
     fps = asset_data.get("fps", project_data.get("fps", 25))

pype/nuke/lib.py

@@ -369,7 +369,9 @@ def reset_frame_range_handles():
 
     # get handles values
     handles = avalon.nuke.get_handles(asset)
-    handle_start, handle_end = pype.get_handle_irregular(asset)
+    asset_entity = pype.get_asset(asset)
+    handle_start = asset_entity["data"]["handle_start"]
+    handle_end = asset_entity["data"]["handle_end"]
 
     fps = asset["data"]["fps"]
     edit_in = int(asset["data"]["fstart"]) - handle_start

pype/nukestudio/lib.py

@@ -46,7 +46,7 @@ def set_workfiles():
         project.setProjectRoot(active_project_root)
 
     # get project data from avalon db
-    project_data = pype.get_project_data()
+    project_data = pype.get_project()["data"]
 
     log.info("project_data: {}".format(project_data))
 

pype/plugins/aport/publish/collect_context.py

@@ -87,13 +87,13 @@ class CollectContextDataFromAport(pyblish.api.ContextPlugin):
         context.data["currentFile"] = current_file
 
         # get project data from avalon
-        project_data = pype.get_project_data()
+        project_data = pype.get_project()["data"]
         assert project_data, "No `project_data` data in avalon db"
         context.data["projectData"] = project_data
         self.log.debug("project_data: {}".format(project_data))
 
         # get asset data from avalon and fix all paths
-        asset_data = pype.get_asset_data()
+        asset_data = pype.get_asset()["data"]
         assert asset_data, "No `asset_data` data in avalon db"
         asset_data = {k: v.replace("\\", "/") for k, v in asset_data.items()
                       if isinstance(v, str)}

pype/plugins/aport/publish/collect_instances.py

@@ -39,15 +39,14 @@ class CollectInstancesFromJson(pyblish.api.ContextPlugin):
         assert instances_data, "No `asset_default` data in json file"
 
         asset_name = a_session["AVALON_ASSET"]
-        entity = io.find_one({"name": asset_name,
-                              "type": "asset"})
+        entity = pype.get_asset(asset_name)
 
         # get frame start > first try from asset data
         frame_start = context.data["assetData"].get("fstart", None)
         if not frame_start:
             self.log.debug("frame_start not on assetData")
             # get frame start > second try from parent data
-            frame_start = pype.get_data_hierarchical_attr(entity, "fstart")
+            frame_start = entity["data"]["fstart"]
             if not frame_start:
                 self.log.debug("frame_start not on any parent entity")
                 # get frame start > third try from parent data
@@ -61,7 +60,7 @@ class CollectInstancesFromJson(pyblish.api.ContextPlugin):
         handles = context.data["assetData"].get("handles", None)
         if not handles:
             # get frame start > second try from parent data
-            handles = pype.get_data_hierarchical_attr(entity, "handles")
+            handles = entity["data"]["handles"]
             if not handles:
                 # get frame start > third try from parent data
                 handles = asset_default["handles"]

pype/plugins/global/publish/collect_project_data.py

@@ -12,6 +12,6 @@ class CollectProjectData(pyblish.api.ContextPlugin):
 
     def process(self, context):
         # get project data from avalon db
-        context.data["projectData"] = pype.get_project_data()
+        context.data["projectData"] = pype.get_project()["data"]
 
         return