Merge branch 'develop' into enhancement/AY-7584_Library-Push-to-Current-project

client/ayon_core/hooks/pre_add_last_workfile_arg.py

@@ -33,6 +33,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
         "cinema4d",
         "silhouette",
         "gaffer",
+        "loki",
     }
     launch_types = {LaunchTypes.local}
 

client/ayon_core/hooks/pre_ocio_hook.py

@@ -24,6 +24,7 @@ class OCIOEnvHook(PreLaunchHook):
         "cinema4d",
         "silhouette",
         "gaffer",
+        "loki",
     }
     launch_types = set()
 

client/ayon_core/pipeline/editorial.py

@@ -7,6 +7,10 @@ import opentimelineio as otio
 from opentimelineio import opentime as _ot
 
 
+# https://github.com/AcademySoftwareFoundation/OpenTimelineIO/issues/1822
+OTIO_EPSILON = 1e-9
+
+
 def otio_range_to_frame_range(otio_range):
     start = _ot.to_frames(
         otio_range.start_time, otio_range.start_time.rate)

client/ayon_core/pipeline/publish/lib.py

@@ -5,6 +5,7 @@ import sys
 import inspect
 import copy
 import warnings
+import hashlib
 import xml.etree.ElementTree
 from typing import TYPE_CHECKING, Optional, Union, List
 
@@ -243,32 +244,38 @@ def publish_plugins_discover(
 
     for path in paths:
         path = os.path.normpath(path)
-        if not os.path.isdir(path):
+        filenames = []
-            continue
+        if os.path.isdir(path):
+            filenames.extend(
+                name
+                for name in os.listdir(path)
+                if (
+                    os.path.isfile(os.path.join(path, name))
+                    and not name.startswith("_")
+                )
+            )
+        else:
+            filenames.append(os.path.basename(path))
+            path = os.path.dirname(path)
 
-        for fname in os.listdir(path):
+        dirpath_hash = hashlib.md5(path.encode("utf-8")).hexdigest()
-            if fname.startswith("_"):
+        for filename in filenames:
-                continue
+            basename, ext = os.path.splitext(filename)
-
+            if ext.lower() != ".py":
-            abspath = os.path.join(path, fname)
-
-            if not os.path.isfile(abspath):
-                continue
-
-            mod_name, mod_ext = os.path.splitext(fname)
-
-            if mod_ext != ".py":
                 continue
 
+            filepath = os.path.join(path, filename)
+            module_name = f"{dirpath_hash}.{basename}"
             try:
                 module = import_filepath(
-                    abspath, mod_name, sys_module_name=mod_name)
+                    filepath, module_name, sys_module_name=module_name
+                )
 
             except Exception as err:  # noqa: BLE001
                 # we need broad exception to catch all possible errors.
-                result.crashed_file_paths[abspath] = sys.exc_info()
+                result.crashed_file_paths[filepath] = sys.exc_info()
 
-                log.debug('Skipped: "%s" (%s)', mod_name, err)
+                log.debug('Skipped: "%s" (%s)', filepath, err)
                 continue
 
             for plugin in pyblish.plugin.plugins_from_module(module):
@@ -354,12 +361,18 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
     # Use project settings based on a category name
     if category:
         try:
-            return (
+            output = (
                 project_settings
                 [category]
                 ["publish"]
                 [plugin.__name__]
             )
+            warnings.warn(
+                "Please fill 'settings_category'"
+                f" for plugin '{plugin.__name__}'.",
+                DeprecationWarning
+            )
+            return output
         except KeyError:
             pass
 
@@ -384,12 +397,18 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
         category_from_file = "core"
 
     try:
-        return (
+        output = (
             project_settings
             [category_from_file]
             [plugin_kind]
             [plugin.__name__]
         )
+        warnings.warn(
+            "Please fill 'settings_category'"
+            f" for plugin '{plugin.__name__}'.",
+            DeprecationWarning
+        )
+        return output
     except KeyError:
         pass
     return {}

client/ayon_core/plugins/publish/cleanup.py

@@ -38,6 +38,8 @@ class CleanUp(pyblish.api.InstancePlugin):
         "webpublisher",
         "shell"
     ]
+    settings_category = "core"
+
     exclude_families = ["clip"]
     optional = True
     active = True

client/ayon_core/plugins/publish/cleanup_farm.py

@@ -13,6 +13,8 @@ class CleanUpFarm(pyblish.api.ContextPlugin):
 
     order = pyblish.api.IntegratorOrder + 11
     label = "Clean Up Farm"
+
+    settings_category = "core"
     enabled = True
 
     # Keep "filesequence" for backwards compatibility of older jobs

client/ayon_core/plugins/publish/collect_anatomy_instance_data.py

@@ -46,6 +46,8 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder + 0.49
     label = "Collect Anatomy Instance data"
 
+    settings_category = "core"
+
     follow_workfile_version = False
 
     def process(self, context):

client/ayon_core/plugins/publish/collect_audio.py

@@ -41,6 +41,7 @@ class CollectAudio(pyblish.api.ContextPlugin):
         "max",
         "circuit",
     ]
+    settings_category = "core"
 
     audio_product_name = "audioMain"
 

client/ayon_core/plugins/publish/collect_frames_fix.py

@@ -23,6 +23,7 @@ class CollectFramesFixDef(
     targets = ["local"]
     hosts = ["nuke"]
     families = ["render", "prerender"]
+    settings_category = "core"
 
     rewrite_version_enable = False
 

client/ayon_core/plugins/publish/collect_scene_version.py

@@ -12,9 +12,10 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
     """
 
     order = pyblish.api.CollectorOrder
-    label = 'Collect Scene Version'
+    label = "Collect Scene Version"
     # configurable in Settings
     hosts = ["*"]
+    settings_category = "core"
 
     # in some cases of headless publishing (for example webpublisher using PS)
     # you want to ignore version from name and let integrate use next version

client/ayon_core/plugins/publish/extract_burnin.py

@@ -57,6 +57,7 @@ class ExtractBurnin(publish.Extractor):
         "unreal",
         "circuit",
     ]
+    settings_category = "core"
 
     optional = True
 

client/ayon_core/plugins/publish/extract_color_transcode.py

@@ -55,6 +55,8 @@ class ExtractOIIOTranscode(publish.Extractor):
     label = "Transcode color spaces"
     order = pyblish.api.ExtractorOrder + 0.019
 
+    settings_category = "core"
+
     optional = True
 
     # Supported extensions

client/ayon_core/plugins/publish/extract_otio_audio_tracks.py

@@ -7,6 +7,7 @@ from ayon_core.lib import (
     get_ffmpeg_tool_args,
     run_subprocess
 )
+from ayon_core.pipeline import editorial
 
 
 class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
@@ -172,6 +173,14 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
                     clip_start = otio_clip.source_range.start_time
                     fps = clip_start.rate
                     conformed_av_start = media_av_start.rescaled_to(fps)
+
+                    # Avoid rounding issue on media available range.
+                    if clip_start.almost_equal(
+                        conformed_av_start,
+                        editorial.OTIO_EPSILON
+                    ):
+                        conformed_av_start = clip_start
+
                     # ffmpeg ignores embedded tc
                     start = clip_start - conformed_av_start
                     duration = otio_clip.source_range.duration

client/ayon_core/plugins/publish/extract_otio_review.py

@@ -23,7 +23,11 @@ from ayon_core.lib import (
     get_ffmpeg_tool_args,
     run_subprocess,
 )
-from ayon_core.pipeline import publish
+from ayon_core.pipeline import (
+    KnownPublishError,
+    editorial,
+    publish,
+)
 
 
 class ExtractOTIOReview(
@@ -97,8 +101,11 @@ class ExtractOTIOReview(
 
         # skip instance if no reviewable data available
         if (
-            not isinstance(otio_review_clips[0], otio.schema.Clip)
+            len(otio_review_clips) == 1
-            and len(otio_review_clips) == 1
+            and (
+                not isinstance(otio_review_clips[0], otio.schema.Clip)
+                or otio_review_clips[0].media_reference.is_missing_reference
+            )
         ):
             self.log.warning(
                 "Instance `{}` has nothing to process".format(instance))
@@ -248,7 +255,7 @@ class ExtractOTIOReview(
 
                 # Single video way.
                 # Extraction via FFmpeg.
-                else:
+                elif hasattr(media_ref, "target_url"):
                     path = media_ref.target_url
                     # Set extract range from 0 (FFmpeg ignores
                     #   embedded timecode).
@@ -370,6 +377,13 @@ class ExtractOTIOReview(
 
         avl_start = avl_range.start_time
 
+        # Avoid rounding issue on media available range.
+        if start.almost_equal(
+            avl_start,
+            editorial.OTIO_EPSILON
+        ):
+            avl_start = start
+
         # An additional gap is required before the available
         # range to conform source start point and head handles.
         if start < avl_start:
@@ -388,6 +402,14 @@ class ExtractOTIOReview(
         # (media duration is shorter then clip requirement).
         end_point = start + duration
         avl_end_point = avl_range.end_time_exclusive()
+
+        # Avoid rounding issue on media available range.
+        if end_point.almost_equal(
+            avl_end_point,
+            editorial.OTIO_EPSILON
+        ):
+            avl_end_point = end_point
+
         if end_point > avl_end_point:
             gap_duration = end_point - avl_end_point
             duration -= gap_duration
@@ -444,7 +466,7 @@ class ExtractOTIOReview(
         command = get_ffmpeg_tool_args("ffmpeg")
 
         input_extension = None
-        if sequence:
+        if sequence is not None:
             input_dir, collection, sequence_fps = sequence
             in_frame_start = min(collection.indexes)
 
@@ -478,7 +500,7 @@ class ExtractOTIOReview(
                 "-i", input_path
             ])
 
-        elif video:
+        elif video is not None:
             video_path, otio_range = video
             frame_start = otio_range.start_time.value
             input_fps = otio_range.start_time.rate
@@ -496,7 +518,7 @@ class ExtractOTIOReview(
                 "-i", video_path
             ])
 
-        elif gap:
+        elif gap is not None:
             sec_duration = frames_to_seconds(gap, self.actual_fps)
 
             # form command for rendering gap files
@@ -510,6 +532,9 @@ class ExtractOTIOReview(
                 "-tune", "stillimage"
             ])
 
+        else:
+            raise KnownPublishError("Sequence, video or gap is required.")
+
         if video or sequence:
             command.extend([
                 "-vf", f"scale={self.to_width}:{self.to_height}:flags=lanczos",

client/ayon_core/plugins/publish/extract_review.py

@@ -165,6 +165,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         "photoshop"
     ]
 
+    settings_category = "core"
     # Supported extensions
     image_exts = {"exr", "jpg", "jpeg", "png", "dpx", "tga", "tiff", "tif"}
     video_exts = {"mov", "mp4"}

client/ayon_core/plugins/publish/extract_thumbnail.py

@@ -43,6 +43,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         "houdini",
         "circuit",
     ]
+    settings_category = "core"
     enabled = False
 
     integrate_thumbnail = False

client/ayon_core/plugins/publish/extract_usd_layer_contributions.py

@@ -256,6 +256,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin,
     label = "Collect USD Layer Contributions (Asset/Shot)"
     families = ["usd"]
     enabled = True
+    settings_category = "core"
 
     # A contribution defines a contribution into a (department) layer which
     # will get layered into the target product, usually the asset or shot.
@@ -633,6 +634,8 @@ class ExtractUSDLayerContribution(publish.Extractor):
     label = "Extract USD Layer Contributions (Asset/Shot)"
     order = pyblish.api.ExtractorOrder + 0.45
 
+    settings_category = "core"
+
     use_ayon_entity_uri = False
 
     def process(self, instance):
@@ -795,6 +798,8 @@ class ExtractUSDAssetContribution(publish.Extractor):
     label = "Extract USD Asset/Shot Contributions"
     order = ExtractUSDLayerContribution.order + 0.01
 
+    settings_category = "core"
+
     use_ayon_entity_uri = False
 
     def process(self, instance):

client/ayon_core/plugins/publish/integrate_hero_version.py

@@ -61,6 +61,8 @@ class IntegrateHeroVersion(
     # Must happen after IntegrateNew
     order = pyblish.api.IntegratorOrder + 0.1
 
+    settings_category = "core"
+
     optional = True
     active = True
 

client/ayon_core/plugins/publish/integrate_product_group.py

@@ -24,6 +24,8 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
     order = pyblish.api.IntegratorOrder - 0.1
     label = "Product Group"
 
+    settings_category = "core"
+
     # Attributes set by settings
     product_grouping_profiles = None
 

client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py

@@ -22,6 +22,8 @@ class PreIntegrateThumbnails(pyblish.api.InstancePlugin):
     label = "Override Integrate Thumbnail Representations"
     order = pyblish.api.IntegratorOrder - 0.1
 
+    settings_category = "core"
+
     integrate_profiles = []
 
     def process(self, instance):

client/ayon_core/plugins/publish/validate_containers.py

@@ -31,6 +31,7 @@ class ValidateOutdatedContainers(
 
     label = "Validate Outdated Containers"
     order = pyblish.api.ValidatorOrder
+    settings_category = "core"
 
     optional = True
     actions = [ShowInventory]

client/ayon_core/plugins/publish/validate_file_saved.py

@@ -37,7 +37,7 @@ class ValidateCurrentSaveFile(pyblish.api.ContextPlugin):
     label = "Validate File Saved"
     order = pyblish.api.ValidatorOrder - 0.1
     hosts = ["fusion", "houdini", "max", "maya", "nuke", "substancepainter",
-             "cinema4d", "silhouette", "gaffer", "blender"]
+             "cinema4d", "silhouette", "gaffer", "blender", "loki"]
     actions = [SaveByVersionUpAction, ShowWorkfilesAction]
 
     def process(self, context):

client/ayon_core/plugins/publish/validate_intent.py

@@ -14,6 +14,8 @@ class ValidateIntent(pyblish.api.ContextPlugin):
     order = pyblish.api.ValidatorOrder
 
     label = "Validate Intent"
+    settings_category = "core"
+
     enabled = False
 
     # Can be modified by settings

client/ayon_core/plugins/publish/validate_version.py

@@ -17,6 +17,7 @@ class ValidateVersion(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin):
     order = pyblish.api.ValidatorOrder
 
     label = "Validate Version"
+    settings_category = "core"
 
     optional = False
     active = True