pyegeria 5.4.7.9__py3-none-any.whl → 5.4.8.2__py3-none-any.whl

pyegeria/solution_architect.py

@@ -15,10 +15,11 @@ from httpx import Response
 from loguru import logger
 
 from pyegeria.models import NewElementRequestBody, TemplateRequestBody, UpdateElementRequestBody, \
-    NewRelationshipRequestBody, DeleteRequestBody, UpdateStatusRequestBody, SearchStringRequestBody
+    NewRelationshipRequestBody, UpdateStatusRequestBody, SearchStringRequestBody, DeleteElementRequestBody, \
+    DeleteRelationshipRequestBody
 from pyegeria.output_formatter import make_preamble, make_md_attribute, generate_output, extract_mermaid_only, \
     extract_basic_dict, MD_SEPARATOR, populate_common_columns
-from pyegeria._output_formats import select_output_format_set, get_output_format_type_match
+from pyegeria.base_report_formats import select_report_spec, get_report_spec_match
 from pyegeria._validators import validate_guid
 from pyegeria.governance_officer import GovernanceOfficer
 from pyegeria._client_new import Client2, max_paging_size
@@ -502,7 +503,7 @@ class SolutionArchitect(Client2):
         # We only set a column's value if it is currently empty (None or "").
         try:
             formats = col_data.get('formats') if isinstance(col_data, dict) else None
-            columns = formats.get('columns') if isinstance(formats, dict) else None
+            columns = formats.get('attributes') if isinstance(formats, dict) else None
             if isinstance(columns, list) and isinstance(rel_dict, dict):
                 for col in columns:
                     if not isinstance(col, dict):
@@ -531,24 +532,24 @@ class SolutionArchitect(Client2):
     # Markdown output support
     #
     def generate_info_supply_chain_output(self, elements: list | dict, search_string: str, element_type_name: str | None,
-                                          output_format: str = 'MD', output_format_set: dict | str = None) -> str | list:
+                                          output_format: str = 'MD', report_spec: dict | str = None) -> str | list:
         """Render Information Supply Chains using the shared output pipeline.
         """
         if output_format == "MERMAID":
             return extract_mermaid_only(elements)
 
         entity_type = "Information Supply Chain"
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            elif isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            elif isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
             else:
                 output_formats = None
         else:
-            output_formats = select_output_format_set("Information Supply Chains", output_format)
+            output_formats = select_report_spec("Information Supply Chains", output_format)
         if output_formats is None:
-            output_formats = select_output_format_set("Default", output_format)
+            output_formats = select_report_spec("Default", output_format)
 
         return generate_output(
             elements=elements,
@@ -561,7 +562,7 @@ class SolutionArchitect(Client2):
         )
 
     def generate_solution_blueprint_output(self, elements: list | dict, search_string: str, element_type_name: str | None,
-                                           output_format: str = 'MD', output_format_set: dict | str = None) -> str | list:
+                                           output_format: str = 'MD', report_spec: dict | str = None) -> str | list:
         """
         Generate output for solution blueprints in the specified format.
 
@@ -577,17 +578,17 @@ class SolutionArchitect(Client2):
             return extract_mermaid_only(elements)
 
         entity_type = "Solution Blueprint"
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            elif isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            elif isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
             else:
                 output_formats = None
         else:
-            output_formats = select_output_format_set("Solution Blueprints", output_format)
+            output_formats = select_report_spec("Solution Blueprints", output_format)
         if output_formats is None:
-            output_formats = select_output_format_set("Default", output_format)
+            output_formats = select_report_spec("Default", output_format)
 
         return generate_output(
             elements=elements,
@@ -600,7 +601,7 @@ class SolutionArchitect(Client2):
         )
 
     def generate_solution_roles_output(self, elements: list | dict, search_string: str, element_type_name: str | None,
-                                       output_format: str = 'MD', output_format_set: dict | str = None) -> str | list:
+                                       output_format: str = 'MD', report_spec: dict | str = None) -> str | list:
         """
         Generate output for solution roles in the specified format.
 
@@ -616,17 +617,17 @@ class SolutionArchitect(Client2):
             return extract_mermaid_only(elements)
 
         entity_type = "Solution Role"
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            elif isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            elif isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
             else:
                 output_formats = None
         else:
-            output_formats = select_output_format_set("Solution Roles", output_format)
+            output_formats = select_report_spec("Solution Roles", output_format)
         if output_formats is None:
-            output_formats = select_output_format_set("Default", output_format)
+            output_formats = select_report_spec("Default", output_format)
 
         return generate_output(
             elements=elements,
@@ -639,7 +640,7 @@ class SolutionArchitect(Client2):
         )
 
     def generate_solution_components_output(self, elements: list | dict, search_string: str, element_type_name: str | None,
-                                            output_format: str = 'MD', output_format_set: dict | str = None) -> str | list:
+                                            output_format: str = 'MD', report_spec: dict | str = None) -> str | list:
         """
         Generate output for solution components in the specified format.
 
@@ -660,17 +661,17 @@ class SolutionArchitect(Client2):
             return extract_mermaid_only(elements)
 
         entity_type = "Solution Component"
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            elif isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            elif isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
             else:
                 output_formats = None
         else:
-            output_formats = select_output_format_set("Solution Components", output_format)
+            output_formats = select_report_spec("Solution Components", output_format)
         if output_formats is None:
-            output_formats = select_output_format_set("Default", output_format)
+            output_formats = select_report_spec("Default", output_format)
 
         return generate_output(
             elements=elements,
@@ -1218,7 +1219,7 @@ class SolutionArchitect(Client2):
 
     @dynamic_catch
     async def _async_unlink_peer_info_supply_chains(self, peer1_guid: str, peer2_guid: str,
-                                                       body: dict | DeleteRequestBody = None) -> None:
+                                                       body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach two peers in an information supply chain from one another.  The linked elements are of type
            'Referenceable' to allow significant data stores to be included in the definition of the information
            supply chain. Request body is optional. Async Version.
@@ -1229,7 +1230,7 @@ class SolutionArchitect(Client2):
             guid of the first information supply chain to link.
         peer2_guid: str
             guid of the second information supply chain to link.
-        body: dict | DeleteRequestBody, optional
+        body: dict | DeleteRelationshipRequestBody, optional
             The body describing the link between the two segments.
 
         Returns
@@ -1250,7 +1251,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": {{isotime}},
@@ -1263,7 +1264,7 @@ class SolutionArchitect(Client2):
         validate_guid(peer2_guid)
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"information-supply-chains/{peer1_guid}/peer-links/{peer2_guid}/detach")
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached supply chains  {peer1_guid} -> {peer2_guid}")
 
@@ -1464,12 +1465,12 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"information-supply-chains/{chain_guid}/compositions/{nested_chain_guid}/detach")
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(f"Removed composition of {nested_chain_guid} -> {chain_guid}")
 
     @dynamic_catch
     def decompose_info_supply_chains(self, chain_guid: str, nested_chain_guid: str,
-                                                       body: dict | DeleteRequestBody = None) -> None:
+                                                       body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach two peers in an information supply chain from one another.  Request body is optional.
 
         Parameters
@@ -1478,7 +1479,7 @@ class SolutionArchitect(Client2):
             guid of the first information supply chain to link.
         nested_chain_guid: str
             guid of the second information supply chain to link.
-        body: dict | DeleteRequestBody, optional
+        body: dict | DeleteRelationshipRequestBody, optional
             The body describing the link between the two segments.
 
         Returns
@@ -1499,7 +1500,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": {{isotime}},
@@ -1512,7 +1513,7 @@ class SolutionArchitect(Client2):
                                                                          nested_chain_guid, body))
 
     @dynamic_catch
-    async def _async_delete_info_supply_chain(self, guid: str, body: dict | DeleteRequestBody = None, cascade_delete: bool = False) -> None:
+    async def _async_delete_info_supply_chain(self, guid: str, body: dict | DeleteElementRequestBody = None, cascade_delete: bool = False) -> None:
         """Delete an information supply chain. Async Version.
 
            Parameters
@@ -1542,7 +1543,7 @@ class SolutionArchitect(Client2):
 
            Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -1555,18 +1556,18 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"information-supply-chains/{guid}/delete")
 
-        await self._async_delete_request(url, body, cascade_delete=cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete=cascade_delete)
         logger.info(f"Deleted Info Supply Chain  {guid} with cascade {cascade_delete}")
 
     @dynamic_catch
-    def delete_info_supply_chain(self, guid: str, body: dict | DeleteRequestBody= None, cascade_delete: bool = False) -> None:
+    def delete_info_supply_chain(self, guid: str, body: dict | DeleteElementRequestBody= None, cascade_delete: bool = False) -> None:
         """ Delete an information supply chain.
 
             Parameters
             ----------
             guid: str
                 guid of the information supply chain to delete.
-            body: dict | DeleteRequestBody, optional
+            body: dict | DeleteElementRequestBody, optional
                 A dictionary containing parameters of the deletion.
            cascade_delete: bool, optional
                If true, the child objects will also be deleted.
@@ -1588,7 +1589,7 @@ class SolutionArchitect(Client2):
 
             Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -1604,7 +1605,7 @@ class SolutionArchitect(Client2):
                                                     starts_with: bool = True, ends_with: bool = False,
                                                     ignore_case: bool = False, start_from: int = 0,
                                                     page_size: int = 0, output_format: str = 'JSON',
-                                                    output_format_set: str = None,
+                                                    report_spec: str = None,
                                                     body: dict| SearchStringRequestBody = None) -> (list[dict] | str):
         """ Retrieve a list of all information supply chains
              Parameters
@@ -1652,7 +1653,7 @@ class SolutionArchitect(Client2):
                 }
         """
 
-        return self.find_information_supply_chains("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, output_format_set, body)
+        return self.find_information_supply_chains("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, report_spec, body)
 
     async def _async_find_information_supply_chains(self, search_string: str = "*", add_implementation: bool = True,
                                                     classification_names: list[str] = None,
@@ -1660,7 +1661,7 @@ class SolutionArchitect(Client2):
                                                     starts_with: bool = True, ends_with: bool = False,
                                                     ignore_case: bool = False, start_from: int = 0,
                                                     page_size: int = 0, output_format: str = 'JSON',
-                                                    output_format_set: str = None,
+                                                    report_spec: str = None,
                                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve the list of information supply chain metadata elements that contain the search string.
                https://egeria-project.org/concepts/information-supply-chain
@@ -1725,7 +1726,7 @@ class SolutionArchitect(Client2):
                                               metadata_element_types=metadata_element_types,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
                                               start_from=start_from, page_size=page_size,
-                                              output_format=output_format, output_format_set=output_format_set,
+                                              output_format=output_format, report_spec=report_spec,
                                               body=body)
 
 
@@ -1736,7 +1737,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve the list of information supply chain metadata elements that contain the search string.
           https://egeria-project.org/concepts/information-supply-chain
@@ -1803,7 +1804,7 @@ class SolutionArchitect(Client2):
             self._async_find_information_supply_chains(search_string, add_implementation,classification_names, metadata_element_types,
                                                        starts_with, ends_with, ignore_case,
                                                        start_from, page_size,  output_format,
-                                                       output_format_set, body))
+                                                       report_spec, body))
         return response
 
     async def _async_get_info_supply_chain_by_name(self, search_filter: str, body: dict = None,
@@ -2562,7 +2563,7 @@ class SolutionArchitect(Client2):
 
 
     @dynamic_catch
-    async def _async_delete_solution_blueprint(self, guid: str, body: dict | DeleteRequestBody, cascade: bool = False) -> None:
+    async def _async_delete_solution_blueprint(self, guid: str, body: dict | DeleteElementRequestBody, cascade: bool = False) -> None:
         """ Delete a solution blueprint. Async Version.
          Parameters
            ----------
@@ -2591,7 +2592,7 @@ class SolutionArchitect(Client2):
 
            Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -2603,11 +2604,11 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"information-supply-chains/{guid}/delete")
 
-        await self._async_delete_request(url, body, cascade_delete=cascade)
+        await self._async_delete_element_request(url, body, cascade_delete=cascade)
         logger.info(f"Deleted Info Supply Chain  {guid} with cascade {cascade}")
 
     @dynamic_catch
-    def delete_solution_blueprint(self, guid: str, body: dict | DeleteRequestBody = None,
+    def delete_solution_blueprint(self, guid: str, body: dict | DeleteElementRequestBody = None,
                                  cascade: bool = False) -> None:
         """ Delete an Solution Blueprint.
 
@@ -2615,7 +2616,7 @@ class SolutionArchitect(Client2):
             ----------
             guid: str
                 guid of the information supply chain to delete.
-            body: dict | DeleteRequestBody, optional
+            body: dict | DeleteElementRequestBody, optional
                 A dictionary containing parameters of the deletion.
            cascade: bool, optional
                If true, the child objects will also be deleted.
@@ -2637,7 +2638,7 @@ class SolutionArchitect(Client2):
 
             Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -2755,7 +2756,7 @@ class SolutionArchitect(Client2):
 
     @dynamic_catch
     async def _async_detach_solution_component_from_blueprint(self, blueprint_guid: str, component_guid: str,
-                                                              body: dict | DeleteRequestBody = None) -> None:
+                                                              body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution component from a solution blueprint.
             Async Version.
 
@@ -2799,13 +2800,13 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-blueprints/{blueprint_guid}/solution-components/{component_guid}/detach")
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached component from blueprint  {component_guid} -> {blueprint_guid}")
 
     @dynamic_catch
     def detach_solution_component_from_blueprint(self, blueprint_guid: str, component_guid: str,
-                                                 body: dict | DeleteRequestBody = None) -> None:
+                                                 body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution component from a solution blueprint.
 
         Parameters
@@ -2851,7 +2852,7 @@ class SolutionArchitect(Client2):
 
     @dynamic_catch
     async def _async_delete_solution_blueprint(self, blueprint_guid: str, cascade_delete: bool = False,
-                                               body: dict | DeleteRequestBody = None) -> None:
+                                               body: dict | DeleteElementRequestBody = None) -> None:
         """Delete a solution blueprint. Async Version.
 
            Parameters
@@ -2895,11 +2896,11 @@ class SolutionArchitect(Client2):
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-blueprints/{blueprint_guid}/delete")
-        await self._async_delete_request(url, body, cascade_delete=cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete=cascade_delete)
         logger.info(f"Deleted Blueprint  {blueprint_guid} with cascade {cascade_delete}")
 
     @dynamic_catch
-    def delete_solution_blueprint(self, blueprint_guid: str, cascade_delete: bool = False, body: dict | DeleteRequestBody = None) -> None:
+    def delete_solution_blueprint(self, blueprint_guid: str, cascade_delete: bool = False, body: dict | DeleteElementRequestBody = None) -> None:
         """ Delete a solution blueprint.
             Parameters
             ----------
@@ -2947,7 +2948,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = "Solution-Blueprint",
+                                    report_spec: str = "Solution-Blueprint",
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve the solution blueprint elements that contain the search string.
            https://egeria-project.org/concepts/solution-blueprint
@@ -3012,7 +3013,7 @@ class SolutionArchitect(Client2):
                                               metadata_element_types=metadata_element_types,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
                                               start_from=start_from, page_size=page_size,
-                                              output_format=output_format, output_format_set=output_format_set,
+                                              output_format=output_format, report_spec=report_spec,
                                               body=body)
 
 
@@ -3021,7 +3022,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve the list of solution blueprint elements that contain the search string.
            https://egeria-project.org/concepts/solution-blueprint
@@ -3084,7 +3085,7 @@ class SolutionArchitect(Client2):
         response = loop.run_until_complete(
             self._async_find_solution_blueprints(search_string, classification_names, metadata_element_types,
                                                   starts_with, ends_with, ignore_case, start_from,
-                                                  page_size, output_format, output_format_set, body))
+                                                  page_size, output_format, report_spec, body))
         return response
 
     def find_all_solution_blueprints(self, classification_names: list[str] = None,
@@ -3092,19 +3093,19 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve a list of all solution blueprint elements
         https://egeria-project.org/concepts/solution-blueprint
         """
         return self.find_solution_blueprints("*", classification_names, metadata_element_types,
                                               starts_with, ends_with, ignore_case, start_from,
-                                              page_size, output_format, output_format_set, body)
+                                              page_size, output_format, report_spec, body)
 
 
     async def _async_get_solution_blueprint_by_guid(self, guid: str, body: dict = None,
                                                     output_format: str = "JSON",
-                                                    output_format_set: str| Dict = "Solution-Blueprint") -> dict | str:
+                                                    report_spec: str| Dict = "Solution-Blueprint") -> dict | str:
         """Return the properties of a specific solution blueprint. Async Version.
 
             Parameters
@@ -3120,7 +3121,7 @@ class SolutionArchitect(Client2):
                 FORM - output markdown with a preamble for a form
                 REPORT - output markdown with a preamble for a report
                 MERMAID - output mermaid markdown
-            output_format_set: str|Dict, optional
+            report_spec: str|Dict, optional
                 Structure of content to return.
 
             Returns
@@ -3161,11 +3162,11 @@ class SolutionArchitect(Client2):
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return a simplified markdown representation
             return self.generate_solution_blueprint_output(element, guid, "SolutionBlueprint",
-                                                           output_format, output_format_set=output_format_set)
+                                                           output_format, report_spec=report_spec)
         return response.json().get("element", NO_ELEMENTS_FOUND)
 
     def get_solution_blueprint_by_guid(self, guid: str, body: dict = None, output_format: str = "JSON",
-                                       output_format_set: str| Dict = "Solution-Blueprint") -> dict | str:
+                                       report_spec: str| Dict = "Solution-Blueprint") -> dict | str:
         """ Return the properties of a specific solution blueprint.
 
             Parameters
@@ -3181,7 +3182,7 @@ class SolutionArchitect(Client2):
                 FORM - output markdown with a preamble for a form
                 REPORT - output markdown with a preamble for a report
                 MERMAID - output mermaid markdown
-            output_format_set: str|Dict, optional
+            report_spec: str|Dict, optional
                 Structure of content to return.
 
             Returns
@@ -3211,12 +3212,12 @@ class SolutionArchitect(Client2):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(self._async_get_solution_blueprint_by_guid(guid, body,
-                                                                                      output_format, output_format_set))
+                                                                                      output_format, report_spec))
         return response
 
     async def _async_get_solution_blueprints_by_name(self, search_filter: str, body: dict = None, start_from: int = 0,
                                                      page_size: int = max_paging_size,
-                                                     output_format: str = "JSON", output_format_set: str| Dict = "Solution-Blueprint") -> dict | str:
+                                                     output_format: str = "JSON", report_spec: str| Dict = "Solution-Blueprint") -> dict | str:
         """ Returns the list of solution blueprints with a particular name. Async Version.
 
             Parameters
@@ -3232,7 +3233,7 @@ class SolutionArchitect(Client2):
                 FORM - output markdown with a preamble for a form
                 REPORT - output markdown with a preamble for a report
                 MERMAID - output mermaid markdown
-            output_format_set: str|Dict, optional
+            report_spec: str|Dict, optional
                 Structure of content to return.
 
             Returns
@@ -3280,12 +3281,12 @@ class SolutionArchitect(Client2):
         if element == NO_ELEMENTS_FOUND:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return a simplified markdown representation
-            return self.generate_solution_blueprint_output(element, search_filter, output_format, output_format_set=output_format_set)
+            return self.generate_solution_blueprint_output(element, search_filter, output_format, report_spec=report_spec)
         return response.json().get("elements", NO_ELEMENTS_FOUND)
 
     def get_solution_blueprints_by_name(self, search_filter: str, body: dict = None, start_from: int = 0,
                                         page_size: int = max_paging_size, output_format: str = "JSON",
-                                        output_format_set: str| Dict = "Solution-Blueprint") -> dict | str:
+                                        report_spec: str| Dict = "Solution-Blueprint") -> dict | str:
         """ Returns the list of solution blueprints with a particular name.
 
             Parameters
@@ -3306,7 +3307,7 @@ class SolutionArchitect(Client2):
                 FORM - output markdown with a preamble for a form
                 REPORT - output markdown with a preamble for a report
                 MERMAID - output mermaid markdown
-            output_format_set: str|Dict, optional
+            report_spec: str|Dict, optional
                 Structure of content to return.
 
             Returns
@@ -3341,7 +3342,7 @@ class SolutionArchitect(Client2):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_solution_blueprints_by_name(search_filter, body, start_from, page_size, output_format, output_format_set))
+            self._async_get_solution_blueprints_by_name(search_filter, body, start_from, page_size, output_format, report_spec))
         return response
 
 
@@ -3887,7 +3888,7 @@ class SolutionArchitect(Client2):
         loop.run_until_complete(self._async_link_subcomponent(component_guid, sub_component_guid, body))
     @dynamic_catch
     async def _async_detach_sub_component(self, parent_component_guid: str, member_component_guid: str,
-                                          body: dict |DeleteRequestBody = None) -> None:
+                                          body: dict |DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution component from a solution component.
             Async Version.
 
@@ -3918,7 +3919,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": {{isotime}},
@@ -3931,12 +3932,12 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-components/{parent_component_guid}/subcomponents/{member_component_guid}/detach")
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached components  {parent_component_guid} -> {member_component_guid}")
 
     @dynamic_catch
-    def detach_sub_component(self, parent_component_guid: str, member_component_guid: str, body: dict| DeleteRequestBody = None) -> None:
+    def detach_sub_component(self, parent_component_guid: str, member_component_guid: str, body: dict| DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution component from a solution component.
             Async Version.
 
@@ -3946,7 +3947,7 @@ class SolutionArchitect(Client2):
             guid of the parent component to disconnect from.
         member_component_guid: str
             guid of the member (child) component to disconnect.
-        body: dict | DeleteRequestBody
+        body: dict | DeleteRelationshipRequestBody
             The body describing the request.
 
         Returns
@@ -3967,7 +3968,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": {{isotime}},
@@ -4081,7 +4082,7 @@ class SolutionArchitect(Client2):
 
     @dynamic_catch
     async def _async_detach_solution_linking_wire(self, component1_guid: str, component2_guid: str,
-                                                  body: dict | DeleteRequestBody = None) -> None:
+                                                  body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution component from a peer solution component.
             Async Version.
 
@@ -4091,7 +4092,7 @@ class SolutionArchitect(Client2):
             GUID of the first component to unlink.
         component2_guid: str
             GUID of the second component to unlink.
-        body: dict | DeleteRequestBody
+        body: dict | DeleteRelationshipRequestBody
             The body describing the request.
 
         Returns
@@ -4112,7 +4113,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class" : "DeleteRequestBody",
+          "class" : "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime" : "{{$isoTimestamp}}",
@@ -4125,12 +4126,12 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-components/{component1_guid}/wired-to/{component2_guid}/detach")
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached solution linking wire between  {component1_guid} -> {component2_guid}")
 
     @dynamic_catch
-    def detach_solution_linking_wire(self, component1_guid: str, component2_guid: str, body: dict | DeleteRequestBody = None) -> None:
+    def detach_solution_linking_wire(self, component1_guid: str, component2_guid: str, body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution component from a peer solution component.
                     Async Version.
 
@@ -4140,7 +4141,7 @@ class SolutionArchitect(Client2):
                     GUID of the first component to unlink.
                 component2_guid: str
                     GUID of the second component to unlink.
-                body: dict | DeleteRequestBody
+                body: dict | DeleteRelationshipRequestBody
                     The body describing the request.
                     The body describing the request.
 
@@ -4162,7 +4163,7 @@ class SolutionArchitect(Client2):
 
                 Body structure:
                 {
-                  "class" : "DeleteRequestBody",
+                  "class" : "DeleteRelationshipRequestBody",
                   "externalSourceGUID": "add guid here",
                   "externalSourceName": "add qualified name here",
                   "effectiveTime" : "{{$isoTimestamp}}",
@@ -4176,7 +4177,7 @@ class SolutionArchitect(Client2):
 
     @dynamic_catch
     async def _async_delete_solution_component(self, solution_component_guid: str, cascade_delete: bool = False,
-                                               body: dict  | DeleteRequestBody= None) -> None:
+                                               body: dict  | DeleteElementRequestBody= None) -> None:
         """Delete a solution component. Async Version.
 
            Parameters
@@ -4185,7 +4186,7 @@ class SolutionArchitect(Client2):
                guid of the component to delete.
            cascade_delete: bool, optional, default: False
                Cascade the delete to dependent objects?
-           body: dict | DeleteRequestBody, optional
+           body: dict | DeleteElementRequestBody, optional
                A dictionary containing parameters for the deletion.
 
            Returns
@@ -4206,7 +4207,7 @@ class SolutionArchitect(Client2):
 
            Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -4218,12 +4219,12 @@ class SolutionArchitect(Client2):
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-components/{solution_component_guid}/delete")
-        await self._async_delete_request(url, body, cascade_delete=cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete=cascade_delete)
         logger.info(f"Deleted Solution Component  {solution_component_guid} with cascade {cascade_delete}")
 
     @dynamic_catch
     def delete_solution_component(self, solution_component_guid: str, cascade_delete: bool = False,
-                                  body: dict | DeleteRequestBody = None) -> None:
+                                  body: dict | DeleteElementRequestBody = None) -> None:
         """Delete a solution component.
            Parameters
            ----------
@@ -4231,7 +4232,7 @@ class SolutionArchitect(Client2):
                guid of the component to delete.
            cascade_delete: bool, optional, default: False
                Cascade the delete to dependent objects?
-           body: dict | DeleteRequestBody, optional
+           body: dict | DeleteElementRequestBody, optional
                A dictionary containing parameters for the deletion.
 
            Returns
@@ -4252,7 +4253,7 @@ class SolutionArchitect(Client2):
 
            Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -4268,7 +4269,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """ Retrieve the solution component elements that contain the search string. The solutions components returned
             include information about consumers, actors, and other solution components that are associated with them.
@@ -4335,7 +4336,7 @@ class SolutionArchitect(Client2):
                                               metadata_element_types=metadata_element_types,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
                                               start_from=start_from, page_size=page_size,
-                                              output_format=output_format, output_format_set=output_format_set,
+                                              output_format=output_format, report_spec=report_spec,
                                               body=body)
 
     def find_solution_components(self, search_string: str = "*", classification_names: list[str] = None,
@@ -4343,7 +4344,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """ Retrieve the solution component elements that contain the search string. The solutions components returned
             include information about consumers, actors, and other solution components that are associated with them.
@@ -4402,7 +4403,7 @@ class SolutionArchitect(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_solution_components(search_string, classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, output_format_set, body))
+            self._async_find_solution_components(search_string, classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, report_spec, body))
         return response
 
     def find_all_solution_components(self, classification_names: list[str] = None,
@@ -4410,12 +4411,12 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve a list of all solution component elements
         https://egeria-project.org/concepts/solution-components
         """
-        return self.find_solution_components("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, output_format_set, body)
+        return self.find_solution_components("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, report_spec, body)
 
 
     async def _async_get_solution_components_by_name(self, search_filter: str, body: dict = None, start_from: int = 0,
@@ -4543,7 +4544,7 @@ class SolutionArchitect(Client2):
         return response
 
     async def _async_get_solution_component_by_guid(self, guid: str, body: dict = None,
-                                                    output_format: str = "JSON", output_format_set: str = "Solution-Component-DrE") -> dict | str:
+                                                    output_format: str = "JSON", report_spec: str = "Solution-Component-DrE") -> dict | str:
         """ Return the properties of a specific solution component. Async Version.
 
             Parameters
@@ -4559,7 +4560,7 @@ class SolutionArchitect(Client2):
                 FORM - output markdown with a preamble for a form
                 REPORT - output markdown with a preamble for a report
                 MERMAID - output mermaid markdown
-            output_format_set: str, default = "Solution-Component-DrE"
+            report_spec: str, default = "Solution-Component-DrE"
                 Structure of output to produce:
 
             Returns
@@ -4592,7 +4593,7 @@ class SolutionArchitect(Client2):
                f"solution-components/{guid}/retrieve")
         response = await self._async_get_guid_request(url, 'SolutionComponent',
                                                       self.generate_solution_components_output,
-                                                      output_format, output_format_set, body)
+                                                      output_format, report_spec, body)
         return response
 
         # if body is None:
@@ -5365,7 +5366,7 @@ class SolutionArchitect(Client2):
         loop.run_until_complete(self._async_link_component_to_actor(role_guid, component_guid, body))
 
     @dynamic_catch
-    async def _async_detach_component_actor(self, role_guid: str, component_guid: str, body: dict | DeleteRequestBody = None) -> None:
+    async def _async_detach_component_actor(self, role_guid: str, component_guid: str, body: dict | DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution role from a solution component.
             Async Version.
 
@@ -5375,7 +5376,7 @@ class SolutionArchitect(Client2):
             guid of the role to disconnect from.
         component_guid: str
             guid of the component to disconnect.
-        body: dict | DeleteRequestBody, optional
+        body: dict | DeleteRelationshipRequestBody, optional
             A dictionary containing the properties of the relationship to create.
 
         Returns
@@ -5396,7 +5397,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": {{isotime}},
@@ -5409,12 +5410,12 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-components/{role_guid}/solution-component-actors/{component_guid}/detach")
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(
             f"Detached role from component  {role_guid} -> {component_guid}")
 
     @dynamic_catch
-    def detach_component_actore(self, role_guid: str, component_guid: str, body: dict |DeleteRequestBody = None) -> None:
+    def detach_component_actore(self, role_guid: str, component_guid: str, body: dict |DeleteRelationshipRequestBody = None) -> None:
         """ Detach a solution role from a solution component.
 
         Parameters
@@ -5423,7 +5424,7 @@ class SolutionArchitect(Client2):
             guid of the role to disconnect from.
         component_guid: str
             guid of the component to disconnect.
-        body: dict | DeleteRequestBody, optional
+        body: dict | DeleteRelationshipRequestBody, optional
             A dictionary containing the properties of the relationship to create.
 
         Returns
@@ -5444,7 +5445,7 @@ class SolutionArchitect(Client2):
 
         Body structure:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": {{isotime}},
@@ -5456,14 +5457,14 @@ class SolutionArchitect(Client2):
         loop.run_until_complete(self._async_detach_component_actor(role_guid, component_guid, body))
 
     @dynamic_catch
-    async def _async_delete_solution_role(self, guid: str,  body: dict | DeleteRequestBody= None, cascade_delete: bool = False,) -> None:
+    async def _async_delete_solution_role(self, guid: str,  body: dict | DeleteElementRequestBody= None, cascade_delete: bool = False,) -> None:
         """Delete a solution role. Async Version.
 
            Parameters
            ----------
            guid: str
                guid of the role to delete.
-            body: dict | DeleteRequestBody, optional
+            body: dict | DeleteElementRequestBody, optional
                A dictionary containing parameters for the deletion.
            cascade_delete: bool, optional, default: False
                Cascade the delete to dependent objects?
@@ -5487,7 +5488,7 @@ class SolutionArchitect(Client2):
 
            Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -5499,18 +5500,18 @@ class SolutionArchitect(Client2):
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/solution-architect/"
                f"solution-roles/{guid}/delete")
 
-        await self._async_delete_request(url, body, cascade_delete=cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete=cascade_delete)
         logger.info(f"Delete solution rule  {guid} with cascade {cascade_delete}")
 
     @dynamic_catch
-    def delete_solution_role(self, guid: str, body: dict | DeleteRequestBody = None,cascade_delete: bool = False) -> None:
+    def delete_solution_role(self, guid: str, body: dict | DeleteElementRequestBody = None,cascade_delete: bool = False) -> None:
         """Delete a solution role. Async Version.
 
            Parameters
            ----------
            guid: str
                guid of the role to delete.
-           body: dict | DeleteRequestBody, optional
+           body: dict | DeleteElementRequestBody, optional
                A dictionary containing parameters for the deletion.
            cascade_delete: bool, optional, default: False
                Cascade the delete to dependent objects?
@@ -5533,7 +5534,7 @@ class SolutionArchitect(Client2):
 
            Body structure:
             {
-              "class": "DeleteRequestBody",
+              "class": "DeleteElementRequestBody",
               "externalSourceGUID": "add guid here",
               "externalSourceName": "add qualified name here",
               "effectiveTime": {{isotime}},
@@ -5549,7 +5550,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve the solution role elements that contain the search string.
            https://egeria-project.org/concepts/actor
@@ -5616,7 +5617,7 @@ class SolutionArchitect(Client2):
                                               metadata_element_types=metadata_element_types,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
                                               start_from=start_from, page_size=page_size,
-                                              output_format=output_format, output_format_set=output_format_set,
+                                              output_format=output_format, report_spec=report_spec,
                                               body=body)
 
     def find_solution_roles(self, search_string: str = "*", classification_names: list[str] = None,
@@ -5624,7 +5625,7 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve the list of solution role elements that contain the search string.
            https://egeria-project.org/concepts/actor
@@ -5689,7 +5690,7 @@ class SolutionArchitect(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_solution_roles(search_string, classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, output_format_set, body))
+            self._async_find_solution_roles(search_string, classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, report_spec, body))
         return response
 
     def find_all_solution_roles(self,  classification_names: list[str] = None,
@@ -5697,12 +5698,12 @@ class SolutionArchitect(Client2):
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
                                     page_size: int = 0, output_format: str = 'JSON',
-                                    output_format_set: str = None,
+                                    report_spec: str = None,
                                     body: dict| SearchStringRequestBody = None) -> list[dict] | str:
         """Retrieve a list of all solution blueprint elements
         https://egeria-project.org/concepts/actor
         """
-        return self.find_solution_roles("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, output_format_set, body)
+        return self.find_solution_roles("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, report_spec, body)
 
 
     async def _async_get_solution_roles_by_name(self, search_filter: str, body: dict = None, start_from: int = 0,