Merge branch 'develop' into enhancement/AY-2612-resolve-adaptation-colorbleed-plugins

client/ayon_core/tools/loader/abstract.py

@@ -177,7 +177,7 @@ class VersionItem:
         other_version = abs(other.version)
         # Hero version is greater than non-hero
         if version == other_version:
-            return self.is_hero
+            return not self.is_hero
         return version > other_version
 
     def __lt__(self, other):
@@ -188,7 +188,7 @@ class VersionItem:
         other_version = abs(other.version)
         # Non-hero version is lesser than hero
         if version == other_version:
-            return not self.is_hero
+            return self.is_hero
         return version < other_version
 
     def __ge__(self, other):

client/ayon_core/tools/sceneinventory/models/containers.py

@@ -90,7 +90,6 @@ class ContainerItem:
         representation_id,
         loader_name,
         namespace,
-        name,
         object_name,
         item_id
     ):
@@ -98,7 +97,6 @@ class ContainerItem:
         self.loader_name = loader_name
         self.object_name = object_name
         self.namespace = namespace
-        self.name = name
         self.item_id = item_id
 
     @classmethod
@@ -107,7 +105,6 @@ class ContainerItem:
             representation_id=container["representation"],
             loader_name=container["loader"],
             namespace=container["namespace"],
-            name=container["name"],
             object_name=container["objectName"],
             item_id=uuid.uuid4().hex,
         )
@@ -204,7 +201,7 @@ class ContainersModel:
     def get_container_items(self):
         self._update_cache()
         return list(self._items_cache)
-    
+
     def get_container_items_by_id(self, item_ids):
         return {
             item_id: self._container_items_by_id.get(item_id)
@@ -329,15 +326,25 @@ class ContainersModel:
             containers = list(host.ls())
         else:
             containers = []
+
         container_items = []
         containers_by_id = {}
         container_items_by_id = {}
         for container in containers:
-            item = ContainerItem.from_container_data(container)
+            try:
+                item = ContainerItem.from_container_data(container)
+            except Exception as e:
+                # skip item if required data are missing
+                self._controller.log_error(
+                    f"Failed to create item: {e}"
+                )
+                continue
+
             containers_by_id[item.item_id] = container
             container_items_by_id[item.item_id] = item
             container_items.append(item)
 
+
         self._containers_by_id = containers_by_id
         self._container_items_by_id = container_items_by_id
         self._items_cache = container_items

server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py

@@ -8,7 +8,7 @@ from ayon_core.lib import (
 )
 
 
-def _get_animation_attr_defs(cls):
+def _get_animation_attr_defs():
     """Get Animation generic definitions."""
     defs = lib.collect_animation_defs()
     defs.extend(
@@ -99,9 +99,7 @@ class CreateAnimation(plugin.MayaHiddenCreator):
         return node_data
 
     def get_instance_attr_defs(self):
-        defs = super(CreateAnimation, self).get_instance_attr_defs()
-        defs += _get_animation_attr_defs(self)
-        return defs
+        return _get_animation_attr_defs()
 
 
 class CreatePointCache(plugin.MayaCreator):
@@ -123,9 +121,7 @@ class CreatePointCache(plugin.MayaCreator):
         return node_data
 
     def get_instance_attr_defs(self):
-        defs = super(CreatePointCache, self).get_instance_attr_defs()
-        defs += _get_animation_attr_defs(self)
-        return defs
+        return _get_animation_attr_defs()
 
     def create(self, product_name, instance_data, pre_create_data):
         instance = super(CreatePointCache, self).create(

server_addon/maya/client/ayon_maya/plugins/create/create_look.py

@@ -42,6 +42,6 @@ class CreateLook(plugin.MayaCreator):
 
     def get_pre_create_attr_defs(self):
         # Show same attributes on create but include use selection
-        defs = super(CreateLook, self).get_pre_create_attr_defs()
+        defs = list(super().get_pre_create_attr_defs())
         defs.extend(self.get_instance_attr_defs())
         return defs

server_addon/maya/client/ayon_maya/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'maya' version."""
-__version__ = "0.2.2"
+__version__ = "0.2.3"

server_addon/maya/package.py

@@ -1,6 +1,6 @@
 name = "maya"
 title = "Maya"
-version = "0.2.2"
+version = "0.2.3"
 client_dir = "ayon_maya"
 
 ayon_required_addons = {