Shotgrid: reviving archived assets is broken

services/leecher/leecher/listener.py

@@ -400,7 +400,7 @@ def send_shotgrid_event_to_ayon(
             },
         )
 
-        self.log.info("Dispatched AYON event with payload:", payload)
+        self.log.debug(f"Dispatched AYON event with payload:{payload}")
 
 
 def service_main():

services/processor/processor/processor.py

@@ -22,6 +22,7 @@
 
 class ShotgridProcessor:
     _sg: shotgun_api3.Shotgun = None
+    _RETRIGGERED_TOPIC = "shotgrid.event.retriggered"
     log = get_logger(__file__)
 
     def __init__(self):
@@ -226,6 +227,7 @@ def start_processing(self):
                     )
                     continue
 
+                failed = False
                 for handler in self.handlers_map.get(payload["action"], []):
                     # If theres any handler "subscribed" to this event type..
                     try:
@@ -244,8 +246,8 @@ def start_processing(self):
                             self,
                             payload,
                         )
-
                     except Exception:
+                        failed = True
                         self.log.error(
                             f"Unable to process handler {handler.__name__}",
                             exc_info=True
@@ -254,22 +256,23 @@ def start_processing(self):
                             event["id"],
                             status="failed",
                             description=(
-                                "An error ocurred while processing"
+                                "An error occurred while processing"
                                 f"{event_id_text}"
                             ),
                             payload={
                                 "message": traceback.format_exc(),
                             },
                         )
 
-                self.log.info(
-                    "Event has been processed... setting to finished!")
+                if not failed:
+                    self.log.info(
+                        "Event has been processed... setting to finished!")
 
-                ayon_api.update_event(
-                    event["id"],
-                    description=f"Event processed successfully{event_id_text}",
-                    status="finished",
-                )
+                    ayon_api.update_event(
+                        event["id"],
+                        description=f"Event processed successfully{event_id_text}",
+                        status="finished",
+                    )
 
             except Exception:
                 self.log.error(traceback.format_exc())

services/shotgrid_common/ayon_shotgrid_hub/__init__.py

@@ -306,6 +306,23 @@ def react_to_shotgrid_event(self, sg_event_meta):
                 f"Ignoring event, AYON project {self.project_name} not found.")
             return
 
+        # revival of Asset with tasks will send first retirement_date changes
+        # on tasks, then retirement_date change on Asset AND only then revival
+        # of Asset
+        if (
+            sg_event_meta["type"] == "attribute_change"
+            and sg_event_meta["attribute_name"] == "retirement_date"
+            and sg_event_meta["new_value"] is None  # eg revival
+        ):
+            if sg_event_meta["entity_type"].lower() == "asset":
+                # do not do updates on not yet existing asset
+                return
+
+            self.log.info("Changed 'retirement_date' event to "
+                          f"'entity_revival' for Task | "
+                          f"{sg_event_meta['entity_id']}.")
+            sg_event_meta["type"] = "entity_revival"
+
         match sg_event_meta["type"]:
             case "new_entity" | "entity_revival":
                 self.log.info(

services/shotgrid_common/ayon_shotgrid_hub/match_shotgrid_hierarchy_in_ayon.py

@@ -19,6 +19,7 @@
 )
 
 from utils import (
+    create_new_ayon_entity,
     get_sg_entities,
     get_asset_category,
     update_ay_entity_custom_attributes,
@@ -115,7 +116,8 @@ def match_shotgrid_hierarchy_in_ayon(
                 )
 
             if not ay_entity:
-                ay_entity = _create_new_entity(
+                ay_entity = create_new_ayon_entity(
+                    sg_session,
                     entity_hub,
                     ay_parent_entity,
                     sg_ay_dict
@@ -226,74 +228,6 @@ def match_shotgrid_hierarchy_in_ayon(
     )
 
 
-def _create_new_entity(
-    entity_hub: ayon_api.entity_hub.EntityHub,
-    parent_entity: Union[ProjectEntity, FolderEntity],
-    sg_ay_dict: Dict
-):
-    """Helper method to create entities in the EntityHub.
-
-    Task Creation:
-        https://github.com/ynput/ayon-python-api/blob/30d702618b58676c3708f09f131a0974a92e1002/ayon_api/entity_hub.py#L284
-
-    Folder Creation:
-        https://github.com/ynput/ayon-python-api/blob/30d702618b58676c3708f09f131a0974a92e1002/ayon_api/entity_hub.py#L254
-
-
-    Args:
-        entity_hub (ayon_api.EntityHub): The project's entity hub.
-        parent_entity: AYON parent entity.
-        sg_ay_dict (dict): AYON ShotGrid entity to create.
-    """
-    if sg_ay_dict["type"].lower() == "task":
-        # only create if parent_entity type is not project
-        if parent_entity.entity_type == "project":
-            log.warning(
-                f"Can't create task '{sg_ay_dict['name']}' under project "
-                "'{parent_entity.name}'. Parent should not be project it self!"
-            )
-            return
-
-        ay_entity = entity_hub.add_new_task(
-            sg_ay_dict["task_type"],
-            name=sg_ay_dict["name"],
-            label=sg_ay_dict["label"],
-            entity_id=sg_ay_dict["data"][CUST_FIELD_CODE_ID],
-            parent_id=parent_entity.id,
-            attribs=sg_ay_dict["attribs"],
-            data=sg_ay_dict["data"],
-        )
-    else:
-        ay_entity = entity_hub.add_new_folder(
-            sg_ay_dict["folder_type"],
-            name=sg_ay_dict["name"],
-            label=sg_ay_dict["label"],
-            entity_id=sg_ay_dict["data"][CUST_FIELD_CODE_ID],
-            parent_id=parent_entity.id,
-            attribs=sg_ay_dict["attribs"],
-            data=sg_ay_dict["data"],
-        )
-
-    # TODO: this doesn't work yet
-    status = sg_ay_dict["attribs"].get("status")
-    if status:
-        # TODO: Implement status update
-        try:
-            # INFO: it was causing error so trying to set status directly
-            ay_entity.status = status
-        except ValueError:
-            # `ValueError: Status ip is not available on project.`
-            # log.warning(f"Status sync not implemented: {e}")
-            pass
-
-    tags = sg_ay_dict["attribs"].get("tags")
-    if tags:
-        ay_entity.tags = [tag["name"] for tag in tags]
-
-    log.info(f"Created new entity: {ay_entity.name} ({ay_entity.id})")
-    return ay_entity
-
-
 def _add_tags(project_name, tags):
     """Add tags to AYON project.
 

services/shotgrid_common/ayon_shotgrid_hub/update_from_ayon.py

@@ -253,18 +253,12 @@ def remove_sg_entity_from_ayon_event(
         sg_session (shotgun_api3.Shotgun): The Shotgrid API session.
     """
     ay_id = ayon_event["payload"]["entityData"]["id"]
-    ay_entity_path = ayon_event["payload"]["entityData"].get("path")
     log.debug(f"Removing Shotgrid entity: {ayon_event['payload']}")
 
-    if not ay_entity_path:
-        log.warning(
-            f"Entity '{ay_id}' does not have a path to remove from Shotgrid."
-        )
-        return
-
     sg_id = ayon_event["payload"]["entityData"]["attrib"].get("shotgridId")
 
     if not sg_id:
+        ay_entity_path = ayon_event["payload"]["entityData"]["path"]
         log.warning(
             f"Entity '{ay_entity_path}' does not have a "
             "ShotGrid ID to remove."