From 3bbd29dafc262d8984e83e4cf638e6a8b8a033e2 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 6 Oct 2024 15:14:22 +0200 Subject: [PATCH 01/46] Show/hide attributes per instance based on status of other toggles --- .../extract_usd_layer_contributions.py | 73 ++++++++++++++++--- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py index acdc5276f7..a67c6ec702 100644 --- a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py +++ b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py @@ -458,7 +458,22 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, return new_instance @classmethod - def get_attribute_defs(cls): + def get_attr_defs_for_instance(cls, create_context, instance): + # Filtering of instance, if needed, can be customized + if not cls.instance_matches_plugin_families(instance): + return [] + + # Attributes logic + disabled = False + publish_attributes = instance["publish_attributes"].get( + cls.__name__, {}) + + enabled = publish_attributes.get("contribution_enabled", True) + variant_enabled = enabled and publish_attributes.get( + "contribution_apply_as_variant", True) + + disabled = not enabled + variant_disabled = not variant_enabled return [ UISeparatorDef("usd_container_settings1"), @@ -484,7 +499,8 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "the contribution itself will be added to the " "department layer." ), - default="usdAsset"), + default="usdAsset", + hidden=disabled), EnumDef("contribution_target_product_init", label="Initialize as", tooltip=( @@ -495,7 +511,8 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "setting will do nothing." ), items=["asset", "shot"], - default="asset"), + default="asset", + hidden=disabled), # Asset layer, e.g. model.usd, look.usd, rig.usd EnumDef("contribution_layer", @@ -507,7 +524,8 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "the list) will contribute as a stronger opinion." ), items=list(cls.contribution_layers.keys()), - default="model"), + default="model", + hidden=disabled), BoolDef("contribution_apply_as_variant", label="Add as variant", tooltip=( @@ -518,13 +536,16 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "appended to as a sublayer to the department layer " "instead." ), - default=True), + default=True, + hidden=disabled), TextDef("contribution_variant_set_name", label="Variant Set Name", - default="{layer}"), + default="{layer}", + hidden=variant_disabled), TextDef("contribution_variant", label="Variant Name", - default="{variant}"), + default="{variant}", + hidden=variant_disabled), BoolDef("contribution_variant_is_default", label="Set as default variant selection", tooltip=( @@ -535,10 +556,41 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "The behavior is unpredictable if multiple instances " "for the same variant set have this enabled." ), - default=False), + default=False, + hidden=variant_disabled), UISeparatorDef("usd_container_settings3"), ] + @classmethod + def register_create_context_callbacks(cls, create_context): + create_context.add_value_changed_callback(cls.on_values_changed) + + @classmethod + def on_values_changed(cls, event): + """Update instance attribute definitions on attribute changes.""" + + # Update attributes if any of the following plug-in attributes + # change: + keys = ["contribution_enabled", "contribution_apply_as_variant"] + + for instance_change in event["changes"]: + instance = instance_change["instance"] + if not cls.instance_matches_plugin_families(instance): + continue + value_changes = instance_change["changes"] + plugin_attribute_changes = ( + value_changes.get("publish_attributes", {}) + .get(cls.__name__, {})) + + if not any(key in plugin_attribute_changes for key in keys): + continue + + # Update the attribute definitions + new_attrs = cls.get_attr_defs_for_instance( + event["create_context"], instance + ) + instance.set_publish_plugin_attr_defs(cls.__name__, new_attrs) + class CollectUSDLayerContributionsHoudiniLook(CollectUSDLayerContributions): """ @@ -551,9 +603,8 @@ class CollectUSDLayerContributionsHoudiniLook(CollectUSDLayerContributions): label = CollectUSDLayerContributions.label + " (Look)" @classmethod - def get_attribute_defs(cls): - defs = super(CollectUSDLayerContributionsHoudiniLook, - cls).get_attribute_defs() + def get_attr_defs_for_instance(cls, create_context, instance): + defs = super().get_attr_defs_for_instance(create_context, instance) # Update default for department layer to look layer_def = next(d for d in defs if d.key == "contribution_layer") From 202800a48749e74f9234ac86d2a4778e170ea33e Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:35:11 +0200 Subject: [PATCH 02/46] added helper function to get task type for an instance --- client/ayon_core/pipeline/create/context.py | 58 +++++++++++++++++---- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index adbb03a820..6ec2ea284c 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -254,7 +254,7 @@ class CreateContext: # Context validation cache self._folder_id_by_folder_path = {} - self._task_names_by_folder_path = {} + self._task_infos_by_folder_path = {} self.thumbnail_paths_by_instance_id = {} @@ -567,7 +567,7 @@ class CreateContext: # Give ability to store shared data for collection phase self._collection_shared_data = {} self._folder_id_by_folder_path = {} - self._task_names_by_folder_path = {} + self._task_infos_by_folder_path = {} self._event_hub.clear_callbacks() def reset_finalization(self): @@ -1468,6 +1468,42 @@ class CreateContext: if failed_info: raise CreatorsCreateFailed(failed_info) + def get_instances_task_type( + self, instances: Optional[Iterable["CreatedInstance"]] = None + ) -> Dict[str, Optional[str]]: + """Helper function to get task type of task on instance. + + Based on context set on instance (using 'folderPath' and 'task') tries + to find task type. + + Task type is 'None' if task is not set or is not valid, and + is always 'None' for instances with promised context. + + Args: + instances (Optional[Iterable[CreatedInstance]]): Instances to + get task type. If not provided all instances are used. + + Returns: + Dict[str, Optional[str]]: Task type by instance id. + + """ + context_infos = self.get_instances_context_info(instances) + output = {} + for instance_id, context_info in context_infos.items(): + folder_path = context_info.folder_path + task_name = context_info.task_name + if not task_name or not folder_path: + output[instance_id] = None + continue + task_info = ( + self._task_infos_by_folder_path.get(folder_path) or {} + ).get(task_name) + task_type = None + if task_info is not None: + task_type = task_info["task_type"] + output[instance_id] = task_type + return output + def get_instances_context_info( self, instances: Optional[Iterable["CreatedInstance"]] = None ) -> Dict[str, InstanceContextInfo]: @@ -1508,6 +1544,7 @@ class CreateContext: if instance.has_promised_context: context_info.folder_is_valid = True context_info.task_is_valid = True + # NOTE missing task type continue # TODO allow context promise folder_path = context_info.folder_path @@ -1522,7 +1559,7 @@ class CreateContext: task_name = context_info.task_name if task_name is not None: - tasks_cache = self._task_names_by_folder_path.get(folder_path) + tasks_cache = self._task_infos_by_folder_path.get(folder_path) if tasks_cache is not None: context_info.task_is_valid = task_name in tasks_cache continue @@ -1574,15 +1611,17 @@ class CreateContext: tasks_entities = ayon_api.get_tasks( project_name, folder_ids=folder_paths_by_id.keys(), - fields={"name", "folderId"} + fields={"name", "folderId", "taskType"} ) - task_names_by_folder_path = collections.defaultdict(set) + task_infos_by_folder_path = collections.defaultdict(dict) for task_entity in tasks_entities: folder_id = task_entity["folderId"] folder_path = folder_paths_by_id[folder_id] - task_names_by_folder_path[folder_path].add(task_entity["name"]) - self._task_names_by_folder_path.update(task_names_by_folder_path) + task_infos_by_folder_path[folder_path][task_entity["name"]] = { + "task_type": task_entity["taskType"], + } + self._task_infos_by_folder_path.update(task_infos_by_folder_path) for instance in to_validate: folder_path = instance["folderPath"] @@ -1593,15 +1632,16 @@ class CreateContext: folder_path = folder_entities[0]["path"] instance["folderPath"] = folder_path - if folder_path not in task_names_by_folder_path: + if folder_path not in task_infos_by_folder_path: continue context_info = info_by_instance_id[instance.id] context_info.folder_is_valid = True if ( not task_name - or task_name in task_names_by_folder_path[folder_path] + or task_name in task_infos_by_folder_path[folder_path] ): + task_info = task_infos_by_folder_path[folder_path] context_info.task_is_valid = True return info_by_instance_id From d0ed7f086e05a7bf5633b04ebb23b81ec5659e11 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:41:29 +0200 Subject: [PATCH 03/46] small improvement --- client/ayon_core/pipeline/create/context.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 6ec2ea284c..f8e277dccf 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1490,17 +1490,19 @@ class CreateContext: context_infos = self.get_instances_context_info(instances) output = {} for instance_id, context_info in context_infos.items(): - folder_path = context_info.folder_path task_name = context_info.task_name - if not task_name or not folder_path: + if not task_name or not context_info.is_valid: output[instance_id] = None continue - task_info = ( - self._task_infos_by_folder_path.get(folder_path) or {} - ).get(task_name) + task_type = None - if task_info is not None: - task_type = task_info["task_type"] + tasks_cache = self._task_infos_by_folder_path.get( + context_info.folder_path + ) + if tasks_cache is not None: + task_info = tasks_cache.get(task_name) + if task_info is not None: + task_type = task_info["task_type"] output[instance_id] = task_type return output From 385e5bd02c551d8d0c340dbab9d50d3ba3f18047 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:46:44 +0200 Subject: [PATCH 04/46] change name of method --- client/ayon_core/pipeline/create/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index f8e277dccf..36bef9f88b 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1468,7 +1468,7 @@ class CreateContext: if failed_info: raise CreatorsCreateFailed(failed_info) - def get_instances_task_type( + def get_instances_task_types( self, instances: Optional[Iterable["CreatedInstance"]] = None ) -> Dict[str, Optional[str]]: """Helper function to get task type of task on instance. From 1ce9bcf9d2ea3a6235ef8b1737e09b749966c302 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:21:05 +0200 Subject: [PATCH 05/46] revert some changes --- client/ayon_core/pipeline/create/context.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 36bef9f88b..ac3851a51a 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -254,7 +254,7 @@ class CreateContext: # Context validation cache self._folder_id_by_folder_path = {} - self._task_infos_by_folder_path = {} + self._task_names_by_folder_path = {} self.thumbnail_paths_by_instance_id = {} @@ -567,7 +567,7 @@ class CreateContext: # Give ability to store shared data for collection phase self._collection_shared_data = {} self._folder_id_by_folder_path = {} - self._task_infos_by_folder_path = {} + self._task_names_by_folder_path = {} self._event_hub.clear_callbacks() def reset_finalization(self): @@ -1561,7 +1561,7 @@ class CreateContext: task_name = context_info.task_name if task_name is not None: - tasks_cache = self._task_infos_by_folder_path.get(folder_path) + tasks_cache = self._task_names_by_folder_path.get(folder_path) if tasks_cache is not None: context_info.task_is_valid = task_name in tasks_cache continue @@ -1613,17 +1613,16 @@ class CreateContext: tasks_entities = ayon_api.get_tasks( project_name, folder_ids=folder_paths_by_id.keys(), - fields={"name", "folderId", "taskType"} + fields={"name", "folderId"} ) - task_infos_by_folder_path = collections.defaultdict(dict) + task_names_by_folder_path = collections.defaultdict(set) for task_entity in tasks_entities: folder_id = task_entity["folderId"] folder_path = folder_paths_by_id[folder_id] - task_infos_by_folder_path[folder_path][task_entity["name"]] = { - "task_type": task_entity["taskType"], - } - self._task_infos_by_folder_path.update(task_infos_by_folder_path) + task_names_by_folder_path[folder_path].add(task_entity["name"]) + + self._task_names_by_folder_path.update(task_names_by_folder_path) for instance in to_validate: folder_path = instance["folderPath"] From 360a8b39b078714a32255a9d27925bd2f57c54ab Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:37:47 +0200 Subject: [PATCH 06/46] implemented logic to cache entities --- client/ayon_core/pipeline/create/context.py | 422 +++++++++++++++----- 1 file changed, 324 insertions(+), 98 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index ac3851a51a..7c9449cb21 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -12,6 +12,7 @@ from typing import ( Iterable, Tuple, List, + Set, Dict, Any, Callable, @@ -252,8 +253,11 @@ class CreateContext: # Shared data across creators during collection phase self._collection_shared_data = None - # Context validation cache + # Entities cache + self._folder_entities_by_id = {} + self._task_entities_by_id = {} self._folder_id_by_folder_path = {} + self._task_ids_by_folder_path = {} self._task_names_by_folder_path = {} self.thumbnail_paths_by_instance_id = {} @@ -356,12 +360,12 @@ class CreateContext: return self._host_is_valid @property - def host_name(self): + def host_name(self) -> str: if hasattr(self.host, "name"): return self.host.name return os.environ["AYON_HOST_NAME"] - def get_current_project_name(self): + def get_current_project_name(self) -> Optional[str]: """Project name which was used as current context on context reset. Returns: @@ -370,7 +374,7 @@ class CreateContext: return self._current_project_name - def get_current_folder_path(self): + def get_current_folder_path(self) -> Optional[str]: """Folder path which was used as current context on context reset. Returns: @@ -379,7 +383,7 @@ class CreateContext: return self._current_folder_path - def get_current_task_name(self): + def get_current_task_name(self) -> Optional[str]: """Task name which was used as current context on context reset. Returns: @@ -388,7 +392,7 @@ class CreateContext: return self._current_task_name - def get_current_task_type(self): + def get_current_task_type(self) -> Optional[str]: """Task type which was used as current context on context reset. Returns: @@ -403,7 +407,7 @@ class CreateContext: self._current_task_type = task_type return self._current_task_type - def get_current_project_entity(self): + def get_current_project_entity(self) -> Optional[Dict[str, Any]]: """Project entity for current context project. Returns: @@ -419,26 +423,21 @@ class CreateContext: self._current_project_entity = project_entity return copy.deepcopy(self._current_project_entity) - def get_current_folder_entity(self): + def get_current_folder_entity(self) -> Optional[Dict[str, Any]]: """Folder entity for current context folder. Returns: - Union[dict[str, Any], None]: Folder entity. + Optional[dict[str, Any]]: Folder entity. """ if self._current_folder_entity is not _NOT_SET: return copy.deepcopy(self._current_folder_entity) - folder_entity = None + folder_path = self.get_current_folder_path() - if folder_path: - project_name = self.get_current_project_name() - folder_entity = ayon_api.get_folder_by_path( - project_name, folder_path - ) - self._current_folder_entity = folder_entity + self._current_folder_entity = self.get_folder_entity(folder_path) return copy.deepcopy(self._current_folder_entity) - def get_current_task_entity(self): + def get_current_task_entity(self) -> Optional[Dict[str, Any]]: """Task entity for current context task. Returns: @@ -447,18 +446,12 @@ class CreateContext: """ if self._current_task_entity is not _NOT_SET: return copy.deepcopy(self._current_task_entity) - task_entity = None + + folder_path = self.get_current_folder_path() task_name = self.get_current_task_name() - if task_name: - folder_entity = self.get_current_folder_entity() - if folder_entity: - project_name = self.get_current_project_name() - task_entity = ayon_api.get_task_by_name( - project_name, - folder_id=folder_entity["id"], - task_name=task_name - ) - self._current_task_entity = task_entity + self._current_task_entity = self.get_task_entity( + folder_path, task_name + ) return copy.deepcopy(self._current_task_entity) def get_current_workfile_path(self): @@ -566,8 +559,14 @@ class CreateContext: # Give ability to store shared data for collection phase self._collection_shared_data = {} + + self._folder_entities_by_id = {} + self._task_entities_by_id = {} + self._folder_id_by_folder_path = {} + self._task_ids_by_folder_path = {} self._task_names_by_folder_path = {} + self._event_hub.clear_callbacks() def reset_finalization(self): @@ -1468,42 +1467,265 @@ class CreateContext: if failed_info: raise CreatorsCreateFailed(failed_info) - def get_instances_task_types( + def get_folder_entities(self, folder_paths: Iterable[str]): + """Get folder entities by paths. + + Args: + folder_paths (Iterable[str]): Folder paths. + + Returns: + Dict[str, Optional[Dict[str, Any]]]: Folder entities by path. + + """ + output = { + folder_path: None + for folder_path in folder_paths + if folder_path is not None + } + remainders = set() + for folder_path in output: + # Skip empty/invalid folder paths + if folder_path is None or "/" not in folder_path: + continue + + if folder_path not in self._folder_id_by_folder_path: + remainders.add(folder_path) + continue + + folder_id = self._folder_id_by_folder_path.get(folder_path) + if not folder_id: + output[folder_path] = None + continue + + folder_entity = self._folder_entities_by_id.get(folder_id) + if folder_entity: + output[folder_path] = folder_entity + else: + remainders.add(folder_path) + + if not remainders: + return output + + folder_paths_by_id = {} + for folder_entity in ayon_api.get_folders( + self.project_name, + folder_paths=remainders, + ): + folder_id = folder_entity["id"] + folder_path = folder_entity["path"] + folder_paths_by_id[folder_id] = folder_path + output[folder_path] = folder_entity + self._folder_entities_by_id[folder_id] = folder_entity + self._folder_id_by_folder_path[folder_path] = folder_id + + return output + + def get_task_entities( + self, + task_names_by_folder_paths: Dict[str, Set[str]] + ) -> Dict[str, Dict[str, Optional[Dict[str, Any]]]]: + """Get task entities by folder path and task name. + + Entities are cached until reset. + + Args: + task_names_by_folder_paths (Dict[str, Set[str]]): Task names by + folder path. + + Returns: + Dict[str, Dict[str, Dict[str, Any]]]: Task entities by folder path + and task name. + + """ + output = {} + for folder_path, task_names in task_names_by_folder_paths.items(): + if folder_path is None: + continue + output[folder_path] = { + task_name: None + for task_name in task_names + if task_name is not None + } + + missing_folder_paths = set() + for folder_path, output_task_entities_by_name in output.items(): + if not output_task_entities_by_name: + continue + + if folder_path not in self._task_ids_by_folder_path: + missing_folder_paths.add(folder_path) + continue + + all_tasks_filled = True + task_ids = self._task_ids_by_folder_path[folder_path] + task_entities_by_name = {} + for task_id in task_ids: + task_entity = self._task_entities_by_id.get(task_id) + if task_entity is None: + all_tasks_filled = False + continue + task_entities_by_name[task_entity["name"]] = task_entity + + any_missing = False + for task_name in set(output_task_entities_by_name): + task_entity = task_entities_by_name.get(task_name) + if task_entity is None: + any_missing = True + continue + + output_task_entities_by_name[task_name] = task_entity + + if any_missing and not all_tasks_filled: + missing_folder_paths.add(folder_path) + + if not missing_folder_paths: + return output + + folder_entities_by_path = self.get_folder_entities( + missing_folder_paths + ) + folder_ids = set() + for folder_path, folder_entity in folder_entities_by_path.items(): + if folder_entity is not None: + folder_ids.add(folder_entity["id"]) + + if not folder_ids: + return output + + task_entities_by_parent_id = collections.defaultdict(list) + for task_entity in ayon_api.get_tasks( + self.project_name, + folder_ids=folder_ids + ): + folder_id = task_entity["folderId"] + task_entities_by_parent_id[folder_id].append(task_entity) + + for folder_id, task_entities in task_entities_by_parent_id.items(): + folder_path = self._folder_id_by_folder_path.get(folder_id) + task_ids = set() + task_names = set() + for task_entity in task_entities: + task_id = task_entity["id"] + task_name = task_entity["name"] + task_ids.add(task_id) + task_names.add(task_name) + self._task_entities_by_id[task_id] = task_entity + + output[folder_path][task_name] = task_entity + self._task_ids_by_folder_path[folder_path] = task_ids + self._task_names_by_folder_path[folder_path] = task_names + + return output + + def get_folder_entity( + self, + folder_path: Optional[str], + ) -> Optional[Dict[str, Any]]: + """Get folder entity by path. + + Entities are cached until reset. + + Args: + folder_path (Optional[str]): Folder path. + + Returns: + Optional[Dict[str, Any]]: Folder entity. + + """ + if not folder_path: + return None + return self.get_folder_entities([folder_path]).get(folder_path) + + def get_task_entity( + self, + folder_path: Optional[str], + task_name: Optional[str], + ) -> Optional[Dict[str, Any]]: + """Get task entity by name and folder path. + + Entities are cached until reset. + + Args: + folder_path (Optional[str]): Folder path. + task_name (Optional[str]): Task name. + + Returns: + Optional[Dict[str, Any]]: Task entity. + + """ + if not folder_path or not task_name: + return None + + output = self.get_task_entities({folder_path: {task_name}}) + return output.get(folder_path, {}).get(task_name) + + def get_instances_folder_entities( self, instances: Optional[Iterable["CreatedInstance"]] = None - ) -> Dict[str, Optional[str]]: - """Helper function to get task type of task on instance. + ) -> Dict[str, Optional[Dict[str, Any]]]: + if instances is None: + instances = self._instances_by_id.values() + instances = list(instances) + output = { + instance.id: None + for instance in instances + } + if not instances: + return output - Based on context set on instance (using 'folderPath' and 'task') tries - to find task type. + folder_paths = { + instance.get("folderPath") + for instance in instances + } + folder_entities_by_path = self.get_folder_entities(folder_paths) + for instance in instances: + folder_path = instance.get("folderPath") + output[instance.id] = folder_entities_by_path.get(folder_path) + return output - Task type is 'None' if task is not set or is not valid, and - is always 'None' for instances with promised context. + def get_instances_task_entities( + self, instances: Optional[Iterable["CreatedInstance"]] = None + ): + """Get task entities for instances. Args: instances (Optional[Iterable[CreatedInstance]]): Instances to - get task type. If not provided all instances are used. + get task entities. If not provided all instances are used. Returns: - Dict[str, Optional[str]]: Task type by instance id. + Dict[str, Optional[Dict[str, Any]]]: Task entity by instance id. """ - context_infos = self.get_instances_context_info(instances) - output = {} - for instance_id, context_info in context_infos.items(): - task_name = context_info.task_name - if not task_name or not context_info.is_valid: - output[instance_id] = None - continue + if instances is None: + instances = self._instances_by_id.values() + instances = list(instances) - task_type = None - tasks_cache = self._task_infos_by_folder_path.get( - context_info.folder_path + output = { + instance.id: None + for instance in instances + } + if not instances: + return output + + filtered_instances = [] + task_names_by_folder_path = collections.defaultdict(set) + for instance in instances: + folder_path = instance.get("folderPath") + task_name = instance.get("task") + if not folder_path or not task_name: + continue + filtered_instances.append(instance) + task_names_by_folder_path[folder_path].add(task_name) + + task_entities_by_folder_path = self.get_task_entities( + task_names_by_folder_path + ) + for instance in filtered_instances: + folder_path = instance["folderPath"] + task_name = instance["task"] + output[instance.id] = ( + task_entities_by_folder_path[folder_path][task_name] ) - if tasks_cache is not None: - task_info = tasks_cache.get(task_name) - if task_info is not None: - task_type = task_info["task_type"] - output[instance_id] = task_type + return output def get_instances_context_info( @@ -1574,75 +1796,79 @@ class CreateContext: # Backwards compatibility for cases where folder name is set instead # of folder path - folder_names = set() folder_paths = set() - for folder_path in task_names_by_folder_path.keys(): + task_names_by_folder_name = {} + task_names_by_folder_path_clean = {} + for folder_path, task_names in task_names_by_folder_path.items(): if folder_path is None: - pass - elif "/" in folder_path: - folder_paths.add(folder_path) - else: - folder_names.add(folder_path) + continue - folder_paths_by_id = {} - if folder_paths: + clean_task_names = { + task_name + for task_name in task_names + if task_name + } + + if "/" not in folder_path: + task_names_by_folder_name[folder_path] = clean_task_names + continue + + folder_paths.add(folder_path) + if not clean_task_names: + continue + + task_names_by_folder_path_clean[folder_path] = clean_task_names + + folder_paths_by_name = collections.defaultdict(list) + if task_names_by_folder_name: for folder_entity in ayon_api.get_folders( project_name, - folder_paths=folder_paths, - fields={"id", "path"} + folder_names=task_names_by_folder_name.keys(), + fields={"name", "path"} ): - folder_id = folder_entity["id"] - folder_path = folder_entity["path"] - folder_paths_by_id[folder_id] = folder_path - self._folder_id_by_folder_path[folder_path] = folder_id - - folder_entities_by_name = collections.defaultdict(list) - if folder_names: - for folder_entity in ayon_api.get_folders( - project_name, - folder_names=folder_names, - fields={"id", "name", "path"} - ): - folder_id = folder_entity["id"] folder_name = folder_entity["name"] folder_path = folder_entity["path"] - folder_paths_by_id[folder_id] = folder_path - folder_entities_by_name[folder_name].append(folder_entity) - self._folder_id_by_folder_path[folder_path] = folder_id + folder_paths_by_name[folder_name].append(folder_path) - tasks_entities = ayon_api.get_tasks( - project_name, - folder_ids=folder_paths_by_id.keys(), - fields={"name", "folderId"} + folder_path_by_name = {} + for folder_name, paths in folder_paths_by_name.items(): + if len(paths) != 1: + continue + path = paths[0] + folder_path_by_name[folder_name] = path + folder_paths.add(path) + clean_task_names = task_names_by_folder_name[folder_name] + if not clean_task_names: + continue + folder_task_names = task_names_by_folder_path_clean.setdefault( + path, set() + ) + folder_task_names |= clean_task_names + + folder_entities_by_path = self.get_folder_entities(folder_paths) + task_entities_by_folder_path = self.get_task_entities( + task_names_by_folder_path_clean ) - task_names_by_folder_path = collections.defaultdict(set) - for task_entity in tasks_entities: - folder_id = task_entity["folderId"] - folder_path = folder_paths_by_id[folder_id] - task_names_by_folder_path[folder_path].add(task_entity["name"]) - - self._task_names_by_folder_path.update(task_names_by_folder_path) - for instance in to_validate: folder_path = instance["folderPath"] task_name = instance.get("task") if folder_path and "/" not in folder_path: - folder_entities = folder_entities_by_name.get(folder_path) - if len(folder_entities) == 1: - folder_path = folder_entities[0]["path"] - instance["folderPath"] = folder_path + new_folder_path = folder_path_by_name.get(folder_path) + if new_folder_path: + folder_path = new_folder_path + instance["folderPath"] = new_folder_path - if folder_path not in task_infos_by_folder_path: + folder_entity = folder_entities_by_path.get(folder_path) + if not folder_entity: continue context_info = info_by_instance_id[instance.id] context_info.folder_is_valid = True if ( not task_name - or task_name in task_infos_by_folder_path[folder_path] + or task_name in task_entities_by_folder_path[folder_path] ): - task_info = task_infos_by_folder_path[folder_path] context_info.task_is_valid = True return info_by_instance_id From 92e43fc45b81a9305589be85871011cf3236012c Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 23 Oct 2024 23:44:24 +0200 Subject: [PATCH 07/46] Fix variable names + simplify logic --- .../extract_usd_layer_contributions.py | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py index a67c6ec702..0ffce8b643 100644 --- a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py +++ b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py @@ -464,17 +464,13 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, return [] # Attributes logic - disabled = False publish_attributes = instance["publish_attributes"].get( cls.__name__, {}) - enabled = publish_attributes.get("contribution_enabled", True) - variant_enabled = enabled and publish_attributes.get( + visible = publish_attributes.get("contribution_enabled", True) + variant_visible = visible and publish_attributes.get( "contribution_apply_as_variant", True) - disabled = not enabled - variant_disabled = not variant_enabled - return [ UISeparatorDef("usd_container_settings1"), UILabelDef(label="USD Contribution"), @@ -500,7 +496,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "department layer." ), default="usdAsset", - hidden=disabled), + visible=visible), EnumDef("contribution_target_product_init", label="Initialize as", tooltip=( @@ -512,7 +508,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, ), items=["asset", "shot"], default="asset", - hidden=disabled), + visible=visible), # Asset layer, e.g. model.usd, look.usd, rig.usd EnumDef("contribution_layer", @@ -525,7 +521,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, ), items=list(cls.contribution_layers.keys()), default="model", - hidden=disabled), + visible=visible), BoolDef("contribution_apply_as_variant", label="Add as variant", tooltip=( @@ -537,15 +533,15 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "instead." ), default=True, - hidden=disabled), + visible=visible), TextDef("contribution_variant_set_name", label="Variant Set Name", default="{layer}", - hidden=variant_disabled), + visible=variant_visible), TextDef("contribution_variant", label="Variant Name", default="{variant}", - hidden=variant_disabled), + visible=variant_visible), BoolDef("contribution_variant_is_default", label="Set as default variant selection", tooltip=( @@ -557,7 +553,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin, "for the same variant set have this enabled." ), default=False, - hidden=variant_disabled), + visible=variant_visible), UISeparatorDef("usd_container_settings3"), ] From 11bb657d35921c42759339937ee8b82230235e98 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 24 Oct 2024 22:10:25 +0200 Subject: [PATCH 08/46] Do not try to continue with logic if the instance isn't valid for the plug-in anyway --- .../plugins/publish/extract_usd_layer_contributions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py index 0ffce8b643..180cb8bbf1 100644 --- a/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py +++ b/client/ayon_core/plugins/publish/extract_usd_layer_contributions.py @@ -600,6 +600,10 @@ class CollectUSDLayerContributionsHoudiniLook(CollectUSDLayerContributions): @classmethod def get_attr_defs_for_instance(cls, create_context, instance): + # Filtering of instance, if needed, can be customized + if not cls.instance_matches_plugin_families(instance): + return [] + defs = super().get_attr_defs_for_instance(create_context, instance) # Update default for department layer to look From 9595d8fe91e27cb046f053eb86711520826c5848 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Sun, 27 Oct 2024 09:39:08 +0100 Subject: [PATCH 09/46] fix serialize of regex --- client/ayon_core/lib/attribute_definitions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/ayon_core/lib/attribute_definitions.py b/client/ayon_core/lib/attribute_definitions.py index 4877a45118..5daf646873 100644 --- a/client/ayon_core/lib/attribute_definitions.py +++ b/client/ayon_core/lib/attribute_definitions.py @@ -523,7 +523,10 @@ class TextDef(AbstractAttrDef): def serialize(self): data = super().serialize() - data["regex"] = self.regex.pattern + regex = None + if self.regex is not None: + regex = self.regex.pattern + data["regex"] = regex data["multiline"] = self.multiline data["placeholder"] = self.placeholder return data From ea2a9e0221bbfff11ce1c75e9f000ec5d4f1d33b Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:56:22 +0100 Subject: [PATCH 10/46] fix also label clone --- client/ayon_core/lib/attribute_definitions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/lib/attribute_definitions.py b/client/ayon_core/lib/attribute_definitions.py index 5daf646873..34956fd33f 100644 --- a/client/ayon_core/lib/attribute_definitions.py +++ b/client/ayon_core/lib/attribute_definitions.py @@ -327,8 +327,8 @@ class UISeparatorDef(UIDef): class UILabelDef(UIDef): type = "label" - def __init__(self, label, key=None): - super().__init__(label=label, key=key) + def __init__(self, label, key=None, *args, **kwargs): + super().__init__(label=label, key=key, *args, **kwargs) def _def_type_compare(self, other: "UILabelDef") -> bool: return self.label == other.label From 37f2a6bb33931d2b8c536ab0c2831c8987d58648 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:43:06 +0100 Subject: [PATCH 11/46] use kwarg to pass subtype --- .../ayon_core/plugins/publish/extract_hierarchy_to_ayon.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py b/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py index 60c92aa8b1..a169affc66 100644 --- a/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py +++ b/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py @@ -154,7 +154,9 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin): # TODO check if existing entity have 'task' type if task_entity is None: task_entity = entity_hub.add_new_task( - task_info["type"], + task_type=task_info["type"], + # TODO change 'parent_id' to 'folder_id' when ayon api + # is updated parent_id=entity.id, name=task_name ) @@ -182,7 +184,7 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin): folder_type = "Folder" child_entity = entity_hub.add_new_folder( - folder_type, + folder_type=folder_type, parent_id=entity.id, name=child_name ) From 90a9ffa4758e841251af398004326748c71df9f8 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:20:03 +0100 Subject: [PATCH 12/46] fix representation entity --- client/ayon_core/pipeline/delivery.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/ayon_core/pipeline/delivery.py b/client/ayon_core/pipeline/delivery.py index 2a2adf984a..de89c8eec2 100644 --- a/client/ayon_core/pipeline/delivery.py +++ b/client/ayon_core/pipeline/delivery.py @@ -383,6 +383,13 @@ def get_representations_delivery_template_data( continue template_data = repre_entity["context"] + # Bug in 'ayon_api', 'get_representations_hierarchy' did not fully + # convert representation entity. Fixed in 'ayon_api' 1.0.10 . + if isinstance(template_data, str): + con = ayon_api.get_server_api_connection() + repre_entity = con._representation_conversion(repre_entity) + template_data = repre_entity["context"] + template_data.update(copy.deepcopy(general_template_data)) template_data.update(get_folder_template_data( repre_hierarchy.folder, project_name From 30a3aeaa86c4a6d6496b7887269069a2ea543691 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:31:00 +0100 Subject: [PATCH 13/46] remove space between version and dot --- client/ayon_core/pipeline/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/pipeline/delivery.py b/client/ayon_core/pipeline/delivery.py index de89c8eec2..1a8a8498b9 100644 --- a/client/ayon_core/pipeline/delivery.py +++ b/client/ayon_core/pipeline/delivery.py @@ -384,7 +384,7 @@ def get_representations_delivery_template_data( template_data = repre_entity["context"] # Bug in 'ayon_api', 'get_representations_hierarchy' did not fully - # convert representation entity. Fixed in 'ayon_api' 1.0.10 . + # convert representation entity. Fixed in 'ayon_api' 1.0.10. if isinstance(template_data, str): con = ayon_api.get_server_api_connection() repre_entity = con._representation_conversion(repre_entity) From e3022d01786a6cd8ff90ae5816c658cd91f467c2 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Wed, 30 Oct 2024 12:24:12 +0000 Subject: [PATCH 14/46] [Automated] Add generated package files to main --- client/ayon_core/version.py | 2 +- package.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py index 8a7065c93c..5a3281ed01 100644 --- a/client/ayon_core/version.py +++ b/client/ayon_core/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'core' version.""" -__version__ = "1.0.4+dev" +__version__ = "1.0.5" diff --git a/package.py b/package.py index 7c5bffe81f..ec21628d04 100644 --- a/package.py +++ b/package.py @@ -1,6 +1,6 @@ name = "core" title = "Core" -version = "1.0.4+dev" +version = "1.0.5" client_dir = "ayon_core" diff --git a/pyproject.toml b/pyproject.toml index c686d685fb..6bdffc663e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ [tool.poetry] name = "ayon-core" -version = "1.0.4+dev" +version = "1.0.5" description = "" authors = ["Ynput Team "] readme = "README.md" From 1af3b2d242ee10e13712afc101523a46703c9eef Mon Sep 17 00:00:00 2001 From: Ynbot Date: Wed, 30 Oct 2024 12:25:01 +0000 Subject: [PATCH 15/46] [Automated] Update version in package.py for develop --- client/ayon_core/version.py | 2 +- package.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py index 5a3281ed01..b2480af462 100644 --- a/client/ayon_core/version.py +++ b/client/ayon_core/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'core' version.""" -__version__ = "1.0.5" +__version__ = "1.0.5+dev" diff --git a/package.py b/package.py index ec21628d04..38d930189f 100644 --- a/package.py +++ b/package.py @@ -1,6 +1,6 @@ name = "core" title = "Core" -version = "1.0.5" +version = "1.0.5+dev" client_dir = "ayon_core" diff --git a/pyproject.toml b/pyproject.toml index 6bdffc663e..31acb3f8b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ [tool.poetry] name = "ayon-core" -version = "1.0.5" +version = "1.0.5+dev" description = "" authors = ["Ynput Team "] readme = "README.md" From d2c7f1db2d7f3d016bca707cb376948030ba973c Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:05:35 +0100 Subject: [PATCH 16/46] remove `"root"` key from template data --- client/ayon_core/pipeline/delivery.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/ayon_core/pipeline/delivery.py b/client/ayon_core/pipeline/delivery.py index 1a8a8498b9..8fdf2547ba 100644 --- a/client/ayon_core/pipeline/delivery.py +++ b/client/ayon_core/pipeline/delivery.py @@ -409,5 +409,9 @@ def get_representations_delivery_template_data( "version": version_entity["version"], }) _merge_data(template_data, repre_entity["context"]) + + # Remove roots from temlate data to auto-fill them with anatomy data + template_data.pop("root") + output[repre_id] = template_data return output From f8d0f2ac36e07e397862ec594c570a2409dbfb6f Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:30:21 +0100 Subject: [PATCH 17/46] fix typo Co-authored-by: Roy Nieterau --- client/ayon_core/pipeline/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/pipeline/delivery.py b/client/ayon_core/pipeline/delivery.py index 8fdf2547ba..05b78dc05b 100644 --- a/client/ayon_core/pipeline/delivery.py +++ b/client/ayon_core/pipeline/delivery.py @@ -410,7 +410,7 @@ def get_representations_delivery_template_data( }) _merge_data(template_data, repre_entity["context"]) - # Remove roots from temlate data to auto-fill them with anatomy data + # Remove roots from template data to auto-fill them with anatomy data template_data.pop("root") output[repre_id] = template_data From e4d0d3dfb95ea519903fb60562b8d1b9cf4f705b Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:31:22 +0100 Subject: [PATCH 18/46] safe pop of root --- client/ayon_core/pipeline/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/pipeline/delivery.py b/client/ayon_core/pipeline/delivery.py index 05b78dc05b..366c261e08 100644 --- a/client/ayon_core/pipeline/delivery.py +++ b/client/ayon_core/pipeline/delivery.py @@ -411,7 +411,7 @@ def get_representations_delivery_template_data( _merge_data(template_data, repre_entity["context"]) # Remove roots from template data to auto-fill them with anatomy data - template_data.pop("root") + template_data.pop("root", None) output[repre_id] = template_data return output From 0c64785f2749ffb60f35287e323f0b6d67b3b007 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:02:52 +0100 Subject: [PATCH 19/46] fix mapping to folder path --- client/ayon_core/pipeline/create/context.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 7c9449cb21..14133cd18b 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1584,24 +1584,24 @@ class CreateContext: folder_entities_by_path = self.get_folder_entities( missing_folder_paths ) - folder_ids = set() + folder_path_by_id = {} for folder_path, folder_entity in folder_entities_by_path.items(): if folder_entity is not None: - folder_ids.add(folder_entity["id"]) + folder_path_by_id[folder_entity["id"]] = folder_path - if not folder_ids: + if not folder_path_by_id: return output task_entities_by_parent_id = collections.defaultdict(list) for task_entity in ayon_api.get_tasks( self.project_name, - folder_ids=folder_ids + folder_ids=folder_path_by_id.keys() ): folder_id = task_entity["folderId"] task_entities_by_parent_id[folder_id].append(task_entity) for folder_id, task_entities in task_entities_by_parent_id.items(): - folder_path = self._folder_id_by_folder_path.get(folder_id) + folder_path = folder_path_by_id[folder_id] task_ids = set() task_names = set() for task_entity in task_entities: From f48425dd47dbb953c62c87d94a8a807486657d9d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:03:00 +0100 Subject: [PATCH 20/46] better variable name --- client/ayon_core/pipeline/create/context.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 14133cd18b..4b7e323737 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1482,14 +1482,14 @@ class CreateContext: for folder_path in folder_paths if folder_path is not None } - remainders = set() + remainder_paths = set() for folder_path in output: # Skip empty/invalid folder paths if folder_path is None or "/" not in folder_path: continue if folder_path not in self._folder_id_by_folder_path: - remainders.add(folder_path) + remainder_paths.add(folder_path) continue folder_id = self._folder_id_by_folder_path.get(folder_path) @@ -1501,15 +1501,15 @@ class CreateContext: if folder_entity: output[folder_path] = folder_entity else: - remainders.add(folder_path) + remainder_paths.add(folder_path) - if not remainders: + if not remainder_paths: return output folder_paths_by_id = {} for folder_entity in ayon_api.get_folders( self.project_name, - folder_paths=remainders, + folder_paths=remainder_paths, ): folder_id = folder_entity["id"] folder_path = folder_entity["path"] From 31c37efce2501fbdf1cc78e2ce7d2b75e4ca1b46 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:18:43 +0100 Subject: [PATCH 21/46] use single variable to cache folders --- client/ayon_core/pipeline/create/context.py | 39 ++++++++------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 4b7e323737..d7fdad6fdb 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -254,9 +254,8 @@ class CreateContext: self._collection_shared_data = None # Entities cache - self._folder_entities_by_id = {} + self._folder_entities_by_path = {} self._task_entities_by_id = {} - self._folder_id_by_folder_path = {} self._task_ids_by_folder_path = {} self._task_names_by_folder_path = {} @@ -560,10 +559,9 @@ class CreateContext: # Give ability to store shared data for collection phase self._collection_shared_data = {} - self._folder_entities_by_id = {} + self._folder_entities_by_path = {} self._task_entities_by_id = {} - self._folder_id_by_folder_path = {} self._task_ids_by_folder_path = {} self._task_names_by_folder_path = {} @@ -1485,38 +1483,31 @@ class CreateContext: remainder_paths = set() for folder_path in output: # Skip empty/invalid folder paths - if folder_path is None or "/" not in folder_path: + if "/" not in folder_path: continue - if folder_path not in self._folder_id_by_folder_path: + if folder_path not in self._folder_entities_by_path: remainder_paths.add(folder_path) continue - folder_id = self._folder_id_by_folder_path.get(folder_path) - if not folder_id: - output[folder_path] = None - continue - - folder_entity = self._folder_entities_by_id.get(folder_id) - if folder_entity: - output[folder_path] = folder_entity - else: - remainder_paths.add(folder_path) + output[folder_path] = self._folder_entities_by_path[folder_path] if not remainder_paths: return output - folder_paths_by_id = {} + found_paths = set() for folder_entity in ayon_api.get_folders( self.project_name, folder_paths=remainder_paths, ): - folder_id = folder_entity["id"] folder_path = folder_entity["path"] - folder_paths_by_id[folder_id] = folder_path + found_paths.add(folder_path) output[folder_path] = folder_entity - self._folder_entities_by_id[folder_id] = folder_entity - self._folder_id_by_folder_path[folder_path] = folder_id + self._folder_entities_by_path[folder_path] = folder_entity + + # Cache empty folders + for path in remainder_paths - found_paths: + self._folder_entities_by_path[path] = None return output @@ -1775,9 +1766,9 @@ class CreateContext: if not folder_path: continue - if folder_path in self._folder_id_by_folder_path: - folder_id = self._folder_id_by_folder_path[folder_path] - if folder_id is None: + if folder_path in self._folder_entities_by_path: + folder_entity = self._folder_entities_by_path[folder_path] + if folder_entity is None: continue context_info.folder_is_valid = True From d860919b22cb7832df2963bf9c23d2aabfcad919 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:21:31 +0100 Subject: [PATCH 22/46] remove unnecessary check --- client/ayon_core/pipeline/create/context.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index d7fdad6fdb..a0145dee29 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1478,11 +1478,11 @@ class CreateContext: output = { folder_path: None for folder_path in folder_paths - if folder_path is not None } remainder_paths = set() for folder_path in output: - # Skip empty/invalid folder paths + # Skip invalid folder paths (e.g. if only folder name + # is passed in) if "/" not in folder_path: continue @@ -1505,7 +1505,7 @@ class CreateContext: output[folder_path] = folder_entity self._folder_entities_by_path[folder_path] = folder_entity - # Cache empty folders + # Cache empty folder entities for path in remainder_paths - found_paths: self._folder_entities_by_path[path] = None From ce4e8a1b04acb42bfd81ca65b4f17d6270e940ca Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:22:47 +0100 Subject: [PATCH 23/46] handle empty paths --- client/ayon_core/pipeline/create/context.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index a0145dee29..3cff5e03b1 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1481,9 +1481,8 @@ class CreateContext: } remainder_paths = set() for folder_path in output: - # Skip invalid folder paths (e.g. if only folder name - # is passed in) - if "/" not in folder_path: + # Skip invalid folder paths (folder name or empty path) + if not folder_path or "/" not in folder_path: continue if folder_path not in self._folder_entities_by_path: From b4009b718ae6bdcfe398361dc3cd4f1176cfcee1 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:23:15 +0100 Subject: [PATCH 24/46] discard None from folder paths --- client/ayon_core/pipeline/create/context.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 3cff5e03b1..6bfd64b822 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1666,6 +1666,7 @@ class CreateContext: instance.get("folderPath") for instance in instances } + folder_paths.discard(None) folder_entities_by_path = self.get_folder_entities(folder_paths) for instance in instances: folder_path = instance.get("folderPath") From eb561dd371cb0ae7825ac2fc281ffb7fd1cfe720 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:07:31 +0100 Subject: [PATCH 25/46] Remove `os.link` compatibility for Windows. Support for Windows exists since Py 3.2 See: https://docs.python.org/3/library/os.html#os.link --- client/ayon_core/lib/path_tools.py | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/client/ayon_core/lib/path_tools.py b/client/ayon_core/lib/path_tools.py index 5c81fbfebf..efe2556afe 100644 --- a/client/ayon_core/lib/path_tools.py +++ b/client/ayon_core/lib/path_tools.py @@ -38,31 +38,7 @@ def create_hard_link(src_path, dst_path): dst_path(str): Full path to a file where a link of source will be added. """ - # Use `os.link` if is available - # - should be for all platforms with newer python versions - if hasattr(os, "link"): - os.link(src_path, dst_path) - return - - # Windows implementation of hardlinks - # - used in Python 2 - if platform.system().lower() == "windows": - import ctypes - from ctypes.wintypes import BOOL - CreateHardLink = ctypes.windll.kernel32.CreateHardLinkW - CreateHardLink.argtypes = [ - ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_void_p - ] - CreateHardLink.restype = BOOL - - res = CreateHardLink(dst_path, src_path, None) - if res == 0: - raise ctypes.WinError() - return - # Raises not implemented error if gets here - raise NotImplementedError( - "Implementation of hardlink for current environment is missing." - ) + os.link(src_path, dst_path) def collect_frames(files): From 0a970abed6bcccb2755f70af189959ca00c6b3d9 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:11:52 +0100 Subject: [PATCH 26/46] Remove Python 2 code. `unicode` does not exist in Py3+ --- client/ayon_core/lib/log.py | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index 36c39f9d84..1ed16b36ff 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -11,12 +11,12 @@ import copy from . import Terminal -# Check for `unicode` in builtins -USE_UNICODE = hasattr(__builtins__, "unicode") - class LogStreamHandler(logging.StreamHandler): - """ StreamHandler class designed to handle utf errors in python 2.x hosts. + """StreamHandler class. + + This was originally designed to handle UTF errors in python 2.x hosts, + however currently solely remains for backwards compatibility. """ @@ -47,27 +47,7 @@ class LogStreamHandler(logging.StreamHandler): stream = self.stream if stream is None: return - fs = "%s\n" - # if no unicode support... - if not USE_UNICODE: - stream.write(fs % msg) - else: - try: - if (isinstance(msg, unicode) and # noqa: F821 - getattr(stream, 'encoding', None)): - ufs = u'%s\n' - try: - stream.write(ufs % msg) - except UnicodeEncodeError: - stream.write((ufs % msg).encode(stream.encoding)) - else: - if (getattr(stream, 'encoding', 'utf-8')): - ufs = u'%s\n' - stream.write(ufs % unicode(msg)) # noqa: F821 - else: - stream.write(fs % msg) - except UnicodeError: - stream.write(fs % msg.encode("UTF-8")) + stream.write(f"{msg}\n") self.flush() except (KeyboardInterrupt, SystemExit): raise From 9f9c03179a6ab3bec5dfe3f8e757be6baf8cc055 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:16:16 +0100 Subject: [PATCH 27/46] Fix enabled check + fix docstrings --- client/ayon_core/lib/log.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index 1ed16b36ff..d619310eb8 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -25,21 +25,21 @@ class LogStreamHandler(logging.StreamHandler): self.enabled = True def enable(self): - """ Enable StreamHandler + """Enable StreamHandler - Used to silence output + Make StreamHandler output again """ self.enabled = True def disable(self): - """ Disable StreamHandler + """Disable StreamHandler - Make StreamHandler output again + Used to silence output """ self.enabled = False def emit(self, record): - if not self.enable: + if not self.enabled: return try: msg = self.format(record) From 9343e3cca98bf9a3f546efdfd77b43a5e78d9da3 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:20:27 +0100 Subject: [PATCH 28/46] Remove `Logger.mongo_process_id` --- client/ayon_core/lib/log.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index 36c39f9d84..03edc93c74 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -141,8 +141,6 @@ class Logger: process_data = None # Cached process name or ability to set different process name _process_name = None - # TODO Remove 'mongo_process_id' in 1.x.x - mongo_process_id = uuid.uuid4().hex @classmethod def get_logger(cls, name=None): From 300e086c8d4075b39e5627e1a68e7cfa6a6c8793 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:28:59 +0100 Subject: [PATCH 29/46] Update client/ayon_core/lib/log.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- client/ayon_core/lib/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index d619310eb8..d392610f32 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -39,7 +39,7 @@ class LogStreamHandler(logging.StreamHandler): self.enabled = False def emit(self, record): - if not self.enabled: + if not self.enabled or self.stream is None: return try: msg = self.format(record) From 01bd1594f5bbabb21cfb85ee312064bbbe9c7a7b Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:29:31 +0100 Subject: [PATCH 30/46] Remove condition that was moved up --- client/ayon_core/lib/log.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index d392610f32..692df93dad 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -45,8 +45,6 @@ class LogStreamHandler(logging.StreamHandler): msg = self.format(record) msg = Terminal.log(msg) stream = self.stream - if stream is None: - return stream.write(f"{msg}\n") self.flush() except (KeyboardInterrupt, SystemExit): From d4ace0706c90e032bdea5139cdc8e690b2f2c673 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:30:53 +0100 Subject: [PATCH 31/46] Remove unused import --- client/ayon_core/lib/path_tools.py | 1 - 1 file changed, 1 deletion(-) diff --git a/client/ayon_core/lib/path_tools.py b/client/ayon_core/lib/path_tools.py index efe2556afe..c6a833f43a 100644 --- a/client/ayon_core/lib/path_tools.py +++ b/client/ayon_core/lib/path_tools.py @@ -1,7 +1,6 @@ import os import re import logging -import platform import clique From df9821f928af8f26863f502737f863cd39778ef9 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 20:31:21 +0100 Subject: [PATCH 32/46] Fix typo --- client/ayon_core/lib/path_tools.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/ayon_core/lib/path_tools.py b/client/ayon_core/lib/path_tools.py index c6a833f43a..ebd22b43c5 100644 --- a/client/ayon_core/lib/path_tools.py +++ b/client/ayon_core/lib/path_tools.py @@ -185,7 +185,7 @@ def get_last_version_from_path(path_dir, filter): assert isinstance(filter, list) and ( len(filter) != 0), "`filter` argument needs to be list and not empty" - filtred_files = list() + filtered_files = list() # form regex for filtering pattern = r".*".join(filter) @@ -193,10 +193,10 @@ def get_last_version_from_path(path_dir, filter): for file in os.listdir(path_dir): if not re.findall(pattern, file): continue - filtred_files.append(file) + filtered_files.append(file) - if filtred_files: - sorted(filtred_files) - return filtred_files[-1] + if filtered_files: + sorted(filtered_files) + return filtered_files[-1] return None From a02954d908507538e62de6818d3339ee945ce4fe Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Thu, 31 Oct 2024 23:19:23 +0100 Subject: [PATCH 33/46] Fix sorting Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- client/ayon_core/lib/path_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/lib/path_tools.py b/client/ayon_core/lib/path_tools.py index ebd22b43c5..31baac168c 100644 --- a/client/ayon_core/lib/path_tools.py +++ b/client/ayon_core/lib/path_tools.py @@ -196,7 +196,7 @@ def get_last_version_from_path(path_dir, filter): filtered_files.append(file) if filtered_files: - sorted(filtered_files) + filtered_files.sort() return filtered_files[-1] return None From 8c87a66cfe29c1eb8dc4a059364a38e3175aebf1 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 1 Nov 2024 12:45:13 +0100 Subject: [PATCH 34/46] Remove unused import --- client/ayon_core/lib/log.py | 1 - 1 file changed, 1 deletion(-) diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py index f48d3767c9..0c2fe5e2d4 100644 --- a/client/ayon_core/lib/log.py +++ b/client/ayon_core/lib/log.py @@ -1,6 +1,5 @@ import os import sys -import uuid import getpass import logging import platform From 1d053c6b7cee154b7e0fc19aa841428c632e60e0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:40:04 +0100 Subject: [PATCH 35/46] action upload to ynput cloud --- .github/workflows/upload_to_ynput_cloud.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/upload_to_ynput_cloud.yml diff --git a/.github/workflows/upload_to_ynput_cloud.yml b/.github/workflows/upload_to_ynput_cloud.yml new file mode 100644 index 0000000000..7745a8e016 --- /dev/null +++ b/.github/workflows/upload_to_ynput_cloud.yml @@ -0,0 +1,16 @@ +name: 📤 Upload to Ynput Cloud + +on: + workflow_dispatch: + release: + types: [published] + +jobs: + call-upload-to-ynput-cloud: + uses: ynput/ops-repo-automation/.github/workflows/upload_to_ynput_cloud.yml@main + secrets: + CI_EMAIL: ${{ secrets.CI_EMAIL }} + CI_USER: ${{ secrets.CI_USER }} + YNPUT_BOT_TOKEN: ${{ secrets.YNPUT_BOT_TOKEN }} + YNPUT_CLOUD_URL: ${{ secrets.YNPUT_CLOUD_URL }} + YNPUT_CLOUD_TOKEN: ${{ secrets.YNPUT_CLOUD_TOKEN }} From ead5d9963a63413f917ad21329979f7e1147de79 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Fri, 1 Nov 2024 14:42:52 +0000 Subject: [PATCH 36/46] [Automated] Add generated package files to main --- client/ayon_core/version.py | 2 +- package.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py index b2480af462..af93f3e660 100644 --- a/client/ayon_core/version.py +++ b/client/ayon_core/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'core' version.""" -__version__ = "1.0.5+dev" +__version__ = "1.0.6" diff --git a/package.py b/package.py index 38d930189f..b3bc01d0d0 100644 --- a/package.py +++ b/package.py @@ -1,6 +1,6 @@ name = "core" title = "Core" -version = "1.0.5+dev" +version = "1.0.6" client_dir = "ayon_core" diff --git a/pyproject.toml b/pyproject.toml index 31acb3f8b4..cccc81c069 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ [tool.poetry] name = "ayon-core" -version = "1.0.5+dev" +version = "1.0.6" description = "" authors = ["Ynput Team "] readme = "README.md" From 348614745a8fc383d16bdf408f5eaa35bc124999 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Fri, 1 Nov 2024 14:43:31 +0000 Subject: [PATCH 37/46] [Automated] Update version in package.py for develop --- client/ayon_core/version.py | 2 +- package.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py index af93f3e660..2b2af81e18 100644 --- a/client/ayon_core/version.py +++ b/client/ayon_core/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'core' version.""" -__version__ = "1.0.6" +__version__ = "1.0.6+dev" diff --git a/package.py b/package.py index b3bc01d0d0..59f0e82be0 100644 --- a/package.py +++ b/package.py @@ -1,6 +1,6 @@ name = "core" title = "Core" -version = "1.0.6" +version = "1.0.6+dev" client_dir = "ayon_core" diff --git a/pyproject.toml b/pyproject.toml index cccc81c069..ca626eff00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ [tool.poetry] name = "ayon-core" -version = "1.0.6" +version = "1.0.6+dev" description = "" authors = ["Ynput Team "] readme = "README.md" From 7d2e676f522d956c406adc021ced1287004d1b1a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:17:57 +0100 Subject: [PATCH 38/46] create attributes widget can show overriden values --- .../publisher/widgets/product_attributes.py | 67 ++++++++++++++++--- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/client/ayon_core/tools/publisher/widgets/product_attributes.py b/client/ayon_core/tools/publisher/widgets/product_attributes.py index 61d5ca111d..b49f846ffa 100644 --- a/client/ayon_core/tools/publisher/widgets/product_attributes.py +++ b/client/ayon_core/tools/publisher/widgets/product_attributes.py @@ -1,6 +1,9 @@ +from typing import Dict + from qtpy import QtWidgets, QtCore from ayon_core.lib.attribute_definitions import UnknownDef +from ayon_core.tools.utils import set_style_property from ayon_core.tools.attribute_defs import create_widget_for_attr_def from ayon_core.tools.publisher.abstract import AbstractPublisherFrontend from ayon_core.tools.publisher.constants import ( @@ -9,6 +12,22 @@ from ayon_core.tools.publisher.constants import ( ) +def _set_label_overriden(label: QtWidgets.QLabel, overriden: bool): + set_style_property( + label, + "overriden", + "1" if overriden else "" + ) + + +class _CreateAttrDefInfo: + def __init__(self, attr_def, instance_ids, defaults, label_widget): + self.attr_def = attr_def + self.instance_ids = instance_ids + self.defaults = defaults + self.label_widget = label_widget + + class CreatorAttrsWidget(QtWidgets.QWidget): """Widget showing creator specific attributes for selected instances. @@ -51,8 +70,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget): self._controller: AbstractPublisherFrontend = controller self._scroll_area = scroll_area - self._attr_def_id_to_instances = {} - self._attr_def_id_to_attr_def = {} + self._attr_def_info_by_id: Dict[str, _CreateAttrDefInfo] = {} self._current_instance_ids = set() # To store content of scroll area to prevent garbage collection @@ -81,8 +99,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget): prev_content_widget.deleteLater() self._content_widget = None - self._attr_def_id_to_instances = {} - self._attr_def_id_to_attr_def = {} + self._attr_def_info_by_id = {} result = self._controller.get_creator_attribute_definitions( self._current_instance_ids @@ -97,9 +114,20 @@ class CreatorAttrsWidget(QtWidgets.QWidget): content_layout.setVerticalSpacing(INPUTS_LAYOUT_VSPACING) row = 0 - for attr_def, instance_ids, values in result: + for attr_def, info_by_id in result: widget = create_widget_for_attr_def(attr_def, content_widget) + default_values = set() if attr_def.is_value_def: + default_values = [] + values = [] + for item in info_by_id.values(): + values.append(item["value"]) + # 'set' cannot be used for default values because they can + # be unhashable types, e.g. 'list'. + default = item["default"] + if default not in default_values: + default_values.append(default) + if len(values) == 1: value = values[0] if value is not None: @@ -108,8 +136,10 @@ class CreatorAttrsWidget(QtWidgets.QWidget): widget.set_value(values, True) widget.value_changed.connect(self._input_value_changed) - self._attr_def_id_to_instances[attr_def.id] = instance_ids - self._attr_def_id_to_attr_def[attr_def.id] = attr_def + attr_def_info = _CreateAttrDefInfo( + attr_def, list(info_by_id), default_values, None + ) + self._attr_def_info_by_id[attr_def.id] = attr_def_info if not attr_def.visible: continue @@ -121,8 +151,14 @@ class CreatorAttrsWidget(QtWidgets.QWidget): col_num = 2 - expand_cols label = None + is_overriden = False if attr_def.is_value_def: + is_overriden = any( + item["value"] != item["default"] + for item in info_by_id.values() + ) label = attr_def.label or attr_def.key + if label: label_widget = QtWidgets.QLabel(label, self) tooltip = attr_def.tooltip @@ -138,6 +174,8 @@ class CreatorAttrsWidget(QtWidgets.QWidget): ) if not attr_def.is_label_horizontal: row += 1 + attr_def_info.label_widget = label_widget + _set_label_overriden(label_widget, is_overriden) content_layout.addWidget( widget, row, col_num, 1, expand_cols @@ -165,12 +203,19 @@ class CreatorAttrsWidget(QtWidgets.QWidget): break def _input_value_changed(self, value, attr_id): - instance_ids = self._attr_def_id_to_instances.get(attr_id) - attr_def = self._attr_def_id_to_attr_def.get(attr_id) - if not instance_ids or not attr_def: + attr_def_info = self._attr_def_info_by_id.get(attr_id) + if attr_def_info is None: return + + if attr_def_info.label_widget is not None: + defaults = attr_def_info.defaults + is_overriden = len(defaults) != 1 or value not in defaults + _set_label_overriden(attr_def_info.label_widget, is_overriden) + self._controller.set_instances_create_attr_values( - instance_ids, attr_def.key, value + attr_def_info.instance_ids, + attr_def_info.attr_def.key, + value ) From ecc7d2bde9d2755a74248c05a81482d2fe906c29 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:18:15 +0100 Subject: [PATCH 39/46] change return type of 'get_creator_attribute_definitions' --- client/ayon_core/tools/publisher/abstract.py | 2 +- .../tools/publisher/models/create.py | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/client/ayon_core/tools/publisher/abstract.py b/client/ayon_core/tools/publisher/abstract.py index a6ae93cecd..5de3f72de1 100644 --- a/client/ayon_core/tools/publisher/abstract.py +++ b/client/ayon_core/tools/publisher/abstract.py @@ -366,7 +366,7 @@ class AbstractPublisherFrontend(AbstractPublisherCommon): @abstractmethod def get_creator_attribute_definitions( self, instance_ids: Iterable[str] - ) -> List[Tuple[AbstractAttrDef, List[str], List[Any]]]: + ) -> List[Tuple[AbstractAttrDef, Dict[str, Dict[str, Any]]]]: pass @abstractmethod diff --git a/client/ayon_core/tools/publisher/models/create.py b/client/ayon_core/tools/publisher/models/create.py index 9c13d8ae2f..e4c208f1e8 100644 --- a/client/ayon_core/tools/publisher/models/create.py +++ b/client/ayon_core/tools/publisher/models/create.py @@ -769,7 +769,7 @@ class CreateModel: def get_creator_attribute_definitions( self, instance_ids: List[str] - ) -> List[Tuple[AbstractAttrDef, List[str], List[Any]]]: + ) -> List[Tuple[AbstractAttrDef, Dict[str, Dict[str, Any]]]]: """Collect creator attribute definitions for multuple instances. Args: @@ -796,12 +796,23 @@ class CreateModel: if found_idx is None: idx = len(output) - output.append((attr_def, [instance_id], [value])) + output.append(( + attr_def, + { + instance_id: { + "value": value, + "default": attr_def.default + } + } + )) _attr_defs[idx] = attr_def else: - _, ids, values = output[found_idx] - ids.append(instance_id) - values.append(value) + _, info_by_id = output[found_idx] + info_by_id[instance_id] = { + "value": value, + "default": attr_def.default + } + return output def set_instances_publish_attr_values( From a1f74f2c783473fd2692efb7a9321dad36f87199 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:04:52 +0100 Subject: [PATCH 40/46] added styling to overriden label --- client/ayon_core/style/data.json | 4 ++++ client/ayon_core/style/style.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/client/ayon_core/style/data.json b/client/ayon_core/style/data.json index 7389387d97..d4a8b6180b 100644 --- a/client/ayon_core/style/data.json +++ b/client/ayon_core/style/data.json @@ -60,7 +60,11 @@ "icon-alert-tools": "#AA5050", "icon-entity-default": "#bfccd6", "icon-entity-disabled": "#808080", + "font-entity-deprecated": "#666666", + + "font-overridden": "#FF8C1A", + "overlay-messages": { "close-btn": "#D3D8DE", "bg-success": "#458056", diff --git a/client/ayon_core/style/style.css b/client/ayon_core/style/style.css index 3d84d917a4..0d1d4f710e 100644 --- a/client/ayon_core/style/style.css +++ b/client/ayon_core/style/style.css @@ -44,6 +44,10 @@ QLabel { background: transparent; } +QLabel[overriden="1"] { + color: {color:font-overridden}; +} + /* Inputs */ QAbstractSpinBox, QLineEdit, QPlainTextEdit, QTextEdit { border: 1px solid {color:border}; From 0e0620770ff03039346e1eb29852531dbceed42c Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:32:14 +0100 Subject: [PATCH 41/46] fix variable definition --- client/ayon_core/tools/publisher/widgets/product_attributes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/ayon_core/tools/publisher/widgets/product_attributes.py b/client/ayon_core/tools/publisher/widgets/product_attributes.py index b49f846ffa..ab41812e4e 100644 --- a/client/ayon_core/tools/publisher/widgets/product_attributes.py +++ b/client/ayon_core/tools/publisher/widgets/product_attributes.py @@ -116,9 +116,8 @@ class CreatorAttrsWidget(QtWidgets.QWidget): row = 0 for attr_def, info_by_id in result: widget = create_widget_for_attr_def(attr_def, content_widget) - default_values = set() + default_values = [] if attr_def.is_value_def: - default_values = [] values = [] for item in info_by_id.values(): values.append(item["value"]) From 9484c42b9a646690769c21b1794f354b49ee7fee Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 4 Nov 2024 19:09:46 +0100 Subject: [PATCH 42/46] 'get_publish_attribute_definitions' returns default values too --- client/ayon_core/tools/publisher/abstract.py | 2 +- .../ayon_core/tools/publisher/models/create.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/ayon_core/tools/publisher/abstract.py b/client/ayon_core/tools/publisher/abstract.py index 5de3f72de1..7fad2b8176 100644 --- a/client/ayon_core/tools/publisher/abstract.py +++ b/client/ayon_core/tools/publisher/abstract.py @@ -383,7 +383,7 @@ class AbstractPublisherFrontend(AbstractPublisherCommon): ) -> List[Tuple[ str, List[AbstractAttrDef], - Dict[str, List[Tuple[str, Any]]] + Dict[str, List[Tuple[str, Any, Any]]] ]]: pass diff --git a/client/ayon_core/tools/publisher/models/create.py b/client/ayon_core/tools/publisher/models/create.py index e4c208f1e8..8763d79712 100644 --- a/client/ayon_core/tools/publisher/models/create.py +++ b/client/ayon_core/tools/publisher/models/create.py @@ -846,7 +846,7 @@ class CreateModel: ) -> List[Tuple[ str, List[AbstractAttrDef], - Dict[str, List[Tuple[str, Any]]] + Dict[str, List[Tuple[str, Any, Any]]] ]]: """Collect publish attribute definitions for passed instances. @@ -876,21 +876,21 @@ class CreateModel: attr_defs = attr_val.attr_defs if not attr_defs: continue + plugin_attr_defs = all_defs_by_plugin_name.setdefault( plugin_name, [] ) - plugin_attr_defs.append(attr_defs) - plugin_values = all_plugin_values.setdefault(plugin_name, {}) + plugin_attr_defs.append(attr_defs) + for attr_def in attr_defs: if isinstance(attr_def, UIDef): continue - attr_values = plugin_values.setdefault(attr_def.key, []) - - value = attr_val[attr_def.key] - attr_values.append((item_id, value)) + attr_values.append( + (item_id, attr_val[attr_def.key], attr_def.default) + ) attr_defs_by_plugin_name = {} for plugin_name, attr_defs in all_defs_by_plugin_name.items(): @@ -904,7 +904,7 @@ class CreateModel: output.append(( plugin_name, attr_defs_by_plugin_name[plugin_name], - all_plugin_values + all_plugin_values[plugin_name], )) return output From d99dff1610f4243f8217a35968d73c54e7a24804 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 4 Nov 2024 19:10:01 +0100 Subject: [PATCH 43/46] modified publish attributes to display overrides --- .../publisher/widgets/product_attributes.py | 86 +++++++++++++------ 1 file changed, 62 insertions(+), 24 deletions(-) diff --git a/client/ayon_core/tools/publisher/widgets/product_attributes.py b/client/ayon_core/tools/publisher/widgets/product_attributes.py index ab41812e4e..206eebc6f1 100644 --- a/client/ayon_core/tools/publisher/widgets/product_attributes.py +++ b/client/ayon_core/tools/publisher/widgets/product_attributes.py @@ -1,8 +1,9 @@ -from typing import Dict +import typing +from typing import Dict, List, Any from qtpy import QtWidgets, QtCore -from ayon_core.lib.attribute_definitions import UnknownDef +from ayon_core.lib.attribute_definitions import AbstractAttrDef, UnknownDef from ayon_core.tools.utils import set_style_property from ayon_core.tools.attribute_defs import create_widget_for_attr_def from ayon_core.tools.publisher.abstract import AbstractPublisherFrontend @@ -11,6 +12,9 @@ from ayon_core.tools.publisher.constants import ( INPUTS_LAYOUT_VSPACING, ) +if typing.TYPE_CHECKING: + from typing import Union + def _set_label_overriden(label: QtWidgets.QLabel, overriden: bool): set_style_property( @@ -28,6 +32,22 @@ class _CreateAttrDefInfo: self.label_widget = label_widget +class _PublishAttrDefInfo: + def __init__( + self, + attr_def: AbstractAttrDef, + plugin_name: str, + instance_ids: List["Union[str, None]"], + defaults: List[Any], + label_widget: "Union[None, QtWidgets.QLabel]", + ): + self.attr_def = attr_def + self.plugin_name = plugin_name + self.instance_ids = instance_ids + self.defaults = defaults + self.label_widget = label_widget + + class CreatorAttrsWidget(QtWidgets.QWidget): """Widget showing creator specific attributes for selected instances. @@ -267,9 +287,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): self._controller: AbstractPublisherFrontend = controller self._scroll_area = scroll_area - self._attr_def_id_to_instances = {} - self._attr_def_id_to_attr_def = {} - self._attr_def_id_to_plugin_name = {} + self._attr_def_info_by_id: Dict[str, _PublishAttrDefInfo] = {} # Store content of scroll area to prevent garbage collection self._content_widget = None @@ -298,9 +316,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): self._content_widget = None - self._attr_def_id_to_instances = {} - self._attr_def_id_to_attr_def = {} - self._attr_def_id_to_plugin_name = {} + self._attr_def_info_by_id = {} result = self._controller.get_publish_attribute_definitions( self._current_instance_ids, self._context_selected @@ -319,9 +335,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): content_layout.addStretch(1) row = 0 - for plugin_name, attr_defs, all_plugin_values in result: - plugin_values = all_plugin_values[plugin_name] - + for plugin_name, attr_defs, plugin_values in result: for attr_def in attr_defs: widget = create_widget_for_attr_def( attr_def, content_widget @@ -334,6 +348,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): widget.setVisible(False) visible_widget = False + label_widget = None if visible_widget: expand_cols = 2 if attr_def.is_value_def and attr_def.is_label_horizontal: @@ -368,35 +383,58 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): widget.value_changed.connect(self._input_value_changed) - attr_values = plugin_values[attr_def.key] - multivalue = len(attr_values) > 1 + instance_ids = [] values = [] - instances = [] - for instance, value in attr_values: + default_values = [] + is_overriden = False + for (instance_id, value, default_value) in ( + plugin_values.get(attr_def.key, []) + ): + instance_ids.append(instance_id) values.append(value) - instances.append(instance) + if not is_overriden and value != default_value: + is_overriden = True + # 'set' cannot be used for default values because they can + # be unhashable types, e.g. 'list'. + if default_value not in default_values: + default_values.append(default_value) - self._attr_def_id_to_attr_def[attr_def.id] = attr_def - self._attr_def_id_to_instances[attr_def.id] = instances - self._attr_def_id_to_plugin_name[attr_def.id] = plugin_name + multivalue = len(values) > 1 + + self._attr_def_info_by_id[attr_def.id] = _PublishAttrDefInfo( + attr_def, + plugin_name, + instance_ids, + default_values, + label_widget, + ) if multivalue: widget.set_value(values, multivalue) else: widget.set_value(values[0]) + if label_widget is not None: + _set_label_overriden(label_widget, is_overriden) + self._scroll_area.setWidget(content_widget) self._content_widget = content_widget def _input_value_changed(self, value, attr_id): - instance_ids = self._attr_def_id_to_instances.get(attr_id) - attr_def = self._attr_def_id_to_attr_def.get(attr_id) - plugin_name = self._attr_def_id_to_plugin_name.get(attr_id) - if not instance_ids or not attr_def or not plugin_name: + attr_def_info = self._attr_def_info_by_id.get(attr_id) + if attr_def_info is None: return + if attr_def_info.label_widget is not None: + defaults = attr_def_info.defaults + is_overriden = len(defaults) != 1 or value not in defaults + _set_label_overriden(attr_def_info.label_widget, is_overriden) + self._controller.set_instances_publish_attr_values( - instance_ids, plugin_name, attr_def.key, value + attr_def_info.instance_ids, + attr_def_info.plugin_name, + attr_def_info.attr_def.key, + value ) def _on_instance_attr_defs_change(self, event): From 98674eb4366bb063d9d09789223b3403db74f7bc Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:07:40 +0100 Subject: [PATCH 44/46] change overriden color --- client/ayon_core/style/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/style/data.json b/client/ayon_core/style/data.json index d4a8b6180b..748a51238a 100644 --- a/client/ayon_core/style/data.json +++ b/client/ayon_core/style/data.json @@ -63,7 +63,7 @@ "font-entity-deprecated": "#666666", - "font-overridden": "#FF8C1A", + "font-overridden": "#33B461", "overlay-messages": { "close-btn": "#D3D8DE", From 46acbacaac83de7245404e978fe9d9423aa5b36a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:51:29 +0100 Subject: [PATCH 45/46] added typehints and tiny docstring --- .../publisher/widgets/product_attributes.py | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/client/ayon_core/tools/publisher/widgets/product_attributes.py b/client/ayon_core/tools/publisher/widgets/product_attributes.py index 206eebc6f1..b0b2640640 100644 --- a/client/ayon_core/tools/publisher/widgets/product_attributes.py +++ b/client/ayon_core/tools/publisher/widgets/product_attributes.py @@ -25,14 +25,22 @@ def _set_label_overriden(label: QtWidgets.QLabel, overriden: bool): class _CreateAttrDefInfo: - def __init__(self, attr_def, instance_ids, defaults, label_widget): - self.attr_def = attr_def - self.instance_ids = instance_ids - self.defaults = defaults - self.label_widget = label_widget + """Helper class to store information about create attribute definition.""" + def __init__( + self, + attr_def: AbstractAttrDef, + instance_ids: List["Union[str, None]"], + defaults: List[Any], + label_widget: "Union[None, QtWidgets.QLabel]", + ): + self.attr_def: AbstractAttrDef = attr_def + self.instance_ids: List["Union[str, None]"] = instance_ids + self.defaults: List[Any] = defaults + self.label_widget: "Union[None, QtWidgets.QLabel]" = label_widget class _PublishAttrDefInfo: + """Helper class to store information about publish attribute definition.""" def __init__( self, attr_def: AbstractAttrDef, @@ -41,11 +49,11 @@ class _PublishAttrDefInfo: defaults: List[Any], label_widget: "Union[None, QtWidgets.QLabel]", ): - self.attr_def = attr_def - self.plugin_name = plugin_name - self.instance_ids = instance_ids - self.defaults = defaults - self.label_widget = label_widget + self.attr_def: AbstractAttrDef = attr_def + self.plugin_name: str = plugin_name + self.instance_ids: List["Union[str, None]"] = instance_ids + self.defaults: List[Any] = defaults + self.label_widget: "Union[None, QtWidgets.QLabel]" = label_widget class CreatorAttrsWidget(QtWidgets.QWidget): From 994dc956c264daccffb5b8bbe7aa8786589be2d3 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:16:57 +0100 Subject: [PATCH 46/46] use blue color --- client/ayon_core/style/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/style/data.json b/client/ayon_core/style/data.json index 748a51238a..24629ec085 100644 --- a/client/ayon_core/style/data.json +++ b/client/ayon_core/style/data.json @@ -63,7 +63,7 @@ "font-entity-deprecated": "#666666", - "font-overridden": "#33B461", + "font-overridden": "#91CDFC", "overlay-messages": { "close-btn": "#D3D8DE",