Load and manage products from a library project

client/ayon_core/pipeline/load/utils.py

@@ -465,7 +465,7 @@ def update_container(container, version=-1):
     from ayon_core.pipeline import get_current_project_name
 
     # Compute the different version from 'representation'
-    project_name = get_current_project_name()
+    project_name = container.get("project_name", get_current_project_name())
     repre_id = container["representation"]
     if not _is_valid_representation_id(repre_id):
         raise ValueError(
@@ -542,9 +542,6 @@ def update_container(container, version=-1):
                 )
             )
 
-    path = get_representation_path(new_representation)
-    if not path or not os.path.exists(path):
-        raise ValueError("Path {} doesn't exist".format(path))
     project_entity = ayon_api.get_project(project_name)
     context = {
         "project": project_entity,
@@ -553,6 +550,9 @@ def update_container(container, version=-1):
         "version": new_version,
         "representation": new_representation,
     }
+    path = get_representation_path_from_context(context)
+    if not path or not os.path.exists(path):
+        raise ValueError("Path {} doesn't exist".format(path))
 
     return Loader().update(container, context)
 
@@ -588,7 +588,7 @@ def switch_container(container, representation, loader_plugin=None):
         )
 
     # Get the new representation to switch to
-    project_name = get_current_project_name()
+    project_name = container.get("project_name", get_current_project_name())
 
     context = get_representation_context(
         project_name, representation["id"]

client/ayon_core/tools/sceneinventory/control.py

@@ -4,7 +4,7 @@
 from ayon_core.host import HostBase
 from ayon_core.pipeline import (
     registered_host,
-    get_current_context,
+    get_current_context
 )
 from ayon_core.tools.common_models import HierarchyModel, ProjectsModel
 
@@ -110,8 +110,9 @@ def get_representation_info_items(self, representation_ids):
             representation_ids
         )
 
-    def get_version_items(self, product_ids):
-        return self._containers_model.get_version_items(product_ids)
+    def get_version_items(self, product_ids, representation_ids):
+        return self._containers_model.get_version_items(
+            product_ids, representation_ids)
 
     # Site Sync methods
     def is_sitesync_enabled(self):

client/ayon_core/tools/sceneinventory/model.py

@@ -130,15 +130,18 @@ def refresh(self, selected=None):
         self._clear_items()
 
         items_by_repre_id = {}
+        project_names = set()
         for container_item in container_items:
             # if (
             #     selected is not None
             #     and container_item.item_id not in selected
             # ):
             #     continue
             repre_id = container_item.representation_id
+            project_name = container_item.project_name
             items = items_by_repre_id.setdefault(repre_id, [])
             items.append(container_item)
+            project_names.add(project_name)
 
         repre_id = set(items_by_repre_id.keys())
         repre_info_by_id = self._controller.get_representation_info_items(
@@ -150,7 +153,7 @@ def refresh(self, selected=None):
             if repre_info.is_valid
         }
         version_items_by_product_id = self._controller.get_version_items(
-            product_ids
+            product_ids, project_names
         )
         # SiteSync addon information
         progress_by_id = self._controller.get_representations_site_progress(

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

@@ -93,13 +93,15 @@ def __init__(
         loader_name,
         namespace,
         object_name,
-        item_id
+        item_id,
+        project_name
     ):
         self.representation_id = representation_id
         self.loader_name = loader_name
         self.object_name = object_name
         self.namespace = namespace
         self.item_id = item_id
+        self.project_name = project_name
 
     @classmethod
     def from_container_data(cls, container):
@@ -109,6 +111,7 @@ def from_container_data(cls, container):
             namespace=container["namespace"],
             object_name=container["objectName"],
             item_id=uuid.uuid4().hex,
+            project_name=container.get("project_name", None)
         )
 
 
@@ -189,15 +192,21 @@ def __init__(self, controller):
         self._items_cache = None
         self._containers_by_id = {}
         self._container_items_by_id = {}
+        self._container_items_by_project = {}
+        self._project_name_by_repre_id = {}
         self._version_items_by_product_id = {}
         self._repre_info_by_id = {}
+        self._product_id_by_project = {}
 
     def reset(self):
         self._items_cache = None
         self._containers_by_id = {}
         self._container_items_by_id = {}
+        self._container_items_by_project = {}
+        self._project_name_by_repre_id = {}
         self._version_items_by_product_id = {}
         self._repre_info_by_id = {}
+        self._product_id_by_project = {}
 
     def get_containers(self):
         self._update_cache()
@@ -221,70 +230,81 @@ def get_container_items_by_id(self, item_ids):
 
     def get_representation_info_items(self, representation_ids):
         output = {}
-        missing_repre_ids = set()
+        missing_repre_ids_by_project = {}
+        current_project_name = self._controller.get_current_project_name()
         for repre_id in representation_ids:
             try:
                 uuid.UUID(repre_id)
             except ValueError:
                 output[repre_id] = RepresentationInfo.new_invalid()
                 continue
 
+            project_name = self._project_name_by_repre_id.get(repre_id)
+            if project_name is None:
+                project_name = current_project_name
             repre_info = self._repre_info_by_id.get(repre_id)
             if repre_info is None:
-                missing_repre_ids.add(repre_id)
+                missing_repre_ids_by_project.setdefault(
+                    project_name, set()
+                    ).add(repre_id)
             else:
                 output[repre_id] = repre_info
 
-        if not missing_repre_ids:
+        if not missing_repre_ids_by_project:
             return output
 
-        project_name = self._controller.get_current_project_name()
-        repre_hierarchy_by_id = get_representations_hierarchy(
-            project_name, missing_repre_ids
-        )
-        for repre_id, repre_hierarchy in repre_hierarchy_by_id.items():
-            kwargs = {
-                "folder_id": None,
-                "folder_path": None,
-                "product_id": None,
-                "product_name": None,
-                "product_type": None,
-                "product_group": None,
-                "version_id": None,
-                "representation_name": None,
-            }
-            folder = repre_hierarchy.folder
-            product = repre_hierarchy.product
-            version = repre_hierarchy.version
-            repre = repre_hierarchy.representation
-            if folder:
-                kwargs["folder_id"] = folder["id"]
-                kwargs["folder_path"] = folder["path"]
-            if product:
-                group = product["attrib"]["productGroup"]
-                kwargs["product_id"] = product["id"]
-                kwargs["product_name"] = product["name"]
-                kwargs["product_type"] = product["productType"]
-                kwargs["product_group"] = group
-            if version:
-                kwargs["version_id"] = version["id"]
-            if repre:
-                kwargs["representation_name"] = repre["name"]
-
-            repre_info = RepresentationInfo(**kwargs)
-            self._repre_info_by_id[repre_id] = repre_info
-            output[repre_id] = repre_info
+        for project_name, missing_ids in missing_repre_ids_by_project.items():
+            repre_hierarchy_by_id = get_representations_hierarchy(
+                project_name, missing_ids
+            )
+            for repre_id, repre_hierarchy in repre_hierarchy_by_id.items():
+                kwargs = {
+                    "folder_id": None,
+                    "folder_path": None,
+                    "product_id": None,
+                    "product_name": None,
+                    "product_type": None,
+                    "product_group": None,
+                    "version_id": None,
+                    "representation_name": None,
+                }
+                folder = repre_hierarchy.folder
+                product = repre_hierarchy.product
+                version = repre_hierarchy.version
+                repre = repre_hierarchy.representation
+                if folder:
+                    kwargs["folder_id"] = folder["id"]
+                    kwargs["folder_path"] = folder["path"]
+                if product:
+                    group = product["attrib"]["productGroup"]
+                    kwargs["product_id"] = product["id"]
+                    kwargs["product_name"] = product["name"]
+                    kwargs["product_type"] = product["productType"]
+                    kwargs["product_group"] = group
+                if version:
+                    kwargs["version_id"] = version["id"]
+                if repre:
+                    kwargs["representation_name"] = repre["name"]
+
+                repre_info = RepresentationInfo(**kwargs)
+                self._repre_info_by_id[repre_id] = repre_info
+                self._product_id_by_project[project_name] = repre_info.product_id
+                output[repre_id] = repre_info
         return output
 
-    def get_version_items(self, product_ids):
+    def get_version_items(self, product_ids, project_names):
         if not product_ids:
             return {}
-
         missing_ids = {
             product_id
             for product_id in product_ids
             if product_id not in self._version_items_by_product_id
         }
+
+        product_ids_by_project = {
+            project_name: self._product_id_by_project.get(project_name)
+            for project_name in project_names
+        }
         if missing_ids:
             status_items_by_name = {
                 status_item.name: status_item
@@ -293,25 +313,27 @@ def get_version_items(self, product_ids):
 
             def version_sorted(entity):
                 return entity["version"]
-
-            project_name = self._controller.get_current_project_name()
+            version_entities_list = []
             version_entities_by_product_id = {
                 product_id: []
                 for product_id in missing_ids
             }
-
-            version_entities = list(ayon_api.get_versions(
-                project_name,
-                product_ids=missing_ids,
-                fields={"id", "version", "productId", "status"}
-            ))
-            version_entities.sort(key=version_sorted)
-            for version_entity in version_entities:
+            for project_name, product_id in product_ids_by_project.items():
+                if product_id not in missing_ids:
+                    continue
+                version_entities = list(ayon_api.get_versions(
+                    project_name,
+                    product_ids={product_id},
+                    fields={"id", "version", "productId", "status"}
+                ))
+
+                version_entities_list.extend(version_entities)
+            version_entities_list.sort(key=version_sorted)
+            for version_entity in version_entities_list:
                 product_id = version_entity["productId"]
                 version_entities_by_product_id[product_id].append(
                     version_entity
                 )
-
             for product_id, version_entities in (
                 version_entities_by_product_id.items()
             ):
@@ -337,7 +359,6 @@ def version_sorted(entity):
                 self._version_items_by_product_id[product_id] = (
                     version_items_by_id
                 )
-
         return {
             product_id: dict(self._version_items_by_product_id[product_id])
             for product_id in product_ids
@@ -358,6 +379,7 @@ def _update_cache(self):
         container_items = []
         containers_by_id = {}
         container_items_by_id = {}
+        project_name_by_repre_id = {}
         invalid_ids_mapping = {}
         for container in containers:
             try:
@@ -381,8 +403,10 @@ def _update_cache(self):
 
             containers_by_id[item.item_id] = container
             container_items_by_id[item.item_id] = item
+            project_name_by_repre_id[item.representation_id] = item.project_name
             container_items.append(item)
 
         self._containers_by_id = containers_by_id
         self._container_items_by_id = container_items_by_id
+        self._project_name_by_repre_id = project_name_by_repre_id
         self._items_cache = container_items

client/ayon_core/tools/sceneinventory/view.py

@@ -208,13 +208,15 @@ def _build_item_menu_for_selection(self, menu, indexes, active_index):
         filtered_items = []
         product_ids = set()
         version_ids = set()
+        project_names = set()
         for container_item in container_items_by_id.values():
             repre_id = container_item.representation_id
             repre_info = repre_info_by_id.get(repre_id)
             if repre_info and repre_info.is_valid:
                 filtered_items.append(container_item)
                 version_ids.add(repre_info.version_id)
                 product_ids.add(repre_info.product_id)
+                project_names.add(container_item.project_name)
 
         # remove
         remove_icon = qtawesome.icon("fa.remove", color=DEFAULT_COLOR)
@@ -228,8 +230,7 @@ def _build_item_menu_for_selection(self, menu, indexes, active_index):
             return
 
         version_items_by_product_id = self._controller.get_version_items(
-            product_ids
-        )
+            product_ids, project_names)
         has_outdated = False
         has_loaded_hero_versions = False
         has_available_hero_version = False
@@ -739,6 +740,10 @@ def _show_version_dialog(self, item_ids, active_repre_id):
             container_item.representation_id
             for container_item in container_items_by_id.values()
         }
+        project_names = {
+            container_item.project_name
+            for container_item in container_items_by_id.values()
+        }
         repre_info_by_id = self._controller.get_representation_info_items(
             repre_ids
         )
@@ -751,8 +756,7 @@ def _show_version_dialog(self, item_ids, active_repre_id):
         active_version_id = active_repre_info.version_id
         active_product_id = active_repre_info.product_id
         version_items_by_product_id = self._controller.get_version_items(
-            product_ids
-        )
+            product_ids, project_names)
         version_items = list(
             version_items_by_product_id[active_product_id].values()
         )
@@ -934,6 +938,10 @@ def _on_switch_to_versioned(self, item_ids):
             container_item.representation_id
             for container_item in containers_items_by_id.values()
         }
+        project_names = {
+            container_item.project_name
+            for container_item in containers_items_by_id.values()
+        }
         repre_info_by_id = self._controller.get_representation_info_items(
             repre_ids
         )
@@ -943,8 +951,7 @@ def _on_switch_to_versioned(self, item_ids):
             if repre_info.is_valid
         }
         version_items_by_product_id = self._controller.get_version_items(
-            product_ids
-        )
+            product_ids, project_names)
 
         update_containers = []
         update_versions = []