From 7cb370e4150e638b06fcdc50f165c1cb022a23e7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 19 Oct 2022 11:34:50 +0200 Subject: [PATCH] OP-4180 - cleanup of _project_doc_to_anatomy_data Previous implementation had only syntax sugar and filtering because of Settings, in base class it is not necessary. --- openpype/pipeline/anatomy.py | 42 ++++-------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index 437a03f898..aad42683e8 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -61,6 +61,8 @@ class BaseAnatomy(object): project_name = project_doc["name"] self.project_name = project_name + self._site_name = site_name + self._data = self._prepare_anatomy_data( project_doc, local_settings, site_name ) @@ -335,43 +337,8 @@ class BaseAnatomy(object): if not project_doc: return {} - project_settings_root = ProjectSettings( - project_doc["name"], reset=False, change_state=False - ) - anatomy_entity = project_settings_root["project_anatomy"] - anatomy_keys = set(anatomy_entity.keys()) - anatomy_keys.remove("attributes") - attribute_keys = set(anatomy_entity["attributes"].keys()) - - attributes = {} - project_doc_data = project_doc.get("data") or {} - for key in attribute_keys: - value = project_doc_data.get(key) - if value is not None: - attributes[key] = value - - project_doc_config = project_doc.get("config") or {} - - app_names = set() - if not project_doc_config or "apps" not in project_doc_config: - set_applications = False - else: - set_applications = True - for app_item in project_doc_config["apps"]: - if not app_item: - continue - app_name = app_item.get("name") - if app_name: - app_names.add(app_name) - - if set_applications: - attributes["applications"] = list(app_names) - - output = {"attributes": attributes} - for key in anatomy_keys: - value = project_doc_config.get(key) - if value is not None: - output[key] = value + output = copy.deepcopy(project_doc["config"]) + output["attributes"] = copy.deepcopy(project_doc["data"]) return output @@ -450,7 +417,6 @@ class Anatomy(BaseAnatomy): " to load data for specific project." )) - self._site_name = site_name project_doc = self.get_project_doc_from_cache(project_name) local_settings = get_local_settings() if not site_name: