pyegeria 5.4.4.2__py3-none-any.whl → 5.4.4.3__py3-none-any.whl

commands/cat/list_format_set.py

@@ -54,10 +54,12 @@ from pyegeria import (
     NO_ELEMENTS_FOUND, GovernanceOfficer, GlossaryManager,
 )
 from pyegeria.config import settings
+from pyegeria.external_references import ExternalReferences
 from pyegeria.logging_configuration import config_logging
+from pyegeria._output_format_models import load_format_sets_from_json
 from pyegeria._output_formats import (select_output_format_set, get_output_format_set_heading,
                                       load_user_format_sets, load_output_format_sets,
-                                      load_format_sets_from_json, get_output_format_set_description)
+                                       get_output_format_set_description)
 from pyegeria._exceptions_new import PyegeriaException, print_exception_response
 
 # pydevd_pycharm.settrace('host.docker.internal',  # Use 'host.docker.internal' to connect to the host machine
@@ -166,6 +168,8 @@ def execute_format_set_action(
             client_class = GovernanceOfficer
         elif class_name == "GlossaryManager":
             client_class = GlossaryManager
+        elif class_name == "ExternalReference":
+            client_class = ExternalReferences
         else:
             client_class = EgeriaTech
 
@@ -258,7 +262,7 @@ def execute_format_set_action(
             return
         else:
             # For TABLE output, add output_format to params
-            params['output_format'] = "DICT"
+            params['output_format'] = "TABLE"
             print(f"\n==> Calling function: {func} with parameters:{params}")
             # Call the function and create a table
             try:

md_processing/md_commands/data_designer_commands.py

@@ -31,6 +31,7 @@ from md_processing.md_processing_utils.extraction_utils import (extract_command_
 from md_processing.md_processing_utils.md_processing_constants import (load_commands, ERROR)
 from pyegeria import DEBUG_LEVEL, body_slimmer
 from pyegeria.egeria_tech_client import EgeriaTech
+from pyegeria.utils import make_format_set_name_from_type
 
 GERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
@@ -451,6 +452,7 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
     in_data_spec_list = attributes.get('In Data Specification', {}).get('value', None)
     in_data_spec_valid = attributes.get('In Data Specification', {}).get('valid', None)
     in_data_spec_exists = attributes.get('In Data Specification', {}).get('exists', None)
+    output_set = make_format_set_name_from_type(object_type)
 
     if directive == "display":
 
@@ -489,7 +491,7 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                     'guid': guid, 'display_name': display_name
                 })
                 return egeria_client.get_collection_by_guid(guid, element_type='Data Specification',
-                                                            output_format='MD')
+                                                            output_format='MD', output_format_set=output_set)
 
             elif object_action == "Create":
                 if valid is False and exists:
@@ -517,7 +519,7 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                         })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_collection_by_guid(guid, object_type, output_format='MD')
+                        return egeria_client.get_collection_by_guid(guid, object_type, output_format='MD', output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)
@@ -562,6 +564,7 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
     attributes = parsed_output['attributes']
     display_name = attributes.get('Display Name', {}).get('value', "None Found")
     status = attributes.get('Status', {}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
 
     if directive == "display":
 
@@ -600,7 +603,7 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                     'guid': guid, 'display_name': display_name
                 })
                 return egeria_client.get_collection_by_guid(guid, element_type='Data Specification',
-                                                            output_format='MD')
+                                                            output_format='MD', output_format_set=output_set)
 
             elif object_action == "Create":
                 if valid is False and exists:
@@ -627,7 +630,7 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                         })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_collection_by_guid(guid, object_type, output_format='MD')
+                        return egeria_client.get_collection_by_guid(guid, object_type, output_format='MD', output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)
@@ -665,7 +668,7 @@ def process_data_structure_upsert_command(egeria_client: EgeriaTech, txt: str,
 
     qualified_name = parsed_output.get('qualified_name', None)
     guid = parsed_output.get('guid', None)
-
+    output_set = make_format_set_name_from_type(object_type)
 
 
     if directive == "display":
@@ -720,7 +723,7 @@ def process_data_structure_upsert_command(egeria_client: EgeriaTech, txt: str,
                         })
                     logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___")
 
-                    core_props = egeria_client.get_data_structure_by_guid(guid, output_format='MD')
+                    core_props = egeria_client.get_data_structure_by_guid(guid, output_format='MD', output_format_set=output_set)
 
                     update_element_dictionary(qualified_name, {
                         'guid': guid, 'display_name': display_name
@@ -757,7 +760,7 @@ def process_data_structure_upsert_command(egeria_client: EgeriaTech, txt: str,
                             'guid': guid, 'display_name': display_name
                             })
 
-                        core_props = egeria_client.get_data_structure_by_guid(guid, output_format='MD')
+                        core_props = egeria_client.get_data_structure_by_guid(guid, output_format='MD', output_format_set=output_set)
 
                         if in_data_dictionary:
                             logger.info(f"Will add to data dictionary(s) `{in_data_dictionary}`")
@@ -809,6 +812,7 @@ def process_data_field_upsert_command(egeria_client: EgeriaTech, txt: str, direc
     guid = parsed_output.get('guid', None)
     valid = parsed_output['valid']
     exists = parsed_output['exists']
+    output_set = make_format_set_name_from_type(object_type)
 
     print(Markdown(parsed_output['display']))
 
@@ -893,7 +897,7 @@ def process_data_field_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                 update_element_dictionary(qualified_name, {
                     'guid': guid, 'display_name': display_name
                     })
-                core_props = egeria_client.get_data_field_by_guid(guid, output_format='MD')  ## update back to by_guid?
+                core_props = egeria_client.get_data_field_by_guid(guid, output_format='MD', output_format_set=output_set)  ## update back to by_guid?
 
                 # existing_data_field = egeria_client.get_data_field_by_guid(guid, output_format='JSON')
 
@@ -935,7 +939,7 @@ def process_data_field_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                             '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, 'MD')
+                        core_props = egeria_client.get_data_field_by_guid(guid, 'MD', output_format_set=output_set)
 
                         # Add the field to any data dictionaries
                         if in_data_dictionary:
@@ -1032,6 +1036,7 @@ def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, direc
     guid = parsed_output.get('guid', None)
     valid = parsed_output['valid']
     exists = parsed_output['exists']
+    output_set = make_format_set_name_from_type(object_type)
 
     print(Markdown(parsed_output['display']))
 
@@ -1082,6 +1087,7 @@ def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, direc
         sample_values = attributes.get('Sample Values', {}).get('value', [])
         data_patterns = attributes.get('Data Patterns', {}).get('value', [])
         additional_properties = attributes.get('Additional Properties', {}).get('value', {})
+        output_set = make_format_set_name_from_type(object_type)
 
         ###############
         aliases = attributes.get('Aliases', {}).get('value', None)
@@ -1171,7 +1177,7 @@ def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                 update_element_dictionary(qualified_name, {
                     'guid': guid, 'display_name': display_name
                     })
-                core_props = egeria_client.get_data_class_by_guid(guid, None, 'MD')
+                core_props = egeria_client.get_data_class_by_guid(guid, None, 'MD', output_format_set=output_set)
 
                 # Sync membership in data dictionaries
                 update_data_collection_memberships(egeria_client, object_type, data_dict_guid_list, "DataDictionary",
@@ -1219,7 +1225,7 @@ def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                             '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')
+                        core_props = egeria_client.get_data_class_by_guid(guid, None, 'MD', output_format_set=output_set)
 
                         # Add the field to any data dictionaries
                         if in_data_dictionary:

md_processing/md_commands/ext_ref_commands.py

@@ -44,6 +44,8 @@ from md_processing.md_processing_utils.md_processing_constants import (GLOSSARY_
 from pyegeria import body_slimmer
 from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_CATEGORIES_FOUND)
 from pyegeria.egeria_tech_client import EgeriaTech
+from pyegeria.utils import make_format_set_name_from_type
+
 
 # EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))
 # console = Console(width=EGERIA_WIDTH)
@@ -84,6 +86,7 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
 
     display_name = attributes['Display Name'].get('value', None)
     status = attributes.get('Status', {}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
     #
 
     if directive == "display":
@@ -111,7 +114,7 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
             prop_body = set_element_prop_body(obj, qualified_name, attributes)
             prop_body["referenceTitle"] = attributes.get('Reference Title', {}).get('value', None)
             prop_body["referenceAbstract"] = attributes.get('Reference Abstract', {}).get('value', None)
-            prop_body["authors"] = attributes.get('Authors', {}).get('name_list', None)
+            prop_body["authors"] = attributes.get('Authors', {}).get('value', None)
             prop_body["organization"] = attributes.get('Organization', {}).get('value', None)
             prop_body["url"] = attributes.get('URL', {}).get('value', None)
             prop_body["sources"] = attributes.get('Sources', {}).get('value', None)
@@ -161,16 +164,16 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
                 body = set_update_body(obj, attributes)
                 body['properties'] = prop_body
 
-                egeria_client.update_project(guid, body)
-                if status:
-                    egeria_client.update_external_reference_status(guid, status)
+                egeria_client.update_external_reference(guid, body)
+                # if status:
+                #     egeria_client.update_external_reference_status(guid, status)
 
                 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_external_reference_by_guid(guid, element_type= object_type,
-                                                            output_format='MD', output_format_set = object_type)
+                                                            output_format='MD', output_format_set = output_set)
 
 
             elif object_action == "Create":
@@ -203,7 +206,7 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
                         logger.success(msg)
                         return egeria_client.get_external_reference_by_guid(guid, element_type=object_type,
                                                                             output_format='MD',
-                                                                            output_format_set=object_type)
+                                                                            output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)

md_processing/md_commands/glossary_commands.py

@@ -39,6 +39,8 @@ from md_processing.md_processing_utils.md_processing_constants import (GLOSSARY_
 from pyegeria import body_slimmer
 from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_CATEGORIES_FOUND)
 from pyegeria.egeria_tech_client import EgeriaTech
+from pyegeria.utils import make_format_set_name_from_type
+
 
 # EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))
 # console = Console(width=EGERIA_WIDTH)
@@ -543,6 +545,8 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
             get_method = egeria_client.get_term_by_guid
             collection_types = ["Glossary", "Folder"]
 
+            output_set = make_format_set_name_from_type(object_type)
+
             if object_action == "Update":
                 if not exists:
                     msg = (f" Element `{display_name}` does not exist! Updating result document with Create "
@@ -571,7 +575,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
                     'guid': guid, 'display_name': display_name
                     })
                 return egeria_client.get_term_by_guid(guid, element_type='GlossaryTerm',
-                                                            output_format='MD', output_format_set="DrE-Term")
+                                                            output_format='MD', output_format_set=output_set)
 
 
             elif object_action == "Create":
@@ -600,7 +604,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
                             })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_term_by_guid(guid, obj, output_format='MD')
+                        return egeria_client.get_term_by_guid(guid, obj, output_format='MD', output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)

md_processing/md_commands/governance_officer_commands.py

@@ -132,6 +132,8 @@ def process_gov_definition_upsert_command(egeria_client: EgeriaTech, txt: str, d
             return valid
 
         elif directive == "process":
+            output_set = make_format_set_name_from_type(object_type)
+
             if object_action == "Update":
                 if not guid:
                     msg = (f"The `{object_type}` '{display_name}' does not yet exist.\n The result document has been "
@@ -153,7 +155,7 @@ def process_gov_definition_upsert_command(egeria_client: EgeriaTech, txt: str, d
                     egeria_client.update_governance_definition_status(guid, status)
                 logger.success(f"Updated {object_type} `{display_name}` with GUID {guid}")
                 return egeria_client.get_governance_definition_by_guid(guid, output_format='MD',
-                                                output_format_set = 'Business-Imperative-DrE')
+                                                output_format_set = output_set)
 
             elif object_action == "Create":
                 if valid is False and exists:
@@ -173,7 +175,7 @@ def process_gov_definition_upsert_command(egeria_client: EgeriaTech, txt: str, d
                     guid = egeria_client.create_governance_definition(body_slimmer(create_body))
                     if guid:
                         logger.success(f"Created {object_type} `{display_name}` with GUID {guid}")
-                        return egeria_client.get_governance_definition_by_guid(guid, output_format='MD')
+                        return egeria_client.get_governance_definition_by_guid(guid, output_format='MD', output_format_set = output_set)
                     else:
                         logger.error(f"Failed to create {object_type} `{display_name}`.")
                         return None

md_processing/md_commands/product_manager_commands.py

@@ -179,6 +179,7 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
 
     display_name = attributes['Display Name'].get('value', None)
     status = attributes.get('Status', {}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
 
     if directive == "display":
 
@@ -222,7 +223,7 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                     'guid': guid, 'display_name': display_name
                     })
                 return egeria_client.get_collection_by_guid(guid, element_type='Data Specification',
-                                                            output_format='MD')
+                                                            output_format='MD', output_format_set=output_set)
 
 
             elif object_action == "Create":
@@ -250,7 +251,7 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                             })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_collection_by_guid(guid, obj, output_format='MD')
+                        return egeria_client.get_collection_by_guid(guid, obj, output_format='MD', output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)
@@ -299,6 +300,7 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
     display_name = attributes['Display Name'].get('value', None)
     product_manager = attributes.get('Product Manager',{}).get('value', None)
     product_status = attributes.get('Product Status',{}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
 
     if directive == "display":
 
@@ -340,7 +342,7 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
                     'guid': guid, 'display_name': display_name
                     })
                 return egeria_client.get_collection_by_guid(guid, element_type='Digital Product',
-                                                            output_format='MD')
+                                                            output_format='MD', output_format_set=output_set)
 
 
             elif object_action == "Create":
@@ -366,7 +368,7 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
                         return egeria_client.get_collection_by_guid(guid, element_type='Digital Product',
-                                                                    output_format='MD')
+                                                                    output_format='MD', output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)
@@ -411,6 +413,7 @@ def process_agreement_upsert_command(egeria_client: EgeriaTech, txt: str, direct
 
     display_name = attributes['Display Name'].get('value', None)
     status = attributes.get('Status', {}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
 
     if directive == "display":
 
@@ -454,7 +457,7 @@ def process_agreement_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                     'guid': guid, 'display_name': display_name
                     })
                 return egeria_client.get_collection_by_guid(guid, element_type='Data Specification',
-                                                            output_format='MD')
+                                                            output_format='MD', output_format_set=output_set)
 
 
             elif object_action == "Create":
@@ -479,7 +482,7 @@ def process_agreement_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                             })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_collection_by_guid(guid, obj, output_format='MD')
+                        return egeria_client.get_collection_by_guid(guid, obj, output_format='MD', output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)

md_processing/md_commands/project_commands.py

@@ -44,6 +44,8 @@ from md_processing.md_processing_utils.md_processing_constants import (GLOSSARY_
 from pyegeria import body_slimmer
 from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_CATEGORIES_FOUND)
 from pyegeria.egeria_tech_client import EgeriaTech
+from pyegeria.utils import make_format_set_name_from_type
+
 
 # EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))
 # console = Console(width=EGERIA_WIDTH)
@@ -83,6 +85,7 @@ def process_project_upsert_command(egeria_client: EgeriaTech, txt: str, directiv
 
     display_name = attributes['Display Name'].get('value', None)
     status = attributes.get('Status', {}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
     #
 
     if directive == "display":
@@ -142,7 +145,7 @@ def process_project_upsert_command(egeria_client: EgeriaTech, txt: str, directiv
                     'guid': guid, 'display_name': display_name
                     })
                 return egeria_client.get_project_by_guid(guid, element_type='Project',
-                                                            output_format='MD', output_format_set = "Projects")
+                                                            output_format='MD', output_format_set = output_set)
 
 
             elif object_action == "Create":
@@ -173,7 +176,7 @@ def process_project_upsert_command(egeria_client: EgeriaTech, txt: str, directiv
                             })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_project_by_guid(guid, output_format='MD', output_format_set = "Projects")
+                        return egeria_client.get_project_by_guid(guid, output_format='MD', output_format_set = output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
                         logger.error(msg)

pyegeria/__init__.py

@@ -62,7 +62,7 @@ from .registered_info import RegisteredInfo
 from .runtime_manager_omvs import RuntimeManager
 from .server_operations import ServerOps
 from .solution_architect import SolutionArchitect
-from .utils import body_slimmer, print_response, to_pascal_case, to_camel_case, camel_to_title_case
+from .utils import body_slimmer,to_pascal_case, to_camel_case, camel_to_title_case
 from .valid_metadata_omvs import ValidMetadataManager
 from .x_action_author_omvs import ActionAuthor
 from .template_manager_omvs import TemplateManager