replaced avalon imports in hiero

openpype/hosts/hiero/api/lib.py

@@ -12,8 +12,7 @@ import hiero
 from Qt import QtWidgets
 from bson.objectid import ObjectId
 
-import avalon.api as avalon
-import avalon.io
+from openpype.pipeline import legacy_io
 from openpype.api import (Logger, Anatomy, get_anatomy_settings)
 from . import tags
 
@@ -383,7 +382,7 @@ def get_publish_attribute(tag):
 
 def sync_avalon_data_to_workfile():
     # import session to get project dir
-    project_name = avalon.Session["AVALON_PROJECT"]
+    project_name = legacy_io.Session["AVALON_PROJECT"]
 
     anatomy = Anatomy(project_name)
     work_template = anatomy.templates["work"]["path"]
@@ -408,7 +407,7 @@ def sync_avalon_data_to_workfile():
         project.setProjectRoot(active_project_root)
 
     # get project data from avalon db
-    project_doc = avalon.io.find_one({"type": "project"})
+    project_doc = legacy_io.find_one({"type": "project"})
     project_data = project_doc["data"]
 
     log.debug("project_data: {}".format(project_data))
@@ -994,7 +993,6 @@ def check_inventory_versions():
     it to red.
     """
     from . import parse_container
-    from avalon import io
 
     # presets
     clip_color_last = "green"
@@ -1006,19 +1004,19 @@ def check_inventory_versions():
 
         if container:
             # get representation from io
-            representation = io.find_one({
+            representation = legacy_io.find_one({
                 "type": "representation",
                 "_id": ObjectId(container["representation"])
             })
 
             # Get start frame from version data
-            version = io.find_one({
+            version = legacy_io.find_one({
                 "type": "version",
                 "_id": representation["parent"]
             })
 
             # get all versions in list
-            versions = io.find({
+            versions = legacy_io.find({
                 "type": "version",
                 "parent": version["parent"]
             }).distinct('name')

openpype/hosts/hiero/api/menu.py

@@ -1,14 +1,16 @@
 import os
 import sys
+
 import hiero.core
-from openpype.api import Logger
-from openpype.tools.utils import host_tools
-from avalon.api import Session
 from hiero.ui import findMenuAction
 
+from openpype.api import Logger
+from openpype.pipeline import legacy_io
+from openpype.tools.utils import host_tools
+
 from . import tags
 
-log = Logger().get_logger(__name__)
+log = Logger.get_logger(__name__)
 
 self = sys.modules[__name__]
 self._change_context_menu = None
@@ -24,8 +26,10 @@ def update_menu_task_label():
         log.warning("Can't find menuItem: {}".format(object_name))
         return
 
-    label = "{}, {}".format(Session["AVALON_ASSET"],
-                            Session["AVALON_TASK"])
+    label = "{}, {}".format(
+        legacy_io.Session["AVALON_ASSET"],
+        legacy_io.Session["AVALON_TASK"]
+    )
 
     menu = found_menu.menu()
     self._change_context_menu = label
@@ -51,7 +55,8 @@ def menu_install():
     menu_name = os.environ['AVALON_LABEL']
 
     context_label = "{0}, {1}".format(
-        Session["AVALON_ASSET"], Session["AVALON_TASK"]
+        legacy_io.Session["AVALON_ASSET"],
+        legacy_io.Session["AVALON_TASK"]
     )
 
     self._change_context_menu = context_label

openpype/hosts/hiero/api/tags.py

@@ -3,9 +3,9 @@ import os
 import hiero
 
 from openpype.api import Logger
-from avalon import io
+from openpype.pipeline import legacy_io
 
-log = Logger().get_logger(__name__)
+log = Logger.get_logger(__name__)
 
 
 def tag_data():
@@ -141,7 +141,7 @@ def add_tags_to_workfile():
     nks_pres_tags = tag_data()
 
     # Get project task types.
-    tasks = io.find_one({"type": "project"})["config"]["tasks"]
+    tasks = legacy_io.find_one({"type": "project"})["config"]["tasks"]
     nks_pres_tags["[Tasks]"] = {}
     log.debug("__ tasks: {}".format(tasks))
     for task_type in tasks.keys():
@@ -159,7 +159,7 @@ def add_tags_to_workfile():
     # asset builds and shots.
     if int(os.getenv("TAG_ASSETBUILD_STARTUP", 0)) == 1:
         nks_pres_tags["[AssetBuilds]"] = {}
-        for asset in io.find({"type": "asset"}):
+        for asset in legacy_io.find({"type": "asset"}):
             if asset["data"]["entityType"] == "AssetBuild":
                 nks_pres_tags["[AssetBuilds]"][asset["name"]] = {
                     "editable": "1",

openpype/hosts/hiero/plugins/load/load_clip.py

@@ -1,5 +1,7 @@
-from avalon import io
-from openpype.pipeline import get_representation_path
+from openpype.pipeline import (
+    legacy_io,
+    get_representation_path,
+)
 import openpype.hosts.hiero.api as phiero
 # from openpype.hosts.hiero.api import plugin, lib
 # reload(lib)
@@ -105,7 +107,7 @@ class LoadClip(phiero.SequenceLoader):
         namespace = container['namespace']
         track_item = phiero.get_track_items(
             track_item_name=namespace)
-        version = io.find_one({
+        version = legacy_io.find_one({
             "type": "version",
             "_id": representation["parent"]
         })
@@ -174,7 +176,7 @@ class LoadClip(phiero.SequenceLoader):
         # define version name
         version_name = version.get("name", None)
         # get all versions in list
-        versions = io.find({
+        versions = legacy_io.find({
             "type": "version",
             "parent": version["parent"]
         }).distinct('name')

openpype/hosts/hiero/plugins/publish/precollect_workfile.py

@@ -1,12 +1,15 @@
 import os
-import pyblish.api
-import hiero.ui
-from openpype.hosts.hiero import api as phiero
-from avalon import api as avalon
-from pprint import pformat
-from openpype.hosts.hiero.api.otio import hiero_export
-from Qt.QtGui import QPixmap
 import tempfile
+from pprint import pformat
+
+import pyblish.api
+from Qt.QtGui import QPixmap
+
+import hiero.ui
+
+from openpype.pipeline import legacy_io
+from openpype.hosts.hiero import api as phiero
+from openpype.hosts.hiero.api.otio import hiero_export
 
 
 class PrecollectWorkfile(pyblish.api.ContextPlugin):
@@ -17,7 +20,7 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
 
     def process(self, context):
 
-        asset = avalon.Session["AVALON_ASSET"]
+        asset = legacy_io.Session["AVALON_ASSET"]
         subset = "workfile"
         project = phiero.get_current_project()
         active_timeline = hiero.ui.activeSequence()

openpype/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py

@@ -1,5 +1,5 @@
 from pyblish import api
-from avalon import io
+from openpype.pipeline import legacy_io
 
 
 class CollectAssetBuilds(api.ContextPlugin):
@@ -18,7 +18,7 @@ class CollectAssetBuilds(api.ContextPlugin):
 
     def process(self, context):
         asset_builds = {}
-        for asset in io.find({"type": "asset"}):
+        for asset in legacy_io.find({"type": "asset"}):
             if asset["data"]["entityType"] == "AssetBuild":
                 self.log.debug("Found \"{}\" in database.".format(asset))
                 asset_builds[asset["name"]] = asset

openpype/hosts/hiero/plugins/publish_old_workflow/precollect_workfile.py

@@ -1,7 +1,7 @@
 import os
 import pyblish.api
 from openpype.hosts.hiero import api as phiero
-from avalon import api as avalon
+from openpype.pipeline import legacy_io
 
 
 class PreCollectWorkfile(pyblish.api.ContextPlugin):
@@ -11,7 +11,7 @@ class PreCollectWorkfile(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder - 0.51
 
     def process(self, context):
-        asset = avalon.Session["AVALON_ASSET"]
+        asset = legacy_io.Session["AVALON_ASSET"]
         subset = "workfile"
 
         project = phiero.get_current_project()