moved attribute definitions to openpype/lib

openpype/hosts/testhost/plugins/create/auto_creator.py

@@ -1,10 +1,10 @@
+from avalon import io
+from openpype.lib import NumberDef
 from openpype.hosts.testhost.api import pipeline
 from openpype.pipeline import (
     AutoCreator,
     CreatedInstance,
-    lib
 )
-from avalon import io
 
 
 class MyAutoCreator(AutoCreator):
@@ -13,7 +13,7 @@ class MyAutoCreator(AutoCreator):
 
     def get_instance_attr_defs(self):
         output = [
-            lib.NumberDef("number_key", label="Number")
+            NumberDef("number_key", label="Number")
         ]
         return output
 

openpype/hosts/testhost/plugins/create/test_creator_1.py

@@ -1,10 +1,16 @@
 import json
 from openpype import resources
 from openpype.hosts.testhost.api import pipeline
+from openpype.lib import (
+    UISeparatorDef,
+    UILabelDef,
+    BoolDef,
+    NumberDef,
+    FileDef,
+)
 from openpype.pipeline import (
     Creator,
     CreatedInstance,
-    lib
 )
 
 
@@ -54,17 +60,17 @@ class TestCreatorOne(Creator):
 
     def get_instance_attr_defs(self):
         output = [
-            lib.NumberDef("number_key", label="Number"),
+            NumberDef("number_key", label="Number"),
         ]
         return output
 
     def get_pre_create_attr_defs(self):
         output = [
-            lib.BoolDef("use_selection", label="Use selection"),
-            lib.UISeparatorDef(),
-            lib.UILabelDef("Testing label"),
-            lib.FileDef("filepath", folders=True, label="Filepath"),
-            lib.FileDef(
+            BoolDef("use_selection", label="Use selection"),
+            UISeparatorDef(),
+            UILabelDef("Testing label"),
+            FileDef("filepath", folders=True, label="Filepath"),
+            FileDef(
                 "filepath_2", multipath=True, folders=True, label="Filepath 2"
             )
         ]

openpype/hosts/testhost/plugins/create/test_creator_2.py

@@ -1,8 +1,8 @@
+from openpype.lib import NumberDef, TextDef
 from openpype.hosts.testhost.api import pipeline
 from openpype.pipeline import (
     Creator,
     CreatedInstance,
-    lib
 )
 
 
@@ -40,8 +40,8 @@ class TestCreatorTwo(Creator):
 
     def get_instance_attr_defs(self):
         output = [
-            lib.NumberDef("number_key"),
-            lib.TextDef("text_key")
+            NumberDef("number_key"),
+            TextDef("text_key")
         ]
         return output
 

openpype/hosts/testhost/plugins/publish/collect_instance_1.py

@@ -1,10 +1,8 @@
 import json
 import pyblish.api
 
-from openpype.pipeline import (
-    OpenPypePyblishPluginMixin,
-    attribute_definitions
-)
+from openpype.lib import attribute_definitions
+from openpype.pipeline import OpenPypePyblishPluginMixin
 
 
 class CollectInstanceOneTestHost(

openpype/lib/__init__.py

@@ -29,6 +29,21 @@ from .vendor_bin_utils import (
     is_oiio_supported
 )
 
+from .attribute_definitions import (
+    AbtractAttrDef,
+
+    UIDef,
+    UISeparatorDef,
+    UILabelDef,
+
+    UnknownDef,
+    NumberDef,
+    TextDef,
+    EnumDef,
+    BoolDef,
+    FileDef,
+)
+
 from .env_tools import (
     env_value_to_bool,
     get_paths_from_environ,
@@ -233,6 +248,19 @@ __all__ = [
     "get_ffmpeg_tool_path",
     "is_oiio_supported",
 
+    "AbtractAttrDef",
+
+    "UIDef",
+    "UISeparatorDef",
+    "UILabelDef",
+
+    "UnknownDef",
+    "NumberDef",
+    "TextDef",
+    "EnumDef",
+    "BoolDef",
+    "FileDef",
+
     "import_filepath",
     "modules_from_path",
     "recursive_bases_from_class",

openpype/pipeline/create/context.py

@@ -6,7 +6,6 @@ import inspect
 from uuid import uuid4
 from contextlib import contextmanager
 
-from ..lib import UnknownDef
 from .creator_plugins import (
     BaseCreator,
     Creator,
@@ -87,6 +86,8 @@ class AttributeValues:
         origin_data(dict): Values loaded from host before conversion.
     """
     def __init__(self, attr_defs, values, origin_data=None):
+        from openpype.lib.attribute_definitions import UnknownDef
+
         if origin_data is None:
             origin_data = copy.deepcopy(values)
         self._origin_data = origin_data

openpype/pipeline/lib/__init__.py

@@ -1,30 +0,0 @@
-from .attribute_definitions import (
-    AbtractAttrDef,
-
-    UIDef,
-    UISeparatorDef,
-    UILabelDef,
-
-    UnknownDef,
-    NumberDef,
-    TextDef,
-    EnumDef,
-    BoolDef,
-    FileDef,
-)
-
-
-__all__ = (
-    "AbtractAttrDef",
-
-    "UIDef",
-    "UISeparatorDef",
-    "UILabelDef",
-
-    "UnknownDef",
-    "NumberDef",
-    "TextDef",
-    "EnumDef",
-    "BoolDef",
-    "FileDef",
-)

openpype/widgets/attribute_defs/widgets.py

@@ -2,7 +2,7 @@ import uuid
 
 from Qt import QtWidgets, QtCore
 
-from openpype.pipeline.lib import (
+from openpype.lib.attribute_definitions import (
     AbtractAttrDef,
     UnknownDef,
     NumberDef,