From e3206796a764e2adf74a1097acf7780f91836863 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 10 Dec 2025 22:16:03 +0100
Subject: [PATCH 1/4] Fix #1600: Filter out containers that lack required keys
 (looking at you `ayon-unreal`!)

---
 .../publish/collect_scene_loaded_versions.py  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
index f509ed807a..6d1563a33a 100644
--- a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
+++ b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+from typing import Any
 import ayon_api
 import ayon_api.utils
 
@@ -32,6 +34,8 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
             self.log.debug("No loaded containers found in scene.")
             return
 
+        containers = self._filter_invalid_containers(containers)
+
         repre_ids = {
             container["representation"]
             for container in containers
@@ -78,3 +82,29 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
 
         self.log.debug(f"Collected {len(loaded_versions)} loaded versions.")
         context.data["loadedVersions"] = loaded_versions
+
+    def _filter_invalid_containers(
+        self,
+        containers: list[dict[str, Any]]
+    ) -> list[dict[str, Any]]:
+        """Filter out invalid containers lacking required keys.
+
+        Skip any invalid containers that lack 'representation' or 'name'
+        keys to avoid KeyError.
+        """
+        # Only filter by what's required for this plug-in instead of validating
+        # a full container schema.
+        required_keys = {"name", "representation"}
+        valid = []
+        for container in containers:
+            missing = [key for key in required_keys if key not in container]
+            if missing:
+                self.log.debug(
+                    "Skipping invalid container, missing required keys:"
+                    " {}. {}".format(", ".join(missing), container)
+                )
+                continue
+            valid.append(container)
+
+
+        return valid

From 5e674844b5cb2a5172b12d4008fd31e22497ceeb Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 10 Dec 2025 22:19:12 +0100
Subject: [PATCH 2/4] Cosmetics

---
 .../ayon_core/plugins/publish/collect_scene_loaded_versions.py   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
index 6d1563a33a..2c214cd1a7 100644
--- a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
+++ b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
@@ -106,5 +106,4 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
                 continue
             valid.append(container)
 
-
         return valid

From 6f534f4ff0ca281b360edd8b5b382746a48f0e7b Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 12 Dec 2025 22:41:28 +0100
Subject: [PATCH 3/4] Update
 client/ayon_core/plugins/publish/collect_scene_loaded_versions.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../ayon_core/plugins/publish/collect_scene_loaded_versions.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
index 2c214cd1a7..54eeefc60b 100644
--- a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
+++ b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
@@ -99,7 +99,7 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
         for container in containers:
             missing = [key for key in required_keys if key not in container]
             if missing:
-                self.log.debug(
+                self.log.warning(
                     "Skipping invalid container, missing required keys:"
                     " {}. {}".format(", ".join(missing), container)
                 )

From b39e09142f8b5ac7aca323e717d1fef7667c19c5 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@ynput.io>
Date: Fri, 12 Dec 2025 23:21:38 +0100
Subject: [PATCH 4/4] :recycle: change pytest-ayon dependency

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index b06f812b27..562bb72035 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,7 @@ opentimelineio = "^0.17.0"
 speedcopy = "^2.1"
 qtpy="^2.4.3"
 pyside6 = "^6.5.2"
-pytest-ayon = { git = "https://github.com/ynput/pytest-ayon.git", branch = "chore/align-dependencies" }
+pytest-ayon = { git = "https://github.com/ynput/pytest-ayon.git", branch = "develop" }
 
 [tool.codespell]
 # Ignore words that are not in the dictionary.