Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #862 from pypeclub/feature/ftrack_custom_attributes_settings

Browse source 
Ftrack custom attributes from settings
This commit is contained in:
Milan Kolar 2021-01-06 13:09:52 +01:00 • committed by GitHub
commit 32bb19d583
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 170 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

42
pype/modules/ftrack/actions/action_create_cust_attrs.py
View file

@ -94,8 +94,8 @@ Example:
"avalon_auto_sync": {
"label": "Avalon auto-sync",
"type": "boolean",
"write_security_role": ["API", "Administrator"],
"read_security_role": ["API", "Administrator"]
"write_security_roles": ["API", "Administrator"],
"read_security_roles": ["API", "Administrator"]
}
},
"is_hierarchical": {
@ -136,7 +136,11 @@ class CustomAttributes(BaseAction):
required_keys = ("key", "label", "type")
presetable_keys = ("default", "write_security_role", "read_security_role")
presetable_keys = (
"default",
"write_security_roles",
"read_security_roles"
)
hierarchical_key = "is_hierarchical"
type_posibilities = (
@ -211,17 +215,17 @@ class CustomAttributes(BaseAction):
self.groups = {}
self.ftrack_settings = get_system_settings()["modules"]["ftrack"]
self.attrs_presets = self.prepare_attribute_pressets()
self.attrs_settings = self.prepare_attribute_settings()
def prepare_attribute_pressets(self):
def prepare_attribute_settings(self):
output = {}
attr_presets = self.ftrack_settings["custom_attributes"]
for entity_type, preset in attr_presets.items():
attr_settings = self.ftrack_settings["custom_attributes"]
for entity_type, attr_data in attr_settings.items():
# Lower entity type
entity_type = entity_type.lower()
# Just store if entity type is not "task"
if entity_type != "task":
output[entity_type] = preset
output[entity_type] = attr_data
continue
# Prepare empty dictionary for entity type if not set yet
@ -229,7 +233,7 @@ class CustomAttributes(BaseAction):
output[entity_type] = {}
# Store presets per lowered object type
for obj_type, _preset in preset.items():
for obj_type, _preset in attr_data.items():
output[entity_type][obj_type.lower()] = _preset
return output
@ -266,14 +270,11 @@ class CustomAttributes(BaseAction):
def create_hierarchical_mongo_attr(self, session, event):
# Set security roles for attribute
default_role_list = ("API", "Administrator", "Pypeclub")
data = {
"key": CUST_ATTR_ID_KEY,
"label": "Avalon/Mongo ID",
"type": "text",
"default": "",
"write_security_roles": default_role_list,
"read_security_roles": default_role_list,
"group": CUST_ATTR_GROUP,
"is_hierarchical": True,
"config": {"markdown": False}
@ -496,21 +497,20 @@ class CustomAttributes(BaseAction):
else:
entity_key = attr_data["entity_type"]
entity_presets = self.attrs_presets.get(entity_key) or {}
entity_settings = self.attrs_settings.get(entity_key) or {}
if entity_key.lower() == "task":
object_type = attr_data["object_type"]
entity_presets = entity_presets.get(object_type.lower()) or {}
entity_settings = entity_settings.get(object_type.lower()) or {}
key_presets = entity_presets.get(attr_key) or {}
for key, value in key_presets.items():
key_settings = entity_settings.get(attr_key) or {}
for key, value in key_settings.items():
if key in self.presetable_keys and value:
output[key] = value
return output
def process_attr_data(self, cust_attr_data, event):
attr_presets = self.presets_for_attr_data(cust_attr_data)
cust_attr_data.update(attr_presets)
attr_settings = self.presets_for_attr_data(cust_attr_data)
cust_attr_data.update(attr_settings)
try:
data = {}
@ -778,9 +778,9 @@ class CustomAttributes(BaseAction):
roles_read = attr["read_security_roles"]
if "write_security_roles" in attr:
roles_write = attr["write_security_roles"]
output['read_security_roles'] = self.get_security_roles(roles_read)
output['write_security_roles'] = self.get_security_roles(roles_write)
output["read_security_roles"] = self.get_security_roles(roles_read)
output["write_security_roles"] = self.get_security_roles(roles_write)
return output
def get_entity_type(self, attr):

8
pype/modules/ftrack/lib/custom_attributes.json
View file

@ -2,15 +2,11 @@
"show": {
"avalon_auto_sync": {
"label": "Avalon auto-sync",
"type": "boolean",
"write_security_role": ["API", "Administrator"],
"read_security_role": ["API", "Administrator"]
"type": "boolean"
},
"library_project": {
"label": "Library Project",
"type": "boolean",
"write_security_role": ["API", "Administrator"],
"read_security_role": ["API", "Administrator"]
"type": "boolean"
}
},
"is_hierarchical": {

98
pype/settings/defaults/system_settings/modules.json
View file

@ -28,78 +28,102 @@
"custom_attributes": {
"show": {
"avalon_auto_sync": {
"default": "",
"write_security_role": [
"write_security_roles": [
"API",
"Administrator"
],
"read_security_role": [
"read_security_roles": [
"API",
"Administrator"
]
},
"library_project": {
"default": "",
"write_security_role": [
"write_security_roles": [
"API",
"Administrator"
],
"read_security_role": [
"read_security_roles": [
"API",
"Administrator"
]
},
"applications": {
"write_security_roles": [
"API",
"Administrator",
"Pypeclub"
],
"read_security_roles": [
"API",
"Administrator",
"Pypeclub"
]
}
},
"is_hierarchical": {
"avalon_mongo_id": {
"write_security_roles": [
"API",
"Administrator",
"Pypeclub"
],
"read_security_roles": [
"API",
"Administrator",
"Pypeclub"
]
},
"tools_env": {
"write_security_roles": [
"API",
"Administrator",
"Pypeclub"
],
"read_security_roles": [
"API",
"Administrator",
"Pypeclub"
]
},
"fps": {
"default": "25",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"frameStart": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"frameEnd": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"clipIn": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"clipOut": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"handleStart": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"handleEnd": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"resolutionWidth": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"resolutionHeight": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
},
"pixelAspect": {
"default": "",
"write_security_role": [],
"read_security_role": []
"write_security_roles": [],
"read_security_roles": []
}
}
}
@ -153,4 +177,4 @@
"idle_manager": {
"enabled": true
}
}
}

2
pype/tools/settings/settings/gui_schemas/system_schema/host_settings/schema_aftereffects.json
View file

@ -21,7 +21,7 @@
"env_group_key": "aftereffects"
},
{
"type": "dict-invisible",
"type": "dict",
"key": "variants",
"children": [
{

2
pype/tools/settings/settings/gui_schemas/system_schema/host_settings/schema_tvpaint.json
View file

@ -21,7 +21,7 @@
"env_group_key": "tvpaint"
},
{
"type": "dict-invisible",
"type": "dict",
"key": "variants",
"children": [
{

117
pype/tools/settings/settings/gui_schemas/system_schema/module_settings/schema_ftrack.json
View file

@ -87,66 +87,75 @@
"type": "dict",
"children": [
{
"type": "dict-modifiable",
"label": "Show Attributes",
"type": "dict",
"key": "show",
"object_type": {
"type": "dict",
"children": [
{
"key": "default",
"label": "default",
"type": "text"
},
{
"key": "write_security_role",
"label": "write",
"type": "list",
"object_type": {
"type": "text"
"label": "Project Custom attributes",
"children": [
{
"type": "schema_template",
"name": "template_custom_attribute",
"template_data": [
{
"key": "avalon_auto_sync"
},
{
"key": "library_project"
},
{
"key": "applications"
}
},
{
"key": "read_security_role",
"label": "Read",
"type": "list",
"object_type": {
"type": "text"
}
}
]
}
]
}
]
},
{
"type": "dict-modifiable",
"label": "Hierarchical Attributes",
"type": "dict",
"key": "is_hierarchical",
"object_type": {
"type": "dict",
"children": [
{
"key": "default",
"label": "default",
"type": "text"
},
{
"key": "write_security_role",
"label": "write",
"type": "list",
"object_type": {
"type": "text"
"label": "Hierarchical Attributes",
"children": [
{
"type": "schema_template",
"name": "template_custom_attribute",
"template_data": [
{
"key": "tools_env"
},
{
"key": "avalon_mongo_id"
},
{
"key": "fps"
},
{
"key": "frameStart"
},
{
"key": "frameEnd"
},
{
"key": "clipIn"
},
{
"key": "clipOut"
},
{
"key": "handleStart"
},
{
"key": "handleEnd"
},
{
"key": "resolutionWidth"
},
{
"key": "resolutionHeight"
},
{
"key": "pixelAspect"
}
},
{
"key": "read_security_role",
"label": "Read",
"type": "list",
"object_type": {
"type": "text"
}
}
]
}
]
}
]
}
]
}

21
pype/tools/settings/settings/gui_schemas/system_schema/module_settings/template_custom_attribute.json Normal file
View file

@ -0,0 +1,21 @@
[
{
"key": "{key}",
"label": "{key}",
"type": "dict",
"children": [
{
"key": "write_security_roles",
"label": "Write roles",
"type": "list",
"object_type": "text"
},
{
"key": "read_security_roles",
"label": "Read roles",
"type": "list",
"object_type": "text"
}
]
}
]

1
pype/tools/settings/settings/widgets/item_types.py
View file

@ -4121,7 +4121,6 @@ TypeToKlass.types["dict-modifiable"] = ModifiableDict
# DEPRECATED - remove when removed from schemas
TypeToKlass.types["splitter"] = SplitterWidget
TypeToKlass.types["dict-item"] = DictWidget
TypeToKlass.types["dict-invisible"] = DictWidget
# ---------------------------------------------
TypeToKlass.types["dict"] = DictWidget
TypeToKlass.types["path-widget"] = PathWidget