pyegeria 1.5.1.0.11__py3-none-any.whl → 1.5.1.0.14__py3-none-any.whl

commands/cat/list_archives.py

@@ -55,7 +55,7 @@ def display_archive_list(
     save_output: bool,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
-):
+) -> object:
     c_client = ClassificationManager(server, url, user_id=username)
     token = c_client.create_egeria_bearer_token(username, user_pass)
 

commands/cat/list_deployed_database_schemas.py

@@ -46,6 +46,14 @@ def check_if_template(header: dict) -> bool:
     return False
 
 
+def make_prop_md(props: dict) -> str:
+    """Given a properties dict, make a markdown string"""
+    props_md = ""
+    for key in props.keys():
+        props_md += f"* {key}: {props[key]}\n"
+    return props_md
+
+
 def list_deployed_database_schemas(
     db_name: str,
     server: str,
@@ -84,102 +92,120 @@ def list_deployed_database_schemas(
 
         om_type = "DeployedDatabaseSchema"
 
-        # get the guid for the database or catalog
-
+        # First get the deployed schemas - either all of them or for a specific server
         if db_name in (None, "*"):
             dbs = c_client.get_elements(om_type)
         else:
+            # get the guid for the database or catalog and then all schemas anchored on that catalog
             db_guid = c_client.get_guid_for_name(db_name)
             dbs = c_client.get_elements_by_classification_with_property_value(
                 "Anchors", db_guid, ["anchorGUID"], om_type
             )
+        # Now we should have a list of Database/Catalog Schemas
 
-        if type(dbs) is list:
-            for element in dbs:
-                header = element["elementHeader"]
-
-                if check_if_template(header):
-                    continue
-
-                el_name = element["properties"].get("name", "---")
-                el_type = header["type"]["typeName"]
-                el_home = header["origin"]["homeMetadataCollectionName"]
-                el_create_time = header["versions"]["createTime"][:-10]
-                el_created_by = header["versions"]["createdBy"]
-                el_created_md = (
-                    f"* **Created By**: {el_created_by}\n"
-                    f"* **Created Time**: {el_create_time}"
-                )
-                el_created_out = Markdown(el_created_md)
-
-                el_guid = header["guid"]
-
-                el_classification = header["classifications"]
-                for c in el_classification:
-                    if c["type"]["typeName"] == "Anchors":
-                        el_anchor_guid = c["classificationProperties"]["anchorGUID"]
-                        el_anchor_type_name = c["classificationProperties"][
-                            "anchorTypeName"
-                        ]
-                        if el_anchor_type_name == "Catalog":
-                            el_cat = c_client.get_element_by_guid(el_anchor_guid)
-                            el_cat_name = el_cat["properties"].get("name", None)
-                            if el_cat_name is None:
-                                el_cat_name = el_cat["properties"].get(
-                                    "qualifiedName", "---"
-                                )
-                            el_cat_guid = el_cat["elementHeader"]["guid"]
-                el_schema_id = (
-                    f"{el_name}\n{el_guid}\n\n\t\tin\n\n{el_cat_name}\n{el_cat_guid}"
-                )
-                el_props_md = ""
-                for prop in element["properties"].keys():
-                    el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
-                el_props_out = Markdown(el_props_md)
-
-                rel_elements = c_client.get_elements_by_property_value(
-                    el_guid, ["anchorGUID"]
-                )
-                schema_md = ""
-                count = 0
-                rel_el_out = ""
-                if type(rel_elements) is list:
-                    len_els = len(rel_elements)
-                    rel_el_md = ""
-                    spacer = "---\n"
-                    for rel_element in rel_elements:
-                        count += 1
-                        rel_type = rel_element["elementHeader"]["type"]["typeName"]
-                        rel_guid = rel_element["elementHeader"]["guid"]
-                        rel_props = rel_element["properties"]
-                        props_md = ""
-                        for key in rel_props.keys():
-                            props_md += f"\t* **{key}**: {rel_props[key]}\n"
-                        rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
-                        # if count > 1 and count < len_els:
-                        #     spacer = "---\n"
-                        # elif count > len_els:
-                        #     spacer = ""
-                        rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
-                        if count == len_els:
-                            rel_el_md = rel_el_md[:-4]
-                    rel_el_out = Markdown(rel_el_md)
-
-                table.add_row(
-                    el_schema_id,
-                    # el_type,
-                    # el_created_out,
-                    # el_home,
-                    # el_guid,
-                    el_props_out,
-                    rel_el_out,
-                )
-
-            return table
-        else:
+        if type(dbs) is not list:
             print("No instances found")
             sys.exit(1)
 
+        for element in dbs:
+            header = element["elementHeader"]
+
+            if check_if_template(header):
+                continue
+
+            el_name = element["properties"].get("name", "---")
+            # el_type = header["type"]["typeName"]
+            # el_home = header["origin"]["homeMetadataCollectionName"]
+            # el_create_time = header["versions"]["createTime"][:-10]
+            # el_created_by = header["versions"]["createdBy"]
+            # el_created_md = (
+            #     f"* **Created By**: {el_created_by}\n"
+            #     f"* **Created Time**: {el_create_time}"
+            # )
+            # el_created_out = Markdown(el_created_md)
+
+            el_guid = header["guid"]
+
+            # get the information about the catalog we are part of
+            el_classification = header["classifications"]
+            for c in el_classification:
+                if c["type"]["typeName"] == "Anchors":
+                    el_anchor_guid = c["classificationProperties"]["anchorGUID"]
+                    el_anchor_type_name = c["classificationProperties"][
+                        "anchorTypeName"
+                    ]
+                    if el_anchor_type_name == "Catalog":
+                        el_cat = c_client.get_element_by_guid(el_anchor_guid)
+                        el_cat_name = el_cat["properties"].get("name", None)
+                        if el_cat_name is None:
+                            el_cat_name = el_cat["properties"].get(
+                                "qualifiedName", "---"
+                            )
+                        el_cat_guid = el_cat["elementHeader"]["guid"]
+            el_schema_id = (
+                f"{el_name}\n{el_guid}\n\n\t\tin\n\n{el_cat_name}\n{el_cat_guid}"
+            )
+
+            # get the schema properties
+            el_props_md = make_prop_md(element["properties"])
+            # el_props_md = ""
+            # for prop in element["properties"].keys():
+            #     el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
+
+            # Now get property facets related to us
+            el_facets = c_client.get_related_elements(
+                el_guid, "ReferenceableFacet", None
+            )
+            el_facets_md = "---\n**Property Facets:**\n"
+            if type(el_facets) is list:
+                for facet in el_facets:
+                    el_facets_md += make_prop_md(facet["relatedElement"]["properties"])
+            else:
+                el_facets_md += "--- \n"
+            # Add the facet properties under the normal properties
+            el_props_out = Markdown(f"{el_props_md}{el_facets_md}")
+            # get the Content within our schema
+            rel_elements = c_client.get_related_elements(
+                el_guid, "DataContentForDataSet", None
+            )
+
+            schema_md = ""
+            count = 0
+            rel_el_out = ""
+            if type(rel_elements) is list:
+                len_els = len(rel_elements)
+                rel_el_md = ""
+                spacer = "---\n"
+                for rel_element in rel_elements:
+                    count += 1
+                    rel_type = rel_element["relationshipHeader"]["type"]["typeName"]
+                    rel_guid = rel_element["relationshipHeader"]["guid"]
+                    rel_props = rel_element["relatedElement"]["properties"]
+                    props_md = ""
+                    for key in rel_props.keys():
+                        props_md += f"\t* **{key}**: {rel_props[key]}\n"
+                    rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
+                    # if count > 1 and count < len_els:
+                    #     spacer = "---\n"
+                    # elif count > len_els:
+                    #     spacer = ""
+                    rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
+                    if count == len_els:
+                        rel_el_md = rel_el_md[:-4]
+                rel_el_out = Markdown(rel_el_md)
+
+            table.add_row(
+                el_schema_id,
+                # el_type,
+                # el_created_out,
+                # el_home,
+                # el_guid,
+                el_props_out,
+                rel_el_out,
+            )
+
+        return table
+
     try:
         console = Console(width=width, force_terminal=not jupyter)
 

commands/cat/list_deployed_databases.py

@@ -32,7 +32,7 @@ EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
-EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "300"))
 
 
 def check_if_template(header: dict) -> bool:

commands/cat/old_list_deployed_database_schemas.py

@@ -0,0 +1,224 @@
+"""This creates a templates guid file from the core metadata archive"""
+from rich.markdown import Markdown
+from rich.prompt import Prompt
+import os
+import argparse
+import time
+import sys
+from rich import box
+from rich.console import Console
+from rich.table import Table
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    EgeriaTech,
+)
+
+
+console = Console()
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+
+def check_if_template(header: dict) -> bool:
+    """Check if the the template classification is set"""
+    classifications = header.get("classifications", None)
+    if classifications is None:
+        return False
+    for c in classifications:
+        if c["type"]["typeName"] == "Template":
+            return True
+    return False
+
+
+def list_deployed_database_schemas(
+    db_name: str,
+    server: str,
+    url: str,
+    username: str,
+    password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
+    token = c_client.create_egeria_bearer_token()
+
+    def generate_table() -> Table:
+        """Make a new table."""
+        table = Table(
+            caption=f"Databases found: {url} - {server} @ {time.asctime()}",
+            style="bold bright_white on black",
+            row_styles=["bold bright_white on black"],
+            header_style="white on dark_blue",
+            title_style="bold bright_white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            # title=f"Elements for Open Metadata Type: '{om_type}' ",
+            expand=True,
+            # width=500
+        )
+
+        table.add_column("Schema in Catalog")
+        table.add_column("Schema Properties")
+
+        # table.add_column("Home Store")
+        # table.add_column("GUID", width=38, no_wrap=True)
+        # table.add_column("Properties")
+        table.add_column("Cataloged Resource")
+
+        om_type = "DeployedDatabaseSchema"
+
+        # get the guid for the database or catalog
+
+        if db_name in (None, "*"):
+            dbs = c_client.get_elements(om_type)
+        else:
+            db_guid = c_client.get_guid_for_name(db_name)
+            dbs = c_client.get_elements_by_classification_with_property_value(
+                "Anchors", db_guid, ["anchorGUID"], om_type
+            )
+
+        if type(dbs) is not list:
+            print("No instances found")
+            sys.exit(1)
+
+        for element in dbs:
+            header = element["elementHeader"]
+
+            if check_if_template(header):
+                continue
+
+            el_name = element["properties"].get("name", "---")
+            el_type = header["type"]["typeName"]
+            el_home = header["origin"]["homeMetadataCollectionName"]
+            el_create_time = header["versions"]["createTime"][:-10]
+            el_created_by = header["versions"]["createdBy"]
+            el_created_md = (
+                f"* **Created By**: {el_created_by}\n"
+                f"* **Created Time**: {el_create_time}"
+            )
+            el_created_out = Markdown(el_created_md)
+
+            el_guid = header["guid"]
+
+            el_classification = header["classifications"]
+            for c in el_classification:
+                if c["type"]["typeName"] == "Anchors":
+                    el_anchor_guid = c["classificationProperties"]["anchorGUID"]
+                    el_anchor_type_name = c["classificationProperties"][
+                        "anchorTypeName"
+                    ]
+                    if el_anchor_type_name == "Catalog":
+                        el_cat = c_client.get_element_by_guid(el_anchor_guid)
+                        el_cat_name = el_cat["properties"].get("name", None)
+                        if el_cat_name is None:
+                            el_cat_name = el_cat["properties"].get(
+                                "qualifiedName", "---"
+                            )
+                        el_cat_guid = el_cat["elementHeader"]["guid"]
+            el_schema_id = (
+                f"{el_name}\n{el_guid}\n\n\t\tin\n\n{el_cat_name}\n{el_cat_guid}"
+            )
+            el_props_md = ""
+            for prop in element["properties"].keys():
+                el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
+            el_props_out = Markdown(el_props_md)
+
+            rel_elements = c_client.get_elements_by_property_value(
+                el_guid, ["anchorGUID"]
+            )
+            schema_md = ""
+            count = 0
+            rel_el_out = ""
+            if type(rel_elements) is list:
+                len_els = len(rel_elements)
+                rel_el_md = ""
+                spacer = "---\n"
+                for rel_element in rel_elements:
+                    count += 1
+                    rel_type = rel_element["elementHeader"]["type"]["typeName"]
+                    rel_guid = rel_element["elementHeader"]["guid"]
+                    rel_props = rel_element["properties"]
+                    props_md = ""
+                    for key in rel_props.keys():
+                        props_md += f"\t* **{key}**: {rel_props[key]}\n"
+                    rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
+                    # if count > 1 and count < len_els:
+                    #     spacer = "---\n"
+                    # elif count > len_els:
+                    #     spacer = ""
+                    rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
+                    if count == len_els:
+                        rel_el_md = rel_el_md[:-4]
+                rel_el_out = Markdown(rel_el_md)
+
+            table.add_row(
+                el_schema_id,
+                # el_type,
+                # el_created_out,
+                # el_home,
+                # el_guid,
+                el_props_out,
+                rel_el_out,
+            )
+
+        return table
+
+    try:
+        console = Console(width=width, force_terminal=not jupyter)
+
+        with console.pager(styles=True):
+            console.print(generate_table())
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+        print("\n\nPerhaps the type name isn't known")
+    finally:
+        c_client.close_session()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="Password")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_USER
+    password = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    try:
+        db_name = Prompt.ask(
+            "Enter the name of a database/catalog to retrieve schemas for", default="*"
+        )
+        list_deployed_database_schemas(db_name, server, url, userid, password)
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

commands/cli/egeria.py

@@ -32,7 +32,9 @@ from commands.my.list_my_profile import display_my_profile
 from commands.my.list_my_roles import display_my_roles
 from commands.my.monitor_my_todos import display_my_todos
 from commands.my.monitor_open_todos import display_todos
-from commands.cat.list_deployed_database_schemas import list_deployed_database_schemas
+from commands.cat.old_list_deployed_database_schemas import (
+    list_deployed_database_schemas,
+)
 from commands.cat.list_deployed_catalogs import list_deployed_catalogs
 from commands.cat.list_deployed_databases import list_deployed_databases
 from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term

commands/cli/egeria_cat.py

@@ -14,23 +14,25 @@ from trogon import tui
 
 from commands.cat.get_asset_graph import asset_viewer
 from commands.cat.get_collection import collection_viewer
+from commands.cat.get_project_dependencies import project_dependency_viewer
+from commands.cat.get_project_structure import project_structure_viewer
 from commands.cat.get_tech_type_elements import tech_viewer
 from commands.cat.get_tech_type_template import template_viewer
+from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
+from commands.cat.list_archives import display_archive_list
 from commands.cat.list_assets import display_assets
+from commands.cat.list_cert_types import display_certifications
+from commands.cat.list_deployed_catalogs import list_deployed_catalogs
+from commands.cat.old_list_deployed_database_schemas import (
+    list_deployed_database_schemas,
+)
+from commands.cat.list_deployed_databases import list_deployed_databases
 from commands.cat.list_glossary import display_glossary_terms
-from commands.cat.list_tech_types import display_tech_types
 from commands.cat.list_projects import display_project_list
-from commands.cat.list_todos import display_to_dos as list_todos
-from commands.cat.get_project_structure import project_structure_viewer
-from commands.cat.get_project_dependencies import project_dependency_viewer
-from commands.cat.list_cert_types import display_certifications
 from commands.cat.list_relationships import list_relationships
+from commands.cat.list_tech_types import display_tech_types
+from commands.cat.list_todos import display_to_dos as list_todos
 from commands.cat.list_user_ids import list_user_ids
-from commands.cat.list_archives import display_archive_list
-from commands.cat.list_deployed_database_schemas import list_deployed_database_schemas
-from commands.cat.list_deployed_catalogs import list_deployed_catalogs
-from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
-from commands.cat.list_deployed_databases import list_deployed_databases
 
 # from pyegeria import ServerOps
 from commands.cli.ops_config import Config
@@ -74,7 +76,7 @@ from commands.my.todo_actions import (
     help="URL of Egeria metadata store platform to connect to",
 )
 @click.option(
-    "--integration-daemon",
+    "--integration_daemon",
     default="integration-daemon",
     envvar="EGERIA_INTEGRATION_DAEMON",
     help="Egeria integration daemon to work with",
@@ -199,8 +201,7 @@ def cli(
 
 
 @cli.group("show")
-@click.pass_context
-def show(ctx):
+def show():
     """Display an Egeria Object"""
     pass
 
@@ -367,7 +368,7 @@ def show_projects(ctx, search_string):
 @click.pass_context
 def show_certification_types(ctx, search_string):
     """Show certification types
-    - generally stay with the default..
+    - generally stay with the default.
     """
     c = ctx.obj
     display_certifications(
@@ -454,7 +455,7 @@ def show_relationships(ctx, relationship):
     "--status",
     type=click.Choice(
         ["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED", "None"],
-        case_sensitive="False",
+        case_sensitive=False,
     ),
     help="Enter an optional status filter",
     required=False,
@@ -492,20 +493,24 @@ def list_archives(ctx):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     display_archive_list(
-        c.view_server, c.view_server_url, c.userid, c.password, None, c.jupyter, c.width
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        False,
+        c.jupyter,
+        c.width,
     )
 
 
-@show.command("list-deployed-schemas")
-@click.option(
-    "--search_catalog", default="*", help="What database or catalog to search"
-)
+@show.command("list-schemas")
+@click.option("--catalog", default="*", help="What database or catalog to search")
 @click.pass_context
-def list_deployed_schemas(search_catalog, ctx):
+def list_deployed_schemas(ctx, catalog):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_database_schemas(
-        search_catalog,
+        catalog,
         c.view_server,
         c.view_server_url,
         c.userid,
@@ -518,7 +523,7 @@ def list_deployed_schemas(search_catalog, ctx):
 @show.command("list-catalogs")
 @click.option("--search_server", default="*", help="Server to search for catalogs")
 @click.pass_context
-def list_catalogs(search_server, ctx):
+def list_catalogs(ctx, search_server):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_catalogs(

commands/tech/list_related_elements.py

@@ -186,10 +186,12 @@ def main():
 
     try:
         element_guid = Prompt.ask("Guid of base element").strip()
-        om_type = Prompt.ask("Enter the Open Metadata Type to find elements of")
+        om_type = Prompt.ask(
+            "Enter the Open Metadata Type to find elements of", default=None
+        )
         relationship_type = Prompt.ask("Enter the relationship type to follow")
 
-        om_type = None if len(om_type) == 0 else om_type.strip()
+        om_type = om_type.strip() if type(om_type) is str else None
         relationship_type = (
             None if len(relationship_type) == 0 else relationship_type.strip()
         )

pyegeria/_client.py

@@ -250,7 +250,7 @@ class Client:
         )
         return response
 
-    async def _async_refresh_egeria_bearer_token(self) -> None:
+    async def _async_refresh_egeria_bearer_token(self) -> str:
         """
         Refreshes the Egeria bearer token. Async version.
 
@@ -272,7 +272,10 @@ class Client:
             and validate_user_id(self.user_id)
             and validate_name(self.user_pwd)
         ):
-            await self._async_create_egeria_bearer_token(self.user_id, self.user_pwd)
+            token = await self._async_create_egeria_bearer_token(
+                self.user_id, self.user_pwd
+            )
+            return token
         else:
             raise InvalidParameterException("Invalid token source")
 

pyegeria/automated_curation_omvs.py

@@ -2455,7 +2455,7 @@ class AutomatedCuration(Client):
         """Initiate a postgres database survey"""
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_initiate_postgres_server_survey(postgres_database_guid)
+            self._async_initiate_postgres_database_survey(postgres_database_guid)
         )
         return response
 
@@ -2468,7 +2468,7 @@ class AutomatedCuration(Client):
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
-            "governanceActionTypeQualifiedName": "survey-postgres-server",
+            "governanceActionTypeQualifiedName": "PostgreSQLSurveys:survey-postgres-server",
             "actionTargets": [
                 {
                     "class": "NewActionTarget",
@@ -2491,7 +2491,7 @@ class AutomatedCuration(Client):
     async def _async_initiate_file_folder_survey(
         self,
         file_folder_guid: str,
-        survey_name: str = "AssetSurvey:survey-folder",
+        survey_name: str = "FileSurveys:survey-folder",
     ) -> str:
         """Initiate a file folder survey - async version
 
@@ -2544,7 +2544,7 @@ class AutomatedCuration(Client):
     def initiate_file_folder_survey(
         self,
         file_folder_guid: str,
-        survey_name: str = "AssetSurvey:survey-folder",
+        survey_name: str = "FileSurveys:survey-folder",
     ) -> str:
         """Initiate a file folder survey - async version
 
@@ -2592,7 +2592,7 @@ class AutomatedCuration(Client):
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
-            "governanceActionTypeQualifiedName": "AssetSurvey:survey-data-file",
+            "governanceActionTypeQualifiedName": "FileSurveys:survey-data-file",
             "actionTargets": [
                 {
                     "class": "NewActionTarget",
@@ -2628,7 +2628,7 @@ class AutomatedCuration(Client):
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
-            "governanceActionTypeQualifiedName": "AssetSurvey:survey-kafka-server",
+            "governanceActionTypeQualifiedName": "ApacheKafkaSurveys:survey-kafka-server",
             "actionTargets": [
                 {
                     "class": "NewActionTarget",
@@ -2679,7 +2679,7 @@ class AutomatedCuration(Client):
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
-            "governanceActionTypeQualifiedName": "AssetSurvey:survey-unity-catalog-server",
+            "governanceActionTypeQualifiedName": "UnityCatalogSurveys:survey-unity-catalog-server",
             "actionTargets": [
                 {
                     "class": "NewActionTarget",
@@ -2729,7 +2729,7 @@ class AutomatedCuration(Client):
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
-            "governanceActionTypeQualifiedName": "AssetSurvey:survey-unity-catalog-schema",
+            "governanceActionTypeQualifiedName": "UnityCatalogSurveys:survey-unity-catalog-schema",
             "actionTargets": [
                 {
                     "class": "NewActionTarget",

pyegeria/classification_manager_omvs.py

@@ -381,6 +381,165 @@ class ClassificationManager(Client):
         )
         return response
 
+    async def _async_find_elements_by_property_value(
+        self,
+        property_value: str,
+        property_names: [str],
+        open_metadata_type_name: str = None,
+        effective_time: str = None,
+        for_lineage: bool = None,
+        for_duplicate_processing: bool = None,
+        start_from: int = 0,
+        page_size: int = max_paging_size,
+        time_out: int = default_time_out,
+    ) -> list | str:
+        """
+        Retrieve elements by a value found in one of the properties specified. The value must only be contained in the
+        properties rather than needing to be an exact match. An open metadata type name may be supplied to restrict the
+        results. Async version.
+
+        https://egeria-project.org/types/
+
+        Parameters
+        ----------
+        property_value: str
+            - property value to be searched.
+        property_names: [str]
+            - property names to search in.
+        open_metadata_type_name : str, default = None
+            - open metadata type to be used to restrict the search
+        effective_time: str, default = None
+            - Time format is "YYYY-MM-DDTHH:MM:SS" (ISO 8601)
+        for_lineage: bool, default is set by server
+            - determines if elements classified as Memento should be returned - normally false
+        for_duplicate_processing: bool, default is set by server
+            - Normally false. Set true when the caller is part of a deduplication function
+        start_from: int, default = 0
+            - index of the list to start from (0 for start).
+        page_size
+            - maximum number of elements to return.
+
+
+        time_out: int, default = default_time_out
+            - http request timeout for this request
+
+        Returns
+        -------
+        [dict] | str
+            Returns a string if no elements found and a list of dict of elements with the results.
+
+        Raises
+        ------
+        InvalidParameterException
+            one of the parameters is null or invalid or
+        PropertyServerException
+            There is a problem adding the element properties to the metadata repository or
+        UserNotAuthorizedException
+            the requesting user is not authorized to issue this request.
+        """
+
+        possible_query_params = query_string(
+            [
+                ("startFrom", start_from),
+                ("pageSize", page_size),
+                ("forLineage", for_lineage),
+                ("forDuplicateProcessing", for_duplicate_processing),
+            ]
+        )
+
+        body = {
+            "class": "FindPropertyNamesProperties",
+            "openMetadataTypeName": open_metadata_type_name,
+            "propertyValue": property_value,
+            "propertyNames": property_names,
+            "effectiveTime": effective_time,
+        }
+
+        url = f"{base_path(self, self.view_server)}/elements/by-property-value-search{possible_query_params}"
+
+        response: Response = await self._async_make_request(
+            "POST", url, body_slimmer(body), time_out=time_out
+        )
+
+        elements = response.json().get("elements", "No elements found")
+        if type(elements) is list:
+            if len(elements) == 0:
+                return "No elements found"
+        return elements
+
+    def find_elements_by_property_value(
+        self,
+        property_value: str,
+        property_names: [str],
+        open_metadata_type_name: str = None,
+        effective_time: str = None,
+        for_lineage: bool = None,
+        for_duplicate_processing: bool = None,
+        start_from: int = 0,
+        page_size: int = max_paging_size,
+        time_out: int = default_time_out,
+    ) -> list | str:
+        """
+        Retrieve elements by a value found in one of the properties specified. The value must only be contained in the
+        properties rather than needing to be an exact match. An open metadata type name may be supplied to restrict the
+        results.
+
+        https://egeria-project.org/types/
+
+        Parameters
+        ----------
+        property_value: str
+            - property value to be searched.
+        property_names: [str]
+            - property names to search in.
+        open_metadata_type_name : str, default = None
+            - open metadata type to be used to restrict the search
+        effective_time: str, default = None
+            - Time format is "YYYY-MM-DDTHH:MM:SS" (ISO 8601)
+        for_lineage: bool, default is set by server
+            - determines if elements classified as Memento should be returned - normally false
+        for_duplicate_processing: bool, default is set by server
+            - Normally false. Set true when the caller is part of a deduplication function
+        start_from: int, default = 0
+            - index of the list to start from (0 for start).
+        page_size
+            - maximum number of elements to return.
+
+
+        time_out: int, default = default_time_out
+            - http request timeout for this request
+
+        Returns
+        -------
+        [dict] | str
+            Returns a string if no elements found and a list of dict of elements with the results.
+
+        Raises
+        ------
+        InvalidParameterException
+            one of the parameters is null or invalid or
+        PropertyServerException
+            There is a problem adding the element properties to the metadata repository or
+        UserNotAuthorizedException
+            the requesting user is not authorized to issue this request.
+        """
+
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_find_elements_by_property_value(
+                property_value,
+                property_names,
+                open_metadata_type_name,
+                effective_time,
+                for_lineage,
+                for_duplicate_processing,
+                start_from,
+                page_size,
+                time_out,
+            )
+        )
+        return response
+
     async def _async_get_element_by_guid(
         self,
         element_guid: str,

pyegeria/glossary_browser_omvs.py

@@ -396,9 +396,8 @@ class GlossaryBrowser(Client):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-browser/glossaries/"
             f"{glossary_guid}/retrieve"
         )
-        print(url)
-        response = await self._async_make_request("POST", url, payload=body)
-        return response.json()
+        response = await self._async_make_request("POST", url, body)
+        return response.json().get("elementList", "No glossaries found")
 
     def get_glossary_by_guid(
         self, glossary_guid: str, effective_time: str = None
@@ -492,7 +491,7 @@ class GlossaryBrowser(Client):
         )
 
         response = await self._async_make_request("POST", url, body)
-        return response.json()
+        return response.json().get("elementList", "No glossaries found")
 
     def get_glossaries_by_name(
         self,
@@ -593,7 +592,7 @@ class GlossaryBrowser(Client):
         )
 
         response = await self._async_make_request("POST", url, body)
-        return response.json()
+        return response.json().get("elementList", "No categories found")
 
     def get_glossary_for_category(
         self,

pyegeria/glossary_manager_omvs.py

@@ -410,7 +410,7 @@ class GlossaryManager(GlossaryBrowser):
         )
 
         response = await self._async_make_request("POST", url, body)
-        return response.json()
+        return response.json().get("elementList", "No glossaries found")
 
     def get_glossaries_by_name(
         self,
@@ -1410,6 +1410,20 @@ class GlossaryManager(GlossaryBrowser):
     ) -> str:
         """This method loads glossary terms into the specified glossary from the indicated file."""
         # Check that glossary exists and get guid
+        glossaries = self.get_glossaries_by_name(glossary_name)
+        if type(glossaries) is not list:
+            return "Unknown glossary"
+        if len(glossaries) > 1:
+            for g in glossaries:
+                glossary_error = (
+                    "Multiple glossaries found - please use the qualified name\n"
+                )
+                glossary_error += (
+                    f"Display Name: {g['glossaryProperties']['displayName']}\tQualified Name:"
+                    f" {g['glossaryProperties']['qualifiedName']}\n"
+                )
+                return glossary_error
+        glossary_guid = glossaries[0]["elementHeader"]["guid"]
 
         # Open file
 

{pyegeria-1.5.1.0.11.dist-info → pyegeria-1.5.1.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 1.5.1.0.11
+Version: 1.5.1.0.14
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

{pyegeria-1.5.1.0.11.dist-info → pyegeria-1.5.1.0.14.dist-info}/RECORD

@@ -7,21 +7,22 @@ commands/cat/get_project_structure.py,sha256=n2GbNd07w1DTo7jTR8b2ewXRyNcat_2BcCB
 commands/cat/get_tech_type_elements.py,sha256=-m3Q0BoNqkCtV8h75vMwTcOV-_ymEXmnJcr4Ec7WMAw,6180
 commands/cat/get_tech_type_template.py,sha256=gMFVcgCIm09GQu1Vsc5ZUVH9XLhItAG1eVGZJrcnHeQ,6174
 commands/cat/glossary_actions.py,sha256=F5-NNiLvfHLbQKZ_RxS6XJ9HOAuXc75GMIAC5Xo0lJQ,7280
-commands/cat/list_archives.py,sha256=83LhNeZWhzRiE-oU6veuIk9ob4XDtDWUoXdGGXaYeE8,5454
+commands/cat/list_archives.py,sha256=FEZ2XYnQIWo2PztWqnj6unn0pbblPU0-bMbTyI3csv4,5464
 commands/cat/list_assets.py,sha256=bNwSaBDz661hfnc2Rn4j4HPHAugKvz0XwN9L1m4FVQk,6529
 commands/cat/list_cert_types.py,sha256=mbCls_EqC5JKG5rvS4o69k7KgZ6aNXlcqoJ3DtHsTFA,7127
 commands/cat/list_deployed_catalogs.py,sha256=eG8K-d7BijD34el_yVx9yfnLJdfwTUiJVxd-gcGwo7k,7157
-commands/cat/list_deployed_database_schemas.py,sha256=oq0jT77KmYLByxBlgpv2k9LscJKOEJqVBj_np5ZVXB0,8537
-commands/cat/list_deployed_databases.py,sha256=TJWqpj3PhvEmTsXhVRk_SODZNjTA5OiyhEzWwQkD-zk,6668
+commands/cat/list_deployed_database_schemas.py,sha256=cYT1tDObfcwo-fTYGiaGVqYnd9liPGvIvhmkPcmb4Q0,9463
+commands/cat/list_deployed_databases.py,sha256=HE8nG-mIlxa9iSUEH-n71o-G2a4ss1Zzalq7YJQIix0,6668
 commands/cat/list_glossary.py,sha256=tUtQQoTGTlDLU-yFbfO3zjiJC9QyEJfg8NxnGCo2mnI,5811
 commands/cat/list_projects.py,sha256=Jzs-DtIpPhCH-gY4PYT6mnRBWnEf4m18TFfcw8UymNU,8011
 commands/cat/list_relationships.py,sha256=U9f78cOi4HyaacqNaFSMq_7rRxVcEczvwPv468GYw3Q,5869
 commands/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFoh0,4609
 commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
+commands/cat/old_list_deployed_database_schemas.py,sha256=R3TtZ77pVbjLYNg08CIBaHqe-p6jr1TI1uuZryVCJ68,8232
 commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-commands/cli/egeria.py,sha256=NDRTZvqWo7H7gcgO_mLVydeSyWKbdeDYl9Eh2vI37PM,31256
-commands/cli/egeria_cat.py,sha256=JZfj2UjyVsIWRxLclyB1ZGVQLTO1jy-GZ18-cVzhRrI,14803
+commands/cli/egeria.py,sha256=HwEYm8TkRQ7b0kFG88Tl-_UI0Fm4U5Jq_s63xOBOHEc,31269
+commands/cli/egeria_cat.py,sha256=654GO8wGToYDAYWGXHaacGwuaz0vkkKRFu1vNPKsleM,14804
 commands/cli/egeria_my.py,sha256=9zIpUDLeA_R-0rgCSQfEZTtVmkxPcEAsYcCTn1wQFrE,6181
 commands/cli/egeria_ops.py,sha256=fxDXYWXRhexx06PdSLCp2FhgUtS13NdDpyg7ea775fc,11531
 commands/cli/egeria_tech.py,sha256=eTDHTHDVEYmr6gUPGfido_Uf7Fec0Nuyxlkhg4KAMAw,13160
@@ -63,7 +64,7 @@ commands/tech/list_elements_for_classification.py,sha256=oAge8RFz4z9H-jCE0fBDhS4
 commands/tech/list_elements_x.py,sha256=k5jkekB7wh6cbzjn7FnwL7pKrPFq_oE-x36c_Z1FuSo,6500
 commands/tech/list_gov_action_processes.py,sha256=AeS4E-DWrS2etsM6nuYD1En1J-7KeB_ZjyLTO9sy6KU,4580
 commands/tech/list_registered_services.py,sha256=QzE_ebdopNkHWMxa-xc902GG6ac4Yw-ln8i8NUsgHVA,6542
-commands/tech/list_related_elements.py,sha256=I1vzNKQfD8Nrwa8JHf4yvWBawKN_vR0AjN0xL_5kWGg,7716
+commands/tech/list_related_elements.py,sha256=mcOy3RIGpIdshcT1o4Tr7Ck-c1dmAC8yBUOF5GAFYrM,7755
 commands/tech/list_related_specification.py,sha256=mWrKenXOskL4cl0DHjH2Z8M9-FJzjkzK62W-tsx3WDU,5918
 commands/tech/list_relationship_types.py,sha256=BlVzrPznZXqMVLN2-2vYEVRGeYsiJrqXxIJEikobyoo,5875
 commands/tech/list_tech_templates.py,sha256=RiyA8a4fIL9BGeGf37Bkk471mK5ECkDJMN9QVNReC1M,6192
@@ -71,14 +72,14 @@ commands/tech/list_valid_metadata_values.py,sha256=N3D0_BmREPszgde3uvvYdfzq7DJ46
 commands/tech/x_list_related_elements.py,sha256=qBsf1619cecaMCTzG0MG22fAT32WNH2Z3CXrjo9z-5Y,5853
 pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
 pyegeria/__init__.py,sha256=mZOa16y_LUUZevlHVQY-X_q0ZE2mEcgAE-eoe16DLls,21893
-pyegeria/_client.py,sha256=pzndEJKN0tcnT7gQFa0r3pzXm9pK4zJKANZOXO79aOs,25949
+pyegeria/_client.py,sha256=H4_BnxS9ww4puwNsx6ML_DALrW0SaqPdXgzi4g4I__8,26011
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=NJ7vAhmvusK1ENvY2MMrBB6A6TgpYjzS9QJxFH56b8c,18470
 pyegeria/_globals.py,sha256=1Uc8392wjbiVN5L__RzxC1-U97RMXj77_iUsMSgeAjQ,638
 pyegeria/_validators.py,sha256=rnZelHJnjHaLZ8UhUTDyB59MfIUJifhALtkYoHBaos4,12736
 pyegeria/asset_catalog_omvs.py,sha256=NUF9C3s_zs9pTfIZyRJlqMCKrhZASJPH08EXzzjki7g,21120
-pyegeria/automated_curation_omvs.py,sha256=Wj9g3Vcx8VmbogxG_kusX38CUylq2r5ZM2sReqUQ-U4,136332
-pyegeria/classification_manager_omvs.py,sha256=VEwvlaDQT12Dwq8Q4lMvYCWYeq0OsC2P0bfsHUdy0CA,180701
+pyegeria/automated_curation_omvs.py,sha256=T_OKzyF-BDV3mTieYHymgcxIgSsoLFrvUtha5uxR804,136375
+pyegeria/classification_manager_omvs.py,sha256=3yInuRy7Cf43oSFZ8BuzcIgtGSm5BfvlKYqtWKRMlPU,186678
 pyegeria/collection_manager_omvs.py,sha256=kye2kjthNnmwxMZhHQKV0xoHbxcNPWjNzRAYOItj_gY,99201
 pyegeria/core_omag_server_config.py,sha256=EtHaPKyc9d6pwTgbnQqGwe5lSBMPIfJOlbJEa1zg1JA,94946
 pyegeria/create_tech_guid_lists.py,sha256=HHkC6HW58EN1BiolrYSRqSE0JhPbTepOFzwtdwBxVaU,4640
@@ -89,8 +90,8 @@ pyegeria/egeria_my_client.py,sha256=XHwbFmSZXJClKDBFV8_fyK9CWaap2FndurRjywKPQiU,
 pyegeria/egeria_tech_client.py,sha256=7NfqpJFft5GR4NPRDVDw22L9caHbXB8fhx0TAf6qEoo,2440
 pyegeria/feedback_manager_omvs.py,sha256=B66e3ZCaC_dirb0mcb2Nz3PYh2ZKsoMAYNOb3euNiro,152931
 pyegeria/full_omag_server_config.py,sha256=LBnqUiz1ofBdlKBzECFs_pQbdJwcWigAukWHGJRR2nU,47340
-pyegeria/glossary_browser_omvs.py,sha256=AnBRp6KKw0507ABz_WmknVL94zLzYzJ4saXrghFlpmw,93455
-pyegeria/glossary_manager_omvs.py,sha256=LmZWwRsDDrvZsf2Whsayj4XHINlER9nu9z2CNc1YOX8,112262
+pyegeria/glossary_browser_omvs.py,sha256=NcitYaZJqwVODBO5zBtWpXPNUJJ3DKzEbRaOFSAyUlg,93554
+pyegeria/glossary_manager_omvs.py,sha256=QnnKPG1XkpZXK0GY7lK4p7i8nZICbWmqNep8_8jg3p4,112966
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
 pyegeria/platform_services.py,sha256=CJIOYIFEbcIGwdWlApAQcXxZTsdrhFtpJcm4O3p7dG0,41646
@@ -101,8 +102,8 @@ pyegeria/server_operations.py,sha256=ciH890hYT85YQ6OpByn4w7s3a7TtvWZpIG5rkRqbcI0
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=tfCGXed5LLt59YA8uZNNtd9UJ-lRZfPU_uZxK31Yux0,65069
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-1.5.1.0.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.0.11.dist-info/METADATA,sha256=rmsnT2nushxBlpPN2rW0q5o1D2v7iKa-JlJnLcyvWx8,2998
-pyegeria-1.5.1.0.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.0.11.dist-info/entry_points.txt,sha256=Pc5kHnxv-vbRpwVMxSSWl66vmf7EZjgzf7nZzz1ow3M,4002
-pyegeria-1.5.1.0.11.dist-info/RECORD,,
+pyegeria-1.5.1.0.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.0.14.dist-info/METADATA,sha256=DySAs-qdcxssUUpzhOAKxUIURSwR_vjM_oNBv8AsLNA,2998
+pyegeria-1.5.1.0.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.0.14.dist-info/entry_points.txt,sha256=Pc5kHnxv-vbRpwVMxSSWl66vmf7EZjgzf7nZzz1ow3M,4002
+pyegeria-1.5.1.0.14.dist-info/RECORD,,