modified plugins

openpype/hosts/tvpaint/plugins/create/create_render_layer.py

@@ -1,11 +1,12 @@
 from avalon.api import CreatorError
-from avalon.tvpaint import (
+
+from openpype.lib import prepare_template_data
+from openpype.hosts.tvpaint.api import (
+    plugin,
     pipeline,
     lib,
     CommunicationWrapper
 )
-from openpype.hosts.tvpaint.api import plugin
-from openpype.lib import prepare_template_data
 
 
 class CreateRenderlayer(plugin.Creator):
@@ -56,7 +57,7 @@ class CreateRenderlayer(plugin.Creator):
         # Validate that communication is initialized
         if CommunicationWrapper.communicator:
             # Get currently selected layers
-            layers_data = lib.layers_data()
+            layers_data = lib.get_layers_data()
 
             selected_layers = [
                 layer
@@ -75,7 +76,7 @@ class CreateRenderlayer(plugin.Creator):
     def process(self):
         self.log.debug("Query data from workfile.")
         instances = pipeline.list_instances()
-        layers_data = lib.layers_data()
+        layers_data = lib.get_layers_data()
 
         self.log.debug("Checking for selection groups.")
         # Collect group ids from selection
@@ -102,7 +103,7 @@ class CreateRenderlayer(plugin.Creator):
         self.log.debug(f"Selected group id is \"{group_id}\".")
         self.data["group_id"] = group_id
 
-        group_data = lib.groups_data()
+        group_data = lib.get_groups_data()
         group_name = None
         for group in group_data:
             if group["group_id"] == group_id:
@@ -169,7 +170,7 @@ class CreateRenderlayer(plugin.Creator):
             return
 
         self.log.debug("Querying groups data from workfile.")
-        groups_data = lib.groups_data()
+        groups_data = lib.get_groups_data()
 
         self.log.debug("Changing name of the group.")
         selected_group = None

openpype/hosts/tvpaint/plugins/create/create_render_pass.py

@@ -1,11 +1,11 @@
 from avalon.api import CreatorError
-from avalon.tvpaint import (
+from openpype.lib import prepare_template_data
+from openpype.hosts.tvpaint.api import (
+    plugin,
     pipeline,
     lib,
     CommunicationWrapper
 )
-from openpype.hosts.tvpaint.api import plugin
-from openpype.lib import prepare_template_data
 
 
 class CreateRenderPass(plugin.Creator):

openpype/hosts/tvpaint/plugins/load/load_image.py

@@ -1,8 +1,8 @@
 from avalon.vendor import qargparse
-from avalon.tvpaint import lib, pipeline
+from openpype.hosts.tvpaint.api import lib, plugin
 
 
-class ImportImage(pipeline.Loader):
+class ImportImage(plugin.Loader):
     """Load image or image sequence to TVPaint as new layer."""
 
     families = ["render", "image", "background", "plate"]

openpype/hosts/tvpaint/plugins/load/load_reference_image.py

@@ -1,10 +1,10 @@
 import collections
 from avalon.pipeline import get_representation_context
 from avalon.vendor import qargparse
-from avalon.tvpaint import lib, pipeline
+from openpype.hosts.tvpaint.api import lib, pipeline, plugin
 
 
-class LoadImage(pipeline.Loader):
+class LoadImage(plugin.Loader):
     """Load image or image sequence to TVPaint as new layer."""
 
     families = ["render", "image", "background", "plate"]

openpype/hosts/tvpaint/plugins/load/load_sound.py

@@ -1,9 +1,9 @@
 import os
 import tempfile
-from avalon.tvpaint import lib, pipeline
+from openpype.hosts.tvpaint.api import lib, plugin
 
 
-class ImportSound(pipeline.Loader):
+class ImportSound(plugin.Loader):
     """Load sound to TVPaint.
 
     Sound layers does not have ids but only position index so we can't

openpype/hosts/tvpaint/plugins/load/load_workfile.py

@@ -1,16 +1,16 @@
 import getpass
 import os
 
-from avalon.tvpaint import lib, pipeline, get_current_workfile_context
 from avalon import api, io
 from openpype.lib import (
     get_workfile_template_key_from_context,
     get_workdir_data
 )
 from openpype.api import Anatomy
+from openpype.hosts.tvpaint.api import lib, pipeline, plugin
 
 
-class LoadWorkfile(pipeline.Loader):
+class LoadWorkfile(plugin.Loader):
     """Load workfile."""
 
     families = ["workfile"]
@@ -24,7 +24,7 @@ class LoadWorkfile(pipeline.Loader):
         host = api.registered_host()
         current_file = host.current_file()
 
-        context = get_current_workfile_context()
+        context = pipeline.get_current_workfile_context()
 
         filepath = self.fname.replace("\\", "/")
 

openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py

@@ -4,7 +4,7 @@ import tempfile
 
 import pyblish.api
 import avalon.api
-from avalon.tvpaint import pipeline, lib
+from openpype.hosts.tvpaint.api import pipeline, lib
 
 
 class ResetTVPaintWorkfileMetadata(pyblish.api.Action):

openpype/hosts/tvpaint/plugins/publish/increment_workfile_version.py

@@ -1,7 +1,7 @@
 import pyblish.api
 
-from avalon.tvpaint import workio
 from openpype.api import version_up
+from openpype.hosts.tvpaint.api import workio
 
 
 class IncrementWorkfileVersion(pyblish.api.ContextPlugin):

openpype/hosts/tvpaint/plugins/publish/validate_asset_name.py

@@ -1,5 +1,5 @@
 import pyblish.api
-from avalon.tvpaint import pipeline
+from openpype.hosts.tvpaint.api import pipeline
 
 
 class FixAssetNames(pyblish.api.Action):

openpype/hosts/tvpaint/plugins/publish/validate_marks.py

@@ -1,7 +1,7 @@
 import json
 
 import pyblish.api
-from avalon.tvpaint import lib
+from openpype.hosts.tvpaint.api import lib
 
 
 class ValidateMarksRepair(pyblish.api.Action):

openpype/hosts/tvpaint/plugins/publish/validate_start_frame.py

@@ -1,5 +1,5 @@
 import pyblish.api
-from avalon.tvpaint import lib
+from openpype.hosts.tvpaint.api import lib
 
 
 class RepairStartFrame(pyblish.api.Action):

openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py

@@ -1,5 +1,5 @@
 import pyblish.api
-from avalon.tvpaint import save_file
+from openpype.hosts.tvpaint.api import save_file
 
 
 class ValidateWorkfileMetadataRepair(pyblish.api.Action):