change 'get_dynamic_data' arguments to be same as in 'get_product_name'

client/ayon_core/hosts/aftereffects/plugins/create/create_render.py

@@ -217,8 +217,9 @@ class RenderCreator(Creator):
         that would cause an issue in published file names.
         """
 
-    def get_dynamic_data(self, variant, task_name, asset_doc,
+    def get_dynamic_data(
-                         project_name, host_name, instance):
+        self, project_name, asset_doc, task_name, variant, host_name, instance
+    ):
         dynamic_data = {}
         if instance is not None:
             composition_name = instance.get("composition_name")

client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py

@@ -62,8 +62,12 @@ class AEWorkfileCreator(AutoCreator):
                 "variant": self.default_variant,
             }
             data.update(self.get_dynamic_data(
-                self.default_variant, task_name, asset_doc,
+                project_name,
-                project_name, host_name, None
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
+                None,
             ))
 
             new_instance = CreatedInstance(

client/ayon_core/hosts/blender/plugins/create/create_workfile.py

@@ -47,7 +47,7 @@ class CreateWorkfile(BaseCreator, AutoCreator):
                 project_name,
                 asset_doc,
                 task_name,
-                self.default_variant,
+                task_name,
                 host_name,
             )
             data = {
@@ -57,10 +57,10 @@ class CreateWorkfile(BaseCreator, AutoCreator):
             }
             data.update(
                 self.get_dynamic_data(
-                    task_name,
-                    task_name,
-                    asset_doc,
                     project_name,
+                    asset_doc,
+                    task_name,
+                    task_name,
                     host_name,
                     workfile_instance,
                 )

client/ayon_core/hosts/fusion/plugins/create/create_workfile.py

@@ -91,8 +91,13 @@ class FusionWorkfileCreator(AutoCreator):
                 "variant": self.default_variant,
             }
             data.update(self.get_dynamic_data(
-                self.default_variant, task_name, asset_doc,
+                project_name,
-                project_name, host_name, None
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
+                None
+
             ))
 
             new_instance = CreatedInstance(

client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py

@@ -88,14 +88,14 @@ class CreateStaticMesh(plugin.HoudiniCreator):
         return attrs + [createsubnetroot, vcformat, convert_units]
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         """
         The default prodcut name templates for Unreal include {asset} and thus
         we should pass that along as dynamic data.
         """
         dynamic_data = super(CreateStaticMesh, self).get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["asset"] = asset_doc["name"]
         return dynamic_data

client/ayon_core/hosts/houdini/plugins/create/create_workfile.py

@@ -52,8 +52,12 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
 
             data.update(
                 self.get_dynamic_data(
-                    variant, task_name, asset_doc,
+                    project_name,
-                    project_name, host_name, current_instance)
+                    asset_doc,
+                    task_name,
+                    variant,
+                    host_name,
+                    current_instance)
             )
             self.log.info("Auto-creating workfile instance...")
             current_instance = CreatedInstance(

client/ayon_core/hosts/max/plugins/create/create_workfile.py

@@ -45,8 +45,12 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
 
             data.update(
                 self.get_dynamic_data(
-                    variant, task_name, asset_doc,
+                    project_name,
-                    project_name, host_name, current_instance)
+                    asset_doc,
+                    task_name,
+                    variant,
+                    host_name,
+                    current_instance)
             )
             self.log.info("Auto-creating workfile instance...")
             instance_node = self.create_node(product_name)

client/ayon_core/hosts/maya/api/plugin.py

@@ -590,7 +590,7 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
         if host_name is None:
             host_name = self.create_context.host_name
         dynamic_data = self.get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         # creator.product_type != 'render' as expected
         return get_product_name(

client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py

@@ -28,14 +28,14 @@ class CreateUnrealSkeletalMesh(plugin.MayaCreator):
         self.joint_hints = set(settings.get("joint_hints", []))
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         """
         The default product name templates for Unreal include {asset} and thus
         we should pass that along as dynamic data.
         """
         dynamic_data = super(CreateUnrealSkeletalMesh, self).get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["asset"] = asset_doc["name"]
         return dynamic_data

client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py

@@ -21,14 +21,14 @@ class CreateUnrealStaticMesh(plugin.MayaCreator):
         self.collision_prefixes = settings["collision_prefixes"]
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         """
         The default product name templates for Unreal include {asset} and thus
         we should pass that along as dynamic data.
         """
         dynamic_data = super(CreateUnrealStaticMesh, self).get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["asset"] = asset_doc["name"]
         return dynamic_data

client/ayon_core/hosts/maya/plugins/create/create_workfile.py

@@ -50,8 +50,12 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
             }
             data.update(
                 self.get_dynamic_data(
-                    variant, task_name, asset_doc,
+                    project_name,
-                    project_name, host_name, current_instance)
+                    asset_doc,
+                    task_name,
+                    variant,
+                    host_name,
+                    current_instance)
             )
             self.log.info("Auto-creating workfile instance...")
             current_instance = CreatedInstance(

client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py

@@ -45,8 +45,12 @@ class WorkfileCreator(AutoCreator):
             "variant": self.default_variant
         })
         instance_data.update(self.get_dynamic_data(
-            self.default_variant, task_name, asset_doc,
+            project_name,
-            project_name, host_name, instance_data
+            asset_doc,
+            task_name,
+            self.default_variant,
+            host_name,
+            instance_data
         ))
 
         instance = CreatedInstance(

client/ayon_core/hosts/photoshop/lib.py

@@ -64,8 +64,12 @@ class PSAutoCreator(AutoCreator):
                 "variant": self.default_variant
             }
             data.update(self.get_dynamic_data(
-                self.default_variant, task_name, asset_doc,
+                project_name,
-                project_name, host_name, None
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
+                None
             ))
 
             if not self.active_on_create:

client/ayon_core/hosts/photoshop/plugins/create/create_image.py

@@ -244,8 +244,15 @@ class ImageCreator(Creator):
         return item.replace(stub.PUBLISH_ICON, '').replace(stub.LOADED_ICON,
                                                            '')
 
-    def get_dynamic_data(self, variant, task_name, asset_doc,
+    def get_dynamic_data(
-                         project_name, host_name, instance):
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name,
+        instance
+    ):
         if instance is not None:
             layer_name = instance.get("layer_name")
             if layer_name:

client/ayon_core/hosts/tvpaint/api/plugin.py

@@ -63,7 +63,7 @@ class TVPaintCreatorCommon:
         instance=None
     ):
         dynamic_data = self.get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
 
         return get_product_name(

client/ayon_core/hosts/tvpaint/plugins/create/create_render.py

@@ -149,10 +149,10 @@ class CreateRenderlayer(TVPaintCreator):
         self.mark_for_review = plugin_settings["mark_for_review"]
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         dynamic_data = super().get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["renderpass"] = self.default_pass_name
         dynamic_data["renderlayer"] = variant
@@ -425,10 +425,10 @@ class CreateRenderPass(TVPaintCreator):
             self._add_instance_to_context(instance)
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         dynamic_data = super().get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["renderpass"] = variant
         dynamic_data["renderlayer"] = "{renderlayer}"
@@ -1044,8 +1044,23 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
         self.active_on_create = plugin_settings["active_on_create"]
         self.default_pass_name = plugin_settings["default_pass_name"]
 
-    def get_dynamic_data(self, variant, *args, **kwargs):
+    def get_dynamic_data(
-        dynamic_data = super().get_dynamic_data(variant, *args, **kwargs)
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name,
+        instance
+    ):
+        dynamic_data = super().get_dynamic_data(
+            project_name,
+            asset_doc,
+            task_name,
+            variant,
+            host_name,
+            instance
+        )
         dynamic_data["renderpass"] = "{renderpass}"
         dynamic_data["renderlayer"] = variant
         return dynamic_data

client/ayon_core/pipeline/create/creator_plugins.py

@@ -497,7 +497,13 @@ class BaseCreator:
         return self.icon
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name,
+        instance
     ):
         """Dynamic data for product name filling.
 
@@ -546,7 +552,12 @@ class BaseCreator:
         if host_name is None:
             host_name = self.create_context.host_name
         dynamic_data = self.get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name,
+            asset_doc,
+            task_name,
+            variant,
+            host_name,
+            instance
         )
 
         return get_product_name(

client/ayon_core/pipeline/create/legacy_create.py

@@ -89,7 +89,7 @@ class LegacyCreator(object):
 
     @classmethod
     def get_dynamic_data(
-        cls, variant, task_name, asset_id, project_name, host_name
+        cls, project_name, asset_id, task_name, variant, host_name
     ):
         """Return dynamic data for current Creator plugin.
 
@@ -148,7 +148,7 @@ class LegacyCreator(object):
         """
 
         dynamic_data = cls.get_dynamic_data(
-            variant, task_name, asset_id, project_name, host_name
+            project_name, asset_id, task_name, variant, host_name
         )
 
         asset_doc = get_asset_by_id(