Feature/shotgrid

.github/workflows/prerelease.yml

@@ -62,22 +62,6 @@ jobs:
     - name: "🖨️ Print changelog to console"
       if: steps.version_type.outputs.type != 'skip'
       run: cat CHANGELOG.md
-
-    - name: 💾 Commit and Tag
-      id: git_commit
-      if: steps.version_type.outputs.type != 'skip'
-      run: |
-        git config user.email ${{ secrets.CI_EMAIL }}
-        git config user.name ${{ secrets.CI_USER }}
-        cd repos/avalon-core
-        git checkout main
-        git pull
-        cd ../..
-        git add .
-        git commit -m "[Automated] Bump version"
-        tag_name="CI/${{ steps.version.outputs.next_tag }}"
-        echo $tag_name
-        git tag -a $tag_name -m "nightly build"
 
     - name: Push to protected main branch
       uses: CasperWA/push-protected@v2.10.0

.gitignore

@@ -102,3 +102,6 @@ website/.docusaurus
 
 .poetry/
 .python-version
+.editorconfig
+.pre-commit-config.yaml
+mypy.ini

.hound.yml

@@ -1,3 +1,3 @@
-flake8:
-  enabled: true
-  config_file: setup.cfg
+flake8:
+  enabled: true
+  config_file: setup.cfg

openpype/hosts/fusion/plugins/load/actions.py

@@ -6,7 +6,7 @@
 
 
 class FusionSetFrameRangeLoader(load.LoaderPlugin):
-    """Specific loader of Alembic for the avalon.animation family"""
+    """Set frame range excluding pre- and post-handles"""
 
     families = ["animation",
                 "camera",
@@ -40,7 +40,7 @@ def load(self, context, name, namespace, data):
 
 
 class FusionSetFrameRangeWithHandlesLoader(load.LoaderPlugin):
-    """Specific loader of Alembic for the avalon.animation family"""
+    """Set frame range including pre- and post-handles"""
 
     families = ["animation",
                 "camera",

openpype/hosts/harmony/plugins/publish/collect_farm_render.py

@@ -144,6 +144,7 @@ def get_instances(self, context):
                 label=node.split("/")[1],
                 subset=subset_name,
                 asset=legacy_io.Session["AVALON_ASSET"],
+                task=task_name,
                 attachTo=False,
                 setMembers=[node],
                 publish=info[4],

openpype/hosts/hiero/api/otio/hiero_export.py

@@ -151,7 +151,7 @@ def create_otio_reference(clip):
     padding = media_source.filenamePadding()
     file_head = media_source.filenameHead()
     is_sequence = not media_source.singleFile()
-    frame_duration = media_source.duration()
+    frame_duration = media_source.duration() - 1
     fps = utils.get_rate(clip) or self.project_fps
     extension = os.path.splitext(path)[-1]
 

openpype/hosts/hiero/plugins/publish/precollect_instances.py

@@ -296,6 +296,8 @@ def get_otio_clip_instance_data(self, track_item):
                 continue
             if otio_clip.name not in track_item.name():
                 continue
+            self.log.debug("__ parent_range: {}".format(parent_range))
+            self.log.debug("__ timeline_range: {}".format(timeline_range))
             if openpype.lib.is_overlapping_otio_ranges(
                     parent_range, timeline_range, strict=True):
 

openpype/hosts/houdini/plugins/load/actions.py

@@ -6,7 +6,7 @@
 
 
 class SetFrameRangeLoader(load.LoaderPlugin):
-    """Set Houdini frame range"""
+    """Set frame range excluding pre- and post-handles"""
 
     families = [
         "animation",
@@ -44,7 +44,7 @@ def load(self, context, name, namespace, data):
 
 
 class SetFrameRangeWithHandlesLoader(load.LoaderPlugin):
-    """Set Maya frame range including pre- and post-handles"""
+    """Set frame range including pre- and post-handles"""
 
     families = [
         "animation",

openpype/hosts/houdini/plugins/load/load_alembic.py

@@ -7,7 +7,7 @@
 
 
 class AbcLoader(load.LoaderPlugin):
-    """Specific loader of Alembic for the avalon.animation family"""
+    """Load Alembic"""
 
     families = ["model", "animation", "pointcache", "gpuCache"]
     label = "Load Alembic"

openpype/hosts/houdini/plugins/load/load_bgeo.py

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+import os
+import re
+
+from openpype.pipeline import (
+    load,
+    get_representation_path,
+)
+from openpype.hosts.houdini.api import pipeline
+
+
+class BgeoLoader(load.LoaderPlugin):
+    """Load bgeo files to Houdini."""
+
+    label = "Load bgeo"
+    families = ["model", "pointcache", "bgeo"]
+    representations = [
+        "bgeo", "bgeosc", "bgeogz",
+        "bgeo.sc", "bgeo.gz", "bgeo.lzma", "bgeo.bz2"]
+    order = -10
+    icon = "code-fork"
+    color = "orange"
+
+    def load(self, context, name=None, namespace=None, data=None):
+
+        import hou
+
+        # Get the root node
+        obj = hou.node("/obj")
+
+        # Define node name
+        namespace = namespace if namespace else context["asset"]["name"]
+        node_name = "{}_{}".format(namespace, name) if namespace else name
+
+        # Create a new geo node
+        container = obj.createNode("geo", node_name=node_name)
+        is_sequence = bool(context["representation"]["context"].get("frame"))
+
+        # Remove the file node, it only loads static meshes
+        # Houdini 17 has removed the file node from the geo node
+        file_node = container.node("file1")
+        if file_node:
+            file_node.destroy()
+
+        # Explicitly create a file node
+        file_node = container.createNode("file", node_name=node_name)
+        file_node.setParms({"file": self.format_path(self.fname, is_sequence)})
+
+        # Set display on last node
+        file_node.setDisplayFlag(True)
+
+        nodes = [container, file_node]
+        self[:] = nodes
+
+        return pipeline.containerise(
+            node_name,
+            namespace,
+            nodes,
+            context,
+            self.__class__.__name__,
+            suffix="",
+        )
+
+    @staticmethod
+    def format_path(path, is_sequence):
+        """Format file path correctly for single bgeo or bgeo sequence."""
+        if not os.path.exists(path):
+            raise RuntimeError("Path does not exist: %s" % path)
+
+        # The path is either a single file or sequence in a folder.
+        if not is_sequence:
+            filename = path
+            print("single")
+        else:
+            filename = re.sub(r"(.*)\.(\d+)\.(bgeo.*)", "\\1.$F4.\\3", path)
+
+            filename = os.path.join(path, filename)
+
+        filename = os.path.normpath(filename)
+        filename = filename.replace("\\", "/")
+
+        return filename
+
+    def update(self, container, representation):
+
+        node = container["node"]
+        try:
+            file_node = next(
+                n for n in node.children() if n.type().name() == "file"
+            )
+        except StopIteration:
+            self.log.error("Could not find node of type `alembic`")
+            return
+
+        # Update the file path
+        file_path = get_representation_path(representation)
+        file_path = self.format_path(file_path)
+
+        file_node.setParms({"fileName": file_path})
+
+        # Update attribute
+        node.setParms({"representation": str(representation["_id"])})
+
+    def remove(self, container):
+
+        node = container["node"]
+        node.destroy()

openpype/hosts/houdini/plugins/load/load_camera.py

@@ -78,7 +78,7 @@ def transfer_non_default_values(src, dest, ignore=None):
 
 
 class CameraLoader(load.LoaderPlugin):
-    """Specific loader of Alembic for the avalon.animation family"""
+    """Load camera from an Alembic file"""
 
     families = ["camera"]
     label = "Load Camera (abc)"

openpype/hosts/houdini/plugins/load/load_image.py

@@ -42,9 +42,9 @@ def get_image_avalon_container():
 
 
 class ImageLoader(load.LoaderPlugin):
-    """Specific loader of Alembic for the avalon.animation family"""
+    """Load images into COP2"""
 
-    families = ["colorbleed.imagesequence"]
+    families = ["imagesequence"]
     label = "Load Image (COP2)"
     representations = ["*"]
     order = -10

openpype/hosts/houdini/plugins/load/load_vdb.py

@@ -9,7 +9,7 @@
 
 
 class VdbLoader(load.LoaderPlugin):
-    """Specific loader of Alembic for the avalon.animation family"""
+    """Load VDB"""
 
     families = ["vdbcache"]
     label = "Load VDB"

openpype/hosts/maya/api/lib_renderproducts.py

@@ -77,6 +77,7 @@
     "arnold": "defaultRenderGlobals.imageFilePrefix",
     "renderman": "rmanGlobals.imageFileFormat",
     "redshift": "defaultRenderGlobals.imageFilePrefix",
+    "mayahardware2": "defaultRenderGlobals.imageFilePrefix"
 }
 
 RENDERMAN_IMAGE_DIR = "maya/<scene>/<layer>"
@@ -155,7 +156,8 @@ class Instance(object):
         "arnold": RenderProductsArnold,
         "vray": RenderProductsVray,
         "redshift": RenderProductsRedshift,
-        "renderman": RenderProductsRenderman
+        "renderman": RenderProductsRenderman,
+        "mayahardware2": RenderProductsMayaHardware
     }.get(renderer_name.lower(), None)
     if renderer is None:
         raise UnsupportedRendererException(
@@ -1124,6 +1126,67 @@ def get_files(self, product):
         return new_files
 
 
+class RenderProductsMayaHardware(ARenderProducts):
+    """Expected files for MayaHardware renderer."""
+
+    renderer = "mayahardware2"
+
+    extensions = [
+        {"label": "JPEG", "index": 8, "extension": "jpg"},
+        {"label": "PNG", "index": 32, "extension": "png"},
+        {"label": "EXR(exr)", "index": 40, "extension": "exr"}
+    ]
+
+    def _get_extension(self, value):
+        result = None
+        if isinstance(value, int):
+            extensions = {
+                extension["index"]: extension["extension"]
+                for extension in self.extensions
+            }
+            try:
+                result = extensions[value]
+            except KeyError:
+                raise NotImplementedError(
+                    "Could not find extension for {}".format(value)
+                )
+
+        if isinstance(value, six.string_types):
+            extensions = {
+                extension["label"]: extension["extension"]
+                for extension in self.extensions
+            }
+            try:
+                result = extensions[value]
+            except KeyError:
+                raise NotImplementedError(
+                    "Could not find extension for {}".format(value)
+                )
+
+        if not result:
+            raise NotImplementedError(
+                "Could not find extension for {}".format(value)
+            )
+
+        return result
+
+    def get_render_products(self):
+        """Get all AOVs.
+        See Also:
+            :func:`ARenderProducts.get_render_products()`
+        """
+        ext = self._get_extension(
+            self._get_attr("defaultRenderGlobals.imageFormat")
+        )
+
+        products = []
+        for cam in self.get_renderable_cameras():
+            product = RenderProduct(productName="beauty", ext=ext, camera=cam)
+            products.append(product)
+
+        return products
+
+
 class AOVError(Exception):
     """Custom exception for determining AOVs."""
 

openpype/hosts/maya/plugins/create/create_render.py

@@ -77,7 +77,8 @@ class CreateRender(plugin.Creator):
         'vray': 'vraySettings.fileNamePrefix',
         'arnold': 'defaultRenderGlobals.imageFilePrefix',
         'renderman': 'rmanGlobals.imageFileFormat',
-        'redshift': 'defaultRenderGlobals.imageFilePrefix'
+        'redshift': 'defaultRenderGlobals.imageFilePrefix',
+        'mayahardware2': 'defaultRenderGlobals.imageFilePrefix',
     }
 
     _image_prefixes = {
@@ -87,7 +88,8 @@ class CreateRender(plugin.Creator):
         # this needs `imageOutputDir`
         # (<ws>/renders/maya/<scene>) set separately
         'renderman': '<layer>_<aov>.<f4>.<ext>',
-        'redshift': 'maya/<Scene>/<RenderLayer>/<RenderLayer>'  # noqa
+        'redshift': 'maya/<Scene>/<RenderLayer>/<RenderLayer>',  # noqa
+        'mayahardware2': 'maya/<Scene>/<RenderLayer>/<RenderLayer>',  # noqa
     }
 
     _aov_chars = {