diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index e9f259e53b..fd66881344 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -79,7 +79,7 @@ _NOT_SET = object() INSTANCE_ADDED_TOPIC = "instances.added" INSTANCE_REMOVED_TOPIC = "instances.removed" VALUE_CHANGED_TOPIC = "values.changed" -INSTANCE_STATE_CHANGED_TOPIC = "instance.state.changed" +INSTANCE_REQUIREMENT_CHANGED_TOPIC = "instance.requirement.changed" PRE_CREATE_ATTR_DEFS_CHANGED_TOPIC = "pre.create.attr.defs.changed" CREATE_ATTR_DEFS_CHANGED_TOPIC = "create.attr.defs.changed" PUBLISH_ATTR_DEFS_CHANGED_TOPIC = "publish.attr.defs.changed" @@ -258,10 +258,10 @@ class CreateContext: "create_attrs_change": BulkInfo(), # Publish attribute definitions changed "publish_attrs_change": BulkInfo(), - # Instance state changed - # - right now used only for 'mandatory' state but can be extended + # Instance requirement changed + # - right now used only for 'mandatory' but can be extended # in future - "state_change": BulkInfo(), + "requirement_change": BulkInfo(), } self._bulk_order = [] @@ -1054,10 +1054,10 @@ class CreateContext: PUBLISH_ATTR_DEFS_CHANGED_TOPIC, callback ) - def add_instance_state_change_callback( + def add_instance_requirement_change_callback( self, callback: Callable ) -> "EventCallback": - """Register callback to listen instance state changes. + """Register callback to listen instance requirement changes. Create plugin changed attribute definitions of instance. @@ -1072,7 +1072,7 @@ class CreateContext: Args: callback (Callable): Callback function that will be called when - create attributes changed. + instance requirement changed. Returns: EventCallback: Created callback object which can be used to @@ -1080,7 +1080,7 @@ class CreateContext: """ return self._event_hub.add_callback( - INSTANCE_STATE_CHANGED_TOPIC, callback + INSTANCE_REQUIREMENT_CHANGED_TOPIC, callback ) def context_data_to_store(self) -> dict[str, Any]: @@ -1358,9 +1358,9 @@ class CreateContext: yield bulk_info @contextmanager - def bulk_instance_state_change(self, sender: Optional[str] = None): + def bulk_instance_requirement_change(self, sender: Optional[str] = None): with self._bulk_context( - "state_change", sender + "requirement_change", sender ) as bulk_info: yield bulk_info @@ -1431,8 +1431,8 @@ class CreateContext: with self.bulk_value_changes() as bulk_item: bulk_item.append((instance_id, new_values)) - def instance_state_changed(self, instance_id: str) -> None: - """Instance state changed. + def instance_requirement_changed(self, instance_id: str) -> None: + """Instance requirement changed. Triggered by `CreatedInstance`. @@ -1441,7 +1441,7 @@ class CreateContext: """ if self._is_instance_events_ready(instance_id): - with self.bulk_instance_state_change() as bulk_item: + with self.bulk_instance_requirement_change() as bulk_item: bulk_item.append(instance_id) # --- context change callbacks --- @@ -2303,8 +2303,8 @@ class CreateContext: self._bulk_create_attrs_change_finished(data, sender) elif key == "publish_attrs_change": self._bulk_publish_attrs_change_finished(data, sender) - elif key == "state_change": - self._bulk_instance_state_change_finished(data, sender) + elif key == "requirement_change": + self._bulk_instance_requirement_change_finished(data, sender) def _bulk_add_instances_finished( self, @@ -2500,7 +2500,7 @@ class CreateContext: sender, ) - def _bulk_instance_state_change_finished( + def _bulk_instance_requirement_change_finished( self, instance_ids: list[str], sender: Optional[str], @@ -2514,7 +2514,7 @@ class CreateContext: ] self._emit_event( - INSTANCE_STATE_CHANGED_TOPIC, + INSTANCE_REQUIREMENT_CHANGED_TOPIC, {"instances": instances}, sender, ) diff --git a/client/ayon_core/pipeline/create/structures.py b/client/ayon_core/pipeline/create/structures.py index 1bc20501cc..a4c68d2502 100644 --- a/client/ayon_core/pipeline/create/structures.py +++ b/client/ayon_core/pipeline/create/structures.py @@ -750,7 +750,7 @@ class CreatedInstance: self._is_mandatory = value if value is True: self["active"] = True - self._create_context.instance_state_changed(self.id) + self._create_context.instance_requirement_changed(self.id) def changes(self): """Calculate and return changes.""" diff --git a/client/ayon_core/tools/publisher/control.py b/client/ayon_core/tools/publisher/control.py index b551b21bd4..038816c6fc 100644 --- a/client/ayon_core/tools/publisher/control.py +++ b/client/ayon_core/tools/publisher/control.py @@ -53,7 +53,8 @@ class PublisherController( changed. "create.context.create.attrs.changed" - Create attributes changed. "create.context.publish.attrs.changed" - Publish attributes changed. - "create.context.instance.state.changed" - Instance state changed. + "create.context.instance.requirement.changed" - Instance requirement + changed. "create.context.removed.instance" - Instance removed from context. "create.model.instances.context.changed" - Instances changed context. like folder, task or variant. diff --git a/client/ayon_core/tools/publisher/models/create.py b/client/ayon_core/tools/publisher/models/create.py index 7f44b374e6..75ed2c73fe 100644 --- a/client/ayon_core/tools/publisher/models/create.py +++ b/client/ayon_core/tools/publisher/models/create.py @@ -483,8 +483,8 @@ class CreateModel: self._create_context.add_publish_attr_defs_change_callback( self._cc_publish_attr_changed ) - self._create_context.add_instance_state_change_callback( - self._cc_instance_state_changed + self._create_context.add_instance_requirement_change_callback( + self._cc_instance_requirement_changed ) self._create_context.reset_finalization() @@ -1181,13 +1181,13 @@ class CreateModel: event_data, ) - def _cc_instance_state_changed(self, event): + def _cc_instance_requirement_changed(self, event): instance_ids = { instance.id for instance in event.data["instances"] } self._emit_event( - "create.context.instance.state.changed", + "create.model.instance.requirement.changed", {"instance_ids": instance_ids}, ) diff --git a/client/ayon_core/tools/publisher/widgets/overview_widget.py b/client/ayon_core/tools/publisher/widgets/overview_widget.py index 44bb09d4fc..a7e099c0d0 100644 --- a/client/ayon_core/tools/publisher/widgets/overview_widget.py +++ b/client/ayon_core/tools/publisher/widgets/overview_widget.py @@ -156,7 +156,7 @@ class OverviewWidget(QtWidgets.QFrame): self._on_instance_context_change ) controller.register_event_callback( - "create.model.instance.state.changed", + "create.model.instance.requirement.changed", self._on_instance_state_changed )