Merge branch 'develop' into feature/validation_exceptions_nuke

openpype/hosts/nuke/api/lib.py

@@ -21,9 +21,7 @@ from openpype.client import (
 )
 from openpype.api import (
     Logger,
-    BuildWorkfile,
     get_version_from_path,
-    get_workdir_data,
     get_current_project_settings,
 )
 from openpype.tools.utils import host_tools
@@ -34,12 +32,17 @@ from openpype.settings import (
     get_anatomy_settings,
 )
 from openpype.modules import ModulesManager
+from openpype.pipeline.template_data import get_template_data_with_names
 from openpype.pipeline import (
     discover_legacy_creator_plugins,
     legacy_io,
     Anatomy,
 )
-from openpype.pipeline.context_tools import get_current_project_asset
+from openpype.pipeline.context_tools import (
+    get_current_project_asset,
+    get_custom_workfile_template_from_session
+)
+from openpype.pipeline.workfile import BuildWorkfile
 
 from . import gizmo_menu
 
@@ -905,6 +908,27 @@ def check_subsetname_exists(nodes, subset_name):
                  if subset_name in read_avalon_data(n).get("subset", "")),
                 False)
 
+
+def get_render_path(node):
+    ''' Generate Render path from presets regarding avalon knob data
+    '''
+    avalon_knob_data = read_avalon_data(node)
+
+    nuke_imageio_writes = get_imageio_node_setting(
+        node_class=avalon_knob_data["families"],
+        plugin_name=avalon_knob_data["creator"],
+        subset=avalon_knob_data["subset"]
+    )
+
+    data = {
+        "avalon": avalon_knob_data,
+        "nuke_imageio_writes": nuke_imageio_writes
+    }
+
+    anatomy_filled = format_anatomy(data)
+    return anatomy_filled["render"]["path"].replace("\\", "/")
+
+
 def format_anatomy(data):
     ''' Helping function for formatting of anatomy paths
 
@@ -942,12 +966,11 @@ def format_anatomy(data):
         data["version"] = get_version_from_path(file)
 
     project_name = anatomy.project_name
-    project_doc = get_project(project_name)
-    asset_doc = get_asset_by_name(project_name, data["avalon"]["asset"])
+    asset_name = data["avalon"]["asset"]
     task_name = os.environ["AVALON_TASK"]
     host_name = os.environ["AVALON_APP"]
-    context_data = get_workdir_data(
-        project_doc, asset_doc, task_name, host_name
+    context_data = get_template_data_with_names(
+        project_name, asset_name, task_name, host_name
     )
     data.update(context_data)
     data.update({
@@ -1105,10 +1128,8 @@ def create_write_node(
         if knob["name"] == "file_type":
             representation = knob["value"]
 
-    host_name = os.environ.get("AVALON_APP")
     try:
         data.update({
-            "app": host_name,
             "imageio_writes": imageio_writes,
             "representation": representation,
         })
@@ -1909,7 +1930,7 @@ class WorkfileSettings(object):
                 families.append(avalon_knob_data.get("families"))
 
             nuke_imageio_writes = get_imageio_node_setting(
-                node_class=avalon_knob_data["family"],
+                node_class=avalon_knob_data["families"],
                 plugin_name=avalon_knob_data["creator"],
                 subset=avalon_knob_data["subset"]
             )
@@ -2432,15 +2453,12 @@ def _launch_workfile_app():
 
 
 def process_workfile_builder():
-    from openpype.lib import (
-        env_value_to_bool,
-        get_custom_workfile_template
-    )
     # to avoid looping of the callback, remove it!
     nuke.removeOnCreate(process_workfile_builder, nodeClass="Root")
 
     # get state from settings
-    workfile_builder = get_current_project_settings()["nuke"].get(
+    project_settings = get_current_project_settings()
+    workfile_builder = project_settings["nuke"].get(
         "workfile_builder", {})
 
     # get all imortant settings
@@ -2450,7 +2468,6 @@ def process_workfile_builder():
 
     # get settings
     createfv_on = workfile_builder.get("create_first_version") or None
-    custom_templates = workfile_builder.get("custom_templates") or None
     builder_on = workfile_builder.get("builder_on_start") or None
 
     last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE")
@@ -2458,8 +2475,8 @@ def process_workfile_builder():
     # generate first version in file not existing and feature is enabled
     if createfv_on and not os.path.exists(last_workfile_path):
         # get custom template path if any
-        custom_template_path = get_custom_workfile_template(
-            custom_templates
+        custom_template_path = get_custom_workfile_template_from_session(
+            project_settings=project_settings
         )
 
         # if custom template is defined

openpype/hosts/nuke/api/pipeline.py

@@ -9,7 +9,6 @@ import pyblish.api
 import openpype
 from openpype.api import (
     Logger,
-    BuildWorkfile,
     get_current_project_settings
 )
 from openpype.lib import register_event_callback
@@ -22,6 +21,7 @@ from openpype.pipeline import (
     deregister_inventory_action_path,
     AVALON_CONTAINER_ID,
 )
+from openpype.pipeline.workfile import BuildWorkfile
 from openpype.tools.utils import host_tools
 
 from .command import viewer_update_and_undo_stop

openpype/hosts/nuke/api/plugin.py

@@ -181,8 +181,6 @@ class ExporterReview(object):
             # get first and last frame
             self.first_frame = min(self.collection.indexes)
             self.last_frame = max(self.collection.indexes)
-            if "slate" in self.instance.data["families"]:
-                self.first_frame += 1
         else:
             self.fname = os.path.basename(self.path_in)
             self.fhead = os.path.splitext(self.fname)[0] + "."