diff --git a/client/ayon_kitsu/plugins/publish/integrate_kitsu_review.py b/client/ayon_kitsu/plugins/publish/integrate_kitsu_review.py index e82d8788..dc09f324 100644 --- a/client/ayon_kitsu/plugins/publish/integrate_kitsu_review.py +++ b/client/ayon_kitsu/plugins/publish/integrate_kitsu_review.py @@ -13,6 +13,8 @@ class IntegrateKitsuReview(KitsuPublishInstancePlugin): families = ["kitsu"] optional = True + match_version_number = True + def process(self, instance): # Check comment has been created comment_id = instance.data.get("kitsuComment", {}).get("id") @@ -45,6 +47,10 @@ def process(self, instance): comment=comment_id, preview_file_path=review_path, normalize_movie=True, - revision=instance.data["version"], + revision=( + instance.data["version"] + if self.match_version_number + else None + ), ) self.log.info("Review upload on comment") diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py index 290baefb..ef172481 100644 --- a/server/settings/publish_plugins.py +++ b/server/settings/publish_plugins.py @@ -104,6 +104,16 @@ class IntegrateKitsuNotes(BaseSettingsModel): title="Custom Comment Template", ) +class IntegrateKitsuReviews(BaseSettingsModel): + match_version_number: bool = SettingsField( + title="Match version number", + description=( + "Set Kitsu note revision to match AYON version number.\n\n" + "Note: If enabled avoid uploading reviewables directly" + " into Kitsu without passing through AYON, as this can desynchronize" + " product version and revision number and cause errors during publish." + ) + ) class PublishPlugins(BaseSettingsModel): CollectKitsuFamily: CollectKitsuFamilyPluginModel = SettingsField( @@ -114,6 +124,10 @@ class PublishPlugins(BaseSettingsModel): default_factory=IntegrateKitsuNotes, title="Integrate Kitsu Note" ) + IntegrateKitsuReview: IntegrateKitsuReviews = SettingsField( + default_factory=IntegrateKitsuReviews, + title="Integrate Kitsu Review" + ) PUBLISH_DEFAULT_VALUES = { @@ -294,5 +308,8 @@ class PublishPlugins(BaseSettingsModel): | family | `{family}` | | name | `{name}` |""", }, - } + }, + "IntegrateKitsuReview": { + "match_version_number": True, + }, }