diff --git a/openpype/hosts/testhost/plugins/create/auto_creator.py b/openpype/hosts/testhost/plugins/create/auto_creator.py index 67052562a0..bf586f894a 100644 --- a/openpype/hosts/testhost/plugins/create/auto_creator.py +++ b/openpype/hosts/testhost/plugins/create/auto_creator.py @@ -71,12 +71,12 @@ class MyAutoCreator(AutoCreator): self._add_instance_to_context(new_instance) elif ( - existing_instance.data["asset"] != asset_name - or existing_instance.data["task"] != task_name + existing_instance["asset"] != asset_name + or existing_instance["task"] != task_name ): asset_doc = io.find_one({"type": "asset", "name": asset_name}) subset_name = self.get_subset_name( variant, task_name, asset_doc, project_name, host_name ) - existing_instance.data["asset"] = asset_name - existing_instance.data["task"] = task_name + existing_instance["asset"] = asset_name + existing_instance["task"] = task_name diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py index 0600d0ff7f..f870fe6a65 100644 --- a/openpype/pipeline/create/context.py +++ b/openpype/pipeline/create/context.py @@ -847,8 +847,8 @@ class CreateContext: instances = self.instances task_names_by_asset_name = collections.defaultdict(set) for instance in instances: - task_name = instance.data.get("task") - asset_name = instance.data.get("asset") + task_name = instance.get("task") + asset_name = instance.get("asset") if asset_name and task_name: task_names_by_asset_name[asset_name].add(task_name) @@ -878,12 +878,12 @@ class CreateContext: if not instance.has_valid_asset or not instance.has_valid_task: continue - asset_name = instance.data["asset"] + asset_name = instance["asset"] if asset_name not in task_names_by_asset_name: instance.set_asset_invalid(True) continue - task_name = instance.data["task"] + task_name = instance["task"] if not task_name: continue diff --git a/openpype/tools/new_publisher/control.py b/openpype/tools/new_publisher/control.py index 100bf0f4a1..0d92a5f516 100644 --- a/openpype/tools/new_publisher/control.py +++ b/openpype/tools/new_publisher/control.py @@ -556,7 +556,7 @@ class PublisherController: found_idx = idx break - value = instance.data["creator_attributes"][attr_def.key] + value = instance["creator_attributes"][attr_def.key] if found_idx is None: idx = len(output) output.append((attr_def, [instance], [value])) diff --git a/openpype/tools/new_publisher/widgets/card_view_widgets.py b/openpype/tools/new_publisher/widgets/card_view_widgets.py index 1175b489ca..e8cfbfcaff 100644 --- a/openpype/tools/new_publisher/widgets/card_view_widgets.py +++ b/openpype/tools/new_publisher/widgets/card_view_widgets.py @@ -70,7 +70,7 @@ class GroupWidget(QtWidgets.QWidget): instances_by_subset_name = collections.defaultdict(list) for instance in instances: instances_by_id[instance.id] = instance - subset_name = instance.data["subset"] + subset_name = instance["subset"] instances_by_subset_name[subset_name].append(instance) for instance_id in tuple(self._widgets_by_id.keys()): @@ -177,8 +177,8 @@ class InstanceCardWidget(CardWidget): icon_layout.addWidget(icon_widget) icon_layout.addWidget(context_warning) - variant = instance.data["variant"] - subset_name = instance.data["subset"] + variant = instance["variant"] + subset_name = instance["subset"] found_parts = set(re.findall(variant, subset_name, re.IGNORECASE)) if found_parts: for part in found_parts: @@ -191,7 +191,7 @@ class InstanceCardWidget(CardWidget): label_widget.setTextInteractionFlags(QtCore.Qt.NoTextInteraction) active_checkbox = NiceCheckbox(parent=self) - active_checkbox.setChecked(instance.data["active"]) + active_checkbox.setChecked(instance["active"]) expand_btn = QtWidgets.QToolButton(self) # Not yet implemented @@ -233,12 +233,12 @@ class InstanceCardWidget(CardWidget): def set_active(self, new_value): checkbox_value = self.active_checkbox.isChecked() - instance_value = self.instance.data["active"] + instance_value = self.instance["active"] # First change instance value and them change checkbox # - prevent to trigger `active_changed` signal if instance_value != new_value: - self.instance.data["active"] = new_value + self.instance["active"] = new_value if checkbox_value != new_value: self.active_checkbox.setChecked(new_value) @@ -253,7 +253,7 @@ class InstanceCardWidget(CardWidget): self.context_warning.setVisible(not valid) def update_instance_values(self): - self.set_active(self.instance.data["active"]) + self.set_active(self.instance["active"]) self._validate_context() def _set_expanded(self, expanded=None): @@ -263,11 +263,11 @@ class InstanceCardWidget(CardWidget): def _on_active_change(self): new_value = self.active_checkbox.isChecked() - old_value = self.instance.data["active"] + old_value = self.instance["active"] if new_value == old_value: return - self.instance.data["active"] = new_value + self.instance["active"] = new_value self.active_changed.emit() def _on_expend_clicked(self): diff --git a/openpype/tools/new_publisher/widgets/list_view_widgets.py b/openpype/tools/new_publisher/widgets/list_view_widgets.py index 062f4242e0..1257820d1f 100644 --- a/openpype/tools/new_publisher/widgets/list_view_widgets.py +++ b/openpype/tools/new_publisher/widgets/list_view_widgets.py @@ -76,11 +76,11 @@ class InstanceListItemWidget(QtWidgets.QWidget): self.instance = instance - subset_name_label = QtWidgets.QLabel(instance.data["subset"], self) + subset_name_label = QtWidgets.QLabel(instance["subset"], self) subset_name_label.setObjectName("ListViewSubsetName") active_checkbox = NiceCheckbox(parent=self) - active_checkbox.setChecked(instance.data["active"]) + active_checkbox.setChecked(instance["active"]) layout = QtWidgets.QHBoxLayout(self) content_margins = layout.contentsMargins() @@ -113,18 +113,18 @@ class InstanceListItemWidget(QtWidgets.QWidget): self.subset_name_label.style().polish(self.subset_name_label) def is_active(self): - return self.instance.data["active"] + return self.instance["active"] def set_active(self, new_value): checkbox_value = self.active_checkbox.isChecked() - instance_value = self.instance.data["active"] + instance_value = self.instance["active"] if new_value is None: new_value = not instance_value # First change instance value and them change checkbox # - prevent to trigger `active_changed` signal if instance_value != new_value: - self.instance.data["active"] = new_value + self.instance["active"] = new_value if checkbox_value != new_value: self.active_checkbox.setChecked(new_value) @@ -134,16 +134,16 @@ class InstanceListItemWidget(QtWidgets.QWidget): self.update_instance_values() def update_instance_values(self): - self.set_active(self.instance.data["active"]) + self.set_active(self.instance["active"]) self._set_valid_property(self.instance.has_valid_context) def _on_active_change(self): new_value = self.active_checkbox.isChecked() - old_value = self.instance.data["active"] + old_value = self.instance["active"] if new_value == old_value: return - self.instance.data["active"] = new_value + self.instance["active"] = new_value self.active_changed.emit(self.instance.id, new_value) @@ -518,12 +518,12 @@ class InstanceListView(AbstractInstanceView): new_items_with_instance = [] activity = None for instance in instances_by_group_name[group_name]: - instance_id = instance.data["uuid"] + instance_id = instance.id if activity is None: - activity = int(instance.data["active"]) + activity = int(instance["active"]) elif activity == -1: pass - elif activity != instance.data["active"]: + elif activity != instance["active"]: activity = -1 self._group_by_instance_id[instance_id] = group_name @@ -534,8 +534,8 @@ class InstanceListView(AbstractInstanceView): continue item = QtGui.QStandardItem() - item.setData(instance.data["subset"], SORT_VALUE_ROLE) - item.setData(instance.data["uuid"], INSTANCE_ID_ROLE) + item.setData(instance["subset"], SORT_VALUE_ROLE) + item.setData(instance_id, INSTANCE_ID_ROLE) new_items.append(item) new_items_with_instance.append((item, instance)) @@ -579,7 +579,7 @@ class InstanceListView(AbstractInstanceView): ) widget.active_changed.connect(self._on_active_changed) self.instance_view.setIndexWidget(proxy_index, widget) - self._widgets_by_id[instance.data["uuid"]] = widget + self._widgets_by_id[instance.id] = widget # Trigger sort at the end of refresh if sort_at_the_end: @@ -635,11 +635,11 @@ class InstanceListView(AbstractInstanceView): def get_selected_items(self): instances = [] - instances_by_id = {} context_selected = False - for instance in self.controller.instances: - instance_id = instance.data["uuid"] - instances_by_id[instance_id] = instance + instances_by_id = { + instance.id: instance + for instance in self.controller.instances + } for index in self.instance_view.selectionModel().selectedIndexes(): instance_id = index.data(INSTANCE_ID_ROLE) diff --git a/openpype/tools/new_publisher/widgets/widgets.py b/openpype/tools/new_publisher/widgets/widgets.py index daad356ecb..be97222151 100644 --- a/openpype/tools/new_publisher/widgets/widgets.py +++ b/openpype/tools/new_publisher/widgets/widgets.py @@ -969,7 +969,7 @@ class GlobalAttrsWidget(QtWidgets.QWidget): asset_names = set() if asset_name is None: for instance in self._current_instances: - asset_names.add(instance.data.get("asset")) + asset_names.add(instance.get("asset")) else: asset_names.add(asset_name) @@ -986,19 +986,19 @@ class GlobalAttrsWidget(QtWidgets.QWidget): subset_names = set() for instance in self._current_instances: if variant_value is not None: - instance.data["variant"] = variant_value + instance["variant"] = variant_value if asset_name is not None: - instance.data["asset"] = asset_name + instance["asset"] = asset_name instance.set_asset_invalid(False) if task_name is not None: - instance.data["task"] = task_name + instance["task"] = task_name instance.set_task_invalid(False) - new_variant_value = instance.data.get("variant") - new_asset_name = instance.data.get("asset") - new_task_name = instance.data.get("task") + new_variant_value = instance.get("variant") + new_asset_name = instance.get("asset") + new_task_name = instance.get("task") asset_doc = asset_docs_by_name[new_asset_name] @@ -1006,7 +1006,7 @@ class GlobalAttrsWidget(QtWidgets.QWidget): new_variant_value, new_task_name, asset_doc, project_name ) subset_names.add(new_subset_name) - instance.data["subset"] = new_subset_name + instance["subset"] = new_subset_name self.subset_value_widget.set_value(subset_names) @@ -1074,13 +1074,13 @@ class GlobalAttrsWidget(QtWidgets.QWidget): if instance.creator is None: editable = False - variants.add(instance.data.get("variant") or self.unknown_value) - families.add(instance.data.get("family") or self.unknown_value) - asset_name = instance.data.get("asset") or self.unknown_value - task_name = instance.data.get("task") or self.unknown_value + variants.add(instance.get("variant") or self.unknown_value) + families.add(instance.get("family") or self.unknown_value) + asset_name = instance.get("asset") or self.unknown_value + task_name = instance.get("task") or self.unknown_value asset_names.add(asset_name) asset_task_combinations.append((asset_name, task_name)) - subset_names.add(instance.data.get("subset") or self.unknown_value) + subset_names.add(instance.get("subset") or self.unknown_value) self.variant_input.set_value(variants) @@ -1169,7 +1169,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget): return for instance in instances: - creator_attributes = instance.data["creator_attributes"] + creator_attributes = instance["creator_attributes"] if attr_def.key in creator_attributes: creator_attributes[attr_def.key] = value diff --git a/openpype/tools/new_publisher/window.py b/openpype/tools/new_publisher/window.py index 1837463ff5..f6f74224f1 100644 --- a/openpype/tools/new_publisher/window.py +++ b/openpype/tools/new_publisher/window.py @@ -420,7 +420,7 @@ class PublisherWindow(QtWidgets.QDialog): all_valid = None for instance in self.controller.instances: - if not instance.data["active"]: + if not instance["active"]: continue if not instance.has_valid_context: