pyegeria 5.4.8__py3-none-any.whl → 5.4.8.3__py3-none-any.whl

pyegeria/glossary_manager.py

@@ -23,10 +23,12 @@ from pyegeria._globals import NO_GUID_RETURNED
 from pyegeria._validators import validate_guid
 from pyegeria.collection_manager import CollectionManager
 from pyegeria.config import settings as app_settings
-from pyegeria.models import (NewElementRequestBody,
-                             ReferenceableProperties, UpdateElementRequestBody, DeleteRequestBody, TemplateRequestBody,
+from pyegeria.models import (NewElementRequestBody, DeleteElementRequestBody, DeleteRelationshipRequestBody,
+                             DeleteClassificationRequestBody,
+                             ReferenceableProperties, UpdateElementRequestBody, TemplateRequestBody,
                              NewRelationshipRequestBody, UpdateRelationshipRequestBody, NewClassificationRequestBody,
-                             FilterRequestBody, GetRequestBody, SearchStringRequestBody, UpdateStatusRequestBody)
+                             FilterRequestBody, GetRequestBody, SearchStringRequestBody, UpdateStatusRequestBody,
+                             DeleteClassificationRequestBody)
 from pyegeria.base_report_formats import select_report_spec, get_report_spec_match
 from pyegeria.output_formatter import (generate_output,
                                        _extract_referenceable_properties, populate_columns_from_properties,
@@ -36,11 +38,6 @@ from pyegeria.utils import body_slimmer, dynamic_catch
 EGERIA_LOCAL_QUALIFIER = app_settings.User_Profile.egeria_local_qualifier
 
 
-("params are in the form of [(paramName, value), (param2Name, value)] if the value is not None, it will be added to "
- "the query string")
-
-
-
 
 class GlossaryProperties(ReferenceableProperties):
     class_: Annotated[Literal["GlossaryProperties"], Field(alias="class")]
@@ -145,7 +142,7 @@ class GlossaryManager(CollectionManager):
             )
         return response
 
-    async def _async_delete_glossary(self, glossary_guid: str, body: dict | DeleteRequestBody = None,
+    async def _async_delete_glossary(self, glossary_guid: str, body: dict | DeleteElementRequestBody = None,
                                      cascade: bool = False) -> None:
         """Delete glossary. Async version.
 
@@ -166,7 +163,7 @@ class GlossaryManager(CollectionManager):
 
         logger.info(f"Deleted glossary {glossary_guid} with cascade {cascade}")
 
-    def delete_glossary(self, glossary_guid: str, body: dict | DeleteRequestBody = None, cascade: bool = False) -> None:
+    def delete_glossary(self, glossary_guid: str, body: dict | DeleteElementRequestBody = None, cascade: bool = False) -> None:
         """Delete a new glossary.
 
         Parameters
@@ -998,7 +995,7 @@ class GlossaryManager(CollectionManager):
             self,
             term_guid: str,
             cascade: bool = False,
-            body: dict | DeleteRequestBody = None
+            body: dict | DeleteElementRequestBody = None
             ) -> None:
         """Delete the glossary terms associated with the specified glossary. Async version.
 
@@ -1033,7 +1030,7 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/delete"
         )
-        await self._async_delete_request(url, body, cascade)
+        await self._async_delete_element_request(url, body, cascade)
         logger.info(f"Deleted collection {term_guid} with cascade {cascade}")
 
 
@@ -1041,7 +1038,7 @@ class GlossaryManager(CollectionManager):
             self,
             term_guid: str,
             cascade: bool = False,
-            body: dict | DeleteRequestBody = None
+            body: dict | DeleteElementRequestBody = None
             ) -> None:
         """Delete the glossary terms associated with the specified glossary.
 
@@ -1078,7 +1075,7 @@ class GlossaryManager(CollectionManager):
             self,
             term_guid: str,
             glossary_guid: str,
-            body: dict | DeleteRequestBody = None
+            body: dict | DeleteRelationshipRequestBody = None
             ) -> None:
         """Move the glossary terms to the specified glossary. Async version.
 
@@ -1110,7 +1107,7 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/move-to/{glossary_guid}"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(f"Moved collection {term_guid} to glossary {glossary_guid}")
 
 
@@ -1118,7 +1115,7 @@ class GlossaryManager(CollectionManager):
             self,
             term_guid: str,
             glossary_guid: str,
-            body: dict | DeleteRequestBody = None
+            body: dict | DeleteRelationshipRequestBody = None
             ) -> None:
         """Move the glossary terms to the specified glossary.
 
@@ -1224,7 +1221,7 @@ class GlossaryManager(CollectionManager):
                     }
                 }
 
-        await self._async_new_classification_request(url, "AbstractConceptProperties",body)
+        await self._async_new_classification_request(url, "AbstractConceptProperties", body)
         logger.info(f"Added AbstractConcept classification to {term_guid}")
 
 
@@ -1285,7 +1282,7 @@ class GlossaryManager(CollectionManager):
             )
 
     async def _async_remove_is_abstract_concepts(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms. Async Version.
 
@@ -1336,11 +1333,11 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/is-abstract-concept/remove"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_classification_request(url, body)
         logger.info(f"Removed AbstractConcept classification to {term_guid}")
 
     def remove_is_abstract_concept(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms.
 
@@ -1457,7 +1454,7 @@ class GlossaryManager(CollectionManager):
                     }
                 }
 
-        await self._async_new_classification_request(url, "ContextDefinitionProperties",body)
+        await self._async_new_classification_request(url, "ContextDefinitionProperties", body)
         logger.info(f"Added AbstractConcept classification to {term_guid}")
 
 
@@ -1519,7 +1516,7 @@ class GlossaryManager(CollectionManager):
             )
 
     async def _async_remove_is_context_definition(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms. Async Version.
 
@@ -1570,11 +1567,11 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/is-context-definition/remove"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_classification_request(url, body)
         logger.info(f"Removed ContextDefinition classification to {term_guid}")
 
     def remove_is_context_definition(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms.
 
@@ -1691,7 +1688,7 @@ class GlossaryManager(CollectionManager):
                     }
                 }
 
-        await self._async_new_classification_request(url, "DataValueProperties",body)
+        await self._async_new_classification_request(url, "DataValueProperties", body)
         logger.info(f"Added DataValue classification to {term_guid}")
 
 
@@ -1753,7 +1750,7 @@ class GlossaryManager(CollectionManager):
             )
 
     async def _async_remove_is_data_value(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms. Async Version.
 
@@ -1804,11 +1801,11 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/is-data-value/remove"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_classification_request(url, body)
         logger.info(f"Removed DataValue classification to {term_guid}")
 
     def remove_is_data_value(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms.
 
@@ -1925,7 +1922,7 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/is-activity"
         )
-        await self._async_new_classification_request(url, "ActivityDescriptionProperties",body)
+        await self._async_new_classification_request(url, "ActivityDescriptionProperties", body)
         logger.info(f"Added DataValue classification to {term_guid}")
 
 
@@ -1987,7 +1984,7 @@ class GlossaryManager(CollectionManager):
             )
 
     async def _async_remove_activity_description(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms. Async Version.
 
@@ -2038,11 +2035,11 @@ class GlossaryManager(CollectionManager):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
             f"terms/{term_guid}/is-activity/remove"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_classification_request(url, body)
         logger.info(f"Removed ActivityDescription classification to {term_guid}")
 
     def remove_activity_description(
-            self, term_guid: str, body: dict | DeleteRequestBody = None,
+            self, term_guid: str, body: dict | DeleteClassificationRequestBody = None,
             ) -> None:
         """Add a relationship between terms.
 
@@ -2354,7 +2351,7 @@ class GlossaryManager(CollectionManager):
             )
 
     async def _async_remove_relationship_between_terms(
-            self, term1_guid: str, term2_guid: str, relationship_type: str, body: dict | DeleteRequestBody = None,
+            self, term1_guid: str, term2_guid: str, relationship_type: str, body: dict | DeleteRelationshipRequestBody = None,
             ) -> None:
         """Remove a relationship between terms. Async Version.
 
@@ -2398,10 +2395,10 @@ class GlossaryManager(CollectionManager):
             f"terms/{term1_guid}/relationships/{relationship_type}/terms/{term2_guid}/remove"
         )
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
 
     def remove_relationship_between_terms(
-            self, term1_guid: str, term2_guid: str, relationship_type: str, body: dict | DeleteRequestBody = None) -> None:
+            self, term1_guid: str, term2_guid: str, relationship_type: str, body: dict | DeleteRelationshipRequestBody = None) -> None:
 
         """Remove a relationship between terms.
 

pyegeria/governance_officer.py

@@ -33,7 +33,7 @@ from pyegeria.config import settings as app_settings
 from pyegeria.models import (SearchStringRequestBody, FilterRequestBody, NewElementRequestBody,
                              ReferenceableProperties, TemplateRequestBody,
                              UpdateElementRequestBody, UpdateStatusRequestBody, NewRelationshipRequestBody,
-                             DeleteRequestBody)
+                             DeleteElementRequestBody, DeleteRelationshipRequestBody,DeleteClassificationRequestBody)
 from pyegeria.utils import dynamic_catch
 
 GOV_DEF_PROPERTIES_LIST = ["GovernanceDefinitionProperties", "GovernanceStrategyProperties", "RegulationProperties",
@@ -851,7 +851,7 @@ class GovernanceOfficer(Client2):
 
     @dynamic_catch
     async def _async_delete_governance_definition(self, definition_guid: str,
-                                                  body: dict | DeleteRequestBody = None,
+                                                  body: dict | DeleteElementRequestBody = None,
                                                   cascade: bool = False) -> None:
         """ Delete a governance definition. Async Version.
 
@@ -863,7 +863,7 @@ class GovernanceOfficer(Client2):
         cascade: bool, optional, defaults to True
             If true, a cascade delete is performed.
 
-        body: dict DeleteRequestBodyt, optional, default = None
+        body: dict DeleteElementRequestBodyt, optional, default = None
             A dict representing the details of the relationship.
 
         Returns
@@ -895,10 +895,10 @@ class GovernanceOfficer(Client2):
             f"{self.platform_url}/s"
             f"ervers/{self.view_server}/api/open-metadata/governance-officer/governance-definitions/"
             f"{definition_guid}/delete")
-        await self._async_delete_request(url, body, cascade)
+        await self._async_delete_element_request(url, body, cascade)
         logger.info(f"Deleted collection {definition_guid} with cascade {cascade}")
 
-    def delete_governance_definition(self, definition_guid: str, body: dict | DeleteRequestBody = None,
+    def delete_governance_definition(self, definition_guid: str, body: dict | DeleteElementRequestBody = None,
                                      cascade: bool = False) -> None:
         """Delete a governance definition.
 
@@ -910,7 +910,7 @@ class GovernanceOfficer(Client2):
         cascade: bool, optional, defaults to True
             If true, a cascade delete is performed.
 
-        body: dict DeleteRequestBodyt, optional, default = None
+        body: dict DeleteElementRequestBodyt, optional, default = None
             A dict representing the details of the relationship.
 
         Returns
@@ -1065,7 +1065,7 @@ class GovernanceOfficer(Client2):
 
     @dynamic_catch
     async def _async_detach_peer_definitions(self, definition_guid1: str, relationship_type: str, definition_guid2: str,
-                                             body: dict | DeleteRequestBody = None) -> None:
+                                             body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach two peer governance definitions. Request body is optional. Async Version.
 
         Parameters
@@ -1110,12 +1110,12 @@ class GovernanceOfficer(Client2):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/"
             f"{self.url_marker}/governance-definitions/"
             f"{definition_guid1}/peer-definitions/{relationship_type}/{definition_guid2}/detach")
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(f"Detached peer definitions: {definition_guid1} -> {definition_guid2}")
 
     @dynamic_catch
     def detach_peer_definitions(self, definition_guid1: str, relationship_type: str, definition_guid2: str,
-                                body: dict = None | DeleteRequestBody) -> None:
+                                body: dict = None | DeleteRelationshipRequestBody) -> None:
         """ Detach two peer governance definitions. Request body is optional.
 
         Parameters
@@ -1287,7 +1287,7 @@ class GovernanceOfficer(Client2):
     @dynamic_catch
     async def _async_detach_supporting_definitions(self, definition_guid1: str, relationship_type: str,
                                                    definition_guid2: str,
-                                                   body: dict | DeleteRequestBody = None) -> None:
+                                                   body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a governance definition from a supporting governance definition.
             Request body is optional. Async Version.
 
@@ -1333,12 +1333,12 @@ class GovernanceOfficer(Client2):
             f"{self.url_marker}/governance-definitions/"
             f"{definition_guid1}/supporting-definitions/{relationship_type}/{definition_guid2}/detach"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(f"Detached digital supporting definitions: {definition_guid1} -> {definition_guid2}")
 
     @dynamic_catch
-    def detach_supporting_definitions(self, definition_guid: str, relationship_type: str, definition_guid2: str,
-                                      body: dict | DeleteRequestBody = None) -> None:
+    def detach_supporting_definitions(self, definition_guid1: str, relationship_type: str, definition_guid2: str,
+                                      body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a governance definition from a supporting governance definition.
             Request body is optional.
 
@@ -1481,7 +1481,7 @@ class GovernanceOfficer(Client2):
 
     @dynamic_catch
     async def _async_detach_governed_by_definition(self, element_guid: str, definition_guid: str,
-                                                   body: dict | DeleteRequestBody = None) -> None:
+                                                   body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a governance definition from a supporting governance definition.
             Request body is optional. Async Version.
 
@@ -1512,7 +1512,7 @@ class GovernanceOfficer(Client2):
 
         Body structure:
         {
-          "class" : "DeleteRequestBody",
+          "class" : "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime" : "{{$isoTimestamp}}",
@@ -1524,12 +1524,12 @@ class GovernanceOfficer(Client2):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/"
             f"{self.url_marker}/elements/{element_guid}/governed-by/{definition_guid}/detach"
         )
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(f"Detached governed-by relationshup between: {definition_guid} -> {element_guid}")
 
     @dynamic_catch
     def detach_governed_by_definitio(self, element_guid: str, definition_guid: str,
-                                      body: dict | DeleteRequestBody = None) -> None:
+                                      body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a governance definition from a supporting governance definition.
             Request body is optional.
 
@@ -1560,7 +1560,7 @@ class GovernanceOfficer(Client2):
 
         Body structure:
         {
-          "class" : "DeleteRequestBody",
+          "class" : "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime" : "{{$isoTimestamp}}",
@@ -1575,7 +1575,7 @@ class GovernanceOfficer(Client2):
 
 
     @dynamic_catch
-    async def _async_delete_governance_definition(self, guid: str, body: dict | DeleteRequestBody = None) -> None:
+    async def _async_delete_governance_definition(self, guid: str, body: dict | DeleteElementRequestBody = None) -> None:
         """ Delete an information supply. Async version.
 
         Parameters
@@ -1617,12 +1617,12 @@ class GovernanceOfficer(Client2):
        """
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/"
                f"{self.url_marker}/governance-definitions/{guid}/delete")
-        await self._async_delete_request(url, body)
+        await self._async_delete_element_request(url, body)
         logger.info(f"Deleted governance definition: {guid} ")
 
 
     @dynamic_catch
-    def delete_governance_definition(self, guid: str, body: dict | DeleteRequestBody = None) -> None:
+    def delete_governance_definition(self, guid: str, body: dict | DeleteElementRequestBody = None) -> None:
         """ Delete an information supply. Request body is optional. Async version.
 
         Parameters
@@ -2180,7 +2180,7 @@ class GovernanceOfficer(Client2):
 
     @dynamic_catch
     async def _async_detach_design_from_implementation(self, design_desc_guid: str, implementation_guid: str,
-                                                       body: dict | DeleteRequestBody = None) -> None:
+                                                       body: dict | DeleteElementRequestBody = None) -> None:
         """ Detach a governance definition from its implementation. Async Version.
 
         Parameters
@@ -2221,13 +2221,13 @@ class GovernanceOfficer(Client2):
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/{self.url_marker}/designs/"
                f"{design_desc_guid}/implementations/{implementation_guid}/detach")
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached design from implementation: {design_desc_guid} -> {implementation_guid}")
 
     @dynamic_catch
     def detach_design_from_implementation(self, design_desc_guid: str, implementation_guid: str,
-                                          body: dict | DeleteRequestBody = None) -> None:
+                                          body: dict | DeleteElementRequestBody = None) -> None:
         """ Detach a governance definition from its implementation. Request body is optional.
 
         Parameters
@@ -2383,7 +2383,7 @@ class GovernanceOfficer(Client2):
 
     @dynamic_catch
     async def _async_detach_implementation_resource(self, design_desc_guid: str, implementation_guid: str,
-                                                    body: dict | DeleteRequestBody = None) -> None:
+                                                    body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a design object such as a solution component or governance definition from one of its implementation
             resources. Request body is optional. Async version.
 
@@ -2425,12 +2425,12 @@ class GovernanceOfficer(Client2):
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/{self.url_marker}/designs/"
                f"{design_desc_guid}/implementation-resources/{implementation_guid}/detach")
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached design from implementation resource: {design_desc_guid} -> {implementation_guid}")
 
     def detach_implementation_resource(self, design_desc_guid: str, implementation_guid: str,
-                                       body: dict | DeleteRequestBody = None) -> None:
+                                       body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a design object such as a solution component or governance definition from one of its implementation
             resources. Request body is optional.
 
@@ -2570,10 +2570,10 @@ class GovernanceOfficer(Client2):
         }
         """
         loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._async_link_governance_results(gov_metric_guid, data_asset_guid, implementation_guid, body))
+        loop.run_until_complete(self._async_link_governance_results(gov_metric_guid, data_asset_guid, body))
 
     @dynamic_catch
-    async def _async_detach_governance_results(self, gov_metric_guid: str, data_asset_guid: str, body: dict | DeleteRequestBody = None) -> None:
+    async def _async_detach_governance_results(self, gov_metric_guid: str, data_asset_guid: str, body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach an governance metric from its measurements data set. Request body is optional.
             https://egeria-project.org/concepts/governance-definition/ Async version.
 
@@ -2611,12 +2611,12 @@ class GovernanceOfficer(Client2):
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/{self.url_marker}/governance-metrics/"
                f"{gov_metric_guid}/measurements/{data_asset_guid}/detach")
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached governance metric from the asset where measurements were stored: {gov_metric_guid} -> {data_asset_guid}")
 
     def detach_governance_results(self, gov_metric_guid: str, data_asset_guid: str,
-                                  body: dict | DeleteRequestBody = None) -> None:
+                                  body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach an governance metric from its measurements data set. Request body is optional.
              https://egeria-project.org/concepts/governance-definition/
 

pyegeria/output_formatter.py

@@ -440,14 +440,16 @@ def generate_entity_md(elements: List[Dict],
             cols = returned_struct.get('formats', {}).get('attributes', [])
             # Find value from 'display_name' or 'title'
             for col in cols:
-                if col.get('key') in ('display_name', 'title'):
+                if col.get('key') in ('display_name', 'title', 'keyword'):
                     display_name = col.get('value')
                     if display_name:
                         break
         else:
-            display_name = props.get('display_name') or props.get('title')
+            display_name = props.get('display_name') or props.get('title') or props.get('keyword')
 
-        if display_name is None:
+        if display_name is None and (keyword:= element['properties'].get('keyword',None)) is not None:
+            display_name = keyword
+        elif display_name is None:
             display_name = "NO DISPLAY NAME"
 
         # Format header based on output format
@@ -632,16 +634,20 @@ def generate_entity_dict(elements: List[Dict],
 
     #####
     # Add attributes based on column spec if available, otherwise, add all
+    import copy
     for element in elements:
         if element is None:
             continue
 
         guid = element.get('elementHeader', {}).get('guid')
 
+        # Work on a per-element deep copy of the columns structure to avoid value leakage across rows
+        local_columns_struct = copy.deepcopy(columns_struct) if columns_struct is not None else None
+
         returned_struct = None
-        if columns_struct is not None:
+        if local_columns_struct is not None:
             try:
-                returned_struct = extract_properties_func(element, columns_struct)
+                returned_struct = extract_properties_func(element, local_columns_struct)
             except TypeError as e:
                 logger.info(f"Error - didn't find extractor?: {e}")
                 returned_struct = None
@@ -654,7 +660,7 @@ def generate_entity_dict(elements: List[Dict],
         # Create entity dictionary
         entity_dict = {}
 
-        columns = columns_struct['formats'].get('attributes', None) if columns_struct else None
+        cols = local_columns_struct['formats'].get('attributes', None) if local_columns_struct else None
         if returned_struct is not None:
             for column in returned_struct.get('formats', {}).get('attributes', []):
                 key = column.get('key')
@@ -664,9 +670,19 @@ def generate_entity_dict(elements: List[Dict],
                     value = additional_props[key]
                 if column.get('format'):
                     value = format_for_markdown_table(value, guid)
-                entity_dict[name] = value
-        elif columns:
-            for column in columns:
+                # Avoid overwriting when multiple columns share the same display name in a spec
+                dict_key = name
+                if dict_key in entity_dict:
+                    logger.warning(f"DICT key collision for display name '{dict_key}'. Suffixing duplicate to preserve all values.")
+                    suffix_idx = 1
+                    tmp_key = f"{dict_key}_{suffix_idx}"
+                    while tmp_key in entity_dict:
+                        suffix_idx += 1
+                        tmp_key = f"{dict_key}_{suffix_idx}"
+                    dict_key = tmp_key
+                entity_dict[dict_key] = value
+        elif cols:
+            for column in cols:
                 key = column['key']
                 name = column['name']
                 value = ""
@@ -677,9 +693,18 @@ def generate_entity_dict(elements: List[Dict],
                     value = additional_props[key]
                 if  column.get('format', None):
                     value = format_for_markdown_table(value, guid or props.get('GUID'))
-                entity_dict[name] = value
+                dict_key = name
+                if dict_key in entity_dict:
+                    logger.warning(f"DICT key collision for display name '{dict_key}'. Suffixing duplicate to preserve all values.")
+                    suffix_idx = 1
+                    tmp_key = f"{dict_key}_{suffix_idx}"
+                    while tmp_key in entity_dict:
+                        suffix_idx += 1
+                        tmp_key = f"{dict_key}_{suffix_idx}"
+                    dict_key = tmp_key
+                entity_dict[dict_key] = value
         else:
-            props = extract_properties_func(element, columns_struct)
+            props = extract_properties_func(element, local_columns_struct)
             # Add properties based on include/exclude lists
             for key, value in props.items():
                 if key not in ['properties', 'mermaid']:  # Skip the raw properties object