Skip to content

Commit

Permalink
Merge pull request #184 from ynput/feature/157-mapping-of-ayon-attrib…
Browse files Browse the repository at this point in the history
…utes-to-ftrack-custom-attributes

Chore: Use mapping of custom attributes to AYON attributes
  • Loading branch information
iLLiCiTiT authored Jan 10, 2025
2 parents 2b42c0d + 2bbac51 commit 54353ad
Show file tree
Hide file tree
Showing 16 changed files with 1,159 additions and 779 deletions.
22 changes: 10 additions & 12 deletions client/ayon_ftrack/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
"FPS_KEYS",
"CUST_ATTR_INTENT",

"CUST_ATTR_APPLICATIONS",
"CUST_ATTR_TOOLS",

"InvalidFpsValue",

"import_filepath",
Expand All @@ -40,12 +37,14 @@

"map_ftrack_users_to_ayon_users",

"get_ayon_attr_configs",
"MappedAYONAttribute",
"CustomAttributesMapping",
"get_all_attr_configs",
"get_custom_attributes_mapping",
"query_custom_attribute_values",
"get_custom_attributes_by_entity_id",
"ensure_mandatory_custom_attributes_exists",
"default_custom_attributes_definition",
"app_definitions_from_app_manager",
"tool_definitions_from_app_manager",

"get_folder_path_for_entities",
"get_datetime_data",
Expand Down Expand Up @@ -74,9 +73,6 @@

FPS_KEYS,
CUST_ATTR_INTENT,

CUST_ATTR_APPLICATIONS,
CUST_ATTR_TOOLS,
)

from .exceptions import (
Expand All @@ -102,12 +98,14 @@
from .users import map_ftrack_users_to_ayon_users

from .custom_attributes import (
get_ayon_attr_configs,
MappedAYONAttribute,
CustomAttributesMapping,
get_all_attr_configs,
get_custom_attributes_mapping,
query_custom_attribute_values,
get_custom_attributes_by_entity_id,
ensure_mandatory_custom_attributes_exists,
default_custom_attributes_definition,
app_definitions_from_app_manager,
tool_definitions_from_app_manager,
)
from .utils import (
get_folder_path_for_entities,
Expand Down
7 changes: 0 additions & 7 deletions client/ayon_ftrack/common/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,3 @@

# Intent custom attribute name
CUST_ATTR_INTENT = "intent"

# TODO these are applications addon specific
# - maybe should be handled by applications?
# Applications custom attribute name
CUST_ATTR_APPLICATIONS = "applications"
# Environment tools custom attribute
CUST_ATTR_TOOLS = "tools_env"
6 changes: 0 additions & 6 deletions client/ayon_ftrack/common/custom_attributes.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"show": {
"library_project": {
"label": "Library Project",
"type": "boolean"
}
},
"is_hierarchical": {
"fps": {
"label": "FPS",
Expand Down
Loading

0 comments on commit 54353ad

Please sign in to comment.