From 8dd4b70aa3c153ece4cb26fb4ee590742850c990 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 6 Sep 2023 16:52:34 +0200 Subject: [PATCH 01/10] nuke: remove redundant workfile colorspace profiles --- .../defaults/project_settings/nuke.json | 6 +----- .../schemas/schema_nuke_imageio.json | 20 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index b736c462ff..7961e77113 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -28,11 +28,7 @@ "colorManagement": "Nuke", "OCIO_config": "nuke-default", "workingSpaceLUT": "linear", - "monitorLut": "sRGB", - "int8Lut": "sRGB", - "int16Lut": "sRGB", - "logLut": "Cineon", - "floatLut": "linear" + "monitorLut": "sRGB" }, "nodes": { "requiredNodes": [ diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json index d4cd332ef8..af826fcf46 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json @@ -106,26 +106,6 @@ "type": "text", "key": "monitorLut", "label": "monitor" - }, - { - "type": "text", - "key": "int8Lut", - "label": "8-bit files" - }, - { - "type": "text", - "key": "int16Lut", - "label": "16-bit files" - }, - { - "type": "text", - "key": "logLut", - "label": "log files" - }, - { - "type": "text", - "key": "floatLut", - "label": "float files" } ] } From 359ead27a2e6f637dda576ae1daf1801bf00f348 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 6 Sep 2023 16:53:41 +0200 Subject: [PATCH 02/10] nuke-addon: remove redundant workfile colorspace names --- server_addon/nuke/server/settings/imageio.py | 32 -------------------- 1 file changed, 32 deletions(-) diff --git a/server_addon/nuke/server/settings/imageio.py b/server_addon/nuke/server/settings/imageio.py index b43017ef8b..3f5ac0b8f9 100644 --- a/server_addon/nuke/server/settings/imageio.py +++ b/server_addon/nuke/server/settings/imageio.py @@ -66,22 +66,6 @@ def ocio_configs_switcher_enum(): class WorkfileColorspaceSettings(BaseSettingsModel): """Nuke workfile colorspace preset. """ - """# TODO: enhance settings with host api: - we need to add mapping to resolve properly keys. - Nuke is excpecting camel case key names, - but for better code consistency we need to - be using snake_case: - - color_management = colorManagement - ocio_config = OCIO_config - working_space_name = workingSpaceLUT - monitor_name = monitorLut - monitor_out_name = monitorOutLut - int_8_name = int8Lut - int_16_name = int16Lut - log_name = logLut - float_name = floatLut - """ colorManagement: Literal["Nuke", "OCIO"] = Field( title="Color Management" @@ -100,18 +84,6 @@ class WorkfileColorspaceSettings(BaseSettingsModel): monitorLut: str = Field( title="Monitor" ) - int8Lut: str = Field( - title="8-bit files" - ) - int16Lut: str = Field( - title="16-bit files" - ) - logLut: str = Field( - title="Log files" - ) - floatLut: str = Field( - title="Float files" - ) class ReadColorspaceRulesItems(BaseSettingsModel): @@ -238,10 +210,6 @@ DEFAULT_IMAGEIO_SETTINGS = { "OCIO_config": "nuke-default", "workingSpaceLUT": "linear", "monitorLut": "sRGB", - "int8Lut": "sRGB", - "int16Lut": "sRGB", - "logLut": "Cineon", - "floatLut": "linear" }, "nodes": { "requiredNodes": [ From 2c0a8d41006c5886d0e05e85c302f00b70c8e8f9 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 7 Sep 2023 14:47:27 +0200 Subject: [PATCH 03/10] adding default factory to list objects --- .../nuke/server/settings/create_plugins.py | 4 ++++ server_addon/nuke/server/settings/imageio.py | 2 ++ .../nuke/server/settings/publish_plugins.py | 3 +++ .../nuke/server/settings/workfile_builder.py | 20 ++++++++++++++----- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/server_addon/nuke/server/settings/create_plugins.py b/server_addon/nuke/server/settings/create_plugins.py index 0bbae4ee77..b89188a77a 100644 --- a/server_addon/nuke/server/settings/create_plugins.py +++ b/server_addon/nuke/server/settings/create_plugins.py @@ -37,6 +37,7 @@ class PrenodeModel(BaseSettingsModel): - We could not support v3 style of settings. """ knobs: list[KnobModel] = Field( + default_factory=list, title="Knobs", ) @@ -66,6 +67,7 @@ class CreateWriteRenderModel(BaseSettingsModel): (we could not support v3 style of settings) """ prenodes: list[PrenodeModel] = Field( + default_factory=list, title="Preceding nodes", ) @@ -95,6 +97,7 @@ class CreateWritePrerenderModel(BaseSettingsModel): (we could not support v3 style of settings) """ prenodes: list[PrenodeModel] = Field( + default_factory=list, title="Preceding nodes", ) @@ -124,6 +127,7 @@ class CreateWriteImageModel(BaseSettingsModel): (we could not support v3 style of settings) """ prenodes: list[PrenodeModel] = Field( + default_factory=list, title="Preceding nodes", ) diff --git a/server_addon/nuke/server/settings/imageio.py b/server_addon/nuke/server/settings/imageio.py index b43017ef8b..16f9bd309a 100644 --- a/server_addon/nuke/server/settings/imageio.py +++ b/server_addon/nuke/server/settings/imageio.py @@ -14,6 +14,7 @@ class NodesModel(BaseSettingsModel): """ _layout = "expanded" plugins: list[str] = Field( + default_factory=list, title="Used in plugins" ) # TODO: rename `nukeNodeClass` to `nuke_node_class` @@ -25,6 +26,7 @@ class NodesModel(BaseSettingsModel): in nuke integration. We could not support v3 style of settings. """ knobs: list[KnobModel] = Field( + default_factory=list, title="Knobs", ) diff --git a/server_addon/nuke/server/settings/publish_plugins.py b/server_addon/nuke/server/settings/publish_plugins.py index 7e898f8c9a..de21870d5f 100644 --- a/server_addon/nuke/server/settings/publish_plugins.py +++ b/server_addon/nuke/server/settings/publish_plugins.py @@ -46,6 +46,7 @@ class NodeModel(BaseSettingsModel): - We could not support v3 style of settings. """ knobs: list[KnobModel] = Field( + default_factory=list, title="Knobs", ) @@ -105,6 +106,7 @@ class ExtractThumbnailModel(BaseSettingsModel): """ nodes: list[NodeModel] = Field( + default_factory=list, title="Nodes (deprecated)" ) reposition_nodes: list[ThumbnailRepositionNodeModel] = Field( @@ -177,6 +179,7 @@ class ExtractReviewDataMovModel(BaseSettingsModel): enabled: bool = Field(title="Enabled") viewer_lut_raw: bool = Field(title="Viewer lut raw") outputs: list[BakingStreamModel] = Field( + default_factory=list, title="Baking streams" ) diff --git a/server_addon/nuke/server/settings/workfile_builder.py b/server_addon/nuke/server/settings/workfile_builder.py index ee67c7c16a..e9ac0db2a0 100644 --- a/server_addon/nuke/server/settings/workfile_builder.py +++ b/server_addon/nuke/server/settings/workfile_builder.py @@ -48,20 +48,30 @@ class BuilderProfileModel(BaseSettingsModel): title="Task names" ) current_context: list[BuilderProfileItemModel] = Field( - title="Current context") + default_factory=list, + title="Current context" + ) linked_assets: list[BuilderProfileItemModel] = Field( - title="Linked assets/shots") + default_factory=list, + title="Linked assets/shots" + ) class WorkfileBuilderModel(BaseSettingsModel): create_first_version: bool = Field( title="Create first workfile") custom_templates: list[CustomTemplateModel] = Field( - title="Custom templates") + default_factory=list, + title="Custom templates" + ) builder_on_start: bool = Field( - title="Run Builder at first workfile") + default=False, + title="Run Builder at first workfile" + ) profiles: list[BuilderProfileModel] = Field( - title="Builder profiles") + default_factory=list, + title="Builder profiles" + ) DEFAULT_WORKFILE_BUILDER_SETTINGS = { From ee050fe63ba6c498fd736bcf2e1bcb1226e49ed9 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 7 Sep 2023 14:47:47 +0200 Subject: [PATCH 04/10] clearing todos and improving docstrings --- server_addon/nuke/server/settings/common.py | 6 ------ .../nuke/server/settings/create_plugins.py | 19 ------------------- server_addon/nuke/server/settings/dirmap.py | 13 ------------- server_addon/nuke/server/settings/imageio.py | 15 ++++----------- .../nuke/server/settings/loader_plugins.py | 8 -------- server_addon/nuke/server/settings/main.py | 4 +--- .../nuke/server/settings/publish_plugins.py | 17 ----------------- .../nuke/server/settings/scriptsmenu.py | 1 - .../settings/templated_workfile_build.py | 1 + .../nuke/server/settings/workfile_builder.py | 2 ++ 10 files changed, 8 insertions(+), 78 deletions(-) diff --git a/server_addon/nuke/server/settings/common.py b/server_addon/nuke/server/settings/common.py index 700f01f3dc..2bc3c9be81 100644 --- a/server_addon/nuke/server/settings/common.py +++ b/server_addon/nuke/server/settings/common.py @@ -89,12 +89,6 @@ knob_types_enum = [ class KnobModel(BaseSettingsModel): - """# TODO: new data structure - - v3 was having type, name, value but - ayon is not able to make it the same. Current model is - defining `type` as `text` and instead of `value` the key is `text`. - So if `type` is `boolean` then key is `boolean` (value). - """ _layout = "expanded" type: str = Field( diff --git a/server_addon/nuke/server/settings/create_plugins.py b/server_addon/nuke/server/settings/create_plugins.py index b89188a77a..80aec51ae0 100644 --- a/server_addon/nuke/server/settings/create_plugins.py +++ b/server_addon/nuke/server/settings/create_plugins.py @@ -16,13 +16,10 @@ def instance_attributes_enum(): class PrenodeModel(BaseSettingsModel): - # TODO: missing in host api - # - good for `dependency` name: str = Field( title="Node name" ) - # TODO: `nodeclass` should be renamed to `nuke_node_class` nodeclass: str = Field( "", title="Node class" @@ -32,10 +29,6 @@ class PrenodeModel(BaseSettingsModel): title="Incoming dependency" ) - """# TODO: Changes in host api: - - Need complete rework of knob types in nuke integration. - - We could not support v3 style of settings. - """ knobs: list[KnobModel] = Field( default_factory=list, title="Knobs", @@ -62,10 +55,6 @@ class CreateWriteRenderModel(BaseSettingsModel): title="Instance attributes" ) - """# TODO: Changes in host api: - - prenodes key was originally dict and now is list - (we could not support v3 style of settings) - """ prenodes: list[PrenodeModel] = Field( default_factory=list, title="Preceding nodes", @@ -92,10 +81,6 @@ class CreateWritePrerenderModel(BaseSettingsModel): title="Instance attributes" ) - """# TODO: Changes in host api: - - prenodes key was originally dict and now is list - (we could not support v3 style of settings) - """ prenodes: list[PrenodeModel] = Field( default_factory=list, title="Preceding nodes", @@ -122,10 +107,6 @@ class CreateWriteImageModel(BaseSettingsModel): title="Instance attributes" ) - """# TODO: Changes in host api: - - prenodes key was originally dict and now is list - (we could not support v3 style of settings) - """ prenodes: list[PrenodeModel] = Field( default_factory=list, title="Preceding nodes", diff --git a/server_addon/nuke/server/settings/dirmap.py b/server_addon/nuke/server/settings/dirmap.py index 2da6d7bf60..7e3c443957 100644 --- a/server_addon/nuke/server/settings/dirmap.py +++ b/server_addon/nuke/server/settings/dirmap.py @@ -25,19 +25,6 @@ class DirmapSettings(BaseSettingsModel): ) -"""# TODO: -nuke is having originally implemented -following data inputs: - -"nuke-dirmap": { - "enabled": false, - "paths": { - "source-path": [], - "destination-path": [] - } -} -""" - DEFAULT_DIRMAP_SETTINGS = { "enabled": False, "paths": { diff --git a/server_addon/nuke/server/settings/imageio.py b/server_addon/nuke/server/settings/imageio.py index 16f9bd309a..44bb72769e 100644 --- a/server_addon/nuke/server/settings/imageio.py +++ b/server_addon/nuke/server/settings/imageio.py @@ -9,22 +9,15 @@ from .common import KnobModel class NodesModel(BaseSettingsModel): - """# TODO: This needs to be somehow labeled in settings panel - or at least it could show gist of configuration - """ _layout = "expanded" plugins: list[str] = Field( default_factory=list, title="Used in plugins" ) - # TODO: rename `nukeNodeClass` to `nuke_node_class` nukeNodeClass: str = Field( title="Nuke Node Class", ) - """ # TODO: Need complete rework of knob types - in nuke integration. We could not support v3 style of settings. - """ knobs: list[KnobModel] = Field( default_factory=list, title="Knobs", @@ -172,7 +165,7 @@ class ImageIOSettings(BaseSettingsModel): _isGroup: bool = True """# TODO: enhance settings with host api: - to restruture settings for simplification. + to restructure settings for simplification. now: nuke/imageio/viewer/viewerProcess future: nuke/imageio/viewer @@ -195,7 +188,7 @@ class ImageIOSettings(BaseSettingsModel): ) """# TODO: enhance settings with host api: - to restruture settings for simplification. + to restructure settings for simplification. now: nuke/imageio/baking/viewerProcess future: nuke/imageio/baking @@ -217,9 +210,9 @@ class ImageIOSettings(BaseSettingsModel): title="Nodes" ) """# TODO: enhance settings with host api: - - old settings are using `regexInputs` key but we + - [ ] old settings are using `regexInputs` key but we need to rename to `regex_inputs` - - no need for `inputs` middle part. It can stay + - [ ] no need for `inputs` middle part. It can stay directly on `regex_inputs` """ regexInputs: RegexInputsModel = Field( diff --git a/server_addon/nuke/server/settings/loader_plugins.py b/server_addon/nuke/server/settings/loader_plugins.py index 6db381bffb..51e2c2149b 100644 --- a/server_addon/nuke/server/settings/loader_plugins.py +++ b/server_addon/nuke/server/settings/loader_plugins.py @@ -6,10 +6,6 @@ class LoadImageModel(BaseSettingsModel): enabled: bool = Field( title="Enabled" ) - """# TODO: v3 api used `_representation` - New api is hiding it so it had to be renamed - to `representations_include` - """ representations_include: list[str] = Field( default_factory=list, title="Include representations" @@ -33,10 +29,6 @@ class LoadClipModel(BaseSettingsModel): enabled: bool = Field( title="Enabled" ) - """# TODO: v3 api used `_representation` - New api is hiding it so it had to be renamed - to `representations_include` - """ representations_include: list[str] = Field( default_factory=list, title="Include representations" diff --git a/server_addon/nuke/server/settings/main.py b/server_addon/nuke/server/settings/main.py index 4687d48ac9..cdaaa3a9e2 100644 --- a/server_addon/nuke/server/settings/main.py +++ b/server_addon/nuke/server/settings/main.py @@ -59,9 +59,7 @@ class NukeSettings(BaseSettingsModel): default_factory=ImageIOSettings, title="Color Management (imageio)", ) - """# TODO: fix host api: - - rename `nuke-dirmap` to `dirmap` was inevitable - """ + dirmap: DirmapSettings = Field( default_factory=DirmapSettings, title="Nuke Directory Mapping", diff --git a/server_addon/nuke/server/settings/publish_plugins.py b/server_addon/nuke/server/settings/publish_plugins.py index de21870d5f..c78685534f 100644 --- a/server_addon/nuke/server/settings/publish_plugins.py +++ b/server_addon/nuke/server/settings/publish_plugins.py @@ -28,11 +28,9 @@ def nuke_product_types_enum(): class NodeModel(BaseSettingsModel): - # TODO: missing in host api name: str = Field( title="Node name" ) - # TODO: `nodeclass` rename to `nuke_node_class` nodeclass: str = Field( "", title="Node class" @@ -41,10 +39,6 @@ class NodeModel(BaseSettingsModel): "", title="Incoming dependency" ) - """# TODO: Changes in host api: - - Need complete rework of knob types in nuke integration. - - We could not support v3 style of settings. - """ knobs: list[KnobModel] = Field( default_factory=list, title="Knobs", @@ -100,10 +94,6 @@ class ExtractThumbnailModel(BaseSettingsModel): use_rendered: bool = Field(title="Use rendered images") bake_viewer_process: bool = Field(title="Bake view process") bake_viewer_input_process: bool = Field(title="Bake viewer input process") - """# TODO: needs to rewrite from v3 to ayon - - `nodes` in v3 was dict but now `prenodes` is list of dict - - also later `nodes` should be `prenodes` - """ nodes: list[NodeModel] = Field( default_factory=list, @@ -216,12 +206,6 @@ class ExctractSlateFrameParamModel(BaseSettingsModel): class ExtractSlateFrameModel(BaseSettingsModel): viewer_lut_raw: bool = Field(title="Viewer lut raw") - """# TODO: v3 api different model: - - not possible to replicate v3 model: - {"name": [bool, str]} - - not it is: - {"name": {"enabled": bool, "template": str}} - """ key_value_mapping: ExctractSlateFrameParamModel = Field( title="Key value mapping", default_factory=ExctractSlateFrameParamModel @@ -290,7 +274,6 @@ class PublishPuginsModel(BaseSettingsModel): title="Extract Slate Frame", default_factory=ExtractSlateFrameModel ) - # TODO: plugin should be renamed - `workfile` not `script` IncrementScriptVersion: IncrementScriptVersionModel = Field( title="Increment Workfile Version", default_factory=IncrementScriptVersionModel, diff --git a/server_addon/nuke/server/settings/scriptsmenu.py b/server_addon/nuke/server/settings/scriptsmenu.py index 9d1c32ebac..0b2d660da5 100644 --- a/server_addon/nuke/server/settings/scriptsmenu.py +++ b/server_addon/nuke/server/settings/scriptsmenu.py @@ -17,7 +17,6 @@ class ScriptsmenuSettings(BaseSettingsModel): """Nuke script menu project settings.""" _isGroup = True - # TODO: in api rename key `name` to `menu_name` name: str = Field(title="Menu Name") definition: list[ScriptsmenuSubmodel] = Field( default_factory=list, diff --git a/server_addon/nuke/server/settings/templated_workfile_build.py b/server_addon/nuke/server/settings/templated_workfile_build.py index e0245c8d06..0899be841e 100644 --- a/server_addon/nuke/server/settings/templated_workfile_build.py +++ b/server_addon/nuke/server/settings/templated_workfile_build.py @@ -28,6 +28,7 @@ class TemplatedWorkfileProfileModel(BaseSettingsModel): class TemplatedWorkfileBuildModel(BaseSettingsModel): + """Settings for templated workfile builder.""" profiles: list[TemplatedWorkfileProfileModel] = Field( default_factory=list ) diff --git a/server_addon/nuke/server/settings/workfile_builder.py b/server_addon/nuke/server/settings/workfile_builder.py index e9ac0db2a0..3ae3b08788 100644 --- a/server_addon/nuke/server/settings/workfile_builder.py +++ b/server_addon/nuke/server/settings/workfile_builder.py @@ -58,6 +58,8 @@ class BuilderProfileModel(BaseSettingsModel): class WorkfileBuilderModel(BaseSettingsModel): + """[deprecated] use Template Workfile Build Settings instead. + """ create_first_version: bool = Field( title="Create first workfile") custom_templates: list[CustomTemplateModel] = Field( From 5475908051c3166daa57155c18b36f672170e12b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 9 Sep 2023 03:25:32 +0000 Subject: [PATCH 05/10] chore(): update bug report / version --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a35dbf1a17..7a39103859 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,6 +35,7 @@ body: label: Version description: What version are you running? Look to OpenPype Tray options: + - 3.16.6-nightly.1 - 3.16.5 - 3.16.5-nightly.5 - 3.16.5-nightly.4 @@ -134,7 +135,6 @@ body: - 3.14.9-nightly.4 - 3.14.9-nightly.3 - 3.14.9-nightly.2 - - 3.14.9-nightly.1 validations: required: true - type: dropdown From 81446b1bbb972bcb8ee8fa9c9df06868d7c008aa Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 11 Sep 2023 11:55:49 +0100 Subject: [PATCH 06/10] Remove hardcoded subset name for reviews --- openpype/hosts/blender/plugins/publish/collect_review.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/collect_review.py b/openpype/hosts/blender/plugins/publish/collect_review.py index 6459927015..3bf2e39e24 100644 --- a/openpype/hosts/blender/plugins/publish/collect_review.py +++ b/openpype/hosts/blender/plugins/publish/collect_review.py @@ -39,15 +39,11 @@ class CollectReview(pyblish.api.InstancePlugin): ] if not instance.data.get("remove"): - - task = instance.context.data["task"] - # Store focal length in `burninDataMembers` burninData = instance.data.setdefault("burninDataMembers", {}) burninData["focalLength"] = focal_length instance.data.update({ - "subset": f"{task}Review", "review_camera": camera, "frameStart": instance.context.data["frameStart"], "frameEnd": instance.context.data["frameEnd"], From ae02fe220aefb292f705f715fea4def1b2192782 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 11 Sep 2023 16:28:11 +0200 Subject: [PATCH 07/10] AfterEffects: fix imports of image sequences (#5581) * Fix loading image sequence in AE * Fix logic Files might be list or str * Update openpype/hosts/aftereffects/plugins/load/load_file.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --------- Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/aftereffects/plugins/load/load_file.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/aftereffects/plugins/load/load_file.py b/openpype/hosts/aftereffects/plugins/load/load_file.py index def7c927ab..8d52aac546 100644 --- a/openpype/hosts/aftereffects/plugins/load/load_file.py +++ b/openpype/hosts/aftereffects/plugins/load/load_file.py @@ -31,13 +31,8 @@ class FileLoader(api.AfterEffectsLoader): path = self.filepath_from_context(context) - repr_cont = context["representation"]["context"] - if "#" not in path: - frame = repr_cont.get("frame") - if frame: - padding = len(frame) - path = path.replace(frame, "#" * padding) - import_options['sequence'] = True + if len(context["representation"]["files"]) > 1: + import_options['sequence'] = True if not path: repr_id = context["representation"]["_id"] From 1fdbe05905995641f02b4c4c3b2d7e27be6ecf3a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 11 Sep 2023 17:21:38 +0200 Subject: [PATCH 08/10] Photoshop: fixed blank Flatten image (#5600) * OP-6763 - refresh all visible for Flatten image Previously newly added layers were missing. * OP-6763 - added explicit image collector Creator was adding 'layer' metadata from workfile only during collect_instances, it was missing for newly added layers. This should be cleaner approach * OP-6763 - removed unnecessary method overwrite Creator is not adding layer to instance, separate collector created. * OP-6763 - cleanup of names Was failing when template for subset name for image family contained {layer} * OP-6763 - cleanup, removed adding layer metadata Separate collector created, cleaner. Fixed propagation of mark_for_review * OP-6763 - using members instead of layer data Members should be more reliable. * OP-6763 - updated image from Settings Explicit subset name template was removed some time ago as confusing. * OP-6763 - added explicit local plugin Automated plugin has different logic, local would need to handle if auto_image is disabled by artist * OP-6763 - Hound * OP-6345 - fix - review for image family Image family instance contained flattened content. Now it reuses previously extracted file without need to re-extract. --- .../plugins/create/create_flatten_image.py | 40 +++++++++--- .../photoshop/plugins/create/create_image.py | 17 ++--- .../publish/collect_auto_image_refresh.py | 24 +++++++ .../plugins/publish/collect_image.py | 20 ++++++ .../plugins/publish/extract_image.py | 8 ++- .../plugins/publish/extract_review.py | 59 +++++++++++++++--- website/docs/admin_hosts_photoshop.md | 7 +-- .../assets/admin_hosts_photoshop_settings.png | Bin 14364 -> 16718 bytes 8 files changed, 144 insertions(+), 31 deletions(-) create mode 100644 openpype/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py create mode 100644 openpype/hosts/photoshop/plugins/publish/collect_image.py diff --git a/openpype/hosts/photoshop/plugins/create/create_flatten_image.py b/openpype/hosts/photoshop/plugins/create/create_flatten_image.py index 9d4189a1a3..e4229788bd 100644 --- a/openpype/hosts/photoshop/plugins/create/create_flatten_image.py +++ b/openpype/hosts/photoshop/plugins/create/create_flatten_image.py @@ -4,6 +4,7 @@ from openpype.lib import BoolDef import openpype.hosts.photoshop.api as api from openpype.hosts.photoshop.lib import PSAutoCreator from openpype.pipeline.create import get_subset_name +from openpype.lib import prepare_template_data from openpype.client import get_asset_by_name @@ -37,19 +38,14 @@ class AutoImageCreator(PSAutoCreator): asset_doc = get_asset_by_name(project_name, asset_name) if existing_instance is None: - subset_name = get_subset_name( - self.family, self.default_variant, task_name, asset_doc, + subset_name = self.get_subset_name( + self.default_variant, task_name, asset_doc, project_name, host_name ) - publishable_ids = [layer.id for layer in api.stub().get_layers() - if layer.visible] data = { "asset": asset_name, "task": task_name, - # ids are "virtual" layers, won't get grouped as 'members' do - # same difference in color coded layers in WP - "ids": publishable_ids } if not self.active_on_create: @@ -69,8 +65,8 @@ class AutoImageCreator(PSAutoCreator): existing_instance["asset"] != asset_name or existing_instance["task"] != task_name ): - subset_name = get_subset_name( - self.family, self.default_variant, task_name, asset_doc, + subset_name = self.get_subset_name( + self.default_variant, task_name, asset_doc, project_name, host_name ) @@ -118,3 +114,29 @@ class AutoImageCreator(PSAutoCreator): Artist might disable this instance from publishing or from creating review for it though. """ + + def get_subset_name( + self, + variant, + task_name, + asset_doc, + project_name, + host_name=None, + instance=None + ): + dynamic_data = prepare_template_data({"layer": "{layer}"}) + subset_name = get_subset_name( + self.family, variant, task_name, asset_doc, + project_name, host_name, dynamic_data=dynamic_data + ) + return self._clean_subset_name(subset_name) + + def _clean_subset_name(self, subset_name): + """Clean all variants leftover {layer} from subset name.""" + dynamic_data = prepare_template_data({"layer": "{layer}"}) + for value in dynamic_data.values(): + if value in subset_name: + return (subset_name.replace(value, "") + .replace("__", "_") + .replace("..", ".")) + return subset_name diff --git a/openpype/hosts/photoshop/plugins/create/create_image.py b/openpype/hosts/photoshop/plugins/create/create_image.py index 8d3ac9f459..af20d456e0 100644 --- a/openpype/hosts/photoshop/plugins/create/create_image.py +++ b/openpype/hosts/photoshop/plugins/create/create_image.py @@ -94,12 +94,17 @@ class ImageCreator(Creator): name = self._clean_highlights(stub, directory) layer_names_in_hierarchy.append(name) - data.update({"subset": subset_name}) - data.update({"members": [str(group.id)]}) - data.update({"layer_name": layer_name}) - data.update({"long_name": "_".join(layer_names_in_hierarchy)}) + data_update = { + "subset": subset_name, + "members": [str(group.id)], + "layer_name": layer_name, + "long_name": "_".join(layer_names_in_hierarchy) + } + data.update(data_update) - creator_attributes = {"mark_for_review": self.mark_for_review} + mark_for_review = (pre_create_data.get("mark_for_review") or + self.mark_for_review) + creator_attributes = {"mark_for_review": mark_for_review} data.update({"creator_attributes": creator_attributes}) if not self.active_on_create: @@ -124,8 +129,6 @@ class ImageCreator(Creator): if creator_id == self.identifier: instance_data = self._handle_legacy(instance_data) - layer = api.stub().get_layer(instance_data["members"][0]) - instance_data["layer"] = layer instance = CreatedInstance.from_existing( instance_data, self ) diff --git a/openpype/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py b/openpype/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py new file mode 100644 index 0000000000..741fb0e9cd --- /dev/null +++ b/openpype/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py @@ -0,0 +1,24 @@ +import pyblish.api + +from openpype.hosts.photoshop import api as photoshop + + +class CollectAutoImageRefresh(pyblish.api.ContextPlugin): + """Refreshes auto_image instance with currently visible layers.. + """ + + label = "Collect Auto Image Refresh" + order = pyblish.api.CollectorOrder + hosts = ["photoshop"] + order = pyblish.api.CollectorOrder + 0.2 + + def process(self, context): + for instance in context: + creator_identifier = instance.data.get("creator_identifier") + if creator_identifier and creator_identifier == "auto_image": + self.log.debug("Auto image instance found, won't create new") + # refresh existing auto image instance with current visible + publishable_ids = [layer.id for layer in photoshop.stub().get_layers() # noqa + if layer.visible] + instance.data["ids"] = publishable_ids + return diff --git a/openpype/hosts/photoshop/plugins/publish/collect_image.py b/openpype/hosts/photoshop/plugins/publish/collect_image.py new file mode 100644 index 0000000000..64727cef33 --- /dev/null +++ b/openpype/hosts/photoshop/plugins/publish/collect_image.py @@ -0,0 +1,20 @@ +import pyblish.api + +from openpype.hosts.photoshop import api + + +class CollectImage(pyblish.api.InstancePlugin): + """Collect layer metadata into a instance. + + Used later in validation + """ + order = pyblish.api.CollectorOrder + 0.200 + label = 'Collect Image' + + hosts = ["photoshop"] + families = ["image"] + + def process(self, instance): + if instance.data.get("members"): + layer = api.stub().get_layer(instance.data["members"][0]) + instance.data["layer"] = layer diff --git a/openpype/hosts/photoshop/plugins/publish/extract_image.py b/openpype/hosts/photoshop/plugins/publish/extract_image.py index cdb28c742d..680f580cc0 100644 --- a/openpype/hosts/photoshop/plugins/publish/extract_image.py +++ b/openpype/hosts/photoshop/plugins/publish/extract_image.py @@ -45,9 +45,11 @@ class ExtractImage(pyblish.api.ContextPlugin): # Perform extraction files = {} ids = set() - layer = instance.data.get("layer") - if layer: - ids.add(layer.id) + # real layers and groups + members = instance.data("members") + if members: + ids.update(set([int(member) for member in members])) + # virtual groups collected by color coding or auto_image add_ids = instance.data.pop("ids", None) if add_ids: ids.update(set(add_ids)) diff --git a/openpype/hosts/photoshop/plugins/publish/extract_review.py b/openpype/hosts/photoshop/plugins/publish/extract_review.py index 4aa7a05bd1..afddbdba31 100644 --- a/openpype/hosts/photoshop/plugins/publish/extract_review.py +++ b/openpype/hosts/photoshop/plugins/publish/extract_review.py @@ -1,4 +1,5 @@ import os +import shutil from PIL import Image from openpype.lib import ( @@ -55,6 +56,7 @@ class ExtractReview(publish.Extractor): } if instance.data["family"] != "review": + self.log.debug("Existing extracted file from image family used.") # enable creation of review, without this jpg review would clash # with jpg of the image family output_name = repre_name @@ -62,8 +64,15 @@ class ExtractReview(publish.Extractor): repre_skeleton.update({"name": repre_name, "outputName": output_name}) - if self.make_image_sequence and len(layers) > 1: - self.log.info("Extract layers to image sequence.") + img_file = self.output_seq_filename % 0 + self._prepare_file_for_image_family(img_file, instance, + staging_dir) + repre_skeleton.update({ + "files": img_file, + }) + processed_img_names = [img_file] + elif self.make_image_sequence and len(layers) > 1: + self.log.debug("Extract layers to image sequence.") img_list = self._save_sequence_images(staging_dir, layers) repre_skeleton.update({ @@ -72,17 +81,17 @@ class ExtractReview(publish.Extractor): "fps": fps, "files": img_list, }) - instance.data["representations"].append(repre_skeleton) processed_img_names = img_list else: - self.log.info("Extract layers to flatten image.") - img_list = self._save_flatten_image(staging_dir, layers) + self.log.debug("Extract layers to flatten image.") + img_file = self._save_flatten_image(staging_dir, layers) repre_skeleton.update({ - "files": img_list, + "files": img_file, }) - instance.data["representations"].append(repre_skeleton) - processed_img_names = [img_list] + processed_img_names = [img_file] + + instance.data["representations"].append(repre_skeleton) ffmpeg_args = get_ffmpeg_tool_args("ffmpeg") @@ -111,6 +120,35 @@ class ExtractReview(publish.Extractor): self.log.info(f"Extracted {instance} to {staging_dir}") + def _prepare_file_for_image_family(self, img_file, instance, staging_dir): + """Converts existing file for image family to .jpg + + Image instance could have its own separate review (instance per layer + for example). This uses extracted file instead of extracting again. + Args: + img_file (str): name of output file (with 0000 value for ffmpeg + later) + instance: + staging_dir (str): temporary folder where extracted file is located + """ + repre_file = instance.data["representations"][0] + source_file_path = os.path.join(repre_file["stagingDir"], + repre_file["files"]) + if not os.path.exists(source_file_path): + raise RuntimeError(f"{source_file_path} doesn't exist for " + "review to create from") + _, ext = os.path.splitext(repre_file["files"]) + if ext != ".jpg": + im = Image.open(source_file_path) + # without this it produces messy low quality jpg + rgb_im = Image.new("RGBA", (im.width, im.height), "#ffffff") + rgb_im.alpha_composite(im) + rgb_im.convert("RGB").save(os.path.join(staging_dir, img_file)) + else: + # handles already .jpg + shutil.copy(source_file_path, + os.path.join(staging_dir, img_file)) + def _generate_mov(self, ffmpeg_path, instance, fps, no_of_frames, source_files_pattern, staging_dir): """Generates .mov to upload to Ftrack. @@ -218,6 +256,11 @@ class ExtractReview(publish.Extractor): (list) of PSItem """ layers = [] + # creating review for existing 'image' instance + if instance.data["family"] == "image" and instance.data.get("layer"): + layers.append(instance.data["layer"]) + return layers + for image_instance in instance.context: if image_instance.data["family"] != "image": continue diff --git a/website/docs/admin_hosts_photoshop.md b/website/docs/admin_hosts_photoshop.md index de684f01d2..d79789760e 100644 --- a/website/docs/admin_hosts_photoshop.md +++ b/website/docs/admin_hosts_photoshop.md @@ -33,7 +33,6 @@ Provides list of [variants](artist_concepts.md#variant) that will be shown to an Provides simplified publishing process. It will create single `image` instance for artist automatically. This instance will produce flatten image from all visible layers in a workfile. -- Subset template for flatten image - provide template for subset name for this instance (example `imageBeauty`) - Review - should be separate review created for this instance ### Create Review @@ -111,11 +110,11 @@ Set Byte limit for review file. Applicable if gigantic `image` instances are pro #### Extract jpg Options -Handles tags for produced `.jpg` representation. `Create review` and `Add review to Ftrack` are defaults. +Handles tags for produced `.jpg` representation. `Create review` and `Add review to Ftrack` are defaults. #### Extract mov Options -Handles tags for produced `.mov` representation. `Create review` and `Add review to Ftrack` are defaults. +Handles tags for produced `.mov` representation. `Create review` and `Add review to Ftrack` are defaults. ### Workfile Builder @@ -124,4 +123,4 @@ Allows to open prepared workfile for an artist when no workfile exists. Useful t Could be configured per `Task type`, eg. `composition` task type could use different `.psd` template file than `art` task. Workfile template must be accessible for all artists. -(Currently not handled by [SiteSync](module_site_sync.md)) \ No newline at end of file +(Currently not handled by [SiteSync](module_site_sync.md)) diff --git a/website/docs/assets/admin_hosts_photoshop_settings.png b/website/docs/assets/admin_hosts_photoshop_settings.png index aaa6ecbed7b353733f8424abe3c2df0cb903935a..9478fbedf785ca8ae66132a14cb400c38e2dccc9 100644 GIT binary patch literal 16718 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 literal 14364 zcmc(Gd03KZ+xOix*{-cZxwTBI=2DYeDDAfDIF(B(gr-)mq_~1qR+b{vG^XWNIa5t8 zxa5jRxj<&Zm?M*q5VGtz;|>2nDud<0r-i_$KjRWpII?KyX^(an5M(vKi`M$ zIlcz~Do6{bQFFlm=SLs%jR63|7X8mGM%2@@0N_w@c>kW02?!}S;6}(~exLfxvNX&u zndrT1zTbD%E2`*rT!?ae*U`Ykp3-w$N_(F=>@@sU6zKOD`n2c1f#*p0hkgUuuP#4c zK=w)B+owK%ue@S|U3wX}mOn4|xV5pB0eNntxoy2&{r1*dSN-#*@uE+OOedBsu{i0O z<_{6pz%`Z~!<;PCIraRE*YHJ&Q}6`&CmSySu-$1f^=i}Ht9Afz=Q$dRmvCs#ihDNL z#Q-q+TL~uB)&My3b7k-1W+-s!aQkV8c|icMaYGn)4Ph3L^XtELKs<~f^M-ivOABB) zpZwoAg=x6FsMU0-dVQQR)xNdx64@NnT#>C}?bMAv~_J#UN zuJ2k-_s%vd&gfu7tchPr$(`roOhR9?1755+TWS)wj4q? zUQAcabJ>OW3Fv{_m}fp3uNz?_6Nyr8!V{|CbZ1{NDWg9B&0d#S%YKK#?r=iKTx!g? z_v=|eT^Z<@d$Z$+YkJFLlqt%$+0HAA(%0C?C))8t>%@as#h&xujhaG4>f$@yk6hVe zf$NDY4Kq`oH`(2DKQ#supR@?dc0GBiTK1-bI)5af^ulc5n0IdjDimcJXVQim-+W+x z=f*XZ-6P*sLI_Gl^QY=%C2n#Iq`Ydg_B7^VKOxaGEnKbK?94V}N00;tmi3gJ6T1%9 z;_aqq?@_D<08Ynghmju%Eu)Vd&qg&R_bu$R-m4*PSyZ%r;cI!AFElF7UxA6RCkMPa z44n-O-US!LY)Pm!w)h=-+TvktP2ixEjqk1F#Y19Fn-+1b!Dk-1F^n5Mfr6!&27O56 zCC1X9MZuO2!d6#I)%m>4WV43ueT-;Hkmfbmy^dpnMn_J93;GV_|1PRrGPI*6OREu> zF>*x%5pCh8;@Z#xkE*(c5oT?M6GoFgR&b!o<97h)yY}sopA1GX23}Z$PwuK5u?!5t z+OG#s{R{ZC>$dqy3{Z=J7r*Jh)}P*Asw0ajsb>>G>-Py#ERl#9v{OwDVh-{CfsCCAf)5#l>z$#Z>~V z=A}~;G61%fjZLxP8v@I-l^2%Kk7m^+Ohqa`4!4MZ;4-;?rdZg>HgOEu?Y|=_K>4xW zVpLS~1XT?`grxmZ)IGPSt?0&8uM*P&p~jGV5XvuRhQzEQaX6~adoVxt9Ta~JEcxrK z_deTF-g2JIrx&;^7M@bToN+z@i&Kun%dFkqid&S_MD{Z~;D<`Y;^dX|T_nM>B>}Kj zRxC}XQxC-9`4|= zQ|CpJx#SIi&n@MJK8h_bz?8K<_WV3HE6`r^?#Q{kH+#3t7aUj78j(YvP|NEV7T*pi zfgyZ4CF{tD`6F$|TzU;eu$!WD-MHRN&(;NJDbi>AeU_i4zPDoIdS@O6$|rcHQ@4%P z4_jwOQnG>!W>JQ7j+PZ8c1jUZ+scSc#xRZ7_6e(#1hhzb?3D_uFYuFD0t$Np=>)Lb zTGCUVjcUB(I2wo=PVa|pFSFKIMg<&-csh#ie;W$r%;YYg!LD$C?1lswJ}kS2XO&aKS{nTtEHOa-yXonaX*>brKObH2gPyj z#FUxDv}4SAJo_U_cJ3J|zg{0@zxb>v-|FZ(mgV5`$>=v-t|p{2z=LhX*Z=R@kIH^Kbfw_sH#xGH&Ee zn$#HwotJ1Kgur0b?_{$e;~l{|-=7ZbK5%J+hP>z%CTImU`6NDRui06xU0TpPO(z}M zII2W74(AlNIF9m1j-%1jYZjSw`U?eb0vk?{`w*hlk?JO)BAmz(#t^(q56ymYGMKvB z(3Q~db+g*JVQOh|TJ`0e1BxnTxJ)u(^gZyxzqfb~)PtuLubVkC)2Nk9N6x9DZBJ&n z6oy6=if|F$wWY?hcW>2W-6k8a?QZyde4?Z0pp$b-uO*$OZgSN~=3Jtz|My_w*P`P; z!!7KN9SqakG^s(DH|wcbBF@@<&BTRHazo4y6q=}pT0I) zW03_VGsN}IGzXLT#v~Vu_%>`v1J3;9rflxCdA1~sft)9hvky@32OuP5KrO_cqPtSU z=@HE-?K#1bn?4xbDJM zUrWSTN+m4`aqzpDtAc#C7yzno>CEW;7f)K96Xz{Bwz+0QDk-yzL%q zH-%-`;+V^hp6Q^EAo)X$2I|dTYz_Vp03;B?* z(lxZ|L)BDgoHV7XoIt`!T!QjiFN`c_y|*VVA7?}ex5Fa)u~QAW*H9CeAQ(KgP%k`T znj|nag6~RHcrX-~w-V?;0=)OwfA`9GyPhu0=mm~~U#=fApmwI<+=#8u)>vZte z0?f4uV=f_ie05-b81qk3puXgN+3_D!MlV54^E4K}k@@eshEv5uU6h_XPfGQ*VmFqb z@09XWfD6t)-)s}dKKf#RZd6@k;pkkz_LOhT_0;)-e1?3u#n&H^wWcXyyl&?2P%?#@ zz9&fT@r5w5jh+=rh@i6%KxgN!q*F2k%d(|M(B{qR;tXe)Ec+H%6IR2?wPt)9hW*k2 zOHbU}jP4{|*Vfot?bFr-7cW-NBsG&R4I65R507fvl&!EU3!Gt4Psx3j@}tYDd06t1 zs}6g38B^PYi-56`vz@C9tqJkV7)rsSr5C~3!;>NRcaS8nMrbJ*#JcAh!Y3Q%QG(WQ zT)(?RRb~A%M`7Btwx1Bclu>AmITUFd$$D#R_-PQ5t$0wXwnVZ7b@82+Lg$! zU;qwA7Eb15#H@m{FerEK*5qVjglrD*V#hB#Lmi*mGHU`l=qOnFD{F)0#~1NTV6Sa! zQP52_3k8#jy|SvLvJ3`E*z_q6jOeTqre;f8r`q&5DX=IzkP42O}Og&+Skd7|60w1Q>j@142J zVWGsG8kn4E%R5^})tta@J>Vjnxu6cwo4Ttvm1DMLsec+;l{N>sq`kc}bP3(R8>|}4 z)s9gXcRqVvFP%3VNVX0G!>InT&suYrjp!}uvo2|~^&`KgTxpURGl>GlP zK;;V71n+(S=?j`|Q1cAO0^w`9Ry;JUM+u|iJF&Zf7b&mq?>Od65Xf%^TebyN@CO)M zPj?2boOIgd_QdE}hTGC#{w17TBs)u3^%zfpPq}q{%m)^emmeh@|6uj1?8p)%EXiNjIR6bNCe~cke;kSoxSLpeUtVJ* z2v*cj!W^Rg%YM%gbjN-3pfT}yUvVoIwGO*FSSR|h29TYGzF|0=zI|6w} zp@bEa!goL7!=n2nZ40=hrpriZCphaA)`pmDIUW3FMoDg9o|fG&`wCQ)G!s5}>w$ph zCEl5^&$zrl<=({j&5?=VK;4g5m-kOzPzHUs6s|`ujg{@L4PV5z1t4^p%h_#SH=mC7 z%`3lAQ>iUkNKwJuFxZ`ffL8gF17=7Q!mc}|P&hO*rfSk3U!c`^5i{#C6$9FrfoIP{ z)3(c?MGFU#Xfrul89!ZO`iA1#wD7$(fgJz=%ER<~V?lptLGD)t7j&e{zoOb4KhL3J z!)J((7*uu{Ec-<`{oY(Jg}?M%b$l^egn~I3Hg4EcJB+ou3=z7V#_&~|1;C(BZ{CMB&5rx)LdfJV{sneCM}pgjo;fEU&3~GlN}DP4TmC4F zA>{}?)5Dmd{gNvETL=Ilw);!Um@KsF>B!;M~aZ>x11TMzff*)V@ zkDS2Y->-d2zmJ|jtgT-6XQgDD?+H8`-gWpM5diO^=WZgm6}=x&kFot9+{+@btwQ0#Cd`N zZwX`TjH;Vo%D)9EbX^+tJR>xn?dmG;f=EKsa~Yc+PuTD(@<)vz)Mx{s;Exip9J%g? zp*7ra+souIerU)-SvCV>gJ9;kYB%`o??C%L@!wL(`~$MRH<&4cPa;oR=*A&$BVMF@ zvtM_4o}f_MjrTHbF$42spT^eU5>90?(+)q;hSv?VW*mCb;Hrhgt}pZ)@_T~@TcWPj zZZHA_-^d3Rba|oUb;?ob>=%m(EsitG8PN{&gMhlrRs;bYy(pdp8Z+@R{x<4>epJZ< zflj2;>P@WGn>cd{%E0SJ`C8-sVMb|Z+rb8kfnsQ;<4L_cu+<|`$nx1oKz95R`J0$L8cSl%KRlVEh z_8a;q6LVV!6&R_E(>vvv$lbh>{=&axh1&`S9xsMZlDl!2wA(XniKiIxyk|{nrmAZR zsz!#wLWBtctkHof&q=HAPC#28Y9^kzBFU?D_jF(O^{{Y5JHV%ya&JEr|0z?(E+)za zww1r!da4sQ`SuihTXJZ0a;KNIppGYzVQZ(3#7|%O(9}68sJ=)XwY%IeZ^3E0P9pbJ zMszy~XBlf^*%lAIQf3CGyRL0g;`&nD6%~{SXg!NQ&vMXyWN3Qshy1BVqyhnMd@sa zEGnfGh*lq4L*M{6eV%#~8Ebn;q_{$Rf~)W8 zas+QHrr3Pb9fc<}7~M>3Vz(r`wv%bsG>RQLUWQ4C5TLWa=T>OpYVQduE2b2P!6$~*GYaZa@}_a&uTr+oH5^@<8g`V$r(OTp zRQ8TW5}<#Pi4vw?Vv`u}$WeG&HWMY#^uS#?y@irrBtD5{UFa%pRXy;68#4y>DtdHb zyn*-VRL?_%<}+)ZyH{3j*i#w1b6Y=LWyY%d%nWc7pW)nhGE_w@QvIP6Rp6jD`6uGI z=y3G_U11X7mju_a%Rg%VteSR>w0GA^{-AEs7TTCEM>>ddkly%0t4PMufzjkrnMjP> zp_NJBJ9`y`VKehbPS1Kj>NI9cQhnCO0=+1kYLRrF%vuL1ER{Lb@&$;`5CCh^gW+i_CAL<WacQL*})n#TQ$aFB8GPL3gp%|nj;p4PtS@1!#odLI7pF7F zk1WvzDk~sxKiq_%u*`M*w#Rob^2fU%h%(oiKUiLcx-Z2&Ec_@)j>|At?QF-|vzvTy zP5b4HqbovnbHUB;aziBiF*OJwz2$41o1xHz$t-fOWm~`Q58y?Bu_Z&U@mFb(OXx3l zml!8wzq_<=JjOy3t9^RruTL92*J|L)0mtwEHt;B}YKpl_=EYCm#)*6S70Wd}@x;oA zU9tZJ=Jo~xsyw_56^4%DKWoa5BwK3^|1;UqNKLvSCLd(2ccvq-xJF$jA{uThiFCwMe{p{qlK#u@!71^GfFlPUpkGE$lKv2Iert+{xdD_E8q z(VxJkUFQz!X0#&`Rv1Ud`69_7aU;SQ0d;8|#DE|44scUt1le5h}Jxl(__MEqe%9df}>^U?GYC}ob8yeB|bPV zt|iEgu`*RNcpxB&Y|@T=*L&3pT zX86ts<72tkc*W`I$(9SLOgYQ>YvTGW3lgg_zjWyb)Ol8@64%wo|QdGE{4wzQ9r^$~|-`1@A zZtl|Cb6O{=p+z@GeUJ5sKJUeraSGae_|2*;L4=8qqzv3pafN{>e{OG_B3ylbF;VI^ zcnojeu0DU(G26s{pK9Q)8lU*5N>nXXN3>zis%?l;1ZPO|b}2Z|b`-4p`@_rU9FFc; z+SPW*_;$y-Qin+Rk!8LF<+gC76R+lS_2~U1xW!;bBxhP86*~Rs7-vgk{^GP)bgZH3h9 zLX5u?)~9MPmf=@Ft2VhVe=G5c*Lih*dnDjdNcz2W|6W#L>v#>-j`-?};w6;2+l0hj zn7#2z5@(8`WI3f*e&S?j)&`&H(PRf@r@W;HHexhXEnU*7g%UWC$X%?5s8`oN)Emo! zUEM>^Ly=%3BSDv@rbM9;92{RLLe>$xro~7`?o84#ut+uRk8R1h{liB`SkX#h1Xx2F z-m`tYfnbEBGz=nfJg|lQ{?`1U)6El0dRQye7Fl&KFQ7q81NVGU_%Z10=vPu7DudI6evY#*H4O z`B2B+TK2fP&M1a;V73kb$v^B+ccCSXOg&9~9$4)-FX+r4tm$}Uv8(!%x5Qy9IA#TF z1#NngT;jiFR9~Hc>r#V&@r~j5-vDy?I~$w?|7=FZ*K)<1@MC{55;OAlZVNA@j$Zo~ z9~U#)CT_9NO^SnTQtZtjfa*5ruC_V*8GlMzEPjF?XY?e?@a1a|ctt7y57+4mj}4x% z@t6&_kO{*JCli4)B+%oRQCbz}{1TE@h@31wzle0eG*mR}5^f#g12cg-#p|wp7WIS^ zx5>QFr{-svv8EJX^5{dw0zj1y-fYIC4thn1RHLtmvHVV#Tw7vjdeuCHFiM+m@!MLM zF$=Ud`x0&~;e+vhC{0Uu5Rs`WubTo6X&~T+LtpT$#$zLe*Tx=!Ji)9NO-ty}3yquW z5K<|5HG{2K`AJ4KCVxe9fdI@JU?uDA@fGqi={~S{YEpm&-yCuq(KK2^YJ1{w_N%e9 zu}33Vpxg$$U|m7yF$MNb=5xln;)`o3Js<5)hc4xea`s2T3E3piLP;l^BghTnrG%Ql z%jj}F+XlV#$1>0b@u>mch0!%}nzjBW3>j7#Ul(OV@XoX|lrC$xD-3zlN2ZAzU+tg+ z$Fjgp_!F6BR%Q%QD(FSg)(u+8(@1Zu25xax{@PBc>AX_6_+#4x#K#j`fSj$UMYZ5H zs%7PebwjaZb*-CR85;R=FSK^;F09of9dtiFxb7U-R5}=5bEWYtA*mUHLQJ&a)gR!*$ zrbTHDC?IJvVOOvPp_^#UQ0{0mF9hCOgQ)k9Qj7odAqMF^no^3)pL_#pG5}>(;Eglk zFMi$D45USD@LJYFFen~_>^aC3A&Joz%pO3B5K?dp-~s__2Wm&vkIaBVi; zUpJAg`{>pqp-q}79s4Ih-i`$FBOhBPvdFa4+Akdb;q`Sgo9Xv9-gpHAPn#On=o*q_ zS|j6D30`0^Q$E#fGxKwjImi$0>&-*GMVVSQ@(0$W@7s?yZVe(GHT839D%14z7yYgO z7zbR+1$zgk`=M^PKq_ZB$>Z!&m@&!2%5RH#hIXhTeFTg9O8Pl}=SMR43Vkx!v@2%% zK||71o%1gDnuw1GlQJAAMd{G=csA&20;jk0istTGZ3LY01R0_;&5ma|UN^zuTw)G# z78*H)$=Aq9Zxx++u6fr!oti(Cu`E@t$nY~16e%28k3` z;PUreL%*uAsT$3U%TGuR(3whFXZj~sE9&0tn@GWQT^Dvuwrqq^KEsG^i|>Eq_YOq< zo!`S6SCkejl1(yqu{)^{wsLE%X}8~}0B1xzR_1y0rCeHVRAW=fX%B9+FFdNi*in$u zzDH)j=XP*c{Gn;#g~yCv>ghbWlh;jcm7=Hemg(oA@^09(Kk-`ebPDF}ff)F@^(jXk z3$mo4*%8NTL{86USFMt*Bf__d9}J!uyw_$M>GiN9tZKsF1yQRTF`6S4CoUfr*z&?l zW-7cf`)e6S^hnlR;1~kjviHr7oTfK1zIMEI1RM9{J#4TK;ivV#@uq26bIU7#e^hD2 z&QWZ2@&j6PV`O93*2o=C(DRI1;)*K7h1p@dqVQIV!(<4M)A()QY9g{kUkGxr8DTVV z8gldI#xt_4CE<_I=UQytL84@8l|Us*)!IX&j9UU4Sp_>}Q3S91c&W$l;6P8-O zQTiN}?f83pXhexAU_JRcR$d#vA!bEd{#j-0gIenRmu+bK06RqF^yUK>x8)MpqcNUC z4Krxt-XfJ zZa~3&N^w8I*JHhC{gEqf%L(Z4+){H=OI`n_N8=?aCxbfcW(#bsLqt-q5QkM{3jG$9 zN3D73!<`H&RQV3gXw6DOW&O}>Dk!q+{~Jxxgsz)tO-hO$;L1j}dIc7ctL|JioN zKQ}~BvKBDW7l3650Q{>=KZ1j5>g)j^Zi~L}@>Mz1ef|pzf}twp^l4=e z(o!@b!T&MU^Mr=TpMLLfcWM+qkuO&3`r&0W@2To%g)<%SGW;|Z|D{N*+Vd0RHCO5+S;66a`TU?Al z4IYT%w!^l>mAt5kC2eaTIW8QkU~C|kn#!90vCEOXSp!SQt@ajyPW2$;8R6RvK;bKR zXj111=Dh`v`H=jk)fEQ#`)dmX3G=$0PnLZif4N3n088@8&lhS&-^f$N;$eY!#Ie7o zmul~v#whf!QP3LU{90EJ|L#=r)8vRSNs;RFw0wjY;D1+33?hP1*`Ej|mh#PD!_gLH zS{YH?x}(i^9;t0dn|2~VB-2i~4Nr!+TiEaM_CN40D<`86Id~E3ur`rvTi`Z^EeNo3 z%TukZqco*hMMdD=Su;by+7!qDS#YoyyB36w28RL6(Be34Ov!Rhs3`1B&~~E+d*P9j z=K1h&F9hWUtO-fJ(c87^$jQR-b+tVF^99@p_|}Tkq@EZ|N>mX#l>U-ax`-`&NnKJB zJS`VbV5fuGyNClHaJi+%tkx7k5FH80MOXsS<@!k>;G~=G9EjfNiVMUNPX+2mu+`P1 zRk3#LME`)rd+n~M^bmO#KD938=;!>e5IJ29LS$F$TyL5rW)%XZ+uR< zWX3q(pR$Ssi}h@%quMp``eZz-8cI$f(qosbJ2}{08#EQPDaJRs6nOCvq?kdN4&`Jg zT3gcnuF4PGr1neN1@pPj&NqB9Eq<n zS$}m)LU-64!0_jPft!AIi@7niOYar$L(d4SiaX{icQl78bEOBnAS@`O=2~c?XzeOZ zDAw*Fe;K&+H) z3veQ`*QYyZvt`Dv8-_d~_d534{aS9~Vr{2;!~0N^FxyWN9vPLljNF1>Qk487s;4eP zc$v!&HP2sYS!oHMAJ_r{HU7al2HzDl$zA|_?E-#maco@>1@l_UG9@SPL%_V`8r`@> zPgHq^N8t?%!M&jbY%?ukE>Nxm4;WbRfhzO=nGWn%A^U$!0V3mU;6;@l6#rS_t1mmh zO2#h!|B#H4V`&Y4Q}doJlB$cV+=^AQ5|em8in&dA(l!8yKl+b~-lpV;J|);p4anmi zRRx4_Y>6?hWo70rPl?7VDP(m7TE?o{IkgYAeAfS|>5T2+n?3gN6 zxCuSCVIi1AqI15fIYFI=H9@o%8_R2z_av6A-ei{u)`98lkmBE@uKLoDT3$eQCNZFR z9NGDv858;psu|;E}41kU?R}wpEHRDVU!} z1!tI5@N-raUL@FnR)8Ajz7AX7aZ{NsL6EcTQbsZJ=um~G;c6%qze@HIRLIGnn#Mbu z)}}PB_j*oYxE@I`BnQ>u9Y`CGIpn$dU?P;04%C{E!dT`}uo^mp*GopX6RM;f6PF_u z_S5OVThbM$dhaBi!ua}=nnw59F`ayzq$-K<=d+d#0&OzK%WY;t5(rCisP(-;(ygfo ze-mGvVI7y9SszUWvkWL+ERP5EB9wweD64h-(tsP0%Sc>Thk0*b7R{+rY!bOMcg8Cc z3FL?bY?a4yt)#gQqG)gYBAEm9S$y005v9Zr`)lCln+#qNaQySO(W;(w`7v2PC+V6! zhm4Cj1?8VL7lct%>2k5{D19{|3U2~#O%}K{xwbqi1~usCSysrA(&k5+(l_kpgeFU* zVSd{+(X!e^L*SCgMlaBkUFFOZY!88jpv^5xZ?1E$2UVz1?( z*emE-U9wfthpxH6nFZhh`xfT^UX}beWoXL|km>>Y;{U6gW5Pz%h+qI50nw|?zP>*2 zKO_A7XKkt6eUNNj(B$WmI92X^xHhelRn+$cjhT`3_-ZlnZ#D)E)@b~g!w8B_Ut)mG zigLU@5|``WSlKf*g$aHccX1VYWwu(RF^4}b8>)5#6$Yc#rKO~SA_b$f-omBC+PWi! zu{7&z(Gj(b9`L|0AS)(6d}RrTseipA9#ov7$ju4a=)nVHZRgdeZOk=Gu~X%Vr4}82 zeiqdkid7s?hLQD|I95>V&c84QUX$OCwkPcz34qG1h>UNA!rIy;C5#OQl&6bQPqFP+ zbmX{+jB@2-Ib)WSQ4ch}<}_@%CX;k{-SamayrM%H+X7}Wzr);-Gm1Z%n4TC7i?;y5 z=ehb>JTEIIlHpf}=Yn@q&ffu`c4_ZHYF|Dp4&6my`rOXU|x3qo&{;#12;L7 z^#kk<$Izn9;M)OaRaSfN)W=$~GDtyhS`t2^F%=!Qh@9?ozb8raC~~^m2zcNBZL2~# zWnt#Q5x1&e+Gl*U{}^IPk!n~;SnVG}6dS3jvQ z^Mr1?jvCAbQ__yRV9XcWG7+@f_R~XTt;AyPtm!)3$w!bo?dhRSfiOeLsIrnjnW_>| z(GdEu#T~bE_Sv6)u|*_oyO$hK^z*kfKOzKxF#;&SRBa?gxj_P{2^nlk*4t}`Bzws> zhd;5Pq?X9TyO~!Mt5L9=j#Tl-@f3_PYlNQLKVT=KD+=I2d6{h7*})O>@YVDxGDH1@ zQY#U{%=OFcNZM(d0A-~ Date: Mon, 11 Sep 2023 17:23:08 +0200 Subject: [PATCH 09/10] AfterEffects: added validator for missing files in FootageItems (#5590) * OP-6345 - updated logic to return path and comp for FootageItem Used later to check existance of file in published comps * OP-6345 - added validator if footage files exist Comp could contain multiple FootageItems, eg imported file(s). If file is missing render triggered by jsx fails silently. * OP-6345 - updated extension * OP-6345 - small updates after testing * OP-6345 - fix - handle Solid Footage items JSX failed silently on Solid item as it doesn't have any `.file` * OP-6345 - enhance documentation * OP-6345 - remove optionality This plugin shouldn't be optional as when needed and skipped it result in really weird behavior. * OP-6345 - updated documentation Added missing plugins. * OP-6345 - missed functionality for optionality * OP-6345 - removed unneeded import --- openpype/hosts/aftereffects/api/extension.zxp | Bin 102930 -> 103005 bytes .../api/extension/CSXS/manifest.xml | 24 ++++----- .../api/extension/jsx/hostscript.jsx | 16 +++++- openpype/hosts/aftereffects/api/ws_stub.py | 8 ++- .../publish/help/validate_footage_items.xml | 14 +++++ .../plugins/publish/validate_footage_items.py | 49 ++++++++++++++++++ website/docs/admin_hosts_aftereffects.md | 8 +++ 7 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 openpype/hosts/aftereffects/plugins/publish/help/validate_footage_items.xml create mode 100644 openpype/hosts/aftereffects/plugins/publish/validate_footage_items.py diff --git a/openpype/hosts/aftereffects/api/extension.zxp b/openpype/hosts/aftereffects/api/extension.zxp index 358e9740d3c2479b88dff08af47eba3d74be63ce..933dc7dc6cab34b6a1630b25d11a2167fa0aef7a 100644 GIT binary patch delta 10917 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 D9WP{T delta 10814 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 BS&;w$ diff --git a/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml b/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml index 0057758320..7329a9e723 100644 --- a/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml +++ b/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml @@ -1,5 +1,5 @@ - @@ -10,22 +10,22 @@ - + - + - - + + - + - - + + - + @@ -63,7 +63,7 @@ 550 400 --> - + ./icons/iconNormal.png @@ -71,9 +71,9 @@ ./icons/iconDisabled.png ./icons/iconDarkNormal.png ./icons/iconDarkRollover.png - + - \ No newline at end of file + diff --git a/openpype/hosts/aftereffects/api/extension/jsx/hostscript.jsx b/openpype/hosts/aftereffects/api/extension/jsx/hostscript.jsx index bc443930df..c00844e637 100644 --- a/openpype/hosts/aftereffects/api/extension/jsx/hostscript.jsx +++ b/openpype/hosts/aftereffects/api/extension/jsx/hostscript.jsx @@ -215,6 +215,8 @@ function _getItem(item, comps, folders, footages){ * Refactor */ var item_type = ''; + var path = ''; + var containing_comps = []; if (item instanceof FolderItem){ item_type = 'folder'; if (!folders){ @@ -222,10 +224,18 @@ function _getItem(item, comps, folders, footages){ } } if (item instanceof FootageItem){ - item_type = 'footage'; if (!footages){ return "{}"; } + item_type = 'footage'; + if (item.file){ + path = item.file.fsName; + } + if (item.usedIn){ + for (j = 0; j < item.usedIn.length; ++j){ + containing_comps.push(item.usedIn[j].id); + } + } } if (item instanceof CompItem){ item_type = 'comp'; @@ -236,7 +246,9 @@ function _getItem(item, comps, folders, footages){ var item = {"name": item.name, "id": item.id, - "type": item_type}; + "type": item_type, + "path": path, + "containing_comps": containing_comps}; return JSON.stringify(item); } diff --git a/openpype/hosts/aftereffects/api/ws_stub.py b/openpype/hosts/aftereffects/api/ws_stub.py index f5b96fa63a..18f530e272 100644 --- a/openpype/hosts/aftereffects/api/ws_stub.py +++ b/openpype/hosts/aftereffects/api/ws_stub.py @@ -37,6 +37,9 @@ class AEItem(object): height = attr.ib(default=None) is_placeholder = attr.ib(default=False) uuid = attr.ib(default=False) + path = attr.ib(default=False) # path to FootageItem to validate + # list of composition Footage is in + containing_comps = attr.ib(factory=list) class AfterEffectsServerStub(): @@ -704,7 +707,10 @@ class AfterEffectsServerStub(): d.get("instance_id"), d.get("width"), d.get("height"), - d.get("is_placeholder")) + d.get("is_placeholder"), + d.get("uuid"), + d.get("path"), + d.get("containing_comps"),) ret.append(item) return ret diff --git a/openpype/hosts/aftereffects/plugins/publish/help/validate_footage_items.xml b/openpype/hosts/aftereffects/plugins/publish/help/validate_footage_items.xml new file mode 100644 index 0000000000..01c8966015 --- /dev/null +++ b/openpype/hosts/aftereffects/plugins/publish/help/validate_footage_items.xml @@ -0,0 +1,14 @@ + + + +Footage item missing + +## Footage item missing + + FootageItem `{name}` contains missing `{path}`. Render will not produce any frames and AE will stop react to any integration +### How to repair? + +Remove `{name}` or provide missing file. + + + diff --git a/openpype/hosts/aftereffects/plugins/publish/validate_footage_items.py b/openpype/hosts/aftereffects/plugins/publish/validate_footage_items.py new file mode 100644 index 0000000000..40a08a2c3f --- /dev/null +++ b/openpype/hosts/aftereffects/plugins/publish/validate_footage_items.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +"""Validate presence of footage items in composition +Requires: +""" +import os + +import pyblish.api + +from openpype.pipeline import ( + PublishXmlValidationError +) +from openpype.hosts.aftereffects.api import get_stub + + +class ValidateFootageItems(pyblish.api.InstancePlugin): + """ + Validates if FootageItems contained in composition exist. + + AE fails silently and doesn't render anything if footage item file is + missing. This will result in nonresponsiveness of AE UI as it expects + reaction from user, but it will not provide dialog. + This validator tries to check existence of the files. + It will not protect from missing frame in multiframes though + (as AE api doesn't provide this information and it cannot be told how many + frames should be there easily). Missing frame is replaced by placeholder. + """ + + order = pyblish.api.ValidatorOrder + label = "Validate Footage Items" + families = ["render.farm", "render.local", "render"] + hosts = ["aftereffects"] + optional = True + + def process(self, instance): + """Plugin entry point.""" + + comp_id = instance.data["comp_id"] + for footage_item in get_stub().get_items(comps=False, folders=False, + footages=True): + self.log.info(footage_item) + if comp_id not in footage_item.containing_comps: + continue + + path = footage_item.path + if path and not os.path.exists(path): + msg = f"File {path} not found." + formatting = {"name": footage_item.name, "path": path} + raise PublishXmlValidationError(self, msg, + formatting_data=formatting) diff --git a/website/docs/admin_hosts_aftereffects.md b/website/docs/admin_hosts_aftereffects.md index 974428fe06..72fdb32faf 100644 --- a/website/docs/admin_hosts_aftereffects.md +++ b/website/docs/admin_hosts_aftereffects.md @@ -18,6 +18,10 @@ Location: Settings > Project > AfterEffects ## Publish plugins +### Collect Review + +Enable/disable creation of auto instance of review. + ### Validate Scene Settings #### Skip Resolution Check for Tasks @@ -28,6 +32,10 @@ Set regex pattern(s) to look for in a Task name to skip resolution check against Set regex pattern(s) to look for in a Task name to skip `frameStart`, `frameEnd` check against values from DB. +### ValidateContainers + +By default this validator will look loaded items with lower version than latest. This validator is context wide so it must be disabled in Context button. + ### AfterEffects Submit to Deadline * `Use Published scene` - Set to True (green) when Deadline should take published scene as a source instead of uploaded local one. From 651177dedbfe75c03022c2b1f7930fdda5b93315 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:17:22 +0200 Subject: [PATCH 10/10] TVPaint: Fix tool callbacks (#5608) * don't wait for tools to show * use 'deque' instead of 'Queue' --- .../hosts/tvpaint/api/communication_server.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/openpype/hosts/tvpaint/api/communication_server.py b/openpype/hosts/tvpaint/api/communication_server.py index 6f76c25e0c..d67ef8f798 100644 --- a/openpype/hosts/tvpaint/api/communication_server.py +++ b/openpype/hosts/tvpaint/api/communication_server.py @@ -11,7 +11,7 @@ import filecmp import tempfile import threading import shutil -from queue import Queue + from contextlib import closing from aiohttp import web @@ -319,19 +319,19 @@ class QtTVPaintRpc(BaseTVPaintRpc): async def workfiles_tool(self): log.info("Triggering Workfile tool") item = MainThreadItem(self.tools_helper.show_workfiles) - self._execute_in_main_thread(item) + self._execute_in_main_thread(item, wait=False) return async def loader_tool(self): log.info("Triggering Loader tool") item = MainThreadItem(self.tools_helper.show_loader) - self._execute_in_main_thread(item) + self._execute_in_main_thread(item, wait=False) return async def publish_tool(self): log.info("Triggering Publish tool") item = MainThreadItem(self.tools_helper.show_publisher_tool) - self._execute_in_main_thread(item) + self._execute_in_main_thread(item, wait=False) return async def scene_inventory_tool(self): @@ -350,13 +350,13 @@ class QtTVPaintRpc(BaseTVPaintRpc): async def library_loader_tool(self): log.info("Triggering Library loader tool") item = MainThreadItem(self.tools_helper.show_library_loader) - self._execute_in_main_thread(item) + self._execute_in_main_thread(item, wait=False) return async def experimental_tools(self): log.info("Triggering Library loader tool") item = MainThreadItem(self.tools_helper.show_experimental_tools_dialog) - self._execute_in_main_thread(item) + self._execute_in_main_thread(item, wait=False) return async def _async_execute_in_main_thread(self, item, **kwargs): @@ -867,7 +867,7 @@ class QtCommunicator(BaseCommunicator): def __init__(self, qt_app): super().__init__() - self.callback_queue = Queue() + self.callback_queue = collections.deque() self.qt_app = qt_app def _create_routes(self): @@ -880,14 +880,14 @@ class QtCommunicator(BaseCommunicator): def execute_in_main_thread(self, main_thread_item, wait=True): """Add `MainThreadItem` to callback queue and wait for result.""" - self.callback_queue.put(main_thread_item) + self.callback_queue.append(main_thread_item) if wait: return main_thread_item.wait() return async def async_execute_in_main_thread(self, main_thread_item, wait=True): """Add `MainThreadItem` to callback queue and wait for result.""" - self.callback_queue.put(main_thread_item) + self.callback_queue.append(main_thread_item) if wait: return await main_thread_item.async_wait() @@ -904,9 +904,9 @@ class QtCommunicator(BaseCommunicator): self._exit() return None - if self.callback_queue.empty(): - return None - return self.callback_queue.get() + if self.callback_queue: + return self.callback_queue.popleft() + return None def _on_client_connect(self): super()._on_client_connect()