From f86619ab1c3eac158c058fb7d4deed9d20ec950c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= Date: Mon, 7 Oct 2024 18:31:15 +0200 Subject: [PATCH 1/3] :fire: remove settings for deprecated validator --- server/settings/publishers.py | 46 ----------------------------------- 1 file changed, 46 deletions(-) diff --git a/server/settings/publishers.py b/server/settings/publishers.py index 514a5de0..3b4b574a 100644 --- a/server/settings/publishers.py +++ b/server/settings/publishers.py @@ -101,36 +101,6 @@ class ValidateRigOutSetNodeIdsModel(BaseSettingsModel): allow_history_only: bool = SettingsField(title="Allow history only") -class ValidateModelNameModel(BaseSettingsModel): - enabled: bool = SettingsField(title="Enabled") - database: bool = SettingsField( - title="Use database shader name definitions" - ) - material_file: MultiplatformPathModel = SettingsField( - default_factory=MultiplatformPathModel, - title="Material File", - description=( - "Path to material file defining list of material names to check." - ) - ) - regex: str = SettingsField( - "(.*)_(\\d)*_(?P.*)_(GEO)", - title="Validation regex", - description=( - "Regex for validating name of top level group name. You can use" - " named capturing groups:(?P.*) for Asset name" - ) - ) - top_level_regex: str = SettingsField( - ".*_GRP", - title="Top level group name regex", - description=( - "To check for asset in name so *_some_asset_name_GRP" - " is valid, use:.*?_(?P.*)_GEO" - ) - ) - - class ValidateModelContentModel(BaseSettingsModel): enabled: bool = SettingsField(title="Enabled") optional: bool = SettingsField(title="Optional") @@ -787,11 +757,6 @@ class PublishersModel(BaseSettingsModel): title="Yeti Rig Settings" ) # Model - START - ValidateModelName: ValidateModelNameModel = SettingsField( - default_factory=ValidateModelNameModel, - title="Validate Model Name", - section="Model", - ) ValidateModelContent: ValidateModelContentModel = SettingsField( default_factory=ValidateModelContentModel, title="Validate Model Content", @@ -1329,17 +1294,6 @@ class PublishersModel(BaseSettingsModel): "optional": False, "active": True }, - "ValidateModelName": { - "enabled": False, - "database": True, - "material_file": { - "windows": "", - "darwin": "", - "linux": "" - }, - "regex": "(.*)_(\\d)*_(?P.*)_(GEO)", - "top_level_regex": ".*_GRP" - }, "ValidateModelContent": { "enabled": True, "optional": False, From 016f9cb2d3761692f4442d6b936424e186c7f5bb Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 8 Oct 2024 11:41:54 +0200 Subject: [PATCH 2/3] Update server/settings/publishers.py --- server/settings/publishers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server/settings/publishers.py b/server/settings/publishers.py index 3b4b574a..06cf0cda 100644 --- a/server/settings/publishers.py +++ b/server/settings/publishers.py @@ -760,6 +760,7 @@ class PublishersModel(BaseSettingsModel): ValidateModelContent: ValidateModelContentModel = SettingsField( default_factory=ValidateModelContentModel, title="Validate Model Content", + section="Model" ) ValidateTransformNamingSuffix: ValidateTransformNamingSuffixModel = ( SettingsField( From fb91a6d4bbe94720efa154164ba237ea7848bfb3 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 8 Oct 2024 11:44:25 +0200 Subject: [PATCH 3/3] Remove unused import --- server/settings/publishers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server/settings/publishers.py b/server/settings/publishers.py index 06cf0cda..49067f4d 100644 --- a/server/settings/publishers.py +++ b/server/settings/publishers.py @@ -3,7 +3,6 @@ from ayon_server.settings import ( BaseSettingsModel, SettingsField, - MultiplatformPathModel, ensure_unique_names, ) from ayon_server.exceptions import BadRequestException