pyegeria 5.4.0.22__py3-none-any.whl → 5.4.0.24__py3-none-any.whl

md_processing/md_commands/product_manager_commands.py

@@ -13,11 +13,12 @@ from rich.markdown import Markdown
 
 from md_processing.md_processing_utils.common_md_proc_utils import (parse_upsert_command, parse_view_command)
 from md_processing.md_processing_utils.common_md_utils import update_element_dictionary, setup_log, set_update_body, \
-    set_element_status_request_body, set_prop_body, set_metadata_source_request_body, set_peer_gov_def_request_body, \
-    set_rel_request_body, set_create_body, set_collection_classifications, set_collection_property_body
+    set_element_status_request_body, set_prop_body, set_delete_request_body, set_rel_request_body, set_peer_gov_def_request_body, \
+    set_rel_request_body, set_create_body, set_collection_classifications, set_product_body
+
 from md_processing.md_processing_utils.extraction_utils import (extract_command_plus, update_a_command)
 from md_processing.md_processing_utils.md_processing_constants import (load_commands, ERROR)
-from pyegeria import DEBUG_LEVEL, body_slimmer, to_pascal_case
+from pyegeria import DEBUG_LEVEL, body_slimmer, to_pascal_case, PyegeriaException
 from pyegeria.egeria_tech_client import EgeriaTech
 
 GERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -56,7 +57,7 @@ def add_member_to_collections(egeria_client: EgeriaTech, collection_list: list,
     Add member to data dictionaries and data specifications.
     """
     body = {
-        "class": "RelationshipRequestBody", "properties": {
+        "class": "NewRelationshipRequestBody", "properties": {
             "class": "CollectionMembershipProperties", "membershipRationale": "User Specified",
             "notes": "Added by Dr.Egeria"
             }
@@ -144,267 +145,267 @@ def update_data_collection_memberships(egeria_client: EgeriaTech, entity_type: s
 # @logger.catch
 
 
-@logger.catch
-def add_field_to_data_structures(egeria_client: EgeriaTech, display_name: str, struct_list: list, guid) -> None:
-    """
-        Add data field to data structures.
-        """
-
-    try:
-        for structure_guid in struct_list:
-            egeria_client.link_member_data_field(structure_guid, guid, None)
-            msg = f"Added `{display_name}` to structure `{structure_guid}`"
-            logger.info(msg)
-        return
-
-    except Exception as e:
-        console.print_exception()
-
-
-@logger.catch
-def remove_field_from_data_structures(egeria_client: EgeriaTech, display_name: str, struct_list: list,
-                                      guid: str) -> None:
-    """Remove a data field from a list of data structures."""
-    try:
-        for structure_guid in struct_list:
-            egeria_client.detach_member_data_field(structure_guid, guid, None)
-            msg = f"Removed `{display_name}` from structure `{structure_guid}`"
-            logger.info(msg)
-        return
-
-    except Exception as e:
-        console.print_exception()
-
-
-@logger.catch
-def sync_data_field_rel_elements(egeria_client: EgeriaTech, structure_list: list, parent_field_list: list, terms: list,
-                                 data_class_guid: str, guid: str, display_name: str,
-                                 replace_all_props: bool = True) -> None:
-    """Sync a field's related elements.
-
-    TODO: Need to add data class support when ready and may need to revisit bodies.
-
-    """
-    if terms:
-        terms = [terms]
-
-    if replace_all_props:
-        rel_el_list = egeria_client.get_data_field_rel_elements(guid)
-        # should I throw an exception if empty?
-        if rel_el_list is None:
-            logger.warning("Unexpected -> the list was None - assigning empty list")
-            rel_el_list = {}
-
-        as_is_data_structs = set(rel_el_list.get("data_structure_guids", []))
-        as_is_parent_fields = set(rel_el_list.get("parent_guids", []))
-        as_is_assigned_meanings = set(rel_el_list.get("assigned_meanings_guids", []))
-        as_is_data_classes = set(rel_el_list.get("data_class_guids", []))
-
-        to_be_data_structs = set(structure_list) if structure_list is not None else set()
-        to_be_parent_fields = set(parent_field_list) if parent_field_list is not None else set()
-        to_be_assigned_meanings = set(terms) if terms is not None else set()
-        to_be_data_classes = set([data_class_guid]) if data_class_guid is not None else set()
-
-        logger.trace(f"as_is_data_structs: {list(as_is_data_structs)} to_be_data_struct: {list(to_be_data_structs)}")
-        logger.trace(
-            f"as_is_parent_fields: {list(as_is_parent_fields)} to_be_parent_fields: {list(to_be_parent_fields)}")
-        logger.trace(f"as_is_assigned_meanings: {list(as_is_assigned_meanings)} to_be_assigned_meanings: "
-                     f"{list(to_be_assigned_meanings)}")
-        logger.trace(f"as_is_data_classes: {list(as_is_data_classes)} to_be_assigned_data_classes: "
-                     f"{list(to_be_data_classes)}")
-
-        data_struct_to_remove = as_is_data_structs - to_be_data_structs
-        logger.trace(f"data_struct_to_remove: {list(data_struct_to_remove)}")
-        if len(data_struct_to_remove) > 0:
-            for ds in data_struct_to_remove:
-                egeria_client.detach_member_data_field(ds, guid, None)
-                msg = f"Removed `{display_name}` from structure `{ds}`"
-                logger.trace(msg)
-        data_struct_to_add = to_be_data_structs - as_is_data_structs
-        logger.trace(f"data_struct_to_add: {list(data_struct_to_add)}")
-        if len(data_struct_to_add) > 0:
-            for ds in data_struct_to_add:
-                egeria_client.link_member_data_field(ds, guid, None)
-                msg = f"Added `{display_name}` to structure `{ds}`"
-                logger.trace(msg)
-
-        parent_field_to_remove = to_be_parent_fields - as_is_parent_fields
-        logger.trace(f"parent_field_to_remove: {list(parent_field_to_remove)}")
-        if len(parent_field_to_remove) > 0:
-            for field in parent_field_to_remove:
-                egeria_client.detach_nested_data_field(field, guid, None)
-                msg = f"Removed `{display_name}` from field `{field}`"
-                logger.trace(msg)
-        parent_field_to_add = to_be_parent_fields - as_is_parent_fields
-        logger.trace(f"parent_field_to_add: {list(parent_field_to_add)}")
-        if len(parent_field_to_add) > 0:
-            for field in parent_field_to_add:
-                egeria_client.link_nested_data_field(field, guid, None)
-                msg = f"Added `{display_name}` to field `{field}`"
-                logger.trace(msg)
-
-        terms_to_remove = as_is_assigned_meanings - to_be_assigned_meanings
-        logger.trace(f"terms_to_remove: {list(terms_to_remove)}")
-        if terms:
-            for term in terms_to_remove:
-                egeria_client.detach_semantic_definition(guid, term, None)
-                msg = f"Removed `{term}` from `{display_name}`"
-                logger.trace(msg)
-        terms_to_add = to_be_assigned_meanings - as_is_assigned_meanings
-        logger.trace(f"terms_to_add: {list(terms_to_add)}")
-        if len(terms_to_add) > 0:
-            for term in terms_to_add:
-                egeria_client.link_semantic_definition(guid, term, None)
-                msg = f"Added `{term}` to`{display_name}`"
-                logger.trace(msg)
-
-        classes_to_remove = as_is_data_classes - to_be_data_classes
-        logger.trace(f"classes_to_remove: {list(classes_to_remove)}")
-        if len(terms_to_remove) > 0:
-            for dc in classes_to_remove:
-                body = {
-                    "class": "MetadataSourceRequestBody", "forLineage": False, "forDuplicateProcessing": False
-                    }
-                egeria_client.detach_data_class_definition(guid, dc, body)
-                msg = f"Removed `{dc}` from `{display_name}`"
-                logger.trace(msg)
-        classes_to_add = to_be_data_classes - as_is_data_classes
-        logger.trace(f"classes_to_add: {list(classes_to_add)}")
-        if len(terms_to_add) > 0:
-            for dc in classes_to_add:
-                body = {
-                    "class": "RelationshipRequestBody", "forLineage": False, "forDuplicateProcessing": False
-                    }
-                egeria_client.link_data_class_definition(guid, dc, body)
-                msg = f"Added `{dc}` to`{display_name}`"
-                logger.trace(msg)
-
-
-    else:  # merge - add field to related elements
-        if structure_list:
-            add_field_to_data_structures(egeria_client, display_name, structure_list, guid)
-            msg = f"Added `{display_name}` to `{structure_list}`"
-            logger.trace(msg)
-
-        if parent_field_list:
-            for field in parent_field_list:
-                egeria_client.link_nested_data_field(field, guid, None)
-                msg = f"Added `{display_name}` to `{field}`"
-                logger.trace(msg)
-        if terms:
-            for term in terms:
-                egeria_client.link_semantic_definition(guid, term, None)
-                msg = f"Added `{term}` to `{display_name}`"
-                logger.trace(msg)
-
-        if data_class_guid:
-            egeria_client.link_data_class_definition(guid, data_class_guid)
-            msg = f"Added `{data_class_guid}` to `{display_name}`"
-            logger.trace(msg)
-
-
-@logger.catch
-def sync_data_class_rel_elements(egeria_client: EgeriaTech, containing_data_class_guids: list, terms: list,
-                                 specializes_data_classes: list, guid: str, display_name: str,
-                                 replace_all_props: bool = True) -> None:
-    """Sync a data class' related elements.
+# @logger.catch
+# def add_field_to_data_structures(egeria_client: EgeriaTech, display_name: str, struct_list: list, guid) -> None:
+#     """
+#         Add data field to data structures.
+#         """
+#
+#     try:
+#         for structure_guid in struct_list:
+#             egeria_client.link_member_data_field(structure_guid, guid, None)
+#             msg = f"Added `{display_name}` to structure `{structure_guid}`"
+#             logger.info(msg)
+#         return
+#
+#     except Exception as e:
+#         console.print_exception()
+#
+#
+# @logger.catch
+# def remove_field_from_data_structures(egeria_client: EgeriaTech, display_name: str, struct_list: list,
+#                                       guid: str) -> None:
+#     """Remove a data field from a list of data structures."""
+#     try:
+#         for structure_guid in struct_list:
+#             egeria_client.detach_member_data_field(structure_guid, guid, None)
+#             msg = f"Removed `{display_name}` from structure `{structure_guid}`"
+#             logger.info(msg)
+#         return
+#
+#     except Exception as e:
+#         console.print_exception()
+#
 
-    """
-    if terms:
-        terms = [terms]
+# @logger.catch
+# def sync_data_field_rel_elements(egeria_client: EgeriaTech, structure_list: list, parent_field_list: list, terms: list,
+#                                  data_class_guid: str, guid: str, display_name: str,
+#                                  replace_all_props: bool = True) -> None:
+#     """Sync a field's related elements.
+#
+#     TODO: Need to add data class support when ready and may need to revisit bodies.
+#
+#     """
+#     if terms:
+#         terms = [terms]
+#
+#     if replace_all_props:
+#         rel_el_list = egeria_client.get_data_field_rel_elements(guid)
+#         # should I throw an exception if empty?
+#         if rel_el_list is None:
+#             logger.warning("Unexpected -> the list was None - assigning empty list")
+#             rel_el_list = {}
+#
+#         as_is_data_structs = set(rel_el_list.get("data_structure_guids", []))
+#         as_is_parent_fields = set(rel_el_list.get("parent_guids", []))
+#         as_is_assigned_meanings = set(rel_el_list.get("assigned_meanings_guids", []))
+#         as_is_data_classes = set(rel_el_list.get("data_class_guids", []))
+#
+#         to_be_data_structs = set(structure_list) if structure_list is not None else set()
+#         to_be_parent_fields = set(parent_field_list) if parent_field_list is not None else set()
+#         to_be_assigned_meanings = set(terms) if terms is not None else set()
+#         to_be_data_classes = set([data_class_guid]) if data_class_guid is not None else set()
+#
+#         logger.trace(f"as_is_data_structs: {list(as_is_data_structs)} to_be_data_struct: {list(to_be_data_structs)}")
+#         logger.trace(
+#             f"as_is_parent_fields: {list(as_is_parent_fields)} to_be_parent_fields: {list(to_be_parent_fields)}")
+#         logger.trace(f"as_is_assigned_meanings: {list(as_is_assigned_meanings)} to_be_assigned_meanings: "
+#                      f"{list(to_be_assigned_meanings)}")
+#         logger.trace(f"as_is_data_classes: {list(as_is_data_classes)} to_be_assigned_data_classes: "
+#                      f"{list(to_be_data_classes)}")
+#
+#         data_struct_to_remove = as_is_data_structs - to_be_data_structs
+#         logger.trace(f"data_struct_to_remove: {list(data_struct_to_remove)}")
+#         if len(data_struct_to_remove) > 0:
+#             for ds in data_struct_to_remove:
+#                 egeria_client.detach_member_data_field(ds, guid, None)
+#                 msg = f"Removed `{display_name}` from structure `{ds}`"
+#                 logger.trace(msg)
+#         data_struct_to_add = to_be_data_structs - as_is_data_structs
+#         logger.trace(f"data_struct_to_add: {list(data_struct_to_add)}")
+#         if len(data_struct_to_add) > 0:
+#             for ds in data_struct_to_add:
+#                 egeria_client.link_member_data_field(ds, guid, None)
+#                 msg = f"Added `{display_name}` to structure `{ds}`"
+#                 logger.trace(msg)
+#
+#         parent_field_to_remove = to_be_parent_fields - as_is_parent_fields
+#         logger.trace(f"parent_field_to_remove: {list(parent_field_to_remove)}")
+#         if len(parent_field_to_remove) > 0:
+#             for field in parent_field_to_remove:
+#                 egeria_client.detach_nested_data_field(field, guid, None)
+#                 msg = f"Removed `{display_name}` from field `{field}`"
+#                 logger.trace(msg)
+#         parent_field_to_add = to_be_parent_fields - as_is_parent_fields
+#         logger.trace(f"parent_field_to_add: {list(parent_field_to_add)}")
+#         if len(parent_field_to_add) > 0:
+#             for field in parent_field_to_add:
+#                 egeria_client.link_nested_data_field(field, guid, None)
+#                 msg = f"Added `{display_name}` to field `{field}`"
+#                 logger.trace(msg)
+#
+#         terms_to_remove = as_is_assigned_meanings - to_be_assigned_meanings
+#         logger.trace(f"terms_to_remove: {list(terms_to_remove)}")
+#         if terms:
+#             for term in terms_to_remove:
+#                 egeria_client.detach_semantic_definition(guid, term, None)
+#                 msg = f"Removed `{term}` from `{display_name}`"
+#                 logger.trace(msg)
+#         terms_to_add = to_be_assigned_meanings - as_is_assigned_meanings
+#         logger.trace(f"terms_to_add: {list(terms_to_add)}")
+#         if len(terms_to_add) > 0:
+#             for term in terms_to_add:
+#                 egeria_client.link_semantic_definition(guid, term, None)
+#                 msg = f"Added `{term}` to`{display_name}`"
+#                 logger.trace(msg)
+#
+#         classes_to_remove = as_is_data_classes - to_be_data_classes
+#         logger.trace(f"classes_to_remove: {list(classes_to_remove)}")
+#         if len(terms_to_remove) > 0:
+#             for dc in classes_to_remove:
+#                 body = {
+#                     "class": "MetadataSourceRequestBody", "forLineage": False, "forDuplicateProcessing": False
+#                     }
+#                 egeria_client.detach_data_class_definition(guid, dc, body)
+#                 msg = f"Removed `{dc}` from `{display_name}`"
+#                 logger.trace(msg)
+#         classes_to_add = to_be_data_classes - as_is_data_classes
+#         logger.trace(f"classes_to_add: {list(classes_to_add)}")
+#         if len(terms_to_add) > 0:
+#             for dc in classes_to_add:
+#                 body = {
+#                     "class": "RelationshipRequestBody", "forLineage": False, "forDuplicateProcessing": False
+#                     }
+#                 egeria_client.link_data_class_definition(guid, dc, body)
+#                 msg = f"Added `{dc}` to`{display_name}`"
+#                 logger.trace(msg)
+#
+#
+#     else:  # merge - add field to related elements
+#         if structure_list:
+#             add_field_to_data_structures(egeria_client, display_name, structure_list, guid)
+#             msg = f"Added `{display_name}` to `{structure_list}`"
+#             logger.trace(msg)
+#
+#         if parent_field_list:
+#             for field in parent_field_list:
+#                 egeria_client.link_nested_data_field(field, guid, None)
+#                 msg = f"Added `{display_name}` to `{field}`"
+#                 logger.trace(msg)
+#         if terms:
+#             for term in terms:
+#                 egeria_client.link_semantic_definition(guid, term, None)
+#                 msg = f"Added `{term}` to `{display_name}`"
+#                 logger.trace(msg)
+#
+#         if data_class_guid:
+#             egeria_client.link_data_class_definition(guid, data_class_guid)
+#             msg = f"Added `{data_class_guid}` to `{display_name}`"
+#             logger.trace(msg)
 
-    if replace_all_props:
-        rel_el_list = egeria_client.get_data_class_rel_elements(guid)
-        if rel_el_list is None:
-            logger.warning("Unexpected -> the list was None - assigning empty list")
-            rel_el_list = {}
-        if terms:
-            terms = [terms]
-
-        as_is_nested_classes = set(rel_el_list.get("nested_data_class_guids", []))
-        as_is_assigned_meanings = set(rel_el_list.get("assigned_meanings_guids", []))
-        as_is_specialized_classes = set(rel_el_list.get("specialized_data_class_guids", []))
-
-        to_be_nested_classes = set(containing_data_class_guids) if containing_data_class_guids is not None else set()
-        to_be_assigned_meanings = set(terms) if terms is not None else set()
-        to_be_specialized_classes = set([specializes_data_classes]) if specializes_data_classes is not None else set()
-
-        logger.trace(
-            f"as_is_nested_classes: {list(as_is_nested_classes)} to_be_nested_classes: {list(to_be_nested_classes)}")
-        logger.trace(f"as_is_assigned_meanings: {list(as_is_assigned_meanings)} to_be_assigned_meanings: "
-                     f"{list(to_be_assigned_meanings)}")
-        logger.trace(f"as_is_specialized_classes: {list(as_is_specialized_classes)} to_be_specizialized_data_classes: "
-                     f"{list(to_be_specialized_classes)}")
-
-        nested_classes_to_remove = to_be_nested_classes - as_is_nested_classes
-        logger.trace(f"nested_classes_to_remove: {list(nested_classes_to_remove)}")
-        if len(nested_classes_to_remove) > 0:
-            for field in nested_classes_to_remove:
-                egeria_client.detach_nested_data_class(field, guid, None)
-                msg = f"Removed `{display_name}` from field `{field}`"
-                logger.trace(msg)
-        nested_classes_to_add = to_be_nested_classes - as_is_nested_classes
-        logger.trace(f"nested_classes_to_add: {list(nested_classes_to_add)}")
-        if len(nested_classes_to_add) > 0:
-            for field in nested_classes_to_add:
-                egeria_client.link_nested_data_class(field, guid, None)
-                msg = f"Added `{display_name}` to field `{field}`"
-                logger.trace(msg)
-
-        terms_to_remove = as_is_assigned_meanings - to_be_assigned_meanings
-        logger.trace(f"terms_to_remove: {list(terms_to_remove)}")
-        if len(terms_to_remove) > 0:
-            for term in terms_to_remove:
-                egeria_client.detach_semantic_definition(guid, term, None)
-                msg = f"Removed `{term}` from `{display_name}`"
-                logger.trace(msg)
-        terms_to_add = to_be_assigned_meanings - as_is_assigned_meanings
-        logger.trace(f"terms_to_add: {list(terms_to_add)}")
-        if len(terms_to_add) > 0:
-            for term in terms_to_add:
-                egeria_client.link_semantic_definition(guid, term, None)
-                msg = f"Added `{term}` to`{display_name}`"
-                logger.trace(msg)
-
-        specialized_classes_to_remove = as_is_specialized_classes - to_be_specialized_classes
-        logger.trace(f"classes_to_remove: {list(specialized_classes_to_remove)}")
-        if len(terms_to_remove) > 0:
-            for dc in specialized_classes_to_remove:
-                body = {
-                    "class": "MetadataSourceRequestBody", "forLineage": False, "forDuplicateProcessing": False
-                    }
-                egeria_client.detach_specialist_data_class(guid, dc, body)
-                msg = f"Removed `{dc}` from `{display_name}`"
-                logger.trace(msg)
-        specialized_classes_to_add = to_be_specialized_classes - as_is_specialized_classes
-        logger.trace(f"classes_to_add: {list(specialized_classes_to_add)}")
-        if len(specialized_classes_to_add) > 0:
-            for dc in specialized_classes_to_add:
-                body = {
-                    "class": "RelationshipRequestBody", "forLineage": False, "forDuplicateProcessing": False
-                    }
-                egeria_client.link_specialist_data_class(guid, dc, body)
-                msg = f"Added `{dc}` to`{display_name}`"
-                logger.trace(msg)
-
-
-    else:  # merge - add field to related elements
-        if containing_data_class_guids:
-            for field in containing_data_class_guids:
-                egeria_client.link_nested_data_class(field, guid, None)
-                msg = f"Added `{display_name}` to `{field}`"
-                logger.trace(msg)
-
-        if terms:
-            for term in terms:
-                egeria_client.link_semantic_definition(guid, term, None)
-                msg = f"Added `{term}` to `{display_name}`"
-                logger.trace(msg)
-        if specializes_data_classes:
-            for el in specializes_data_classes:
-                egeria_client.link_specialist_data_class(guid, el)
-            msg = f"Linked `{el}` to `{display_name}`"
-            logger.trace(msg)
+#
+# @logger.catch
+# def sync_data_class_rel_elements(egeria_client: EgeriaTech, containing_data_class_guids: list, terms: list,
+#                                  specializes_data_classes: list, guid: str, display_name: str,
+#                                  replace_all_props: bool = True) -> None:
+#     """Sync a data class' related elements.
+#
+#     """
+#     if terms:
+#         terms = [terms]
+#
+#     if replace_all_props:
+#         rel_el_list = egeria_client.get_data_class_rel_elements(guid)
+#         if rel_el_list is None:
+#             logger.warning("Unexpected -> the list was None - assigning empty list")
+#             rel_el_list = {}
+#         if terms:
+#             terms = [terms]
+#
+#         as_is_nested_classes = set(rel_el_list.get("nested_data_class_guids", []))
+#         as_is_assigned_meanings = set(rel_el_list.get("assigned_meanings_guids", []))
+#         as_is_specialized_classes = set(rel_el_list.get("specialized_data_class_guids", []))
+#
+#         to_be_nested_classes = set(containing_data_class_guids) if containing_data_class_guids is not None else set()
+#         to_be_assigned_meanings = set(terms) if terms is not None else set()
+#         to_be_specialized_classes = set([specializes_data_classes]) if specializes_data_classes is not None else set()
+#
+#         logger.trace(
+#             f"as_is_nested_classes: {list(as_is_nested_classes)} to_be_nested_classes: {list(to_be_nested_classes)}")
+#         logger.trace(f"as_is_assigned_meanings: {list(as_is_assigned_meanings)} to_be_assigned_meanings: "
+#                      f"{list(to_be_assigned_meanings)}")
+#         logger.trace(f"as_is_specialized_classes: {list(as_is_specialized_classes)} to_be_specizialized_data_classes: "
+#                      f"{list(to_be_specialized_classes)}")
+#
+#         nested_classes_to_remove = to_be_nested_classes - as_is_nested_classes
+#         logger.trace(f"nested_classes_to_remove: {list(nested_classes_to_remove)}")
+#         if len(nested_classes_to_remove) > 0:
+#             for field in nested_classes_to_remove:
+#                 egeria_client.detach_nested_data_class(field, guid, None)
+#                 msg = f"Removed `{display_name}` from field `{field}`"
+#                 logger.trace(msg)
+#         nested_classes_to_add = to_be_nested_classes - as_is_nested_classes
+#         logger.trace(f"nested_classes_to_add: {list(nested_classes_to_add)}")
+#         if len(nested_classes_to_add) > 0:
+#             for field in nested_classes_to_add:
+#                 egeria_client.link_nested_data_class(field, guid, None)
+#                 msg = f"Added `{display_name}` to field `{field}`"
+#                 logger.trace(msg)
+#
+#         terms_to_remove = as_is_assigned_meanings - to_be_assigned_meanings
+#         logger.trace(f"terms_to_remove: {list(terms_to_remove)}")
+#         if len(terms_to_remove) > 0:
+#             for term in terms_to_remove:
+#                 egeria_client.detach_semantic_definition(guid, term, None)
+#                 msg = f"Removed `{term}` from `{display_name}`"
+#                 logger.trace(msg)
+#         terms_to_add = to_be_assigned_meanings - as_is_assigned_meanings
+#         logger.trace(f"terms_to_add: {list(terms_to_add)}")
+#         if len(terms_to_add) > 0:
+#             for term in terms_to_add:
+#                 egeria_client.link_semantic_definition(guid, term, None)
+#                 msg = f"Added `{term}` to`{display_name}`"
+#                 logger.trace(msg)
+#
+#         specialized_classes_to_remove = as_is_specialized_classes - to_be_specialized_classes
+#         logger.trace(f"classes_to_remove: {list(specialized_classes_to_remove)}")
+#         if len(terms_to_remove) > 0:
+#             for dc in specialized_classes_to_remove:
+#                 body = {
+#                     "class": "MetadataSourceRequestBody", "forLineage": False, "forDuplicateProcessing": False
+#                     }
+#                 egeria_client.detach_specialist_data_class(guid, dc, body)
+#                 msg = f"Removed `{dc}` from `{display_name}`"
+#                 logger.trace(msg)
+#         specialized_classes_to_add = to_be_specialized_classes - as_is_specialized_classes
+#         logger.trace(f"classes_to_add: {list(specialized_classes_to_add)}")
+#         if len(specialized_classes_to_add) > 0:
+#             for dc in specialized_classes_to_add:
+#                 body = {
+#                     "class": "RelationshipRequestBody", "forLineage": False, "forDuplicateProcessing": False
+#                     }
+#                 egeria_client.link_specialist_data_class(guid, dc, body)
+#                 msg = f"Added `{dc}` to`{display_name}`"
+#                 logger.trace(msg)
+#
+#
+#     else:  # merge - add field to related elements
+#         if containing_data_class_guids:
+#             for field in containing_data_class_guids:
+#                 egeria_client.link_nested_data_class(field, guid, None)
+#                 msg = f"Added `{display_name}` to `{field}`"
+#                 logger.trace(msg)
+#
+#         if terms:
+#             for term in terms:
+#                 egeria_client.link_semantic_definition(guid, term, None)
+#                 msg = f"Added `{term}` to `{display_name}`"
+#                 logger.trace(msg)
+#         if specializes_data_classes:
+#             for el in specializes_data_classes:
+#                 egeria_client.link_specialist_data_class(guid, el)
+#             msg = f"Linked `{el}` to `{display_name}`"
+#             logger.trace(msg)
 #
 # Product Manager Commands
 #
@@ -442,37 +443,37 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
     attributes = parsed_output['attributes']
 
     display_name = attributes['Display Name'].get('value', None)
-    description = attributes.get('Description',{}).get('value', None)
-    user_defined_status = attributes.get('User Defined Status',{}).get('value', None)
-
-    collection_classification = attributes.get('Collection Classification', {}).get('value', None)
+    # description = attributes.get('Description',{}).get('value', None)
+    # user_defined_status = attributes.get('User Defined Status',{}).get('value', None)
+    #
+    # collection_classification = attributes.get('Collection Classification', {}).get('value', None)
 
-    current_version = attributes.get('Version Identifier',{}).get('value', None)
+    # current_version = attributes.get('Version Identifier',{}).get('value', None)
 
     # status = attributes.get('Status',{}).get('value', "ACTIVE")
 
-    anchor_guid = attributes.get('Anchor ID', {}).get('guid', None)
-    parent_guid = attributes.get('Parent ID', {}).get('guid', None)
-    parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value', None)
-    parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value',"CollectionMembership")
-    parent_at_end1 = attributes.get('Parent at End1', {}).get('value', True)
-    anchor_scope_guid = attributes.get('Anchor Scope GUID', {}).get('value', None)
-    is_own_anchor = attributes.get('Is Own Anchor', {}).get('value', True)
-    if parent_guid is None:
-        is_own_anchor = True
-
-
-    additional_prop = attributes.get('Additional Properties', {}).get('value', None)
-    additional_properties = json.loads(additional_prop) if additional_prop is not None else None
-    extended_prop = attributes.get('Extended Properties', {}).get('value', None)
-    extended_properties = json.loads(extended_prop) if extended_prop is not None else None
-    external_source_guid = attributes.get('External Source Name', {}).get('guid', None)
-    external_source_name = attributes.get('External Source Name', {}).get('value', None)
-    effective_time = attributes.get('Effective Time', {}).get('value', None)
-    for_lineage = attributes.get('For Lineage', {}).get('value', None)
-    for_duplicate_processing = attributes.get('For Duplicate Processing', {}).get('value', None)
-
-    replace_all_props = not attributes.get('Merge Update', {}).get('value', True)
+    # anchor_guid = attributes.get('Anchor ID', {}).get('guid', None)
+    # parent_guid = attributes.get('Parent ID', {}).get('guid', None)
+    # parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value', None)
+    # parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value',"CollectionMembership")
+    # parent_at_end1 = attributes.get('Parent at End1', {}).get('value', True)
+    # anchor_scope_guid = attributes.get('Anchor Scope GUID', {}).get('value', None)
+    # is_own_anchor = attributes.get('Is Own Anchor', {}).get('value', True)
+    # if parent_guid is None:
+    #     is_own_anchor = True
+
+
+    # additional_prop = attributes.get('Additional Properties', {}).get('value', None)
+    # additional_properties = json.loads(additional_prop) if additional_prop is not None else None
+    # extended_prop = attributes.get('Extended Properties', {}).get('value', None)
+    # extended_properties = json.loads(extended_prop) if extended_prop is not None else None
+    # external_source_guid = attributes.get('External Source Name', {}).get('guid', None)
+    # external_source_name = attributes.get('External Source Name', {}).get('value', None)
+    # effective_time = attributes.get('Effective Time', {}).get('value', None)
+    # for_lineage = attributes.get('For Lineage', {}).get('value', None)
+    # for_duplicate_processing = attributes.get('For Duplicate Processing', {}).get('value', None)
+
+    # replace_all_props = not attributes.get('Merge Update', {}).get('value', True)
 
     if directive == "display":
 
@@ -497,10 +498,10 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                 else:
                     print(Markdown(
                         f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
-                prop_body = set_collection_property_body(object_type,qualified_name,attributes)
+                prop_body = set_prop_body(object_type,qualified_name,attributes)
 
                 body = set_update_body(object_type, attributes)
-                body['properties'] = set_collection_property_body(object_type,qualified_name,attributes)
+                body['properties'] = set_prop_body(object_type,qualified_name,attributes)
 
                 egeria_client.update_collection_w_body(guid, body)
                 # egeria_client.update_collection_status(guid, status)
@@ -522,8 +523,10 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
 
                 else:
                     body = set_create_body(object_type,attributes)
-                    body["initialClassifications"] = set_collection_classifications(object_type, attributes)
-                    body["properties"] = set_collection_property_body(object_type, qualified_name,attributes)
+
+                    # if this is a root or folder (maybe more in the future), then make sure that the classification is set.
+                    body["initialClassifications"] = set_collections_classifications(object_type, attributes)
+                    body["properties"] = set_prop_body(object_type, qualified_name,attributes)
 
 
                     guid = egeria_client.create_collection_w_body(body)
@@ -540,9 +543,11 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                         logger.error(msg)
                         return None
 
+        except PyegeriaException as e:
+            logger.error(f"Pyegeria error performing {command}: {e}")
+            return None
         except Exception as e:
             logger.error(f"Error performing {command}: {e}")
-            return None
     else:
         return None
 
@@ -576,51 +581,8 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
     attributes = parsed_output['attributes']
 
     display_name = attributes['Display Name'].get('value', None)
-    description = attributes.get('Description',{}).get('value', None)
-    user_defined_status = attributes.get('User Defined Status',{}).get('value', None)
-    product_identifier = attributes.get('Product Identifier',{}).get('value', None)
-    product_name = attributes.get('Product Name',{}).get('value', None)
-    product_type = attributes.get('Product Type',{}).get('value', None)
-
-
-
-    product_description = attributes.get('Product Description',{}).get('value', None)
-    maturity = attributes.get('Maturity',{}).get('value', None)
-    service_life = attributes.get('Service Life',{}).get('value', None)
-    introduction_date = attributes.get('Introduction Date',{}).get('value', None)
-    next_version_date = attributes.get('Next Version Date',{}).get('value', None)
-    withdrawal_date = attributes.get('Withdrawal Date',{}).get('value', None)
-
-    collection_type = attributes.get('Collection Type', {}).get('value', None)
-    current_version = attributes.get('Version Identifier',{}).get('value', None)
     product_manager = attributes.get('Product Manager',{}).get('value', None)
 
-
-    product_status = attributes.get('Status',{}).get('value', "ACTIVE")
-
-    anchor_guid = attributes.get('Anchor ID', {}).get('guid', None)
-    parent_guid = attributes.get('Parent ID', {}).get('guid', None)
-    parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value', None)
-    parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value',"CollectionMembership")
-    parent_at_end1 = attributes.get('Parent at End1', {}).get('value', True)
-    anchor_scope_guid = attributes.get('Anchor Scope GUID', {}).get('value', None)
-    is_own_anchor = attributes.get('Is Own Anchor', {}).get('value', True)
-    if parent_guid is None:
-        is_own_anchor = True
-
-
-    additional_prop = attributes.get('Additional Properties', {}).get('value', None)
-    additional_properties = json.loads(additional_prop) if additional_prop is not None else None
-    extended_prop = attributes.get('Extended Properties', {}).get('value', None)
-    extended_properties = json.loads(extended_prop) if extended_prop is not None else None
-    external_source_guid = attributes.get('External Source Name', {}).get('guid', None)
-    external_source_name = attributes.get('External Source Name', {}).get('value', None)
-    effective_time = attributes.get('Effective Time', {}).get('value', None)
-    for_lineage = attributes.get('For Lineage', {}).get('value', None)
-    for_duplicate_processing = attributes.get('For Duplicate Processing', {}).get('value', None)
-
-    replace_all_props = not attributes.get('Merge Update', {}).get('value', True)
-
     if directive == "display":
 
         return None
@@ -644,34 +606,8 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
                 else:
                     print(Markdown(
                         f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
-                prop_body = set_prop_body(object_type,qualified_name,attributes)
-
-                body ={
-                    "class": "UpdateElementRequestBody",
-                    "properties": {
-                        "class": "DigitalProductProperties",
-                        "qualifiedName": qualified_name,
-                        "userDefinedStatus": user_defined_status,
-                        "name": display_name,
-                        "description": description,
-                        "identifier": product_identifier,
-                        "productName": product_name,
-                        "productType": product_type,
-                        "maturity": maturity,
-                        "serviceLife": service_life,
-                        "introductionDate": introduction_date,
-                        "nextVersionDate": next_version_date,
-                        "withdrawDate": withdrawal_date,
-                        "currentVersion": current_version,
-                        "additionalProperties": additional_properties,
-                        "extendedProperties": extended_properties,
-                        },
-                    "externalSourceGUID": external_source_guid,
-                    "externalSourceName": external_source_name,
-                    "effectiveTime": effective_time,
-                    "forLineage": for_lineage,
-                    "forDuplicateProcessing": for_duplicate_processing
-                    }
+                prop_body = set_product_body(object_type,qualified_name,attributes)
+                # Todo: Update product manager later?
 
                 egeria_client.update_digital_product(guid, body)
                 egeria_client.update_digital_product_status(guid, product_status)
@@ -692,49 +628,21 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
                     return update_a_command(txt, object_action, object_type, qualified_name, guid)
 
                 else:
-                    body = {
-                        "class": "NewDigitalProductRequestBody",
-                        "isOwnAnchor": is_own_anchor,
-                        "parentGUID": parent_guid,
-                        "parentRelationshipTypeName": parent_relationship_type_name,
-                        "parentAtEnd1": parent_at_end1,
-                        "properties": {
-                            "class": "DigitalProductProperties",
-                            "qualifiedName": qualified_name,
-                            "userDefinedStatus": user_defined_status,
-                            "name": display_name,
-                            "description" : description,
-                            "identifier": product_identifier,
-                            "productName": product_name,
-                            "productType": product_type,
-                            "maturity": maturity,
-                            "serviceLife": service_life,
-                            "introductionDate": introduction_date,
-                            "nextVersionDate": next_version_date,
-                            "withdrawDate": withdrawal_date,
-                            "currentVersion": current_version,
-
-                            "additionalProperties": additional_properties,
-                            "extendedProperties": extended_properties,
-                            },
-                        "initialStatus": product_status,
-                        "externalSourceGUID": external_source_guid,
-                        "externalSourceName": external_source_name,
-                        "effectiveTime" : effective_time,
-                        "forLineage": for_lineage,
-                        "forDuplicateProcessing": for_duplicate_processing
-                        }
-
-
+                    body = set_create_body(object_type, attributes)
+                    body["initialClassifications"] = set_collection_classifications(object_type, attributes)
+                    prop_body = set_product_body(object_type, qualified_name, attributes)
+                    body["properties"] = prop_body
 
                     guid = egeria_client.create_digital_product(body)
                     if guid:
                         update_element_dictionary(qualified_name, {
                             'guid': guid, 'display_name': display_name
                             })
+                        # Todo: Add product manager link later? Agreements?
+
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_collection_by_guid(guid, collection_type='Digital Product',
+                        return egeria_client.get_collection_by_guid(guid, element_type='Digital Product',
                                                                     output_format='MD')
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"