Feature/93 flexible template assignment

pype/nuke/lib.py

@@ -1412,7 +1412,6 @@ def get_representation_data(self, tags=None, range=False):
  'ext': self.ext,
  'files': self.file,
  "stagingDir": self.staging_dir,
- "anatomy_template": "render",
  "tags": [self.name.replace("_", "-")] + add_tags
  }
 

pype/plugins/global/publish/extract_burnin.py

@@ -193,7 +193,6 @@ def process(self, instance):
  self.log.debug("Output: {}".format(output))
 
  repre_update = {
- "anatomy_template": "render",
  "files": movieFileBurnin,
  "name": repre["name"],
  "tags": [x for x in repre["tags"] if x != "delete"]

pype/plugins/global/publish/integrate_new.py

@@ -40,10 +40,6 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
  'name': representation name (usually the same as extension)
  'ext': file extension
  optional data
- 'anatomy_template': 'publish' or 'render', etc.
- template from anatomy that should be used for
- integrating this file. Only the first level can
- be specified right now.
  "frameStart"
  "frameEnd"
  'fps'
@@ -92,6 +88,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
  "family", "hierarchy", "task", "username"
  ]
  default_template_name = "publish"
+ template_name_profiles = None
 
  def process(self, instance):
 
@@ -268,6 +265,8 @@ def register(self, instance):
  if 'transfers' not in instance.data:
  instance.data['transfers'] = []
 
+ template_name = self.template_name_from_instance(instance)
+
  published_representations = {}
  for idx, repre in enumerate(instance.data["representations"]):
  published_files = []
@@ -292,9 +291,6 @@ def register(self, instance):
  if repre.get('stagingDir'):
  stagingdir = repre['stagingDir']
 
- template_name = (
- repre.get('anatomy_template') or self.default_template_name
- )
  if repre.get("outputName"):
  template_data["output"] = repre['outputName']
 
@@ -701,3 +697,69 @@ def create_version_data(self, context, instance):
  version_data[key] = instance.data[key]
 
  return version_data
+
+ def main_family_from_instance(self, instance):
+ """Returns main family of entered instance."""
+ family = instance.data.get("family")
+ if not family:
+ family = instance.data["families"][0]
+ return family
+
+ def template_name_from_instance(self, instance):
+ template_name = self.default_template_name
+ if not self.template_name_profiles:
+ self.log.debug((
+ "Template name profiles are not set."
+ " Using default \"{}\""
+ ).format(template_name))
+ return template_name
+
+ # Task name from session?
+ task_name = io.Session.get("AVALON_TASK")
+ family = self.main_family_from_instance(instance)
+
+ matching_profiles = None
+ highest_value = -1
+ for name, filters in self.template_name_profiles:
+ value = 0
+ families = filters.get("families")
+ if families:
+ if family not in families:
+ continue
+ value += 1
+
+ tasks = filters.get("tasks")
+ if tasks:
+ if task_name not in tasks:
+ continue
+ value += 1
+
+ if value > highest_value:
+ matching_profiles = {}
+ highest_value = value
+
+ if value == highest_value:
+ matching_profiles[name] = filters
+
+ if len(matching_profiles) == 1:
+ template_name = matching_profiles.keys()[0]
+ self.log.debug(
+ "Using template name \"{}\".".format(template_name)
+ )
+
+ elif len(matching_profiles) > 1:
+ template_name = matching_profiles.keys()[0]
+ self.log.warning((
+ "More than one template profiles matched"
+ " Family \"{}\" and Task: \"{}\"."
+ " Using first template name in row \"{}\"."
+ ).format(family, task_name, template_name))
+
+ else:
+ self.log.debug((
+ "None of template profiles matched"
+ " Family \"{}\" and Task: \"{}\"."
+ " Using default template name \"{}\""
+ ).format(family, task_name, template_name))
+
+ return template_name

pype/plugins/global/publish/submit_publish_job.py

@@ -380,7 +380,6 @@ def _create_instances_for_aov(self, instance_data, exp_files):
  "frameEnd": int(instance_data.get("frameEndHandle")),
  # If expectedFile are absolute, we need only filenames
  "stagingDir": staging,
- "anatomy_template": "render",
  "fps": new_instance.get("fps"),
  "tags": ["review"] if preview else []
  }
@@ -443,7 +442,6 @@ def _get_representations(self, instance, exp_files):
  "frameEnd": int(instance.get("frameEndHandle")),
  # If expectedFile are absolute, we need only filenames
  "stagingDir": os.path.dirname(list(c)[0]),
- "anatomy_template": "render",
  "fps": instance.get("fps"),
  "tags": ["review", "preview"] if preview else [],
  }
@@ -462,13 +460,11 @@ def _get_representations(self, instance, exp_files):
  "name": ext,
  "ext": ext,
  "files": os.path.basename(r),
- "stagingDir": os.path.dirname(r),
- "anatomy_template": "publish"
+ "stagingDir": os.path.dirname(r)
  }
  if r in bake_render_path:
  rep.update({
  "fps": instance.get("fps"),
- "anatomy_template": "render",
  "tags": ["review", "delete"]
  })
  # solve families with `preview` attributes

pype/plugins/maya/publish/extract_yeti_cache.py

@@ -73,7 +73,6 @@ def process(self, instance):
  'ext': 'fur',
  'files': cache_files[0] if len(cache_files) == 1 else cache_files,
  'stagingDir': dirname,
- 'anatomy_template': 'publish',
  'frameStart': int(start_frame),
  'frameEnd': int(end_frame)
  }
@@ -84,8 +83,7 @@ def process(self, instance):
  'name': 'fursettings',
  'ext': 'fursettings',
  'files': os.path.basename(data_file),
- 'stagingDir': dirname,
- 'anatomy_template': 'publish'
+ 'stagingDir': dirname
  }
  )
 

pype/plugins/maya/publish/extract_yeti_rig.py

@@ -169,8 +169,7 @@ def process(self, instance):
  'name': "ma",
  'ext': 'ma',
  'files': "yeti_rig.ma",
- 'stagingDir': dirname,
- 'anatomy_template': 'publish'
+ 'stagingDir': dirname
  }
  )
  self.log.info("settings file: {}".format("yeti.rigsettings"))
@@ -179,8 +178,7 @@ def process(self, instance):
  'name': 'rigsettings',
  'ext': 'rigsettings',
  'files': 'yeti.rigsettings',
- 'stagingDir': dirname,
- 'anatomy_template': 'publish'
+ 'stagingDir': dirname
  }
  )
 

pype/plugins/nuke/publish/collect_writes.py

@@ -79,8 +79,7 @@ def process(self, instance):
  representation = {
  'name': ext,
  'ext': ext,
- "stagingDir": output_dir,
- "anatomy_template": "render"
+ "stagingDir": output_dir
  }
 
  try:

pype/plugins/nuke/publish/extract_render_local.py

@@ -71,8 +71,7 @@ def process(self, instance):
  'ext': ext,
  'frameStart': "%0{}d".format(len(str(last_frame))) % first_frame,
  'files': collected_frames,
- "stagingDir": out_dir,
- "anatomy_template": "render"
+ "stagingDir": out_dir
  }
  instance.data["representations"].append(repre)
 

pype/plugins/nuke/publish/extract_thumbnail.py

@@ -130,7 +130,6 @@ def render_thumbnail(self, instance):
  "stagingDir": staging_dir,
  "frameStart": first_frame,
  "frameEnd": last_frame,
- "anatomy_template": "render",
  "tags": tags
  }
  instance.data["representations"].append(repre)

pype/plugins/standalonepublisher/publish/collect_context.py

@@ -46,7 +46,6 @@ def process(self, context):
  in_data = json.load(f)
 
  asset_name = in_data["asset"]
- family_preset_key = in_data.get("family_preset_key", "")
  family = in_data["family"]
  subset = in_data["subset"]
 
@@ -57,15 +56,6 @@ def process(self, context):
 
  presets = config.get_presets()
 
- # Get from presets anatomy key that will be used for getting template
- # - default integrate new is used if not set
- anatomy_key = (
- presets.get("standalone_publish", {})
- .get("families", {})
- .get(family_preset_key, {})
- .get("anatomy_template")
- )
-
  project = io.find_one({"type": "project"})
  asset = io.find_one({"type": "asset", "name": asset_name})
  context.data["project"] = project
@@ -98,12 +88,9 @@ def process(self, context):
  instance.data["source"] = "standalone publisher"
 
  for component in in_data["representations"]:
-
  component["destination"] = component["files"]
  component["stagingDir"] = component["stagingDir"]
- # Do not set anatomy_template if not specified
- if anatomy_key:
- component["anatomy_template"] = anatomy_key
+
  if isinstance(component["files"], list):
  collections, remainder = clique.assemble(component["files"])
  self.log.debug("collecting sequence: {}".format(collections))