Merge branch 'develop'

Author: iLLiCiTiT

ayon_api/__init__.py

@@ -99,29 +99,35 @@
 
     get_tasks,
 
-    get_folder_ids_with_subsets,
-    get_subset_by_id,
-    get_subset_by_name,
-    get_subsets,
-    get_subset_families,
+    get_folder_ids_with_products,
+    get_product_by_id,
+    get_product_by_name,
+    get_products,
+    get_product_types,
+    get_project_product_types,
+    get_product_type_names,
 
     get_version_by_id,
     get_version_by_name,
     version_is_latest,
     get_versions,
-    get_hero_version_by_subset_id,
+    get_hero_version_by_product_id,
     get_hero_version_by_id,
     get_hero_versions,
     get_last_versions,
-    get_last_version_by_subset_id,
-    get_last_version_by_subset_name,
+    get_last_version_by_product_id,
+    get_last_version_by_product_name,
     get_representation_by_id,
     get_representation_by_name,
     get_representations,
     get_representations_parents,
     get_representation_parents,
     get_repre_ids_by_context_filters,
 
+    get_workfiles_info,
+    get_workfile_info,
+    get_workfile_info_by_id,
+
     get_thumbnail,
     get_folder_thumbnail,
     get_version_thumbnail,
@@ -143,8 +149,8 @@
     get_folders_links,
     get_task_links,
     get_tasks_links,
-    get_subset_links,
-    get_subsets_links,
+    get_product_links,
+    get_products_links,
     get_version_links,
     get_versions_links,
     get_representations_links,
@@ -251,29 +257,35 @@
 
     "get_tasks",
 
-    "get_folder_ids_with_subsets",
-    "get_subset_by_id",
-    "get_subset_by_name",
-    "get_subsets",
-    "get_subset_families",
+    "get_folder_ids_with_products",
+    "get_product_by_id",
+    "get_product_by_name",
+    "get_products",
+    "get_product_types",
+    "get_project_product_types",
+    "get_product_type_names",
 
     "get_version_by_id",
     "get_version_by_name",
     "version_is_latest",
     "get_versions",
-    "get_hero_version_by_subset_id",
+    "get_hero_version_by_product_id",
     "get_hero_version_by_id",
     "get_hero_versions",
     "get_last_versions",
-    "get_last_version_by_subset_id",
-    "get_last_version_by_subset_name",
+    "get_last_version_by_product_id",
+    "get_last_version_by_product_name",
     "get_representation_by_id",
     "get_representation_by_name",
     "get_representations",
     "get_representations_parents",
     "get_representation_parents",
     "get_repre_ids_by_context_filters",
 
+    "get_workfiles_info",
+    "get_workfile_info",
+    "get_workfile_info_by_id",
+
     "get_thumbnail",
     "get_folder_thumbnail",
     "get_version_thumbnail",
@@ -295,8 +307,8 @@
     "get_folders_links",
     "get_task_links",
     "get_tasks_links",
-    "get_subset_links",
-    "get_subsets_links",
+    "get_product_links",
+    "get_products_links",
     "get_version_links",
     "get_versions_links",
     "get_representations_links",

ayon_api/_api.py

@@ -656,29 +656,39 @@ def get_folder_by_name(*args, **kwargs):
     return con.get_folder_by_name(*args, **kwargs)
 
 
-def get_folder_ids_with_subsets(*args, **kwargs):
+def get_folder_ids_with_products(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_folder_ids_with_subsets(*args, **kwargs)
+    return con.get_folder_ids_with_products(*args, **kwargs)
 
 
-def get_subsets(*args, **kwargs):
+def get_product_types(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_subsets(*args, **kwargs)
+    return con.get_product_types(*args, **kwargs)
 
 
-def get_subset_by_id(*args, **kwargs):
+def get_project_product_types(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_subset_by_id(*args, **kwargs)
+    return con.get_project_product_types(*args, **kwargs)
 
 
-def get_subset_by_name(*args, **kwargs):
+def get_product_type_names(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_subset_by_name(*args, **kwargs)
+    return con.get_product_type_names(*args, **kwargs)
 
 
-def get_subset_families(*args, **kwargs):
+def get_products(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_subset_families(*args, **kwargs)
+    return con.get_products(*args, **kwargs)
+
+
+def get_product_by_id(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_product_by_id(*args, **kwargs)
+
+
+def get_product_by_name(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_product_by_name(*args, **kwargs)
 
 
 def get_versions(*args, **kwargs):
@@ -701,9 +711,9 @@ def get_hero_version_by_id(*args, **kwargs):
     return con.get_hero_version_by_id(*args, **kwargs)
 
 
-def get_hero_version_by_subset_id(*args, **kwargs):
+def get_hero_version_by_product_id(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_hero_version_by_subset_id(*args, **kwargs)
+    return con.get_hero_version_by_product_id(*args, **kwargs)
 
 
 def get_hero_versions(*args, **kwargs):
@@ -716,14 +726,14 @@ def get_last_versions(*args, **kwargs):
     return con.get_last_versions(*args, **kwargs)
 
 
-def get_last_version_by_subset_id(*args, **kwargs):
+def get_last_version_by_product_id(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_last_version_by_subset_id(*args, **kwargs)
+    return con.get_last_version_by_product_id(*args, **kwargs)
 
 
-def get_last_version_by_subset_name(*args, **kwargs):
+def get_last_version_by_product_name(*args, **kwargs):
     con = get_server_api_connection()
-    return con.get_last_version_by_subset_name(*args, **kwargs)
+    return con.get_last_version_by_product_name(*args, **kwargs)
 
 
 def version_is_latest(*args, **kwargs):
@@ -761,6 +771,21 @@ def get_repre_ids_by_context_filters(*args, **kwargs):
     return con.get_repre_ids_by_context_filters(*args, **kwargs)
 
 
+def get_workfiles_info(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_workfiles_info(*args, **kwargs)
+
+
+def get_workfile_info(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_workfile_info(*args, **kwargs)
+
+
+def get_workfile_info_by_id(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_workfile_info_by_id(*args, **kwargs)
+
+
 def create_project(
     project_name,
     project_code,
@@ -954,31 +979,31 @@ def get_task_links(
     )
 
 
-def get_subsets_links(
+def get_products_links(
     project_name,
-    subset_ids=None,
+    product_ids=None,
     link_types=None,
     link_direction=None
 ):
     con = get_server_api_connection()
-    return con.get_subsets_links(
+    return con.get_products_links(
         project_name,
-        subset_ids,
+        product_ids,
         link_types,
         link_direction
     )
 
 
-def get_subset_links(
+def get_product_links(
     project_name,
-    subset_id,
+    product_id,
     link_types=None,
     link_direction=None
 ):
     con = get_server_api_connection()
-    return con.get_subset_links(
+    return con.get_product_links(
         project_name,
-        subset_id,
+        product_id,
         link_types,
         link_direction
     )

ayon_api/constants.py

@@ -4,6 +4,13 @@
 # Backwards compatibility
 SERVER_TOKEN_ENV_KEY = SERVER_API_ENV_KEY
 
+# --- Product types ---
+DEFAULT_PRODUCT_TYPE_FIELDS = {
+    "name",
+    "icon",
+    "color",
+}
+
 # --- Project ---
 DEFAULT_PROJECT_FIELDS = {
     "active",
@@ -36,21 +43,21 @@
     "assignees",
 }
 
-# --- Subsets ---
-DEFAULT_SUBSET_FIELDS = {
+# --- Products ---
+DEFAULT_PRODUCT_FIELDS = {
     "id",
     "name",
     "folderId",
     "active",
-    "family",
+    "productType",
 }
 
 # --- Versions ---
 DEFAULT_VERSION_FIELDS = {
     "id",
     "name",
     "version",
-    "subsetId",
+    "productId",
     "taskId",
     "active",
     "author",

ayon_api/entity_hub.py

@@ -558,7 +558,7 @@ def _get_folder_fields(self):
         folder_fields = set(
             self._connection.get_default_fields_for_type("folder")
         )
-        folder_fields.add("hasSubsets")
+        folder_fields.add("hasProducts")
         if self._allow_data_changes:
             folder_fields.add("data")
         return folder_fields
@@ -602,7 +602,7 @@ def query_entities_from_server(self):
             for folder in folders_by_parent_id[parent_id]:
                 folder_entity = self.add_folder(folder)
                 children_ids.add(folder_entity.id)
-                folder_entity.has_published_content = folder["hasSubsets"]
+                folder_entity.has_published_content = folder["hasProducts"]
                 hierarchy_queue.append((folder_entity.id, folder_entity))
 
             for task in tasks_by_parent_id[parent_id]:
@@ -1564,7 +1564,7 @@ def __init__(self, folder_type, *args, label=None, path=None, **kwargs):
 
         self._orig_folder_type = folder_type
         self._orig_label = label
-        # Know if folder has any subsets
+        # Know if folder has any products
         # - is used to know if folder allows hierarchy changes
         self._has_published_content = False
         self._path = path