pyegeria 5.4.0.3__py3-none-any.whl → 5.4.0.5__py3-none-any.whl

pyegeria/data_designer_omvs.py

@@ -11,9 +11,11 @@ import asyncio
 from os import terminal_size
 
 from httpx import Response
+from loguru import logger
 from prompt_toolkit import data_structures
 
-from pyegeria import select_output_format_set
+from pyegeria import Client2
+from pyegeria._output_formats import select_output_format_set, get_output_format_type_match
 from pyegeria._client import Client, max_paging_size
 from pyegeria._globals import NO_ELEMENTS_FOUND
 from pyegeria.output_formatter import (extract_mermaid_only, extract_basic_dict, generate_output,
@@ -45,7 +47,7 @@ def base_path(client, view_server: str):
     return f"{client.platform_url}/servers/{view_server}/api/open-metadata/data-designer"
 
 
-class DataDesigner(Client):
+class DataDesigner(Client2):
     """DataDesigner is a class that extends the Client class. The Data Designer OMVS provides APIs for
       building specifications for data. This includes common data fields in a data dictionary, data specifications
       for a project and data classes for data quality validation.
@@ -1115,7 +1117,7 @@ r       replace_all_properties: bool, default = False
         loop.run_until_complete(self._async_delete_data_field(data_struct_guid, body, cascade))
 
     async def _async_find_all_data_structures(self, start_from: int = 0, page_size: int = max_paging_size,
-                                              output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                              output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """Returns a list of all known data structures. Async version.
 
         Parameters
@@ -1126,7 +1128,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: dict, optional, default = None
             - The desired output columns/field options.
         Returns
         -------
@@ -1157,11 +1159,11 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_structure_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_structure_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_all_data_structures(self, start_from: int = 0, page_size: int = max_paging_size,
-                                 output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                 output_format: str = 'JSON',  output_format_set: dict = None) -> list | str:
         """ Returns a list of all known data structures.
 
         Parameters
@@ -1192,13 +1194,13 @@ r       replace_all_properties: bool, default = False
         """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_find_all_data_structures(start_from, page_size, output_format, columns_struct))
+        response = loop.run_until_complete(self._async_find_all_data_structures(start_from, page_size, output_format, output_format_set))
         return response
 
     async def _async_find_data_structures_w_body(self, body: dict, start_from: int = 0,
                                                  page_size: int = max_paging_size, starts_with: bool = True,
                                                  ends_with: bool = False, ignore_case: bool = True,
-                                                 output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                                 output_format: str = 'JSON',  output_format_set: str | dict = None) -> list | str:
         """ Retrieve the list of data structure metadata elements that contain the search string.
             Async version.
 
@@ -1218,7 +1220,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", 'REPORT', 'FORM', "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1266,12 +1268,12 @@ r       replace_all_properties: bool, default = False
         if type(elements) is list and len(elements) == 0:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_structure_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_structure_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_data_structures_w_body(self, body: dict, start_from: int = 0, page_size: int = max_paging_size,
                                     starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                    output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                    output_format: str = 'JSON',  output_format_set: str | dict = None) -> list | str:
         """ Retrieve the list of data structure metadata elements that contain the search string.
 
         Parameters
@@ -1290,7 +1292,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str | dict, optional, default = None
             - The desired output columns/field options.
         Returns
         -------
@@ -1325,18 +1327,18 @@ r       replace_all_properties: bool, default = False
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_find_data_structures_w_body(body, start_from, page_size, starts_with, ends_with, ignore_case,
-                                                    output_format, columns_struct))
+                                                    output_format, output_format_set))
         return response
 
-    async def _async_find_data_structures(self, filter: str, start_from: int = 0, page_size: int = max_paging_size,
+    async def _async_find_data_structures(self, search_string: str, start_from: int = 0, page_size: int = max_paging_size,
                                           starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                          output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                          output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Find the list of data structure metadata elements that contain the search string.
             Async version.
 
         Parameters
         ----------
-        filter: str
+        search_string: str
             - search string to filter on.
         start_from: int, default = 0
             - index of the list to start from (0 for start).
@@ -1350,7 +1352,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - one of "DICT", "MERMAID" or "JSON"
-        columns_struct: dict, optional, default = None
+        output_format_set: dict|str, optional, default = None
             - The desired output columns/field options.
         Returns
         -------
@@ -1367,10 +1369,10 @@ r       replace_all_properties: bool, default = False
             the requesting user is not authorized to issue this request.
 
         """
-        if filter == "*":
-            filter = None
+        if search_string == "*":
+            search_string = None
 
-        body = {"filter": filter}
+        body = {"filter": search_string}
         starts_with_s = str(starts_with).lower()
         ends_with_s = str(ends_with).lower()
         ignore_case_s = str(ignore_case).lower()
@@ -1379,8 +1381,6 @@ r       replace_all_properties: bool, default = False
             [("startFrom", start_from), ("pageSize", page_size), ("startsWith", ends_with_s), ("endsWith", ends_with_s),
              ("ignoreCase", ignore_case_s),])
 
-
-
         url = (f"{base_path(self, self.view_server)}/data-structures/by-search-string"
                f"{possible_query_params}")
 
@@ -1391,17 +1391,17 @@ r       replace_all_properties: bool, default = False
             return NO_ELEMENTS_FOUND
 
         if output_format != 'JSON':  # return a simplified markdown representation
-            return self._generate_data_structure_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_structure_output(elements, filter, output_format, output_format_set)
         return elements
 
-    def find_data_structures(self, filter: str, start_from: int = 0, page_size: int = max_paging_size,
+    def find_data_structures(self, search_string: str, start_from: int = 0, page_size: int = max_paging_size,
                              starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                             output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                             output_format: str = 'JSON',  output_format_set:str| dict = None) -> list | str:
         """ Retrieve the list of data structure metadata elements that contain the search string filter.
 
         Parameters
         ----------
-        filter: str
+        search_string: str
             - search string to filter on.
         start_from: int, default = 0
             - index of the list to start from (0 for start).
@@ -1416,7 +1416,7 @@ r       replace_all_properties: bool, default = False
         output_format: str, default = "DICT"
             output_format: str, default = "DICT"
             -  one of "DICT", "MERMAID" or "JSON"
-        columns_struct: dict, optional, default = None
+        output_format_set: dict|str, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1438,13 +1438,13 @@ r       replace_all_properties: bool, default = False
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_data_structures(filter, start_from, page_size, starts_with, ends_with, ignore_case,
-                                             output_format, columns_struct))
+            self._async_find_data_structures(search_string, start_from, page_size, starts_with, ends_with, ignore_case,
+                                             output_format, output_format_set))
         return response
 
     async def _async_get_data_structures_by_name(self, filter: str, body: dict = None, start_from: int = 0,
                                                  page_size: int = max_paging_size,
-                                                 output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                                 output_format: str = 'JSON',  output_format_set: str | dict = None) -> list | str:
         """ Get the list of data structure metadata elements with a matching name to the search string filter.
             Async version.
 
@@ -1460,7 +1460,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - one of "DICT", "MERMAID" or "JSON"
-        columns_struct: dict, optional, default = None
+        output_format_set: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1505,11 +1505,11 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_structure_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_structure_output(elements, filter, output_format, output_format_set)
         return elements
 
     def get_data_structures_by_name(self, filter: str, body: dict = None, start_from: int = 0,
-                                    page_size: int = max_paging_size, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                    page_size: int = max_paging_size, output_format: str = 'JSON',  output_format_set: str | dict = None) -> list | str:
         """ Get the list of data structure metadata elements with a matching name to the search string filter.
 
         Parameters
@@ -1524,7 +1524,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
          - one of "DICT", "MERMAID" or "JSON"
-        columns_struct: dict, optional, default = None
+        output_format_set: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1546,11 +1546,11 @@ r       replace_all_properties: bool, default = False
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_structures_by_name(filter, body, start_from, page_size, output_format, columns_struct))
+            self._async_get_data_structures_by_name(filter, body, start_from, page_size, output_format, output_format_set))
         return response
 
     async def _async_get_data_structure_by_guid(self, guid: str, body: dict = None,
-                                                 output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                                 output_format: str = 'JSON',  output_format_set: str | dict = None) -> list | str:
         """ Get the  data structure metadata elements for the specified GUID.
             Async version.
 
@@ -1562,7 +1562,7 @@ r       replace_all_properties: bool, default = False
             - optional request body.
         output_format: str, default = "DICT"
          - one of "DICT", "MERMAID" or "JSON"
-        columns_struct: dict, optional, default = None
+        output_format_set: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1603,10 +1603,10 @@ r       replace_all_properties: bool, default = False
         if type(element) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_structure_output(element, filter, output_format, columns_struct)
+            return self._generate_data_structure_output(element, filter, output_format, output_format_set)
         return element
 
-    def get_data_structure_by_guid(self, guid: str, body: str = None, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+    def get_data_structure_by_guid(self, guid: str, body: str = None, output_format: str = 'JSON',  output_format_set: str | dict = None) -> list | str:
         """ Get the data structure metadata element with the specified unique identifier..
 
         Parameters
@@ -1617,7 +1617,7 @@ r       replace_all_properties: bool, default = False
             - optional request body.
         output_format: str, default = "DICT"
          - one of "DICT", "MERMAID" or "JSON"
-        columns_struct: dict, optional, default = None
+        output_format_set: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1649,7 +1649,7 @@ r       replace_all_properties: bool, default = False
     """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_get_data_structure_by_guid(guid, body, output_format, columns_struct))
+        response = loop.run_until_complete(self._async_get_data_structure_by_guid(guid, body, output_format, output_format_set))
         return response
 
     #
@@ -2479,7 +2479,7 @@ r       replace_all_properties: bool, default = False
         loop.run_until_complete(self._async_delete_data_field(data_field_guid, body, cascade))
 
     async def _async_find_all_data_fields(self, start_from: int = 0, page_size: int = max_paging_size,
-                                          output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                          output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """Returns a list of all known data fields. Async version.
 
         Parameters
@@ -2490,7 +2490,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2522,11 +2522,11 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_field_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_field_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_all_data_fields(self, start_from: int = 0, page_size: int = max_paging_size,
-                             output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                             output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Returns a list of all known data fields.
 
         Parameters
@@ -2537,7 +2537,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2557,12 +2557,12 @@ r       replace_all_properties: bool, default = False
         """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_find_all_data_fields(start_from, page_size, output_format,columns_struct))
+        response = loop.run_until_complete(self._async_find_all_data_fields(start_from, page_size, output_format, output_format_set))
         return response
 
     async def _async_find_data_fields_w_body(self, body: dict, start_from: int = 0, page_size: int = max_paging_size,
                                              starts_with: bool = True, ends_with: bool = False,
-                                             ignore_case: bool = True, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                             ignore_case: bool = True, output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Retrieve the list of data class metadata elements that contain the search string.
             Async version.
 
@@ -2582,7 +2582,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -2633,12 +2633,12 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_field_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_field_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_data_fields_w_body(self, body: dict, start_from: int = 0, page_size: int = max_paging_size,
                                 starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Retrieve the list of data class metadata elements that contain the search string.
 
         Parameters
@@ -2657,7 +2657,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -2694,12 +2694,12 @@ r       replace_all_properties: bool, default = False
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_find_data_fields_w_body(body, start_from, page_size, starts_with, ends_with, ignore_case,
-                                                output_format,columns_struct))
+                                                output_format,output_format_set))
         return response
 
     async def _async_find_data_fields(self, filter: str, start_from: int = 0, page_size: int = max_paging_size,
                                       starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                      output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                      output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Find the list of data class elements that contain the search string.
             Async version.
 
@@ -2719,7 +2719,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2756,12 +2756,12 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_field_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_field_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_data_fields(self, filter: str, start_from: int = 0, page_size: int = max_paging_size,
                          starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                         output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                         output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Retrieve the list of data fields elements that contain the search string filter.
 
         Parameters
@@ -2780,7 +2780,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2803,12 +2803,12 @@ r       replace_all_properties: bool, default = False
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_find_data_fields(filter, start_from, page_size, starts_with, ends_with, ignore_case,
-                                         output_format, columns_struct))
+                                         output_format, output_format_set))
         return response
 
     async def _async_get_data_fields_by_name(self, filter: str, body: dict = None, start_from: int = 0,
                                              page_size: int = max_paging_size,
-                                             output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                             output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the list of data class metadata elements with a matching name to the search string filter.
             Async version.
 
@@ -2824,7 +2824,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2869,11 +2869,11 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_field_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_field_output(elements, filter, output_format, output_format_set)
         return elements
 
     def get_data_fields_by_name(self, filter: str, body: dict = None, start_from: int = 0,
-                                page_size: int = max_paging_size, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                page_size: int = max_paging_size, output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the list of data class elements with a matching name to the search string filter.
 
         Parameters
@@ -2888,7 +2888,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2924,11 +2924,11 @@ r       replace_all_properties: bool, default = False
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_fields_by_name(filter, body, start_from, page_size, output_format, columns_struct))
+            self._async_get_data_fields_by_name(filter, body, start_from, page_size, output_format, output_format_set))
         return response
 
     async def _async_get_data_field_by_guid(self, guid: str, body: dict = None,
-                                            output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                            output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the  data class elements for the specified GUID.
             Async version.
 
@@ -2940,7 +2940,7 @@ r       replace_all_properties: bool, default = False
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2982,10 +2982,10 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_field_output(elements, None, output_format, columns_struct)
+            return self._generate_data_field_output(elements, None, output_format, output_format_set)
         return elements
 
-    def get_data_field_by_guid(self, guid: str, body: str = None, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+    def get_data_field_by_guid(self, guid: str, body: str = None, output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the  data structure metadata element with the specified unique identifier..
 
         Parameters
@@ -2996,7 +2996,7 @@ r       replace_all_properties: bool, default = False
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -3028,7 +3028,7 @@ r       replace_all_properties: bool, default = False
     """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_get_data_field_by_guid(guid, body, output_format, columns_struct))
+        response = loop.run_until_complete(self._async_get_data_field_by_guid(guid, body, output_format, output_format_set))
         return response
 
     ###
@@ -4061,7 +4061,7 @@ r       replace_all_properties: bool, default = False
         loop.run_until_complete(self._async_delete_data_class(data_class_guid, body, cascade))
 
     async def _async_find_all_data_classes(self, start_from: int = 0, page_size: int = max_paging_size,
-                                           output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                           output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Returns a list of all data classes. Async version.
 
         Parameters
@@ -4072,7 +4072,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -4105,11 +4105,11 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_class_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_class_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_all_data_classes(self, start_from: int = 0, page_size: int = max_paging_size,
-                              output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                              output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Returns a list of all data classes.
 
         Parameters
@@ -4120,7 +4120,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -4140,12 +4140,12 @@ r       replace_all_properties: bool, default = False
         """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_find_all_data_classes(start_from, page_size, output_format, columns_struct))
+        response = loop.run_until_complete(self._async_find_all_data_classes(start_from, page_size, output_format, output_format_set))
         return response
 
     async def _async_find_data_classes_w_body(self, body: dict, start_from: int = 0, page_size: int = max_paging_size,
                                               starts_with: bool = True, ends_with: bool = False,
-                                              ignore_case: bool = True, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                              ignore_case: bool = True, output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Retrieve the list of data class metadata elements that contain the search string.
             Async version.
 
@@ -4165,7 +4165,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -4215,12 +4215,12 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_class_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_class_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_data_classes_w_body(self, body: dict, start_from: int = 0, page_size: int = max_paging_size,
                                  starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                 output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                 output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Retrieve the list of data class metadata elements that contain the search string.
 
         Parameters
@@ -4239,7 +4239,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -4276,12 +4276,12 @@ r       replace_all_properties: bool, default = False
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_find_data_classes_w_body(body, start_from, page_size, starts_with, ends_with, ignore_case,
-                                                 output_format, columns_struct))
+                                                 output_format, output_format_set))
         return response
 
     async def _async_find_data_classes(self, filter: str, start_from: int = 0, page_size: int = max_paging_size,
                                        starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                       output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                       output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Find the list of data class elements that contain the search string.
             Async version.
 
@@ -4301,7 +4301,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -4341,12 +4341,12 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_class_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_class_output(elements, filter, output_format, output_format_set)
         return elements
 
     def find_data_classes(self, filter: str, start_from: int = 0, page_size: int = max_paging_size,
                           starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                          output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                          output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Retrieve the list of data fields elements that contain the search string filter.
 
         Parameters
@@ -4365,7 +4365,7 @@ r       replace_all_properties: bool, default = False
             - If True, the case of the search string is ignored.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -4389,12 +4389,12 @@ r       replace_all_properties: bool, default = False
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_find_data_classes(filter, start_from, page_size, starts_with, ends_with, ignore_case,
-                                          output_format, columns_struct))
+                                          output_format, output_format_set))
         return response
 
     async def _async_get_data_classes_by_name(self, filter: str, body: dict = None, start_from: int = 0,
                                               page_size: int = max_paging_size,
-                                              output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                              output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the list of data class metadata elements with a matching name to the search string filter.
             Async version.
 
@@ -4410,7 +4410,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -4455,11 +4455,11 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_class_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_class_output(elements, filter, output_format, output_format_set)
         return elements
 
     def get_data_classes_by_name(self, filter: str, body: dict = None, start_from: int = 0,
-                                 page_size: int = max_paging_size, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                 page_size: int = max_paging_size, output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the list of data class elements with a matching name to the search string filter.
 
         Parameters
@@ -4474,7 +4474,7 @@ r       replace_all_properties: bool, default = False
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -4506,16 +4506,15 @@ r       replace_all_properties: bool, default = False
           "filter": "Add name here"
         }
 
-
     """
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_classes_by_name(filter, body, start_from, page_size, output_format, columns_struct))
+            self._async_get_data_classes_by_name(filter, body, start_from, page_size, output_format, output_format_set))
         return response
 
     async def _async_get_data_class_by_guid(self, guid: str, body: dict = None,
-                                            output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+                                            output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the  data class elements for the specified GUID.
             Async version.
 
@@ -4527,7 +4526,7 @@ r       replace_all_properties: bool, default = False
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -4568,10 +4567,10 @@ r       replace_all_properties: bool, default = False
         if type(elements) is str:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return other representations
-            return self._generate_data_class_output(elements, filter, output_format, columns_struct)
+            return self._generate_data_class_output(elements, filter, output_format, output_format_set)
         return elements
 
-    def get_data_class_by_guid(self, guid: str, body: str = None, output_format: str = 'JSON',  columns_struct: dict = None) -> list | str:
+    def get_data_class_by_guid(self, guid: str, body: str = None, output_format: str = 'JSON',  output_format_set: str|dict = None) -> list | str:
         """ Get the  data structure metadata element with the specified unique identifier..
 
         Parameters
@@ -4582,7 +4581,7 @@ r       replace_all_properties: bool, default = False
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        columns_struct: dict, optional, default = None
+        output_format_set: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -4614,7 +4613,7 @@ r       replace_all_properties: bool, default = False
     """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_get_data_class_by_guid(guid, body, output_format, columns_struct))
+        response = loop.run_until_complete(self._async_get_data_class_by_guid(guid, body, output_format, output_format_set))
         return response
 
     ###
@@ -5381,7 +5380,8 @@ r       replace_all_properties: bool, default = False
                                    )
 
 
-    def _generate_data_structure_output(self, elements, filter, output_format, columns_struct)  -> str | list:
+    def _generate_data_structure_output(self, elements: dict|list[dict], filter:str = None,
+                                        output_format: str = "DICT", output_format_set: str|dict = None)  -> str | list:
         """
         Generate output for data structures in the specified format.
 
@@ -5394,20 +5394,27 @@ r       replace_all_properties: bool, default = False
             Formatted output as string or list of dictionaries
         """
         entity_type = "Data Structure"
-        if columns_struct is None:
-            columns_struct = select_output_format_set(entity_type, output_format)
-
-
+        if output_format_set is None:
+            output_format_set = select_output_format_set(entity_type, output_format)
+
+        if output_format_set:
+            if isinstance(output_format_set, str):
+                output_formats = select_output_format_set(output_format_set, output_format)
+            if isinstance(output_format_set, dict):
+                output_formats = get_output_format_type_match(output_format_set, output_format)
+        else:
+            output_formats = None
+        logger.trace(f"Executing _generate_data_structure_output for {entity_type}: {output_formats}")
         return generate_output(elements,
                                filter,
                                entity_type,
                                output_format,
                                self._extract_data_structure_properties,
                                None,
-                               columns_struct,
+                               output_formats,
                                )
 
-    def _generate_data_class_output(self, elements: dict, filter: str, output_format: str, columns_struct: dict = None)  -> str | list:
+    def _generate_data_class_output(self, elements: dict|list[dict], filter: str = None, output_format: str = "DICT", output_format_set: str|dict = None)  -> str | list:
         """
         Generate output for data classes in the specified format.
 
@@ -5415,26 +5422,34 @@ r       replace_all_properties: bool, default = False
             elements: Dictionary or list of dictionaries containing data class elements
             filter: The search string used to find the elements
             output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
-            columns_struct: Optional columns structure
+            output_format_set: Optional output format set
                 - Option column/attribute selection and definition.
         Returns:
             Formatted output as either a string or list of dictionaries
         """
         entity_type = "Data Class"
-        if columns_struct is None:
-            columns_struct = select_output_format_set(entity_type, output_format)
-
+        if output_format_set is None:
+            output_format_set = select_output_format_set(entity_type, output_format)
+
+        if output_format_set:
+            if isinstance(output_format_set, str):
+                output_formats = select_output_format_set(output_format_set, output_format)
+            if isinstance(output_format_set, dict):
+                output_formats = get_output_format_type_match(output_format_set, output_format)
+        else:
+            output_formats = None
+        logger.trace(f"Executing _generate_data_class_output for {entity_type}: {output_formats}")
         return generate_output(elements,
                                filter,
                                entity_type,
                                output_format,
                                self._extract_data_class_properties,
                                None,
-                               columns_struct,
+                               output_formats,
                                )
 
-    def _generate_data_field_output(self, elements: dict, filter: str, output_format: str,
-                                    columns_struct: dict = None)  -> str | list:
+    def _generate_data_field_output(self, elements: dict|list[dict], filter: str = None, output_format: str = "DICT",
+                                    output_format_set: str|dict = None)  -> str | list:
         """
         Generate output for data fields in the specified format.
 
@@ -5442,24 +5457,32 @@ r       replace_all_properties: bool, default = False
             elements: Dictionary or list of dictionaries containing data field elements
             filter: The search string used to find the elements
             output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
-            columns_struct: dict, Optional, default = None
+            output_format_set: str|dict, Optional, default = None
             - Option column/attribute selection and definition.
 
         Returns:
             Formatted output as a string or list of dictionaries
         """
         entity_type = "Data Field"
-        if columns_struct is None:
-            columns_struct = select_output_format_set(entity_type, output_format)
-
+        if output_format_set is None:
+            output_format_set = select_output_format_set(entity_type, output_format)
+
+        if output_format_set:
+            if isinstance(output_format_set, str):
+                output_formats = select_output_format_set(output_format_set, output_format)
+            if isinstance(output_format_set, dict):
+                output_formats = get_output_format_type_match(output_format_set, output_format)
+        else:
+            output_formats = None
+        logger.trace(f"Executing _generate_data_field_output for {entity_type}: {output_formats}")
         return generate_output(elements,
-                                   filter,
-                                   entity_type,
-                                   output_format,
-                                   self._extract_data_field_properties,
-                                   None,
-                                   columns_struct,
-                                   )
+                               filter,
+                               entity_type,
+                               output_format,
+                               self._extract_data_field_properties,
+                               None,
+                               output_formats,
+                               )