Fixed 'instance' code

openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py

@@ -1,13 +1,7 @@
 # -*- coding: utf-8 -*-
-import os
-
 import gazu
 import pyblish.api
 
-from openpype.client import (
-    get_assets,
-)
-
 
 class CollectKitsuEntities(pyblish.api.ContextPlugin):
     """Collect Kitsu entities according to the current context"""
@@ -17,67 +11,61 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin):
 
     def process(self, context):
 
-        # Get all needed names
-        project_name = context.data.get("projectName")
-        asset_name = None
-        task_name = None
-        # If asset and task name doesn't exist in context, look in instance
+        kitsu_project = None
+
+        kitsu_entities_by_id = {}
         for instance in context:
-            asset_name = instance.data.get("asset")
+            asset_doc = instance.data.get("assetEntity")
             task_name = instance.data.get("task")
+            if not asset_doc:
+                continue
 
-        # Get all assets of the local project
-        asset_docs = {
-            asset_doc["name"]: asset_doc
-            for asset_doc in get_assets(project_name)
-        }
+            zou_asset_data = asset_doc["data"].get("zou")
+            if not zou_asset_data:
+                raise AssertionError("Zou asset data not found in OpenPype!")
 
-        # Get asset object
-        asset = asset_docs.get(asset_name)
-        if not asset:
-            raise AssertionError(f"{asset_name} not found in DB")
+            if kitsu_project is None:
+                kitsu_project = gazu.project.get_project(
+                    zou_asset_data["project_id"])
+                if not kitsu_project:
+                    raise AssertionError("Project not found in kitsu!")
 
-        zou_asset_data = asset["data"].get("zou")
-        if not zou_asset_data:
-            raise AssertionError("Zou asset data not found in OpenPype!")
-        self.log.debug(f"Collected zou asset data: {zou_asset_data}")
+            entity_type = zou_asset_data["type"]
+            kitsu_id = zou_asset_data["id"]
+            kitsu_entity = kitsu_entities_by_id.get(kitsu_id)
+            if not kitsu_entity:
+                if entity_type == "Shot":
+                    kitsu_entity = gazu.shot.get_shot(kitsu_id)
+                else:
+                    kitsu_entity = gazu.asset.get_asset(kitsu_id)
+                kitsu_entities_by_id[kitsu_id] = kitsu_entity
 
-        kitsu_project = gazu.project.get_project(zou_asset_data["project_id"])
-        if not kitsu_project:
-            raise AssertionError("Project not found in kitsu!")
-        context.data["kitsu_project"] = kitsu_project
-        self.log.debug(f"Collect kitsu project: {kitsu_project}")
+            if not kitsu_entity:
+                raise AssertionError(
+                    "{} not found in kitsu!".format(entity_type))
+            instance.data["kitsu_entity"] = kitsu_entity
 
-        entity_type = zou_asset_data["type"]
-        if entity_type == "Shot":
-            kitsu_entity = gazu.shot.get_shot(zou_asset_data["id"])
-        else:
-            kitsu_entity = gazu.asset.get_asset(zou_asset_data["id"])
-        if not kitsu_entity:
-            raise AssertionError(f"{entity_type} not found in kitsu!")
-        context.data["kitsu_entity"] = kitsu_entity
-        self.log.debug(f"Collect kitsu {entity_type}: {kitsu_entity}")
-
-        if task_name:
-            zou_task_data = asset["data"]["tasks"][task_name].get("zou")
-            self.log.debug(f"Collected zou task data: {zou_task_data}")
-            if zou_task_data:
-                kitsu_task = gazu.task.get_task(zou_task_data["id"])
-                if not kitsu_task:
-                    raise AssertionError("Task not found in kitsu!")
-                context.data["kitsu_task"] = kitsu_task
-                self.log.debug(f"Collect kitsu task: {kitsu_task}")
-            else:
+            if not task_name:
+                continue
+            zou_task_data = asset_doc["data"]["tasks"][task_name].get("zou")
+            self.log.debug(
+                "Collected zou task data: {}".format(zou_task_data))
+            if not zou_task_data:
                 kitsu_task_type = gazu.task.get_task_type_by_name(task_name)
                 if not kitsu_task_type:
                     raise AssertionError(
-                        f"Task type {task_name} not found in Kitsu!"
+                        "Task type {} not found in Kitsu!".format(task_name)
                     )
+                continue
+            kitsu_task_id = zou_task_data["id"]
+            kitsu_task = kitsu_entities_by_id.get(kitsu_task_id)
+            if not kitsu_task:
+                kitsu_task = gazu.task.get_task(zou_task_data["id"])
+                kitsu_entities_by_id[kitsu_task_id] = kitsu_task
 
-                kitsu_task = gazu.task.get_task_by_name(
-                    kitsu_entity, kitsu_task_type
-                )
-                if not kitsu_task:
-                    raise AssertionError("Task not found in kitsu!")
-                context.data["kitsu_task"] = kitsu_task
-                self.log.debug(f"Collect kitsu task: {kitsu_task}")
+            if not kitsu_task:
+                raise AssertionError("Task not found in kitsu!")
+            instance.data["kitsu_task"] = kitsu_task
+            self.log.debug("Collect kitsu task: {}".format(kitsu_task))
+
+        context.data["kitsu_project"] = kitsu_project

openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py

@@ -21,30 +21,32 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin):
 
         self.log.debug("Comment is `{}`".format(publish_comment))
 
-        # Get note status, by default uses the task status for the note
-        # if it is not specified in the configuration
-        note_status = context.data["kitsu_task"]["task_status_id"]
-        if self.set_status_note:
-            kitsu_status = gazu.task.get_task_status_by_short_name(
-                self.note_status_shortname
-            )
-            if kitsu_status:
-                note_status = kitsu_status
-                self.log.info("Note Kitsu status: {}".format(note_status))
-            else:
-                self.log.info(
-                    "Cannot find {} status. The status will not be "
-                    "changed!".format(self.note_status_shortname)
+        for instance in context:
+
+            # Get note status, by default uses the task status for the note
+            # if it is not specified in the configuration
+            note_status = instance.data["kitsu_task"]["task_status"]["id"]
+
+            if self.set_status_note:
+                kitsu_status = gazu.task.get_task_status_by_short_name(
+                    self.note_status_shortname
                 )
+                if kitsu_status:
+                    note_status = kitsu_status
+                    self.log.info("Note Kitsu status: {}".format(note_status))
+                else:
+                    self.log.info(
+                        "Cannot find {} status. The status will not be "
+                        "changed!".format(self.note_status_shortname)
+                    )
 
-        # Add comment to kitsu task
-        self.log.debug(
-            "Add new note in taks id {}".format(
-                context.data["kitsu_task"]["id"]
+            # Add comment to kitsu task
+            task = instance.data["kitsu_task"]["id"]
+            self.log.debug(
+                "Add new note in taks id {}".format(task)
+            )
+            kitsu_comment = gazu.task.add_comment(
+                task, note_status, comment=publish_comment
             )
-        )
-        kitsu_comment = gazu.task.add_comment(
-            context.data["kitsu_task"], note_status, comment=publish_comment
-        )
 
-        context.data["kitsu_comment"] = kitsu_comment
+            instance.data["kitsu_comment"] = kitsu_comment

openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py

@@ -13,9 +13,8 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin):
 
     def process(self, instance):
 
-        context = instance.context
-        task = context.data["kitsu_task"]
-        comment = context.data.get("kitsu_comment")
+        task = instance.data["kitsu_task"]["id"]
+        comment = instance.data["kitsu_comment"]["id"]
 
         # Check comment has been created
         if not comment:
@@ -29,7 +28,6 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin):
             # Skip if not tagged as review
             if "kitsureview" not in representation.get("tags", []):
                 continue
-
             review_path = representation.get("published_path")
             self.log.debug("Found review at: {}".format(review_path))