Merge branch 'develop' into enhancement/save-next-version-reuse-comment

client/ayon_core/plugins/publish/collect_scene_loaded_versions.py

@@ -1,7 +1,9 @@
 import ayon_api
 import ayon_api.utils
 
+from ayon_core.host import ILoadHost
 from ayon_core.pipeline import registered_host
+
 import pyblish.api
 
 
@@ -27,16 +29,23 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
     def process(self, context):
         host = registered_host()
         if host is None:
-            self.log.warn("No registered host.")
+            self.log.warning("No registered host.")
             return
 
-        if not hasattr(host, "ls"):
-            host_name = host.__name__
-            self.log.warn("Host %r doesn't have ls() implemented." % host_name)
+        if not isinstance(host, ILoadHost):
+            host_name = host.name
+            self.log.warning(
+                f"Host {host_name} does not implement ILoadHost. "
+                "Skipping querying of loaded versions in scene."
+            )
+            return
+
+        containers = list(host.get_containers())
+        if not containers:
+            # Opt out early if there are no containers
+            self.log.debug("No loaded containers found in scene.")
             return
 
-        loaded_versions = []
-        containers = list(host.ls())
         repre_ids = {
             container["representation"]
             for container in containers
@@ -61,6 +70,7 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
 
         # QUESTION should we add same representation id when loaded multiple
         #   times?
+        loaded_versions = []
         for con in containers:
             repre_id = con["representation"]
             repre_entity = repre_entities_by_id.get(repre_id)
@@ -80,4 +90,5 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
             }
             loaded_versions.append(version)
 
+        self.log.debug(f"Collected {len(loaded_versions)} loaded versions.")
         context.data["loadedVersions"] = loaded_versions