Merge branch 'develop' into feature/integrate-reviewables-to-ayon

server/settings/main.py

@@ -169,6 +169,46 @@ class VersionStartCategoryModel(BaseSettingsModel):
     )
 
 
+class EnvironmentReplacementModel(BaseSettingsModel):
+    environment_key: str = SettingsField("", title="Enviroment variable")
+    pattern: str = SettingsField("", title="Pattern")
+    replacement: str = SettingsField("", title="Replacement")
+
+
+class FilterEnvsProfileModel(BaseSettingsModel):
+    _layout = "expanded"
+
+    host_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Host names"
+    )
+
+    task_types: list[str] = SettingsField(
+        default_factory=list,
+        title="Task types",
+        enum_resolver=task_types_enum
+    )
+
+    task_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Task names"
+    )
+
+    folder_paths: list[str] = SettingsField(
+        default_factory=list,
+        title="Folder paths"
+    )
+
+    skip_env_keys: list[str] = SettingsField(
+        default_factory=list,
+        title="Skip environment variables"
+    )
+    replace_in_environment: list[EnvironmentReplacementModel] = SettingsField(
+        default_factory=list,
+        title="Replace values in environment"
+    )
+
+
 class CoreSettings(BaseSettingsModel):
     studio_name: str = SettingsField("", title="Studio name", scope=["studio"])
     studio_code: str = SettingsField("", title="Studio code", scope=["studio"])
@@ -219,6 +259,9 @@ class CoreSettings(BaseSettingsModel):
         title="Project environments",
         section="---"
     )
+    filter_env_profiles: list[FilterEnvsProfileModel] = SettingsField(
+        default_factory=list,
+    )
 
     @validator(
         "environments",
@@ -313,5 +356,6 @@ DEFAULT_VALUES = {
     "project_environments": json.dumps(
         {},
         indent=4
-    )
+    ),
+    "filter_env_profiles": [],
 }

server/settings/publish_plugins.py

@@ -964,7 +964,8 @@ DEFAULT_PUBLISH_VALUES = {
                     "nuke",
                     "harmony",
                     "photoshop",
-                    "aftereffects"
+                    "aftereffects",
+                    "fusion"
                 ],
                 "enabled": True,
                 "optional": True,

server/settings/tools.py

@@ -195,6 +195,7 @@ def _product_types_enum():
         "editorial",
         "gizmo",
         "image",
+        "imagesequence",
         "layout",
         "look",
         "matchmove",
@@ -212,7 +213,6 @@ def _product_types_enum():
         "setdress",
         "take",
         "usd",
-        "usdShade",
         "vdbcache",
         "vrayproxy",
         "workfile",
@@ -222,6 +222,13 @@ def _product_types_enum():
     ]
 
 
+def filter_type_enum():
+    return [
+        {"value": "is_allow_list", "label": "Allow list"},
+        {"value": "is_deny_list", "label": "Deny list"},
+    ]
+
+
 class LoaderProductTypeFilterProfile(BaseSettingsModel):
     _layout = "expanded"
     # TODO this should use hosts enum
@@ -231,9 +238,15 @@ class LoaderProductTypeFilterProfile(BaseSettingsModel):
         title="Task types",
         enum_resolver=task_types_enum
     )
-    is_include: bool = SettingsField(True, title="Exclude / Include")
+    filter_type: str = SettingsField(
+        "is_allow_list",
+        title="Filter type",
+        section="Product type filter",
+        enum_resolver=filter_type_enum
+    )
     filter_product_types: list[str] = SettingsField(
         default_factory=list,
+        title="Product types",
         enum_resolver=_product_types_enum
     )
 
@@ -499,14 +512,7 @@ DEFAULT_TOOLS_VALUES = {
         "workfile_lock_profiles": []
     },
     "loader": {
-        "product_type_filter_profiles": [
-            {
-                "hosts": [],
-                "task_types": [],
-                "is_include": True,
-                "filter_product_types": []
-            }
-        ]
+        "product_type_filter_profiles": []
     },
     "publish": {
         "template_name_profiles": [