pyegeria 5.4.0.dev13__py3-none-any.whl → 5.4.0.1__py3-none-any.whl

md_processing/md_commands/product_manager_commands.py

@@ -12,7 +12,9 @@ from rich.console import Console
 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
+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
 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
@@ -41,15 +43,7 @@ load_commands('commands.json')
 debug_level = DEBUG_LEVEL
 
 console = Console(width=int(200))
-
-log_format = "D {time} | {level} | {function} | {line} | {message} | {extra}"
-logger.remove()
-logger.add(sys.stderr, level="INFO", format=log_format, colorize=True)
-full_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_INBOX_PATH, "data_designer_debug.log")
-# logger.add(full_file_path, rotation="1 day", retention="1 week", compression="zip", level="TRACE", format=log_format,
-#            colorize=True)
-logger.add("debug_log", rotation="1 day", retention="1 week", compression="zip", level="TRACE", format=log_format,
-           colorize=True)
+setup_log()
 
 
 #
@@ -411,12 +405,14 @@ def sync_data_class_rel_elements(egeria_client: EgeriaTech, containing_data_clas
                 egeria_client.link_specialist_data_class(guid, el)
             msg = f"Linked `{el}` to `{display_name}`"
             logger.trace(msg)
-
+#
+# Product Manager Commands
+#
 
 @logger.catch
 def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
-    Processes a data specification create or update object_action by extracting key attributes such as
+    Processes a digital product create or update object_action by extracting key attributes such as
     spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
 
     :param txt: A string representing the input cell to be processed for
@@ -426,6 +422,7 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
     """
 
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
 
     parsed_output = parse_upsert_command(egeria_client, object_type, object_action, txt, directive)
 
@@ -442,38 +439,32 @@ 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['Description'].get('value', None)
-    user_defined_status = attributes['User Defined Status'].get('value', None)
-    product_identifier = attributes['Product Identifier'].get('value', None)
-    product_name = attributes['Product Name'].get('value', None)
-    product_type = attributes['Product Type'].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['Product Description'].get('value', None)
-    maturity = attributes['Maturity'].get('value', None)
-    service_life = attributes['Service Life'].get('value', None)
-    introduction_date = attributes['Introduction Date'].get('value', None)
-    next_version_date = attributes['Next Version Date'].get('value', None)
-    withdrawal_date = attributes['Withdrawal Date'].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['Current Version'].get('value', None)
-    product_manager = attributes['Product Manager'].get('value', None)
-
-    agreements = attributes['Agreements'].get('value', None)
-    agreement_names = attributes['Agreements Names'].get('name_list', None)
-    agreement_guids = attributes['Agreements Guids'].get('guid_list', None)
+    current_version = attributes.get('Version Identifier',{}).get('value', None)
+    product_manager = attributes.get('Product Manager',{}).get('value', None)
 
-    subscriptions = attributes['Digital Subscriptions'].get('value', None)
-    subscription_names = attributes['Digital Subscriptions Names'].get('name_list', None)
-    subscription_guids = attributes['Digital Subscriptions Guids'].get('guid_list', None)
 
-    product_status = attributes['Product Status'].get('value', "ACTIVE")
+    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',                                                                                     "CollectionMembership")
+    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)
@@ -516,6 +507,7 @@ 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",
@@ -534,7 +526,6 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
                         "nextVersionDate": next_version_date,
                         "withdrawDate": withdrawal_date,
                         "currentVersion": current_version,
-
                         "additionalProperties": additional_properties,
                         "extendedProperties": extended_properties,
                         },
@@ -621,9 +612,9 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
 
 
 @logger.catch
-def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+def process_agreement_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
-    Processes a data dictionary create or update object_action by extracting key attributes such as
+    Processes an agreement create or update object_action by extracting key attributes such as
     spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
 
     :param txt: A string representing the input cell to be processed for
@@ -633,6 +624,7 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
     """
 
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
 
     parsed_output = parse_upsert_command(egeria_client, object_type, object_action, txt, directive)
 
@@ -643,31 +635,47 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
     guid = parsed_output.get('guid', None)
 
     print(Markdown(parsed_output['display']))
+
     logger.debug(json.dumps(parsed_output, indent=4))
 
     attributes = parsed_output['attributes']
-    description = attributes['Description'].get('value', None)
-    display_name = attributes.get('Display Name', {}).get('value', "None Found")
-    display_name = display_name if display_name is not None else "None Found"
+
+    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)
+    agreement_status = attributes.get('Status',{}).get('value', None)
+    agreement_identifier = attributes.get('Agreement Identifier',{}).get('value', None)
+
+    version_identifier = attributes.get('Version Identifier',{}).get('value', None)
+
+    actors = attributes.get('Agreement Actors',{}).get('value', None)
+    actor_names = attributes.get('Agreement Actors',{}).get('name_list', None)
+    actor_guids = attributes.get('Agreement Actors',{}).get('guid_list', None)
     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',
-                                                                                            "CollectionMembership")
+    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
-    collection_type = attributes.get('Collection Type', {}).get('value', None)
-    replace_all_props = not attributes.get('Merge Update', {}).get('value', 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
     elif directive == "validate":
         if valid:
@@ -677,561 +685,130 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
         return valid
 
     elif directive == "process":
-
         try:
             if object_action == "Update":
-
                 if not exists:
-                    logger.error(f"Element `{display_name}` does not exist! Updating result document with Create "
-                                 f"object_action\n\n___")
+                    msg = (f" Element `{display_name}` does not exist! Updating result document with Create "
+                           f"object_action\n")
+                    logger.error(msg)
                     return update_a_command(txt, object_action, object_type, qualified_name, guid)
                 elif not valid:
-                    logger.error(f"Element `{display_name}` does not have a valid specification? Review..\n\n___ ")
                     return None
                 else:
                     print(Markdown(
-                        f"==> Validation of {command} completed successfully! Proceeding to apply the changes."))
-
-                egeria_client.update_collection(guid, qualified_name, display_name, description, collection_type,
-                                                 additional_properties,
-                                                extended_properties, replace_all_props)
-                logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___")
-                update_element_dictionary(qualified_name, {
-                    'guid': guid, 'display_name': display_name
-                    })
-                return egeria_client.get_collection_by_guid(guid, collection_type='Data Dictionary', output_format='MD')
-
-            elif object_action == "Create":
-                if valid is False and exists:
-                    logger.error(f"\nElement `{display_name}` already exists and result document updated changing "
-                                 f"`Create` to `Update` in processed output\n\n___")
-                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
-                else:
-                    guid = egeria_client.create_data_dictionary_collection(display_name, description, qualified_name,
-                                                                           is_own_anchor, anchor_guid, parent_guid,
-                                                                           parent_relationship_type_name,
-                                                                           parent_at_end1, collection_type,
-                                                                           anchor_scope_guid, additional_properties,
-                                                                           extended_properties)
-                    if guid:
-                        update_element_dictionary(qualified_name, {
-                            'guid': guid, 'display_name': display_name
-                            })
-                        logger.success(f"Created Element `{display_name}` with GUID {guid}\n\n___")
-
-                        return egeria_client.get_collection_by_guid(guid, collection_type='Data Dictionary',
-                                                                    output_format='MD')
-                    else:
-                        logger.error(f"Failed to create Term `{display_name}`\n\n___")
-                        return None
-
-        except Exception as e:
-            logger.error(f"{ERROR}Error performing {command}: {e}")
-            Console().print_exception(show_locals=True)
-            return None
-    else:
-        return None
-
-
-@logger.catch
-def process_data_structure_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[
-    str]:
-    """
-    Processes a data structure create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
-
-    :param txt: A string representing the input cell to be processed for
-        extracting glossary-related attributes.
-    :param directive: an optional string indicating the directive to be used - display, validate or execute
-    :return: A string summarizing the outcome of the processing.
-    """
-    from md_processing.md_processing_utils.common_md_utils import set_debug_level
-
-    set_debug_level(directive)
-
-    command, object_type, object_action = extract_command_plus(txt)
-
-    parsed_output = parse_upsert_command(egeria_client, object_type, object_action, txt, directive)
-
-    valid = parsed_output['valid']
-    exists = parsed_output['exists']
-
-    qualified_name = parsed_output.get('qualified_name', None)
-    guid = parsed_output.get('guid', None)
-
-    print(Markdown(parsed_output['display']))
-
-    if directive == "display":
-        return None
-
-    elif directive == "validate":
-        if valid:
-            print(Markdown(f"==> Validation of {command} completed successfully!\n"))
-        else:
-            msg = f"Validation failed for object_action `{command}`\n"
-        return valid
-
-    elif directive == "process":
-        logger.debug(json.dumps(parsed_output, indent=4))
-        attributes = parsed_output['attributes']
+                        f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
 
-        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)
-        anchor_guid = attributes.get('Anchor ID', {}).get('guid', None)
-        is_own_anchor = attributes.get('Is Own Anchor', {}).get('value', None)
-        parent_id = attributes.get('Parent ID', {}).get('value', 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_properties = attributes.get('Parent Relationship Properties', {}).get('value', None)
-        parent_at_end1 = attributes.get('Parent at End1', {}).get('value', None)
-
-        display_name = attributes['Display Name'].get('value', None)
-
-        namespace = attributes.get('Namespace', {}).get('value', None)
-        description = attributes.get('Description', {}).get('value', None)
-        version_id = attributes.get('Version Identifier', {}).get('value', None)
-        aliases = attributes.get('Aliases', {}).get('value', None)
-        name_patterns = attributes.get('Name Patterns', {}).get('value', None)
-        is_nullable = attributes.get('Is Nullable', {}).get('value', None)
-        default_value = attributes.get('Default Value', {}).get('value', None)
-        data_type = attributes.get('Data Type', {}).get('value', None)
-        min_length = attributes.get('Minimum Length', {}).get('value', None)
-        length = attributes.get('Length', {}).get('value', None)
-        precision = attributes.get('Precision', {}).get('value', None)
-        ordered_values = attributes.get('Ordered Values', {}).get('value', None)
-        sort_order = attributes.get('Sort Order', {}).get('value', None)
-        additional_properties = attributes.get('Additional Properties', {}).get('value', None)
-        effective_from = attributes.get('Effective From', {}).get('value', None)
-        effective_to = attributes.get('Effective To', {}).get('value', None)
-
-        position = attributes.get('Position', {}).get('value', None)
-        min_cardinality = attributes.get('Minimum Cardinality', {}).get('value', None)
-        max_cardinality = attributes.get('Maximum Cardinality', {}).get('value', None)
-        in_data_structure = attributes.get('In Data Structure', {}).get('value', None)
-        data_class = attributes.get('Data Class', {}).get('value', None)
-        glossary_term = attributes.get('Glossary Term', {}).get('value', None)
-        glossary_term_guid = attributes.get('Glossary Term', {}).get('guid', None)
-
-        # name_details_list = attributes.get("dict_list", None)
-
-        data_spec_name_list = attributes.get("In Data Specification", {}).get("name_list", "")
-        data_spec_value = attributes.get("In Data Specification", {}).get("value", None)
-        data_spec_guid_list = attributes.get("In Data Specification", {}).get("guid_list", None)
-
-        in_data_dictionary = attributes.get('In Data Dictionary', {}).get('dict_list', None)
-        data_dict_name_list = attributes.get('In Data Dictionary', {}).get('name_list', "")
-        data_dict_value_list = attributes.get('In Data Dictionary', {}).get('value', None)
-        data_dict_guid_list = attributes.get("In Data Dictionary", {}).get("guid_list", None)
-
-        parent_data_field = attributes.get('Parent Data Field', {}).get('value', None)
-        parent_data_field_guid = attributes.get('Parent Data Field', {}).get('guid', None)
-
-        anchor_scope_guid = attributes.get('Anchor Scope GUID', {}).get('value', None)
-
-        collection_type = object_type
-        replace_all_props = True
-        if not valid:
-            if exists and object_action == "Create":
-                msg = (f"Create failed because Element `{display_name}` exists - changing `Create` to `Update` in "
-                       f"processed output \n\n___")
-                logger.error(msg)
-                return update_a_command(txt, object_action, object_type, qualified_name, guid)
-            else:
-                return None
-        elif object_action == "Update" and not exists:
-            logger.error(f"Element `{display_name}` does not exist! Updating result document with Create "
-                         f"object_action\n\n___")
-            return update_a_command(txt, object_action, object_type, qualified_name, guid)
+                product_body = {
+                        "class": "AgreementProperties",
+                        "qualifiedName": qualified_name,
+                        "userDefinedStatus": user_defined_status,
+                        "name": display_name,
+                        "description": description,
+                        "identifier": agreement_identifier,
+                        "additionalProperties": additional_properties,
+                        "extendedProperties": extended_properties,
+                    }
 
-        else:
-            print(Markdown(f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
+                body = set_update_body(object_type, attributes)
+                body['properties'] = product_body
 
-        try:
-            if object_action == "Update":
-                body = {
-                    "class": "UpdateElementRequestBody", "externalSourceGUID": external_source_guid,
-                    "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                    "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing, "properties": {
-                        "class": "DataStructureProperties", "qualifiedName": qualified_name,
-                        "displayName": display_name, "description": description, "namespace": namespace,
-                        "versionIdentifier": version_id, "additionalProperties": additional_properties,
-                        "effectiveFrom": effective_from, "effectiveTo": effective_to
-                        }
-                    }
-                egeria_client.update_data_structure_w_body(guid, body, replace_all_props)
-                logger.info(f"Updated element `{display_name}` with GUID {guid}")
-                core_props = egeria_client.get_data_structure_by_guid(guid, output_format='MD')
+                egeria_client.update_agreement(guid, body, replace_all_props)
+                status_update_body = set_element_status_request_body(object_type, attributes)
+                egeria_client.update_agreement_status(guid, status_update_body)
 
+                logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___")
                 update_element_dictionary(qualified_name, {
                     'guid': guid, 'display_name': display_name
                     })
-
-                update_data_collection_memberships(egeria_client, object_type, data_spec_guid_list, "DataSpec", guid,
-                                                   display_name, replace_all_props)
-                core_props += f"## In Data Dictionary\n\n{data_dict_name_list}\n\n"
-                core_props += f"## In Data Specification\n\n{data_spec_name_list}\n\n"
-                logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___")
-                return core_props
+                return egeria_client.get_collection_by_guid(guid, collection_type='Data Specification',
+                                                            output_format='MD')
 
             elif object_action == "Create":
-                if exists:
-                    logger.warning(f"\nTerm `{display_name}` already exists and result document updated\n\n___")
+                if valid is False and exists:
+                    msg = (f"  Digital Product `{display_name}` already exists and result document updated changing "
+                           f"`Create` to `Update` in processed output\n\n___")
+                    logger.error(msg)
                     return update_a_command(txt, object_action, object_type, qualified_name, guid)
-                else:
 
+                else:
                     body = {
-                        "class": "NewElementRequestBody", "externalSourceGUID": external_source_guid,
-                        "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                        "forLineage": False, "forDuplicateProcessing": False, "anchorGUID": anchor_guid,
-                        "isOwnAnchor": is_own_anchor, "parentGUID": parent_guid,
+                        "class": "NewAgreementRequestBody",
+                        "isOwnAnchor": is_own_anchor,
+                        "parentGUID": parent_guid,
                         "parentRelationshipTypeName": parent_relationship_type_name,
-                        "parentRelationshipProperties": parent_relationship_properties, "parentAtEnd1": parent_at_end1,
+                        "parentAtEnd1": parent_at_end1,
                         "properties": {
-                            "class": "DataStructureProperties", "qualifiedName": qualified_name,
-                            "displayName": display_name, "description": description, "namespace": namespace,
-                            "versionIdentifier": version_id, "additionalProperties": additional_properties,
-                            "effectiveFrom": effective_from, "effectiveTo": effective_to
-                            }
+                            "class": "AgreementProperties",
+                            "qualifiedName": qualified_name,
+                            "userDefinedStatus": user_defined_status,
+                            "name": display_name,
+                            "description" : description,
+                            "identifier" : agreement_identifier,
+                            "additionalProperties": additional_properties,
+                            "extendedProperties": extended_properties,
+                            },
+                        "initialStatus": agreement_status,
+                        "externalSourceGUID": external_source_guid,
+                        "externalSourceName": external_source_name,
+                        "effectiveTime" : effective_time,
+                        "forLineage": for_lineage,
+                        "forDuplicateProcessing": for_duplicate_processing
                         }
+                    if object_type == "Data Sharing Agreement":
+                        guid = egeria_client.create_data_sharing_agreement(body)
+                    elif object_type == "Agreement":
+                        guid = egeria_client.create_agreement(body)
 
-                    guid = egeria_client.create_data_structure_w_body(body_slimmer(body))
                     if guid:
                         update_element_dictionary(qualified_name, {
                             'guid': guid, 'display_name': display_name
                             })
-
-                        core_props = egeria_client.get_data_structure_by_guid(guid, output_format='MD')
-
-                        if in_data_dictionary:
-                            logger.info(f"Will add to data dictionary(s) `{in_data_dictionary}`")
-                            result = add_member_to_collections(egeria_client, in_data_dictionary, display_name,
-                                                                    guid)
-                            core_props += f"## In Data Dictionary\n\n{data_dict_name_list}\n\n"
-
-                        if data_spec_guid_list:
-                            result = add_member_to_collections(egeria_client, data_spec_guid_list, display_name,
-                                                                    guid)
-                            core_props += f"## In Data Specifications\n\n`{data_spec_name_list}`\n\n"
-
-                        logger.info(f"Created Element `{display_name}` with GUID {guid}\n\n___")
-
-                        return core_props
+                        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',
+                                                                    output_format='MD')
                     else:
-                        logger.error(f"Failed to create Data Structure `{display_name}`\n\n___")
+                        msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
+                        logger.error(msg)
                         return None
 
-
         except Exception as e:
-            logger.error(f"Error performing {object_action}: {e}\n\n___")
+            logger.error(f"Error performing {command}: {e}")
             return None
     else:
         return None
 
 
-@logger.catch
-def process_data_field_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+def process_link_agreement_item_command(egeria_client: EgeriaTech, txt: str,
+                                        directive: str = "display") -> Optional[str]:
     """
-    Processes a data field create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    Processes a link or unlink command to associate or break up peer governance definitions.
 
     :param txt: A string representing the input cell to be processed for
-        extracting glossary-related attributes.
+        extracting blueprint-related attributes.
     :param directive: an optional string indicating the directive to be used - display, validate or execute
     :return: A string summarizing the outcome of the processing.
     """
-    from md_processing.md_processing_utils.common_md_utils import set_debug_level
-
-    set_debug_level(directive)
-
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
 
-    parsed_output = parse_upsert_command(egeria_client, object_type, object_action, txt, directive)
-    attributes = parsed_output['attributes']
-    display_name = attributes['Display Name'].get('value', None)
-    qualified_name = parsed_output.get('qualified_name', None)
-    guid = parsed_output.get('guid', None)
-    valid = parsed_output['valid']
-    exists = parsed_output['exists']
+    parsed_output = parse_view_command(egeria_client, object_type, object_action, txt, directive)
 
     print(Markdown(parsed_output['display']))
 
-    if directive == "display":
-
-        return None
-    elif directive == "validate":
-        if valid:
-            print(Markdown(f"==> Validation of {command} completed successfully!\n"))
-        else:
-            msg = f"Validation failed for object_action `{command}`\n"
-            logger.error(msg)
-        return valid
-
-    elif directive == "process":
-        logger.debug(json.dumps(parsed_output, indent=4))
-
-        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)
-        anchor_guid = attributes.get('Anchor ID', {}).get('guid', None)
-        is_own_anchor = attributes.get('Is Own Anchor', {}).get('value', None)
-        # parent_id = attributes.get('Parent ID', {}).get('value', None)
-        # parent_guid = attributes['Parent ID'].get('guid', None)
-        # parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value', None)
-        # parent_relationship_properties = attributes.get('Parent Relationship Properties',{}).get('value', None)
-        # parent_at_end1 = attributes.get('Parent at End1', {}).get('value', None)
-
-        namespace = attributes.get('Namespace', {}).get('value', None)
-        description = attributes.get('Description', {}).get('value', None)
-        version_id = attributes.get('Version Identifier', {}).get('value', None)
-        aliases = attributes.get('Aliases', {}).get('value', None)
-        name_patterns = attributes.get('Name Patterns', {}).get('value', None)
-        is_nullable = attributes.get('Is Nullable', {}).get('value', None)
-        default_value = attributes.get('Default Value', {}).get('value', None)
-        data_type = attributes.get('Data Type', {}).get('value', None)
-        min_length = attributes.get('Minimum Length', {}).get('value', None)
-        length = attributes.get('Length', {}).get('value', None)
-        precision = attributes.get('Precision', {}).get('value', None)
-        ordered_values = attributes.get('Ordered Values', {}).get('value', None)
-        sort_order = attributes.get('Sort Order', {}).get('value', None)
-        additional_properties = attributes.get('Additional Properties', {}).get('value', None)
-        effective_from = attributes.get('Effective From', {}).get('value', None)
-        effective_to = attributes.get('Effective To', {}).get('value', None)
-
-        glossary_term = attributes['Glossary Term'].get('value', None)
-        glossary_term_guid = attributes['Glossary Term'].get('guid', None)
-
-        merge_update = attributes.get('Merge Update', {}).get('value', None)
-
-        position = attributes.get('Position', {}).get('value', None)
-        min_cardinality = attributes.get('Minimum Cardinality', {}).get('value', None)
-        max_cardinality = attributes.get('Maximum Cardinality', {}).get('value', None)
-
-        in_data_structure = attributes.get('In Data Structure', {}).get('value', None)
-        data_structure_guid_list = attributes.get('In Data Structure', {}).get('guid_list', None)
-        in_data_structure_names = attributes.get('In Data Structure Names', {}).get('name_list', None)
-
-        data_class = attributes.get('Data Class', {}).get('value', None)
-        data_class_guid = attributes.get('Data Class', {}).get('guid', None)
-
-        glossary_term_guid = attributes.get('Glossary Term', {}).get('guid', None)
-        if glossary_term_guid:
-            glossary_term_guid = [glossary_term_guid]
-
-        glossary_term_guid = attributes.get('Glossary Term', {}).get('guid', None)
-
-        # name_details_list = attributes.get("dict_list", None)
-
-        in_data_spec = attributes.get("In Data Specification", {}).get("value", None)  # this is a [dict]
-        data_spec_name_list = attributes.get("In Data Specification", {}).get("name_list", None)
-        data_spec_guid_list = attributes.get("In Data Specification", {}).get("guid_list", None)
-
-        in_data_dictionary = attributes.get('In Data Dictionary', {}).get('value', None)
-        in_data_dictionary_names = attributes.get('In Data Dictionary', {}).get('name_list', None)
-        data_dict_guid_list = attributes.get("In Data Dictionary", {}).get("guid_list", None)
-
-        parent_data_field = attributes.get('Parent Data Field', {}).get('value', None)
-        parent_data_field_guids = attributes.get('Parent Data Field', {}).get('guid_list', None)
-        parent_data_field_names = attributes.get('Parent Data Field', {}).get('name_list', None)
-
-        anchor_scope_guid = attributes.get('Anchor Scope GUID', {}).get('value', None)
-
-        replace_all_props = not merge_update
-
-        if not valid:
-            if exists and object_action == "Create":
-                msg = (f"Create failed because Element `{display_name}` exists - changing `Create` to `Update` in "
-                       f"processed output\n\n___")
-                logger.error(msg)
-                return update_a_command(txt, object_action, object_type, qualified_name, guid)
-            else:
-                msg = f"Invalid specification - please review\n\n___"
-                logger.error(msg)
-                return None
-        else:
-            print(Markdown(f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
-
-        try:
-            if object_action == "Update":
-                if not exists:
-                    logger.error(f"Element `{display_name}` does not exist! Updating result document with Create "
-                                 f"object_action\n\n___")
-                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
-
-                # first update the base data field
-                body = {
-                    "class": "UpdateElementRequestBody", "externalSourceGUID": external_source_guid,
-                    "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                    "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing, "properties": {
-                        "class": "DataFieldProperties", "qualifiedName": qualified_name, "displayName": display_name,
-                        "namespace": namespace, "description": description, "versionIdentifier": version_id,
-                        "aliases": aliases, "namePatterns": name_patterns, "isDeprecated": False,
-                        "isNullable": is_nullable, "defaultValue": default_value, "dataType": data_type,
-                        "minimumLength": min_length, "length": length, "precision": precision,
-                        "orderedValues": ordered_values, "sortOrder": sort_order,
-                        "additionalProperties": additional_properties, "effectiveFrom": effective_from,
-                        "effectiveTo": effective_to
-                        }
-                    }
-
-                egeria_client.update_data_field(guid, body, not merge_update)
-                logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}")
-                # Update data dictionary membership
-                update_element_dictionary(qualified_name, {
-                    'guid': guid, 'display_name': display_name
-                    })
-                core_props = egeria_client.find_data_fields(qualified_name,
-                                                            output_format='MD')  ## update back to by_guid?
-
-                # existing_data_field = egeria_client.get_data_field_by_guid(guid, output_format='JSON')
-
-                # Sync membership in data dictionaries
-                update_data_collection_memberships(egeria_client, object_type, data_dict_guid_list, "DataDictionary",
-                                                   guid, display_name, replace_all_props)
-                logger.success(f"Updating data dictionaries `{in_data_dictionary_names}`")
-                core_props += f"\n\n## In Data Dictionary\n\n{in_data_dictionary_names}\n\n"
-
-                # Sync data field related elements (data structure, parent data fields, terms, data classes
-                sync_data_field_rel_elements(egeria_client, data_structure_guid_list, parent_data_field_guids,
-                                             glossary_term_guid, data_class_guid, guid, display_name, replace_all_props)
-                core_props += f"\n\n## In Data Structure {in_data_structure_names}\n\n"
-                core_props += f"\n\n## Glossary Term \n\n{glossary_term}\n\n"
-                core_props += f"\n\n## Parent Data Field\n\n{parent_data_field_names}\n\n"
-                core_props += f"\n\n## Data Class\n\n{data_class}\n\n"
-                core_props += "\n_______________________________________________________________________________\n\n"
-
-                # Update data classes
-                logger.success(f"Updated Element `{display_name}`\n\n___")
-                return core_props
-
-            elif object_action == "Create":
-                if valid is False and exists:
-                    logger.error(
-                        f"\nData Field `{display_name}` already exists and result document updated changing `Create` "
-                        f"to `Update` in processed output\n\n___")
-                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
-                else:
-                    # First lets create the data field
-                    body = {
-                        "class": "NewElementRequestBody", "properties": {
-                            "class": "DataFieldProperties", "qualifiedName": qualified_name,
-                            "displayName": display_name, "namespace": namespace, "description": description,
-                            "versionIdentifier": version_id, "aliases": aliases, "namePatterns": name_patterns,
-                            "isDeprecated": False, "isNullable": is_nullable, "defaultValue": default_value,
-                            "dataType": data_type, "minimumLength": min_length, "length": length,
-                            "precision": precision, "orderedValues": ordered_values, "sortOrder": sort_order,
-                            "additionalProperties": additional_properties
-                            }
-                        }
-                    guid = egeria_client.create_data_field(body)
-                    if guid:
-                        # Now update our element dictionary with the new information
-                        update_element_dictionary(qualified_name, {
-                            'guid': guid, 'display_name': display_name
-                            })
-                        # Start assembling the information we will present back out
-                        core_props = egeria_client.get_data_field_by_guid(guid, None, 'MD')
-
-                        # Add the field to any data dictionaries
-                        if in_data_dictionary:
-                            logger.info(f"Will add to data dictionary `{in_data_dictionary}`")
-                            add_member_to_collections(egeria_client, data_dict_guid_list, display_name, guid)
-                            core_props += f"\n\n## In Data Dictionary\n\n{in_data_dictionary_names}\n\n"
-
-                        # Add the field to any data structures
-                        if in_data_structure:
-                            core_props += f"\n\n## In Data Structure\n\n{in_data_structure_names}\n\n"
-                            for ds_guid in data_structure_guid_list:
-                                # todo This is too naive? - need to better accommodate the relationship
-                                df_body = {
-                                    "class": "RelationshipRequestBody", "properties": {
-                                        "class": "MemberDataFieldProperties", "dataFieldPosition": position,
-                                        "minCardinality": min_cardinality, "maxCardinality": max_cardinality,
-                                        }
-                                    }
-
-                                msg = f"Adding field to structure {ds_guid}"
-                                logger.info(msg)
-                                egeria_client.link_member_data_field(ds_guid, guid, df_body)
-                            core_props += f"\n\n## In Data Structure {in_data_structure_names}\n\n"
-
-                        if glossary_term:
-                            if glossary_term_guid:
-                                glossary_body = {
-                                    "class": "RelationshipRequestBody", "externalSourceGUID": external_source_guid,
-                                    "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                                    "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing
-                                    }
-                                core_props += f"\n\n## Glossary Term \n\n{glossary_term}\n\n"
-                                egeria_client.link_semantic_definition(guid, glossary_term_guid, glossary_body)
-
-                        if parent_data_field_guids:
-                            # parent_df_body = {
-                            #     "class": "MetadataSourceRequestBody", "externalSourceGUID": external_source_guid,
-                            #     "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                            #     "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing
-                            #     }
-
-                            # egeria_client.link_nested_data_field(parent_data_field_guid, guid, parent_df_body)
-                            for parent_guid in parent_data_field_guids:
-                                egeria_client.link_nested_data_field(parent_guid, guid)
-                            core_props += f"\n\n## Parent Data Field\n\n{parent_data_field_names}\n\n"
-
-                        # Link data class
-                        if data_class:
-                            body = {
-                                "class": "RelationshipRequestBody", "externalSourceGUID": external_source_guid,
-                                "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                                "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing
-                                }
-                            egeria_client.link_data_class_definition(guid, data_class_guid, body)
-                            msg = f"Adding data class `{data_class}` to data field {display_name}"
-                            logger.info(msg)
-
-                        logger.success(f"Created Element `{display_name}` with guid `{guid}`")
-                        logger.success("=====================================================\n\n")
-                        core_props += "\n___\n\n"
-                        return core_props
-
-                    else:
-                        logger.error(f"Failed to create Term `{display_name}`\n\n___")
-                        return None
-
-        except Exception as e:
-            logger.error(f"Error performing {command}: {e}\n\n___")
-            return None
-    else:
-        return None
-
-
-@logger.catch
-def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
-    """
-    Processes a data class create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
-
-    :param txt: A string representing the input cell to be processed for
-        extracting glossary-related attributes.
-    :param directive: an optional string indicating the directive to be used - display, validate or execute
-    :return: A string summarizing the outcome of the processing.
-    """
-
-    command, object_type, object_action = extract_command_plus(txt)
-
-    parsed_output = parse_upsert_command(egeria_client, object_type, object_action, txt, directive)
+    logger.debug(json.dumps(parsed_output, indent=4))
 
     attributes = parsed_output['attributes']
-    display_name = attributes['Display Name'].get('value', None)
-    qualified_name = parsed_output.get('qualified_name', None)
-    guid = parsed_output.get('guid', None)
+    agreement = attributes.get('Agreement Name',{}).get('value', None)
+    agreement_guid = attributes.get('Definition 1', {}).get('guid', None)
+    item = attributes.get('Item Name',{}).get('value', None)
+    item_guid = attributes.get('Definition 2', {}).get('guid', None)
+    label = attributes.get('Link Label', {}).get('value', None)
+    description = attributes.get('Description', {}).get('value', None)
+
     valid = parsed_output['valid']
-    exists = parsed_output['exists']
+    exists = agreement_guid is not None and  item_guid is not None
 
-    print(Markdown(parsed_output['display']))
 
     if directive == "display":
 
@@ -1241,225 +818,78 @@ def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, direc
             print(Markdown(f"==> Validation of {command} completed successfully!\n"))
         else:
             msg = f"Validation failed for object_action `{command}`\n"
-            logger.error(msg)
         return valid
 
     elif directive == "process":
-        logger.debug(json.dumps(parsed_output, indent=4))
-
-        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', False)
-        for_duplicate_processing = attributes.get('For Duplicate Processing', {}).get('value', False)
-        anchor_guid = attributes.get('Anchor ID', {}).get('guid', None)
-        is_own_anchor = attributes.get('Is Own Anchor', {}).get('value', None)
-        # parent_id = attributes.get('Parent ID', {}).get('value', None)
-        # parent_guid = attributes['Parent ID'].get('guid', None)
-        # parent_relationship_type_name = attributes.get('Parent Relationship Type Name', {}).get('value', None)
-        # parent_relationship_properties = attributes.get('Parent Relationship Properties',{}).get('value', None)
-        # parent_at_end1 = attributes.get('Parent at End1', {}).get('value', None)
-
-        namespace = attributes.get('Namespace', {}).get('value', None)
-        description = attributes.get('Description', {}).get('value', None)
-        version_id = attributes.get('Version Identifier', {}).get('value', None)
-
-        ###############
-        match_property_names = attributes.get('Match Property Names', {}).get('value', [])
-        specification_details = attributes.get('Specification Details', {}).get('value', {})
-        match_threshold = attributes.get('Match Threshold', {}).get('value', 0)
-        specification = attributes.get('Specification', {}).get('value', None)
-        data_type = attributes.get('Data Type', {}).get('value', None)
-        is_nullable = attributes.get('Is Nullable', {}).get('value', True)
-        allow_duplicates = attributes.get('Allow Duplicates', {}).get('value', True)
-        default_value = attributes.get('Default Value', {}).get('value', None)
-        average_value = attributes.get('Average Value', {}).get('value', None)
-        value_list = attributes.get('Value List', {}).get('value', None)
-        value_range_from = attributes.get('Value Range From', {}).get('value', None)
-        value_range_to = attributes.get('Value Range To', {}).get('value', None)
-        sample_values = attributes.get('Sample Values', {}).get('value', [])
-        data_patterns = attributes.get('Data Patterns', {}).get('value', [])
-        additional_properties = attributes.get('Additional Properties', {}).get('value', {})
-
-        ###############
-        aliases = attributes.get('Aliases', {}).get('value', None)
-        name_patterns = attributes.get('Name Patterns', {}).get('value', None)
-
-        min_length = attributes.get('Minimum Length', {}).get('value', None)
-        length = attributes.get('Length', {}).get('value', None)
-        precision = attributes.get('Precision', {}).get('value', None)
-        ordered_values = attributes.get('Ordered Values', {}).get('value', None)
-        sort_order = attributes.get('Sort Order', {}).get('value', None)
-        effective_from = attributes.get('Effective From', {}).get('value', None)
-        effective_to = attributes.get('Effective To', {}).get('value', None)
-
-        glossary_term = attributes.get('Glossary Term', {}).get('value', None)
-        glossary_term_guid = attributes.get('Glossary Term', {}).get('guid', None)
-
-        merge_update = attributes.get('Merge Update', {}).get('value', True)
-
-        position = attributes.get('Position', {}).get('value', None)
-        min_cardinality = attributes.get('Minimum Cardinality', {}).get('value', None)
-        max_cardinality = attributes.get('Maximum Cardinality', {}).get('value', None)
-
-        in_data_structure = attributes.get('In Data Structure', {}).get('value', None)
-        data_structure_guid_list = attributes.get('In Data Structure', {}).get('guid_list', None)
-        in_data_structure_names = attributes.get('In Data Structure Names', {}).get('name_list', None)
-
-        data_class = attributes.get('Data Class', {}).get('value', None)
-        glossary_term = attributes.get('Glossary Term', {}).get('value', None)
-
-        glossary_term_guid = attributes.get('Glossary Term', {}).get('guid', None)
-
-        in_data_dictionary = attributes.get('In Data Dictionary', {}).get('value', None)
-        in_data_dictionary_names = attributes.get('In Data Dictionary', {}).get('name_list', None)
-        data_dict_guid_list = attributes.get("In Data Dictionary", {}).get("guid_list", None)
-
-        containing_data_class = attributes.get('Containing Data Class', {}).get('value', None)
-        containing_data_class_guids = attributes.get('Containing Data Class', {}).get('guid_list', None)
-        containing_data_class_names = attributes.get('Containing Data Class', {}).get('name_list', None)
-
-        specializes_data_class = attributes.get('Specializes Data Class', {}).get('value', None)
-        specializes_data_class_guid = attributes.get('Specializes Data Class', {}).get('guid', None)
-        specializes_data_class_name = attributes.get('Specializes Data Class', {}).get('name', None)
-
-        anchor_scope_guid = attributes.get('Anchor Scope GUID', {}).get('value', None)
-
-        replace_all_props = not merge_update
-
-        if not valid:
-            if exists and object_action == "Create":
-                msg = (f"Create failed because Element `{display_name}` exists - changing `Create` to `Update` in "
-                       f"processed output\n\n___")
-                logger.error(msg)
-                return update_a_command(txt, object_action, object_type, qualified_name, guid)
-            else:
-                msg = f"Invalid specification - please review\n\n___"
-                return None
-        else:
-            print(Markdown(f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
+        gov_peer_relationship_type = object_type[:-1].replace(" ","") + "Link"
 
         try:
-            if object_action == "Update":
+            if object_action == "Detach":
                 if not exists:
-                    logger.error(f"Element `{display_name}` does not exist! Updating result document with Create "
-                                 f"object_action\n\n___")
-                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
-
-                # first update the base data class
-                body = {
-                    "class": "UpdateElementRequestBody", "externalSourceGUID": external_source_guid,
-                    "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                    "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing, "properties": {
-                        "class": "DataClassProperties", "qualifiedName": qualified_name, "displayName": display_name,
-                        "description": description, "namespace": namespace, "matchPropertyNames": match_property_names,
-                        "matchThreshold": match_threshold, "specification": specification,
-                        "specificationDetails": specification_details, "dataType": data_type,
-                        "allowsDuplicateValues": allow_duplicates, "isNullable": is_nullable,
-                        "defaultValue": default_value, "averageValue": average_value, "valueList": value_list,
-                        "valueRangeFrom": value_range_from, "valueRangeTo": value_range_to,
-                        "sampleValues": sample_values, "dataPatterns": data_patterns,
-                        "additionalProperties": additional_properties
-                        }
-                    }
+                    msg = (f" Link `{label}` does not exist! Updating result document with Link "
+                           f"object_action\n")
+                    logger.error(msg)
+                    out = parsed_output['display'].replace('Link', 'Detach', 1)
+                    return out
+                elif not valid:
+                    return None
+                else:
+                    print(Markdown(
+                        f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
+                    body = set_metadata_source_request_body(object_type, attributes)
 
-                egeria_client.update_data_class(guid, body, not merge_update)
-                logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}")
-                # Update data dictionary membership
-                update_element_dictionary(qualified_name, {
-                    'guid': guid, 'display_name': display_name
-                    })
-                core_props = egeria_client.get_data_class_by_guid(guid, None, 'MD')
+                egeria_client.detach_agreement_item(agreement_guid, item_guid,body)
 
-                # Sync membership in data dictionaries
-                update_data_collection_memberships(egeria_client, object_type, data_dict_guid_list, "DataDictionary",
-                                                   guid, display_name, replace_all_props)
-                logger.success(f"Updating data dictionaries `{in_data_dictionary_names}`")
-                core_props += f"\n\n## In Data Dictionary\n\n{in_data_dictionary_names}\n\n"
+                logger.success(f"===> Detached agreement item `{item}` from agreement `{agreement}`\n")
+                out = parsed_output['display'].replace('Unlink', 'Link', 1)
 
-                # Sync data field related elements (data structure, parent data fields, terms, data classes
-                sync_data_class_rel_elements(egeria_client, containing_data_class_guids, glossary_term_guid,
-                                             specializes_data_class_guid, guid, display_name, replace_all_props)
+                return (out)
 
-                core_props += f"\n\n## Glossary Term \n\n{glossary_term}\n\n"
-                core_props += f"\n\n## Containing Data Class\n\n{containing_data_class_names}\n\n"
-                core_props += "\n___\n\n"
+            elif object_action == "Link":
+                if valid is False and exists:
+                    msg = (f"-->  Link called `{label}` already exists and result document updated changing "
+                           f"`Link` to `Detach` in processed output\n")
+                    logger.error(msg)
 
-                # Update data classes
-                logger.success(f"Updated Element `{display_name}`\n\n___")
-                return core_props
+                elif valid is False:
+                    msg = f"==>{object_type} Link with label `{label}` is not valid and can't be created"
+                    logger.error(msg)
+                    return
 
-            elif object_action == "Create":
-                if valid is False and exists:
-                    logger.error(
-                        f"\nData Class `{display_name}` already exists and result document updated changing `Create` "
-                        f"to `Update` in processed output\n\n___")
-                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
                 else:
-                    # First lets create the data class
-                    body = {
-                        "class": "NewElementRequestBody", "properties": {
-                            "class": "DataClassProperties", "qualifiedName": qualified_name,
-                            "displayName": display_name, "description": description, "namespace": namespace,
-                            "matchPropertyNames": match_property_names, "matchThreshold": match_threshold,
-                            "specification": specification, "specificationDetails": specification_details,
-                            "dataType": data_type, "allowsDuplicateValues": allow_duplicates, "isNullable": is_nullable,
-                            "defaultValue": default_value, "averageValue": average_value, "valueList": value_list,
-                            "valueRangeFrom": value_range_from, "valueRangeTo": value_range_to,
-                            "sampleValues": sample_values, "dataPatterns": data_patterns,
-                            "additionalProperties": additional_properties
-                            }
-                        }
-                    guid = egeria_client.create_data_class(body)
-                    if guid:
-                        # Now update our element dictionary with the new information
-                        update_element_dictionary(qualified_name, {
-                            'guid': guid, 'display_name': display_name
-                            })
-                        # Start assembling the information we will present back out
-                        core_props = egeria_client.get_data_class_by_guid(guid, None, 'MD')
-
-                        # Add the field to any data dictionaries
-                        if in_data_dictionary:
-                            logger.info(f"Will add to data dictionary `{in_data_dictionary}`")
-                            add_member_to_collections(egeria_client, data_dict_guid_list, display_name, guid)
-                            core_props += f"\n\n## In Data Dictionary\n\n{in_data_dictionary_names}\n\n"
-
-                        if glossary_term:
-                            if glossary_term_guid:
-                                glossary_body = {
-                                    "class": "RelationshipRequestBody", "externalSourceGUID": external_source_guid,
-                                    "externalSourceName": external_source_name, "effectiveTime": effective_time,
-                                    "forLineage": for_lineage, "forDuplicateProcessing": for_duplicate_processing
-                                    }
-
-                                core_props += f"\n\n## Glossary Term \n\n{glossary_term}\n\n"
-                                egeria_client.link_semantic_definition(guid, glossary_term_guid, glossary_body)
-
-                        if containing_data_class_guids:
-                            for dc_guid in containing_data_class_guids:
-                                egeria_client.link_nested_data_class(dc_guid, guid)
-                            core_props += f"\n\n## Parent Data Field\n\n{containing_data_class_names}\n\n"
-
-                        if specializes_data_class_guid:
-                            egeria_client.link_specialist_data_class(specializes_data_class_guid, guid)
-                            core_props += f"\n\n## Specialized Data Field\n\n{specializes_data_class_name}\n\n"
-
-                        logger.success(f"Created Element `{display_name}`")
-                        core_props += "\n___\n\n"
-                        return core_props
+                    body = set_rel_request_body(object_type, attributes)
+                    item_props = {
+                        "class": "AgreementItemProperties",
+                        "agreementItemId": attributes["Agreement Item Id"],
+                        "agreementStart": attributes["Agreement Start"],
+                        "agreementEnd": attributes["Agreement End"],
+                        "restrictions": attributes["Restrictions"],
+                        "obligations": attributes["Obligations"],
+                        "entitlements": attributes["Entitlements"],
+                        "usageMeasurements": attributes["Usage Measurements"],
+                        "effectiveFrom": attributes["Effective From"],
+                        "effectiveTo": attributes["Effective To"]
+
+                    }
+                    egeria_client.link_agreement_item(agreement_guid,
+                                                        item_guid, body)
+                    msg = f"==>Linked {object_type} `{agreement} to item {item}\n"
+                    logger.success(msg)
+                    out = parsed_output['display'].replace('Link', 'Detach', 1)
+                    return out
 
-                    else:
-                        logger.error(f"Failed to create Term `{display_name}`\n\n___")
-                        return None
 
         except Exception as e:
-            logger.error(f"Error performing {command}: {e}\n\n___")
+            logger.error(f"Error performing {command}: {e}")
             return None
     else:
         return None
 
 
+
+#
+# View commands
+#
 @logger.catch
 def process_data_collection_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[
     str]:
@@ -1473,6 +903,7 @@ def process_data_collection_list_command(egeria_client: EgeriaTech, txt: str, di
     :return: A string summarizing the outcome of the processing.
     """
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
     if object_type in ["Data Dictionary", "Data Dictionaries", "DataDict", "DataDictionary"]:
         col_type = "DataDictionary"
     elif object_type in ["Data Specification", "Data Specifications", "Data Specs"]:
@@ -1546,8 +977,8 @@ def process_data_collection_list_command(egeria_client: EgeriaTech, txt: str, di
     else:
         return None
 
-
-def process_data_structure_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[
+# TODO
+def process_data_agreement_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[
     str]:
     """
     Processes a Data Dictionary list object_action by extracting key attributes such as
@@ -1559,6 +990,7 @@ def process_data_structure_list_command(egeria_client: EgeriaTech, txt: str, dir
     :return: A string summarizing the outcome of the processing.
     """
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
 
     parsed_output = parse_view_command(egeria_client, object_type, object_action, txt, directive)
 
@@ -1608,8 +1040,8 @@ def process_data_structure_list_command(egeria_client: EgeriaTech, txt: str, dir
     else:
         return None
 
-
-def process_data_field_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+# TODO
+def process_subscription_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a Data Dictionary list object_action by extracting key attributes such as
      search string from the given text.
@@ -1620,6 +1052,7 @@ def process_data_field_list_command(egeria_client: EgeriaTech, txt: str, directi
     :return: A string summarizing the outcome of the processing.
     """
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
 
     parsed_output = parse_view_command(egeria_client, object_type, object_action, txt, directive)
 
@@ -1684,8 +1117,8 @@ def process_data_field_list_command(egeria_client: EgeriaTech, txt: str, directi
     else:
         return None
 
-
-def process_data_class_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+# TODO
+def process_digital_product_list_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a Data Dictionary list object_action by extracting key attributes such as
      search string from the given text.
@@ -1696,6 +1129,7 @@ def process_data_class_list_command(egeria_client: EgeriaTech, txt: str, directi
     :return: A string summarizing the outcome of the processing.
     """
     command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
 
     parsed_output = parse_view_command(egeria_client, object_type, object_action, txt, directive)