renamed method 'get_attribute_defs' to 'get_instance_attr_defs'

Ellipsanime · Jan 18, 2022 · f8be576 · f8be576
1 parent 20f5e8f
commit f8be576
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/openpype/hosts/testhost/plugins/create/auto_creator.py b/openpype/hosts/testhost/plugins/create/auto_creator.py
@@ -11,7 +11,7 @@ class MyAutoCreator(AutoCreator):
  identifier = "workfile"
  family = "workfile"
 
- def get_attribute_defs(self):
+ def get_instance_attr_defs(self):
  output = [
  lib.NumberDef("number_key", label="Number")
  ]

diff --git a/openpype/hosts/testhost/plugins/create/test_creator_1.py b/openpype/hosts/testhost/plugins/create/test_creator_1.py
@@ -1,3 +1,4 @@
+import json
 from openpype import resources
 from openpype.hosts.testhost.api import pipeline
 from openpype.pipeline import (
@@ -35,7 +36,10 @@ def remove_instances(self, instances):
  for instance in instances:
  self._remove_instance_from_context(instance)
 
- def create(self, subset_name, data, options=None):
+ def create(self, subset_name, data, pre_create_data):
+ print("Data that can be used in create:\n{}".format(
+ json.dumps(pre_create_data, indent=4)
+ ))
  new_instance = CreatedInstance(self.family, subset_name, data, self)
  pipeline.HostContext.add_instance(new_instance.data_to_store())
  self.log.info(new_instance.data)
@@ -48,7 +52,7 @@ def get_default_variants(self):
  "different_variant"
  ]
 
- def get_attribute_defs(self):
+ def get_instance_attr_defs(self):
  output = [
  lib.NumberDef("number_key", label="Number"),
  ]

diff --git a/openpype/hosts/testhost/plugins/create/test_creator_2.py b/openpype/hosts/testhost/plugins/create/test_creator_2.py
@@ -15,7 +15,7 @@ class TestCreatorTwo(Creator):
  def get_icon(self):
  return "cube"
 
- def create(self, subset_name, data, options=None):
+ def create(self, subset_name, data, pre_create_data):
  new_instance = CreatedInstance(self.family, subset_name, data, self)
  pipeline.HostContext.add_instance(new_instance.data_to_store())
  self.log.info(new_instance.data)
@@ -38,7 +38,7 @@ def remove_instances(self, instances):
  for instance in instances:
  self._remove_instance_from_context(instance)
 
- def get_attribute_defs(self):
+ def get_instance_attr_defs(self):
  output = [
  lib.NumberDef("number_key"),
  lib.TextDef("text_key")

diff --git a/openpype/hosts/testhost/plugins/publish/collect_context.py b/openpype/hosts/testhost/plugins/publish/collect_context.py
@@ -19,7 +19,7 @@ class CollectContextDataTestHost(
  hosts = ["testhost"]
 
  @classmethod
- def get_attribute_defs(cls):
+ def get_instance_attr_defs(cls):
  return [
  attribute_definitions.BoolDef(
  "test_bool",

diff --git a/openpype/hosts/testhost/plugins/publish/collect_instance_1.py b/openpype/hosts/testhost/plugins/publish/collect_instance_1.py
@@ -20,7 +20,7 @@ class CollectInstanceOneTestHost(
  hosts = ["testhost"]
 
  @classmethod
- def get_attribute_defs(cls):
+ def get_instance_attr_defs(cls):
  return [
  attribute_definitions.NumberDef(
  "version",

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
@@ -419,7 +419,7 @@ def __init__(
  # Stored creator specific attribute values
  # {key: value}
  creator_values = copy.deepcopy(orig_creator_attributes)
- creator_attr_defs = creator.get_attribute_defs()
+ creator_attr_defs = creator.get_instance_attr_defs()
 
  self._data["creator_attributes"] = CreatorAttributeValues(
  self, creator_attr_defs, creator_values, orig_creator_attributes

diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
@@ -163,7 +163,7 @@ def get_subset_name(
  dynamic_data=dynamic_data
  )
 
- def get_attribute_defs(self):
+ def get_instance_attr_defs(self):
  """Plugin attribute definitions.
 
  Attribute definitions of plugin that hold data about created instance