Merge remote-tracking branch 'upstream/develop' into remove_unused_code

openpype/hosts/flame/plugins/publish/integrate_batch_group.py

@@ -3,9 +3,9 @@ import copy
 from collections import OrderedDict
 from pprint import pformat
 import pyblish
-from openpype.lib import get_workdir
 import openpype.hosts.flame.api as opfapi
 import openpype.pipeline as op_pipeline
+from openpype.pipeline.workfile import get_workdir
 
 
 class IntegrateBatchGroup(pyblish.api.InstancePlugin):
@@ -324,7 +324,13 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
         project_doc = instance.data["projectEntity"]
         asset_entity = instance.data["assetEntity"]
         anatomy = instance.context.data["anatomy"]
+        project_settings = instance.context.data["project_settings"]
 
         return get_workdir(
-            project_doc, asset_entity, task_data["name"], "flame", anatomy
+            project_doc,
+            asset_entity,
+            task_data["name"],
+            "flame",
+            anatomy,
+            project_settings=project_settings
         )

openpype/hosts/fusion/scripts/fusion_switch_shot.py

@@ -15,7 +15,7 @@ from openpype.pipeline import (
 from openpype.lib import version_up
 from openpype.hosts.fusion import api
 from openpype.hosts.fusion.api import lib
-from openpype.lib.avalon_context import get_workdir_from_session
+from openpype.pipeline.context_tools import get_workdir_from_session
 
 log = logging.getLogger("Update Slap Comp")
 

openpype/hosts/fusion/utility_scripts/switch_ui.py

@@ -14,7 +14,7 @@ from openpype.pipeline import (
     legacy_io,
 )
 from openpype.hosts.fusion import api
-from openpype.lib.avalon_context import get_workdir_from_session
+from openpype.pipeline.context_tools import get_workdir_from_session
 
 log = logging.getLogger("Fusion Switch Shot")
 

openpype/hosts/maya/api/menu.py

@@ -6,9 +6,9 @@ from Qt import QtWidgets, QtGui
 import maya.utils
 import maya.cmds as cmds
 
-from openpype.api import BuildWorkfile
 from openpype.settings import get_project_settings
 from openpype.pipeline import legacy_io
+from openpype.pipeline.workfile import BuildWorkfile
 from openpype.tools.utils import host_tools
 from openpype.hosts.maya.api import lib, lib_rendersettings
 from .lib import get_main_window, IS_HEADLESS

openpype/hosts/maya/api/plugin.py

@@ -208,7 +208,8 @@ class ReferenceLoader(Loader):
         file_type = {
             "ma": "mayaAscii",
             "mb": "mayaBinary",
-            "abc": "Alembic"
+            "abc": "Alembic",
+            "fbx": "FBX"
         }.get(representation["name"])
 
         assert file_type, "Unsupported representation: %s" % representation
@@ -234,7 +235,7 @@ class ReferenceLoader(Loader):
             path = self.prepare_root_value(path,
                                            representation["context"]
                                                          ["project"]
-                                                         ["code"])
+                                                         ["name"])
             content = cmds.file(path,
                                 loadReference=reference_node,
                                 type=file_type,

openpype/hosts/maya/plugins/publish/collect_render.py

@@ -193,7 +193,6 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                 )
 
             # append full path
-            full_exp_files = []
             aov_dict = {}
             default_render_file = context.data.get('project_settings')\
                 .get('maya')\
@@ -213,6 +212,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                     full_paths.append(full_path)
                     publish_meta_path = os.path.dirname(full_path)
                 aov_dict[aov_first_key] = full_paths
+            full_exp_files = [aov_dict]
 
             frame_start_render = int(self.get_render_attribute(
                 "startFrame", layer=layer_name))

openpype/hosts/maya/plugins/publish/extract_look.py

@@ -429,7 +429,19 @@ class ExtractLook(openpype.api.Extractor):
                 # node doesn't have color space attribute
                 color_space = "Raw"
             else:
-                if files_metadata[source]["color_space"] == "Raw":
+                # get the resolved files
+                metadata = files_metadata.get(source)
+                # if the files are unresolved from `source`
+                # assume color space from the first file of
+                # the resource
+                if not metadata:
+                    first_file = next(iter(resource.get(
+                        "files", [])), None)
+                    if not first_file:
+                        continue
+                    first_filepath = os.path.normpath(first_file)
+                    metadata = files_metadata[first_filepath]
+                if metadata["color_space"] == "Raw":
                     # set color space to raw if we linearized it
                     color_space = "Raw"
                 # Remap file node filename to destination

openpype/hosts/nuke/api/lib.py

@@ -21,7 +21,6 @@ from openpype.client import (
 )
 from openpype.api import (
     Logger,
-    BuildWorkfile,
     get_version_from_path,
     get_current_project_settings,
 )
@@ -39,7 +38,11 @@ from openpype.pipeline import (
     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
 
@@ -912,7 +915,7 @@ def get_render_path(node):
     avalon_knob_data = read_avalon_data(node)
 
     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"]
     )
@@ -1920,7 +1923,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"]
             )
@@ -2219,7 +2222,7 @@ def get_write_node_template_attr(node):
     avalon_knob_data = read_avalon_data(node)
     # get template data
     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"]
     )
@@ -2444,15 +2447,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
@@ -2462,7 +2462,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")
@@ -2470,8 +2469,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/tvpaint/plugins/load/load_workfile.py

@@ -1,15 +1,15 @@
 import os
 
-from openpype.lib import (
-    StringTemplate,
-    get_workfile_template_key_from_context,
-    get_last_workfile_with_version,
-)
+from openpype.lib import StringTemplate
 from openpype.pipeline import (
     registered_host,
     legacy_io,
     Anatomy,
 )
+from openpype.pipeline.workfile import (
+    get_workfile_template_key_from_context,
+    get_last_workfile_with_version,
+)
 from openpype.pipeline.template_data import get_template_data_with_names
 from openpype.hosts.tvpaint.api import lib, pipeline, plugin
 
@@ -57,8 +57,7 @@ class LoadWorkfile(plugin.Loader):
             asset_name,
             task_name,
             host_name,
-            project_name=project_name,
-            dbcon=legacy_io
+            project_name=project_name
         )
         anatomy = Anatomy(project_name)