pyegeria 5.4.0.dev11__py3-none-any.whl → 5.4.0.dev12__py3-none-any.whl

md_processing/md_processing_utils/common_md_proc_utils.py

@@ -62,7 +62,7 @@ def parse_upsert_command(egeria_client: EgeriaTech, object_type: str, object_act
     display_name = ""
     labels = {}
 
-    command_spec = get_command_spec(object_type)
+    command_spec = get_command_spec(f"Create {object_type}")
     attributes = command_spec.get('Attributes', [])
     command_display_name = command_spec.get('display_name', None)
     command_qn_prefix = command_spec.get('qn_prefix', None)
@@ -264,8 +264,10 @@ def parse_view_command(egeria_client: EgeriaTech, object_type: str, object_actio
     parsed_output['exists'] = False
 
     labels = {}
-
-    command_spec = get_command_spec(f"{object_action} {object_type}")
+    if object_action == "Unlink":
+        command_spec = get_command_spec(f"Link {object_type}")
+    else:
+        command_spec = get_command_spec(f"{object_action} {object_type}")
     attributes = command_spec.get('Attributes', [])
     command_display_name = command_spec.get('display_name', None)
 
@@ -344,12 +346,12 @@ def parse_view_command(egeria_client: EgeriaTech, object_type: str, object_actio
 
             elif style == 'Reference Name':
                 parsed_attributes[key] = proc_ids(egeria_client, key, labels, txt, object_action, if_missing)
-                if ((if_missing == ERROR) and parsed_attributes[key].get("value", None)):
+                if ((if_missing == ERROR) and parsed_attributes[key].get("value", None) is None):
                     msg = f"Required parameter `{parsed_attributes[key]['value']}` is missing"
                     logger.error(msg)
                     parsed_output['valid'] = False
                     parsed_output['reason'] += msg
-                elif parsed_attributes[key]['value'] and parsed_attributes['exists'] is False:
+                elif parsed_attributes[key]['value'] and parsed_attributes[key]['exists'] is False:
                     msg = f"Reference Name `{parsed_attributes[key]['value']}` is specified but does not exist"
                     logger.error(msg)
                     parsed_output['valid'] = False

md_processing/md_processing_utils/md_processing_constants.py

@@ -51,18 +51,37 @@ command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term
                 "List Term Details", "List Glossary Terms", "List Term History", "List Term Revision History",
                 "List Term Update History", "List Glossary Structure", "List Glossaries", "List Categories",
                 "List Glossary Categories", "Create Personal Project", "Update Personal Project", "Create Category",
-                "Update Category", "Create Solution Blueprint", "Update Solution Blueprint", "View Solution Blueprint", "View Solution Blueprints", "View Blueprints",
+                "Update Category", "Create Solution Blueprint", "Update Solution Blueprint", "View Solution Blueprint",
+                "View Solution Blueprints", "View Blueprints",
                 "View Information Supply Chain", "View Information Supply Chains", "View Supply Chains", "View Supply Chain",
                 "View Solution Components", "View Solution Component", "View Solution Roles", "View Solution Role",
                 "Create Information Supply Chain", "Update Information Supply Chain",
-                "Create Information Supply Chain Segment", "Update Information Supply Chain Segment", "Link Segments", "Detach Segments",
-                "Create Solution Component", "Update Solution Component", "Create Term-Term Relationship",
+                "Link Information Supply Chain Peers", "Link Supply Chains", "Link Information Supply Chains",
+                "Unlink Information Supply Chain Peers", "Unlink Information Supply Chains", "Unlink Supply Chains",
+                "Create Solution Component", "Update Solution Component", "Link Solution Components", "Wire Solution Components",
+                "Detach Solution Components", "Unlink Solution Components", "Create Term-Term Relationship",
                 "Update Term-Term Relationship", "Create Data Spec", "Create Data Specification", "Update Data Spec",
                 "Update Data Specification", "Create Data Field", "Update Data Field", "Create Data Structure",
                 "Update Data Structure", "Create Data Dictionary", "Update Data Dictionary", "Create Data Dict",
                 "Update Data Dict", " View Data Dictionary", "View Data Dictionaries", "View Data Specifications",
                 "View Data Specs", "View Data Structures", "View Data Structure", "View Data Fields", "View Data Field",
-                "View Dataa Classes", "View Data Class", "Create Data Class", "Update Data Class",]
+                "View Dataa Classes", "View Data Class", "Create Data Class", "Update Data Class",
+                "Create Digital Product", "Create Data Product", "Update Digital Product", "Update Data Product",
+                "Create Agreement", "Create Digital Agreement", "Create Data Agreement",
+                "Update Agreement", "Update Data Agreement", "Update Data Agreement",
+                "Link Digital Products", "Link Data Products", "Detach Digital Products", "Detach Data Products",
+                "Create Data Sharing Agreement", "Update Data Sharing Agreement",
+                "Create Digital Subscription", "Create Product Subscription", "Update Digital Subscription", "Update Product Subscription",
+                "Attach Agreement Items", "Detach Agreement Items",
+                "Attach Contract", "Detach Contract",
+                "Attach Subscriber", "Detach Subscriber",
+                "Link Collection to Resource", "Attach Collection to Resource",
+                "Unlink Collection From Resource", "Detach Collection From Resource",
+                "Add Member to Collection", "Add Member", "Member->Collection",
+                "Remove Member from Collection","Remove Member from Collection",
+                "View Digital Products", "View Data Products", "List Data Products", "List Digtal Products",
+                "View Agreements", "View Data Sharing Agreements", "List Agreements", "List Data Sharing Agreements",
+                "View Subscriptions", "List Subscriptions",]
 
 
 pre_command = "\n---\n==> Processing object_action:"
@@ -88,6 +107,7 @@ def load_commands(filename: str) -> None:
 
 def get_command_spec(command: str) -> dict | None:
     global COMMAND_DEFINITIONS
+
     com = COMMAND_DEFINITIONS.get('Command Specifications', {}).get(command, None)
     if com:
         return com
@@ -99,6 +119,7 @@ def get_command_spec(command: str) -> dict | None:
 
 def find_alternate_names(command: str) -> str | None:
     global COMMAND_DEFINITIONS
+
     comm_spec = COMMAND_DEFINITIONS.get('Command Specifications', {})
     for key, value in comm_spec.items():
         if isinstance(value, dict):

pyegeria/__init__.py

@@ -43,6 +43,7 @@ from .feedback_manager_omvs import FeedbackManager
 from .full_omag_server_config import FullServerConfig
 from .glossary_browser_omvs import GlossaryBrowser
 from .glossary_manager_omvs import GlossaryManager
+from .governance_officer_omvs import GovernanceOfficer
 from .mermaid_utilities import (construct_mermaid_web, construct_mermaid_jup, generate_process_graph, load_mermaid,
                                 parse_mermaid_code, render_mermaid, save_mermaid_graph, save_mermaid_html, )
 from .metadata_explorer_omvs import MetadataExplorer

pyegeria/_client.py

@@ -32,7 +32,6 @@ from pyegeria._validators import (
     validate_url,
     validate_user_id,
 )
-from pyegeria.output_formatter import make_preamble, make_md_attribute
 
 ...
 

pyegeria/collection_manager_omvs.py

@@ -7,11 +7,10 @@ Copyright Contributors to the ODPi Egeria project.
 """
 
 import asyncio
-
 from pyegeria._client import Client
 from pyegeria._globals import NO_ELEMENTS_FOUND
 from pyegeria._validators import validate_guid, validate_search_string
-from pyegeria.output_formatter import (extract_mermaid_only, extract_basic_dict, generate_output)
+from pyegeria.output_formatter import (extract_mermaid_only, extract_basic_dict, generate_output, markdown_to_html)
 from pyegeria.utils import body_slimmer
 
 
@@ -34,6 +33,8 @@ def query_string(params):
     return result
 
 
+
+
 class CollectionManager(Client):
     """
     Maintain and explore the contents of nested collections. These collections can be used to represent digital
@@ -191,7 +192,7 @@ class CollectionManager(Client):
             self._async_get_attached_collections(parent_guid, start_from, page_size, body, output_format))
 
     async def _async_find_collections_w_body(self, body: dict, classification_name: str = None,
-                                             starts_with: bool = False, ends_with: bool = False,
+                                             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_profile: str = "CORE") -> list | str:
         """ Returns the list of collections matching the search string filtered by the optional classification.
@@ -278,7 +279,7 @@ class CollectionManager(Client):
             return self.generate_collection_output(elements, None, None, output_format)
         return elements
 
-    def find_collections_w_body(self, body: dict, classification_name: str = None, starts_with: bool = False,
+    def find_collections_w_body(self, body: dict, classification_name: str = None, 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_profile: str = "CORE") -> list | str:
@@ -345,7 +346,7 @@ class CollectionManager(Client):
                                                 start_from, page_size, output_format, output_profile))
 
     async def _async_find_collections(self, search_string: str = '*', classification_name: str = None,
-                                      starts_with: bool = False, ends_with: bool = False, ignore_case: bool = False,
+                                      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_profile: str = "CORE") -> list | str:
         """ Returns the list of collections matching the search string filtered by the optional classification.
@@ -402,9 +403,9 @@ class CollectionManager(Client):
                                                          start_from, page_size, output_format, output_profile)
         return resp
 
-    def find_collections(self, search_string: str = '*', classification_name: str = None, starts_with: bool = False,
-                         ends_with: bool = False, ignore_case: bool = False, start_from: int = 0, page_size: int = 0,
-                         output_format: str = 'JSON', output_profile: str = "CORE") -> list | str:
+    def find_collections(self, search_string: str = '*', classification_name: str = None, 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_profile: str = "CORE") -> list | str:
         """ Returns the list of collections matching the search string filtered by the optional classification.
             The search string is located in the request body and is interpreted as a plain string. The full
             body allows complete control including status, asOfTime and effectiveTime.
@@ -2952,7 +2953,10 @@ class CollectionManager(Client):
     #   Digital Products
     #
     async def _async_create_digital_product(self, body: dict) -> str:
-        """Create a new collection that represents a digital product. Async version.
+        """ Create a new collection that represents a digital product. To set a lifecycle status
+            use a NewDigitalProductRequestBody which has a default status of DRAFT. Using a
+            NewElementRequestBody sets the status to ACTIVE.
+            Async version.
 
         Parameters
         ----------
@@ -2978,6 +2982,8 @@ class CollectionManager(Client):
         be valid dates if specified, otherwise you will get a 400 error response.
 
         JSON Structure looks like:
+
+        Without lifecycle status:
         {
           "class" : "NewElementRequestBody",
           "anchorGUID" : "anchor GUID, if set then isOwnAnchor=false",
@@ -3060,64 +3066,111 @@ class CollectionManager(Client):
         return resp.json().get("guid", "No GUID returned")
 
     def create_digital_product(self, body: dict) -> str:
-        """Create a new collection that represents a digital product. Async version.
-
-        Parameters
-        ----------
-        body: dict
-            A dict representing the details of the collection to create.
-
-        Returns
-        -------
-        str - the guid of the created collection
-
-        Raises
-        ------
-        InvalidParameterException
-          If the client passes incorrect parameters on the request - such as bad URLs or invalid values
-        PropertyServerException
-          Raised by the server when an issue arises in processing a valid request
-        NotAuthorizedException
-          The principle specified by the user_id does not have authorization for the requested action
+        """ Create a new collection that represents a digital product. To set a lifecycle status
+               use a NewDigitalProductRequestBody which has a default status of DRAFT. Using a
+               NewElementRequestBody sets the status to ACTIVE.
+
+           Parameters
+           ----------
+           body: dict
+               A dict representing the details of the collection to create.
+
+           Returns
+           -------
+           str - the guid of the created collection
+
+           Raises
+           ------
+           InvalidParameterException
+             If the client passes incorrect parameters on the request - such as bad URLs or invalid values
+           PropertyServerException
+             Raised by the server when an issue arises in processing a valid request
+           NotAuthorizedException
+             The principle specified by the user_id does not have authorization for the requested action
+
+           Notes
+           -----
+           Note: the three dates: introductionDate, nextVersionDate and withdrawDate must
+           be valid dates if specified, otherwise you will get a 400 error response.
+
+           JSON Structure looks like:
+
+           Without lifecycle status:
+           {
+             "class" : "NewElementRequestBody",
+             "anchorGUID" : "anchor GUID, if set then isOwnAnchor=false",
+             "isOwnAnchor" : false,
+             "parentGUID" : "parent GUID, if set, set all parameters beginning 'parent'",
+             "parentRelationshipTypeName" : "open metadata type name",
+             "parentAtEnd1": true,
+             "properties": {
+               "class" : "CollectionProperties",
+               "qualifiedName": "Must provide a unique name here",
+               "name" : "Add display name here",
+               "description" : "Add description of the collection here",
+               "collectionType": "Add appropriate valid value for type",
+               "collectionOrder" : "OTHER",
+               "orderByPropertyName" : "Add property name if 'collectionOrder' is OTHER"
+             },
+             "digitalProductProperties" : {
+               "class" : "DigitalProductProperties",
+               "productStatus" : "ACTIVE",
+               "productName" : "Add name here",
+               "productType" : "Add valid value here",
+               "description" : "Add description here",
+               "introductionDate" : "date",
+               "maturity" : "Add valid value here",
+               "serviceLife" : "Add the estimated lifetime of the product",
+               "currentVersion": "V1.0",
+               "nextVersion": "V1.1",
+               "withdrawDate": "date",
+               "additionalProperties": {
+                 "property1Name" : "property1Value",
+                 "property2Name" : "property2Value"
+               }
+             }
+           }
 
-        Notes
-        -----
-        JSON Structure looks like:
-        {
-          "class" : "NewElementRequestBody",
-          "anchorGUID" : "anchor GUID, if set then isOwnAnchor=false",
-          "isOwnAnchor" : false,
-          "parentGUID" : "parent GUID, if set, set all parameters beginning 'parent'",
-          "parentRelationshipTypeName" : "open metadata type name",
-          "parentAtEnd1": true,
-          "properties": {
-            "class" : "CollectionProperties",
-            "qualifiedName": "Must provide a unique name here",
-            "name" : "Add display name here",
-            "description" : "Add description of the collection here",
-            "collectionType": "Add appropriate valid value for type",
-            "collectionOrder" : "OTHER",
-            "orderByPropertyName" : "Add property name if 'collectionOrder' is OTHER"
-          },
-          "digitalProductProperties" : {
-            "class" : "DigitalProductProperties",
-            "productStatus" : "ACTIVE",
-            "productName" : "Add name here",
-            "productType" : "Add valid value here",
-            "description" : "Add description here",
-            "introductionDate" : "date",
-            "maturity" : "Add valid value here",
-            "serviceLife" : "Add the estimated lifetime of the product",
-            "currentVersion": "V1.0",
-            "nextVersion": "V1.1",
-            "withdrawDate": "date",
-            "additionalProperties": {
-              "property1Name" : "property1Value",
-              "property2Name" : "property2Value"
-            }
-          }
-        }
-        """
+           With a lifecycle, the body is:
+           {
+             "class" : "NewDigitalProductRequestBody",
+             "isOwnAnchor" : true,
+             "anchorScopeGUID" : "optional GUID of search scope",
+             "parentGUID" : "xxx",
+             "parentRelationshipTypeName" : "CollectionMembership",
+             "parentAtEnd1": true,
+             "properties": {
+               "class" : "DigitalProductProperties",
+               "qualifiedName": "DigitalProduct:Add product name here",
+               "userDefinedStatus" : "Optional value here - used when initial status is OTHER",
+               "name" : "Product display name",
+               "description" : "Add description of product and its expected usage here",
+               "identifier" : "Add product identifier here",
+               "productName" : "Add product name here",
+               "productType" : "Periodic Delta",
+               "maturity" : "Add valid value here",
+               "serviceLife" : "Add the estimated lifetime of the product",
+               "introductionDate" : "date",
+               "nextVersionDate": "date",
+               "withdrawDate": "date",
+               "currentVersion": "V0.1",
+               "additionalProperties": {
+                 "property1Name" : "property1Value",
+                 "property2Name" : "property2Value"
+               }
+             },
+             "initialStatus" : "DRAFT",
+             "externalSourceGUID": "add guid here",
+             "externalSourceName": "add qualified name here",
+             "effectiveTime" : "{{$isoTimestamp}}",
+             "forLineage" : false,
+             "forDuplicateProcessing" : false
+           }
+
+           The valid values for initialStatus are: DRAFT, PREPARED, PROPOSED, APPROVED, REJECTED, APPROVED_CONCEPT,
+           UNDER_DEVELOPMENT, DEVELOPMENT_COMPLETE, APPROVED_FOR_DEPLOYMENT, ACTIVE, DISABLED, DEPRECATED,
+           OTHER.  If using OTHER, set the userDefinedStatus with the status value you want.
+           """
         loop = asyncio.get_event_loop()
         resp = loop.run_until_complete(self._async_create_digital_product(body))
         return resp
@@ -5331,7 +5384,7 @@ class CollectionManager(Client):
     #
     #
 
-    async def _async_attach_collection(self, parent_guid: str, collection_guid: str, body: dict = None):
+    async def _async_attach_collection(self, parent_guid: str, collection_guid: str, body: dict = None, make_anchor: bool = False):
         """ Connect an existing collection to an element using the ResourceList relationship (0019).
             Async version.
 
@@ -5343,6 +5396,8 @@ class CollectionManager(Client):
             The identifier of the collection being attached.
         body: dict, optional, default = None
             A dict representing the details of the relationship.
+        make_anchor: bool, optional, default = False
+            Indicates if the collection should be anchored to the element.
 
         Returns
         -------
@@ -5383,13 +5438,13 @@ class CollectionManager(Client):
         """
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/collection-manager/metadata-elements/"
-               f"{parent_guid}/collections/{collection_guid}/attach")
+               f"{parent_guid}/collections/{collection_guid}/attach?makeAchor={make_anchor}")
         if body:
             await self._async_make_request("POST", url, body)
         else:
             await self._async_make_request("POST", url)
 
-    def attach_collection(self, parent_guid: str, collection_guid: str, body: dict = None):
+    def attach_collection(self, parent_guid: str, collection_guid: str, body: dict = None, make_anchor: bool = False):
         """ Connect an existing collection to an element using the ResourceList relationship (0019).
 
             Parameters
@@ -5400,6 +5455,8 @@ class CollectionManager(Client):
                 The identifier of the collection being attached.
             body: dict, optional, default = None
                 A dict representing the details of the relationship.
+            make_anchor: bool, optional, default = False
+                Indicates if the collection should be anchored to the element.
 
             Returns
             -------
@@ -5438,7 +5495,7 @@ class CollectionManager(Client):
             }
             """
         loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._async_attach_collection(parent_guid, collection_guid, body))
+        loop.run_until_complete(self._async_attach_collection(parent_guid, collection_guid, body, make_anchor))
 
     async def _async_detach_collection(self, parent_guid: str, collection_guid: str, body: dict = None):
         """ Detach an existing collection from an element. If the collection is anchored to the element, it is delete.
@@ -5453,6 +5510,7 @@ class CollectionManager(Client):
         body: dict, optional, default = None
             A dict representing the details of the relationship.
 
+
         Returns
         -------
         Nothing
@@ -6060,6 +6118,7 @@ class CollectionManager(Client):
         for classification in classifications:
             classification_names += f"{classification['classificationName']}, "
         classification_names = classification_names[:-2]
+        mermaid = element.get('mermaidGraph', "") or ""
 
         member_names = ""
         members = self.get_member_list(collection_guid=guid)
@@ -6072,7 +6131,7 @@ class CollectionManager(Client):
             'GUID': guid, 'display_name': display_name, 'qualified_name': qualified_name, 'description': description,
             'classifications': classification_names, 'collection_type': collection_type, 'members': member_names,
             'properties': properties, 'additional_properties': additional_properties,
-            'extended_properties': extended_properties,
+            'extended_properties': extended_properties, 'mermaid': mermaid
             }
 
     def generate_basic_structured_output(self, elements, filter, output_format: str = 'DICT',
@@ -6083,7 +6142,7 @@ class CollectionManager(Client):
         Args:
             elements: Dictionary or list of dictionaries containing element data
             filter: The search string used to find the elements
-            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID)
+            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
 
         Returns:
             Formatted output as string or list of dictionaries
@@ -6093,6 +6152,19 @@ class CollectionManager(Client):
             return extract_mermaid_only(elements)
         elif output_format == "DICT":
             return extract_basic_dict(elements)
+        elif output_format == "HTML":
+            if collection_type is None:
+                entity_type = "Collection"
+            else:
+                entity_type = collection_type
+
+            return generate_output(
+                elements=elements, 
+                search_string=filter, 
+                entity_type=entity_type,
+                output_format="HTML",
+                extract_properties_func=self._extract_collection_properties
+            )
 
         # For other formats (MD, FORM, REPORT, LIST), use generate_output
         elif output_format in ["MD", "FORM", "REPORT", "LIST"]:
@@ -6121,7 +6193,7 @@ class CollectionManager(Client):
             classification_name: str
                 The type of collection.
             filter: The search string used to find the elements
-            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID)
+            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
 
         Returns:
             Formatted output as a string or list of dictionaries
@@ -6131,10 +6203,20 @@ class CollectionManager(Client):
         else:
             entity_type = classification_name
 
-        if output_format in ["MD", "FORM", "REPORT", "LIST", "DICT", "MERMAID"]:
+        if output_format == "HTML":
+            return generate_output(
+                elements=elements, 
+                search_string=filter, 
+                entity_type=entity_type,
+                output_format="HTML",
+                extract_properties_func=self._extract_collection_properties
+            )
+
+        elif output_format in ["MD", "FORM", "REPORT", "LIST", "DICT", "MERMAID"]:
             # Define columns for LIST format
             columns = [{'name': 'Name', 'key': 'display_name'},
                        {'name': 'Qualified Name', 'key': 'qualified_name', 'format': True},
+                       {'name': 'Collection Type', 'key': 'collection_type'},
                        {'name': 'Description', 'key': 'description', 'format': True},
                        {'name': "Classifications", 'key': 'classifications'},
                        {'name': 'Members', 'key': 'members', 'format': True}, ]
@@ -6146,49 +6228,6 @@ class CollectionManager(Client):
         else:
             return self.generate_basic_structured_output(elements, filter, output_format)
 
-    # def generate_collection_output(self, elements, filter, collection_type: str, output_format,
-    #  # output_profile: str = "CORE") -> str | list | dict:  #     """  #     Generate output in the specified  #
-    #  format  # for the given elements.  #  #     Args:  #         elements: Dictionary or list of dictionaries  #
-    #  containing  # element data  #         filter: The search string used to find the elements  #  #
-    #  output_format: The  # desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, JSON)  #  #
-    #  output_profile: str, optional,  # default = "CORE"  #             The desired output profile - BASIC, CORE,
-    #  FULL  #     Returns:  #  # Formatted output as string or list of dictionaries  #     """  #     if  #
-    #  collection_type is None:  #  # entity_type = "Collection"  #     else:  #         entity_type =  #
-    #  collection_type  #  #     # For LIST and DICT  # formats, get member information  #  #     if output_format in
-    #  ["LIST", "DICT"]:  #         # Get the collection  # GUID  #         collection_guid = None  #         if  #
-    #  isinstance(elements, dict):  #             collection_guid  # = elements.get('elementHeader', {}).get('guid')
-    #         elif isinstance(elements, list) and len(elements) >  # 0:  #             collection_guid = elements[  #
-    #         0].get('elementHeader', {}).get('guid')  #  #         # Get member  # list if we have a valid  #
-    #         collection GUID  #         members = []  #         if collection_guid:  #  # members =  #
-    #         self.get_member_list(collection_guid=collection_guid)  #             if isinstance(members,
-    # str):  # "No members found" case  #                 members = []  #  #         # For DICT format, include all
-    # member information in the result  #         if output_format == "DICT":  #             result =  #  #
-    # self.generate_basic_structured_output(elements, filter, output_format, collection_type)  #             if  #  #
-    # isinstance(result, list):  #                 for item in result:  #                     item['members'] =  #  #
-    # members  #                 return result  #             elif isinstance(result, dict):  #  # result['members']
-    # = members  #                 return result  #  #         # For LIST format, add a column with  # bulleted list
-    # of qualified names  #         elif output_format == "LIST":  #             # Define columns for  # LIST format,
-    # including the new Members column  #             columns = [{'name': 'Collection Name',
-    # 'key': 'display_name'},  #                 {'name': 'Qualified Name', 'key': 'qualified_name'},  #  # {'name':
-    # 'Collection Type', 'key': 'collection_type'},  #                 {'name': 'Description',
-    # 'key': 'description', 'format': True},  #                 {'name': 'Classifications',
-    # 'key': 'classifications'},  #                 {'name': 'Members', 'key': 'members', 'format': True}]  #  #  #
-    # Create a function to add member information to the properties  #             def get_additional_props(element,
-    # guid, output_format):  #                 if not members:  #                     return {'members': ''}  #  #  #
-    # Create a comma-separated list of qualified names (no newlines to avoid table formatting issues)  #  #  #
-    # member_list = ", ".join([member.get('qualifiedName', '') for member in members])  #                 return {  #
-    # 'members': member_list}  #  #             # Generate output with the additional properties  #  #  # return  #
-    # generate_output(elements=elements, search_string=filter, entity_type=entity_type,
-    #  # output_format=output_format, extract_properties_func=self._extract_collection_properties,
-    #  # get_additional_props_func=get_additional_props, columns=columns)  #  #     # For FORM, REPORT, JSON formats,
-    # keep behavior unchanged  #     return self.generate_basic_structured_output(elements, filter, output_format,
-    # collection_type)
-
-    # def generate_data_class_output(self, elements, filter, output_format) -> str | list:  #     return  #  #  #
-    # self.generate_basic_structured_output(elements, filter, output_format)  #  # def generate_data_field_output(  #
-    # self, elements, filter, output_format) -> str | list:  #     return self.generate_basic_structured_output(  #
-    # elements, filter, output_format)
-
 
 if __name__ == "__main__":
     print("Main-Collection Manager")

pyegeria/data_designer_omvs.py

@@ -4283,7 +4283,7 @@ r       replace_all_properties: bool, default = False
         ignore_case_s = str(ignore_case).lower()
 
         possible_query_params = query_string(
-            [("startFrom", start_from), ("pageSize", page_size), ("startsWith", ends_with_s), ("endsWith", ends_with_s),
+            [("startFrom", start_from), ("pageSize", page_size), ("startsWith", starts_with_s), ("endsWith", ends_with_s),
              ("ignoreCase", ignore_case_s)])
 
         url = (f"{base_path(self, self.view_server)}/data-classes/by-search-string"
@@ -5308,7 +5308,7 @@ r       replace_all_properties: bool, default = False
         Args:
             elements: Dictionary or list of dictionaries containing element data
             filter: The search string used to find the elements
-            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID)
+            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
 
         Returns:
             Formatted output as string or list of dictionaries
@@ -5318,6 +5318,14 @@ r       replace_all_properties: bool, default = False
             return extract_mermaid_only(elements)
         elif output_format == "DICT":
             return extract_basic_dict(elements)
+        elif output_format == "HTML":
+            return generate_output(
+                elements=elements, 
+                search_string=filter, 
+                entity_type="Data Element",
+                output_format="HTML",
+                extract_properties_func=self._extract_data_structure_properties
+            )
 
         # For other formats (MD, FORM, REPORT, LIST), use generate_output
         elif output_format in ["MD", "FORM", "REPORT", "LIST"]:
@@ -5339,12 +5347,12 @@ r       replace_all_properties: bool, default = False
         Args:
             elements: Dictionary or list of dictionaries containing data structure elements
             filter: The search string used to find the elements
-            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID)
+            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
 
         Returns:
             Formatted output as string or list of dictionaries
         """
-        if output_format in ["MD", "FORM", "REPORT", "LIST", "MERMAID"]:
+        if output_format in ["MD", "FORM", "REPORT", "LIST", "MERMAID", "HTML"]:
             # Define columns for LIST format
             columns = [{'name': 'Structure Name', 'key': 'display_name'},
                 {'name': 'Qualified Name', 'key': 'qualified_name','format': True}, {'name': 'Namespace', 'key': 'namespace'},
@@ -5364,12 +5372,12 @@ r       replace_all_properties: bool, default = False
         Args:
             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)
+            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
 
         Returns:
             Formatted output as string or list of dictionaries
         """
-        if output_format in ["DICT", "MD", "FORM", "REPORT", "LIST", "MERMAID"]:
+        if output_format in ["DICT", "MD", "FORM", "REPORT", "LIST", "MERMAID", "HTML"]:
             # Define columns for LIST format
             columns = [{'name': 'Class Name', 'key': 'display_name'},
                 {'name': 'Qualified Name', 'key': 'qualified_name','format': True},
@@ -5388,12 +5396,12 @@ r       replace_all_properties: bool, default = False
         Args:
             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)
+            output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
 
         Returns:
             Formatted output as a string or list of dictionaries
         """
-        if output_format in ["MD", "FORM", "REPORT", "LIST", "DICT", "MERMAID"]:
+        if output_format in ["MD", "FORM", "REPORT", "LIST", "DICT", "MERMAID", "HTML"]:
             # Define columns for LIST format
             columns = [{'name': 'Field Name', 'key': 'display_name'},
                 {'name': 'Qualified Name', 'key': 'qualified_name','format': True}, {'name': 'Data Type', 'key': 'data_type'},