Publisher: filter creators based on task

client/ayon_core/tools/publisher/control.py

@@ -8,6 +8,7 @@
 import shutil
 import inspect
 from abc import ABCMeta, abstractmethod
+import re
 
 import six
 import arrow
@@ -1837,14 +1838,15 @@ def _reset_plugins(self):
     def _collect_creator_items(self):
         # TODO add crashed initialization of create plugins to report
         output = {}
-        allowed_creator_identifiers = self._get_allowed_creator_identifiers()
+        allowed_creator_labels = self._get_allowed_creator_labels()
         for identifier, creator in self._create_context.creators.items():
             try:
                 if (
-                    allowed_creator_identifiers is not None
-                    and identifier not in allowed_creator_identifiers
+                    allowed_creator_labels is not None
+                    and not self._label_matches_allowed(
+                        creator.label, allowed_creator_labels)
                 ):
-                    self.log.debug(f"{identifier} not allowed for context")
+                    self.log.debug(f"{creator.label} not allowed for context")
                     continue
                 output[identifier] = CreatorItem.from_creator(creator)
             except Exception:
@@ -1856,16 +1858,16 @@ def _collect_creator_items(self):
 
         return output
 
-    def _get_allowed_creator_identifiers(self):
-        """Provide configured creator identifier in this context
+    def _get_allowed_creator_labels(self):
+        """Provide configured creator label in this context
 
-        If no profile provided for current context, it shows all creators
+        If no profile matches current context, it shows all creators
         """
 
         task_type = self._create_context.get_current_task_type()
         project_settings = self._get_current_project_settings()
 
-        allowed_creator_identifiers = None
+        allowed_creator_labels = None
         filter_creator_profiles = (
             project_settings
             ["core"]
@@ -1885,8 +1887,16 @@ def _get_allowed_creator_identifiers(self):
         )
 
         if profile:
-            allowed_creator_identifiers = profile["creator_identifiers"]
-        return allowed_creator_identifiers
+            allowed_creator_labels = profile["creator_labels"]
+            self.log.debug(f"Only allowed `{allowed_creator_labels}` creators")
+        return allowed_creator_labels
+
+    def _label_matches_allowed(self, label, allowed_labels):
+        """Implement regex support for allowed labels."""
+        for allowed in allowed_labels:
+            if re.match(allowed, label):
+                return True
+        return False
 
     def _reset_instances(self):
         """Reset create instances."""

server/settings/tools.py

@@ -50,9 +50,11 @@ class FilterCreatorProfile(BaseSettingsModel):
     task_names: list[str] = SettingsField(
         default_factory=list,
         title="Task names")
-    creator_identifiers: list[str] = SettingsField(
+    creator_labels: list[str] = SettingsField(
         default_factory=list,
-        title="Allowed Creator Identifiers")
+        title="Allowed Creator Labels",
+        description="Copy creator label from Publisher, regex supported."
+    )
 
 
 class CreatorToolModel(BaseSettingsModel):
@@ -70,7 +72,9 @@ class CreatorToolModel(BaseSettingsModel):
 
     filter_creator_profiles: list[FilterCreatorProfile] = SettingsField(
         default_factory=list,
-        title="Filter creator profiles"
+        title="Filter creator profiles",
+        description="White list of creator labels that will be only shown if "
+                    "profile matches context."
     )
 
     @validator("product_types_smart_select")