From 43b557d95e10978090492434ad8282dcd79d0958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Mon, 1 Dec 2025 18:17:08 +0100
Subject: [PATCH] :recycle: check for compatibility

---
 client/ayon_core/pipeline/compatibility.py    |  3 ++-
 client/ayon_core/pipeline/publish/lib.py      |  6 ++---
 client/ayon_core/plugins/publish/integrate.py | 25 ++++++++++++-------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/pipeline/compatibility.py b/client/ayon_core/pipeline/compatibility.py
index f7d48526b7..dce627e391 100644
--- a/client/ayon_core/pipeline/compatibility.py
+++ b/client/ayon_core/pipeline/compatibility.py
@@ -13,4 +13,5 @@ def is_product_base_type_supported() -> bool:
         bool: True if product base types are supported, False otherwise.
 
     """
-    return False
+    import ayon_api
+    return ayon_api.product_base_type_supported()
diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index c2dcc89cd5..729e694c4f 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -122,8 +122,8 @@ def get_publish_template_name(
     task_type,
     project_settings=None,
     hero=False,
+    product_base_type: Optional[str] = None,
     logger=None,
-    product_base_type: Optional[str] = None
 ):
     """Get template name which should be used for passed context.
 
@@ -141,10 +141,10 @@ def get_publish_template_name(
         task_type (str): Task type on which is instance working.
         project_settings (Dict[str, Any]): Prepared project settings.
         hero (bool): Template is for hero version publishing.
-        logger (logging.Logger): Custom logger used for 'filter_profiles'
-            function.
         product_base_type (Optional[str]): Product type for which should
             be found template.
+        logger (logging.Logger): Custom logger used for 'filter_profiles'
+            function.
 
     Returns:
         str: Template name which should be used for integration.
diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index 4589f6f542..eaf82b37c4 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -28,6 +28,7 @@ from ayon_core.pipeline.publish import (
     KnownPublishError,
     get_publish_template_name,
 )
+from pipeline import is_product_base_type_supported
 
 log = logging.getLogger(__name__)
 
@@ -396,15 +397,21 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         product_id = None
         if existing_product_entity:
             product_id = existing_product_entity["id"]
-        product_entity = new_product_entity(
-            product_name,
-            product_type,
-            folder_entity["id"],
-            data=data,
-            attribs=attributes,
-            entity_id=product_id,
-            product_base_type=product_base_type
-        )
+
+        new_product_entity_kwargs = {
+            "product_name": product_name,
+            "product_type": product_type,
+            "folder_id": folder_entity["id"],
+            "data": data,
+            "attribs": attributes,
+            "entity_id": product_id,
+            "product_base_type": product_base_type,
+        }
+
+        if not is_product_base_type_supported():
+            new_product_entity_kwargs.pop("product_base_type")
+
+        product_entity = new_product_entity(**new_product_entity_kwargs)
 
         if existing_product_entity is None:
             # Create a new product