resolved conflict

This commit is contained in:
Kayla Man 2023-11-13 18:21:48 +08:00
commit b71ca80bdb
186 changed files with 11840 additions and 940 deletions

View file

@ -1,6 +1,30 @@
from pydantic import Field
import json
from pydantic import Field, validator
from ayon_server.settings import BaseSettingsModel
from ayon_server.exceptions import BadRequestException
class ValidateAttributesModel(BaseSettingsModel):
enabled: bool = Field(title="ValidateAttributes")
attributes: str = Field(
"{}", title="Attributes", widget="textarea")
@validator("attributes")
def validate_json(cls, value):
if not value.strip():
return "{}"
try:
converted_value = json.loads(value)
success = isinstance(converted_value, dict)
except json.JSONDecodeError:
success = False
if not success:
raise BadRequestException(
"The attibutes can't be parsed as json object"
)
return value
class BasicValidateModel(BaseSettingsModel):
@ -15,6 +39,10 @@ class PublishersModel(BaseSettingsModel):
title="Validate Frame Range",
section="Validators"
)
ValidateAttributes: ValidateAttributesModel = Field(
default_factory=ValidateAttributesModel,
title="Validate Attributes"
)
DEFAULT_PUBLISH_SETTINGS = {
@ -22,5 +50,9 @@ DEFAULT_PUBLISH_SETTINGS = {
"enabled": True,
"optional": True,
"active": True
}
},
"ValidateAttributes": {
"enabled": False,
"attributes": "{}"
},
}