From cc59f9bd3efc20c0cc946972164f4b88d2c1a5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20LORRAIN?= <jerome.lorrain@protonmail.com>
Date: Fri, 5 Nov 2021 18:00:26 +0100
Subject: [PATCH 1/2] Add following workfile versioning option on publish

---
 .../publish/collect_anatomy_instance_data.py       |  7 ++++++-
 openpype/plugins/publish/validate_version.py       |  8 ++++----
 .../settings/defaults/project_settings/global.json |  3 +++
 .../schemas/schema_global_publish.json             | 14 ++++++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/openpype/plugins/publish/collect_anatomy_instance_data.py b/openpype/plugins/publish/collect_anatomy_instance_data.py
index 4fd657167c..e0eb1618b5 100644
--- a/openpype/plugins/publish/collect_anatomy_instance_data.py
+++ b/openpype/plugins/publish/collect_anatomy_instance_data.py
@@ -38,6 +38,8 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder + 0.49
     label = "Collect Anatomy Instance data"
 
+    follow_workfile_version = False
+
     def process(self, context):
         self.log.info("Collecting anatomy data for all instances.")
 
@@ -213,7 +215,10 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
         context_asset_doc = context.data["assetEntity"]
 
         for instance in context:
-            version_number = instance.data.get("version")
+            if self.follow_workfile_version:
+                version_number = context.data('version')
+            else:
+                version_number = instance.data.get("version")
             # If version is not specified for instance or context
             if version_number is None:
                 # TODO we should be able to change default version by studio
diff --git a/openpype/plugins/publish/validate_version.py b/openpype/plugins/publish/validate_version.py
index 927e024476..b86d72a658 100644
--- a/openpype/plugins/publish/validate_version.py
+++ b/openpype/plugins/publish/validate_version.py
@@ -21,8 +21,8 @@ class ValidateVersion(pyblish.api.InstancePlugin):
 
         if latest_version is not None:
             msg = (
-                "Version `{0}` that you are trying to publish, already exists"
-                " in the database. Version in database: `{1}`. Please version "
-                "up your workfile to a higher version number than: `{1}`."
-            ).format(version, latest_version)
+                "Version `{0}` from instance `{1}` that you are trying to publish, already exists"
+                " in the database. Version in database: `{2}`. Please version "
+                "up your workfile to a higher version number than: `{2}`."
+            ).format(version, instance.data["name"], latest_version)
             assert (int(version) > int(latest_version)), msg
diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index 45c1a59d17..134435d909 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -1,5 +1,8 @@
 {
     "publish": {
+        "CollectAnatomyInstanceData": {
+            "follow_workfile_version": false
+        },
         "ValidateEditorialAssetName": {
             "enabled": true,
             "optional": false
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index c50f383f02..375f0c26da 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -4,6 +4,20 @@
     "key": "publish",
     "label": "Publish plugins",
     "children": [
+        {
+            "type": "dict",
+            "collapsible": true,
+            "key": "CollectAnatomyInstanceData",
+            "label": "Collect Anatomy Instance Data",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "follow_workfile_version",
+                    "label": "Follow workfile version"
+                }
+            ]
+        },
         {
             "type": "dict",
             "collapsible": true,

From d4f04f72da7a952cca2709df0fd6e42a6b374637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20LORRAIN?= <jerome.lorrain@protonmail.com>
Date: Wed, 10 Nov 2021 12:07:07 +0100
Subject: [PATCH 2/2] fix line sizes

---
 openpype/plugins/publish/validate_version.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openpype/plugins/publish/validate_version.py b/openpype/plugins/publish/validate_version.py
index b86d72a658..e48ce6e3c3 100644
--- a/openpype/plugins/publish/validate_version.py
+++ b/openpype/plugins/publish/validate_version.py
@@ -21,8 +21,9 @@ class ValidateVersion(pyblish.api.InstancePlugin):
 
         if latest_version is not None:
             msg = (
-                "Version `{0}` from instance `{1}` that you are trying to publish, already exists"
-                " in the database. Version in database: `{2}`. Please version "
-                "up your workfile to a higher version number than: `{2}`."
+                "Version `{0}` from instance `{1}` that you are trying to"
+                " publish, already exists in the database. Version in"
+                " database: `{2}`. Please version up your workfile to a higher"
+                " version number than: `{2}`."
             ).format(version, instance.data["name"], latest_version)
             assert (int(version) > int(latest_version)), msg