From 39d45b9fbe11625f344f83194ac014b02390e73b Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 24 Jun 2025 12:06:14 +0200 Subject: [PATCH 1/3] remove not existing 'IconData' --- client/ayon_core/tools/loader/models/products.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py index 41919461d0..16ba91e7d5 100644 --- a/client/ayon_core/tools/loader/models/products.py +++ b/client/ayon_core/tools/loader/models/products.py @@ -12,7 +12,6 @@ from ayon_api.operations import OperationsSession from ayon_core.lib import NestedCacheItem from ayon_core.style import get_default_entity_icon_color from ayon_core.tools.loader.abstract import ( - IconData, ProductTypeItem, ProductBaseTypeItem, ProductItem, @@ -113,7 +112,7 @@ def product_item_from_entity( product_type_icon = product_type_item.icon product_base_type_icon = product_base_type_item.icon - product_icon: IconData = { + product_icon = { "type": "awesome-font", "name": "fa.file-o", "color": get_default_entity_icon_color(), @@ -144,7 +143,7 @@ def product_type_item_from_data( # TODO implement icon implementation # icon = product_type_data["icon"] # color = product_type_data["color"] - icon: IconData = { + icon = { "type": "awesome-font", "name": "fa.folder", "color": "#0091B2", @@ -165,7 +164,7 @@ def product_base_type_item_from_data( ProductBaseTypeDict: Product base type item. """ - icon: IconData = { + icon = { "type": "awesome-font", "name": "fa.folder", "color": "#0091B2", @@ -176,7 +175,7 @@ def product_base_type_item_from_data( def create_default_product_type_item(product_type: str) -> ProductTypeItem: - icon: IconData = { + icon = { "type": "awesome-font", "name": "fa.folder", "color": "#0091B2", @@ -194,7 +193,7 @@ def create_default_product_base_type_item( Returns: ProductBaseTypeItem: Default product base type item. """ - icon: IconData = { + icon = { "type": "awesome-font", "name": "fa.folder", "color": "#0091B2", From 8ecb0331f594ed94c2df01063d0fdb1a86adf298 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 24 Jun 2025 12:06:25 +0200 Subject: [PATCH 2/3] use 'get_project_product_base_types' only if is implemented --- client/ayon_core/tools/loader/models/products.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py index 16ba91e7d5..8291203697 100644 --- a/client/ayon_core/tools/loader/models/products.py +++ b/client/ayon_core/tools/loader/models/products.py @@ -283,8 +283,11 @@ class ProductsModel: cache = self._product_base_type_items_cache[project_name] if not cache.is_valid: - product_base_types = ayon_api.get_project_product_base_types( - project_name) + product_base_types = [] + if hasattr(ayon_api, "get_project_product_base_types"): + product_base_types = ayon_api.get_project_product_base_types( + project_name + ) cache.update_data([ product_base_type_item_from_data(product_base_type) for product_base_type in product_base_types From 5f4d4d72c21a088ea40bc8347258f3d49d1a7c38 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 24 Jun 2025 12:17:48 +0200 Subject: [PATCH 3/3] add todo --- client/ayon_core/tools/loader/models/products.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py index 8291203697..c177be4557 100644 --- a/client/ayon_core/tools/loader/models/products.py +++ b/client/ayon_core/tools/loader/models/products.py @@ -284,6 +284,8 @@ class ProductsModel: cache = self._product_base_type_items_cache[project_name] if not cache.is_valid: product_base_types = [] + # TODO add temp implementation here when it is actually + # implemented and available on server. if hasattr(ayon_api, "get_project_product_base_types"): product_base_types = ayon_api.get_project_product_base_types( project_name