pyegeria 1.5.1.1.37__tar.gz → 1.5.1.1.39__tar.gz

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/PKG-INFO

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

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cat/glossary_actions.py

@@ -259,7 +259,7 @@ def create_term(
 def load_terms(
     glossary_name, file_name, verbose, upsert, server, url, userid, password, timeout
 ):
-    """Delete the glossary specified"""
+    """Load terms from file into the glossary specified"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
     try:
@@ -294,7 +294,7 @@ def load_terms(
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 @click.option("--timeout", default=60, help="Number of seconds to wait")
 def export_terms(glossary_guid, file_name, server, url, userid, password, timeout):
-    """Delete the glossary specified"""
+    """Export the glossary specified"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
     try:
@@ -308,3 +308,27 @@ def export_terms(glossary_guid, file_name, server, url, userid, password, timeou
         print_exception_response(e)
     finally:
         m_client.close_session()
+
+
+@click.command("delete-term")
+@click.option("--term-guid", help="Unique identity of term", required=True)
+@click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
+@click.option(
+    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+)
+@click.option("--userid", default=EGERIA_USER, help="Egeria user")
+@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+@click.option("--timeout", default=60, help="Number of seconds to wait")
+def delete_term(term_guid, server, url, userid, password, timeout):
+    """Delete the Term specified"""
+    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
+    token = m_client.create_egeria_bearer_token()
+    try:
+        m_client.delete_term(term_guid)
+
+        click.echo(f"Deleted term:  {term_guid}")
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cat/list_glossaries.py

@@ -87,7 +87,9 @@ def display_glossaries(
             expand=True,
         )
         table.add_column("Glossary Name")
-        table.add_column("Qualified Name / GUID", width=38, no_wrap=True)
+        table.add_column(
+            "Qualified Name & GUID", width=38, no_wrap=True, justify="center"
+        )
         table.add_column("Language")
         table.add_column("Description")
         table.add_column("Usage")
@@ -101,7 +103,7 @@ def display_glossaries(
                 display_name = glossary["glossaryProperties"]["displayName"]
                 qualified_name = glossary["glossaryProperties"]["qualifiedName"]
                 guid = glossary["elementHeader"]["guid"]
-                q_name = f"{qualified_name}\n\n{guid}"
+                q_name = Text(f"{qualified_name}\n&\n{guid}", justify="center")
                 language = glossary["glossaryProperties"]["language"]
                 description = glossary["glossaryProperties"]["description"]
                 usage = glossary["glossaryProperties"]["usage"]

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cat/list_servers_deployed_imp.py

@@ -81,10 +81,14 @@ def display_servers_by_dep_imp(
         table.add_column("Description")
         table.add_column("Qualified Name & GUID", no_wrap=True)
 
-        server_list = p_client.get_servers_by_dep_impl_type(filter)
-        if type(server_list) is str:
+        unsorted_server_list = p_client.get_servers_by_dep_impl_type(filter)
+        if type(unsorted_server_list) is str:
             print("No matching Software Servers found?")
             sys.exit(1)
+        server_list = sorted(
+            unsorted_server_list,
+            key=lambda x: x["properties"].get("displayName", "---").lower(),
+        )
 
         for server in server_list:
             display_name = server["properties"].get("displayName", "---")
@@ -144,7 +148,9 @@ def main():
     url = args.url if args.url is not None else EGERIA_PLATFORM_URL
     userid = args.userid if args.userid is not None else EGERIA_ADMIN_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
-    filter = Prompt.ask("Search string", default="*")
+    filter = Prompt.ask(
+        "Filter deployed for deployed implementation type by search string", default="*"
+    )
     display_servers_by_dep_imp(filter, server, url, userid, user_pass)
 
 

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cat/list_terms.py

@@ -88,10 +88,7 @@ def display_glossary_terms(
     token = g_client.create_egeria_bearer_token()
     if (glossary_name is not None) and (glossary_name != "*"):
         glossary_guid = g_client.__get_guid__(
-            glossary_guid,
-            glossary_name,
-            "qualifiedName",
-            "Glossary",
+            glossary_guid, glossary_name, "qualifiedName", None, "Glossary"
         )
 
     def generate_table(search_string: str, glossary_guid: str = None) -> Table:
@@ -141,14 +138,20 @@ def display_glossary_terms(
             if props == "None":
                 return table
 
-            display_name = Text(props["displayName"], style=style)
+            display_name = Text(props["displayName"], style=style, justify="center")
             qualified_name = props["qualifiedName"]
             term_guid = term["elementHeader"]["guid"]
-            q_name = Text(f"{qualified_name}\n\t\t&\n{term_guid}", style=style)
-            abbrev = Text(props.get("abbreviation", " "), style=style)
+            q_name = Text(
+                f"{qualified_name}\n&\n{term_guid}", style=style, justify="center"
+            )
+            abbrev = Text(props.get("abbreviation", " "), style=style, justify="center")
             summary = Text(props.get("summary", " "), style=style)
             description = Text(props.get("description", " "), style=style)
-            version = Text(props.get("publishVersionIdentifier", " "), style=style)
+            version = Text(
+                props.get("publishVersionIdentifier", " "),
+                style=style,
+                justify="center",
+            )
 
             classifications = term["elementHeader"]["classifications"]
             glossary_guid = None

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cli/egeria.py

@@ -43,6 +43,7 @@ from pyegeria.commands.cat.glossary_actions import (
     delete_glossary,
     create_term,
     load_terms,
+    delete_term,
     export_terms,
 )
 from pyegeria.commands.cat.list_glossaries import display_glossaries
@@ -936,7 +937,9 @@ def archives(ctx):
 
 @show.command("deployed-servers")
 @click.option(
-    "--search-string", default="*", help="Filter deployed servers by search string"
+    "--search-string",
+    default="*",
+    help="Filter deployed for deployed implementation type by search string",
 )
 @click.pass_context
 def show_deployed_servers(ctx, search_string):
@@ -1035,6 +1038,7 @@ tell.add_command(reassign_todo)
 tell.add_command(delete_todo)
 tell.add_command(create_todo)
 tell.add_command(load_terms)
+tell.add_command(delete_term)
 tell.add_command(export_terms)
 
 
@@ -1180,6 +1184,13 @@ def gov_eng_status(ctx, engine_list, engine_host, list):
 
 
 @engine_host.command("activity")
+@click.option(
+    "--rowlimit",
+    default=0,
+    type=int,
+    show_default=True,
+    help="If non-zero, limit the number of rows returned",
+)
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
@@ -1191,11 +1202,12 @@ def gov_eng_status(ctx, engine_list, engine_host, list):
     help="Compressed combines some attributes into a single column",
 )
 @click.pass_context
-def eng_activity_status(ctx, list, compressed):
+def eng_activity_status(ctx, rowlimit: int, list: bool, compressed: bool):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
     if compressed:
         display_engine_activity_c(
+            rowlimit,
             c.view_server,
             c.view_server_url,
             c.admin_user,
@@ -1206,6 +1218,7 @@ def eng_activity_status(ctx, list, compressed):
         )
     else:
         display_engine_activity(
+            rowlimit,
             c.view_server,
             c.view_server_url,
             c.admin_user,

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cli/egeria_cat.py

@@ -22,6 +22,7 @@ from pyegeria.commands.cat.glossary_actions import (
     create_glossary,
     delete_glossary,
     create_term,
+    delete_term,
     load_terms,
     export_terms,
 )
@@ -519,7 +520,9 @@ def list_archives(ctx):
 
 @show.command("deployed-servers")
 @click.option(
-    "--search-string", default="*", help="Filter deployed servers by search string"
+    "--search-string",
+    default="*",
+    help="Filter deployed for deployed implementation type by search string",
 )
 @click.pass_context
 def show_deployed_servers(ctx, search_string):
@@ -615,6 +618,7 @@ tell.add_command(mark_todo_complete)
 tell.add_command(reassign_todo)
 tell.add_command(delete_todo)
 tell.add_command(create_todo)
+tell.add_command(delete_term)
 tell.add_command(load_terms)
 tell.add_command(export_terms)
 

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/cli/egeria_ops.py

@@ -302,6 +302,13 @@ def gov_eng_status(ctx, engine_list, engine_host, list):
 
 
 @engine_host.command("activity")
+@click.option(
+    "--rowlimit",
+    default=0,
+    type=int,
+    show_default=True,
+    help="If non-zero, limit the number of rows returned",
+)
 @click.option(
     "--compressed",
     is_flag=True,
@@ -317,11 +324,12 @@ def gov_eng_status(ctx, engine_list, engine_host, list):
     help="If True, a paged list will be shown",
 )
 @click.pass_context
-def eng_activity_status(ctx, list, compressed):
+def eng_activity_status(ctx, rowlimit: int, list: bool, compressed: bool):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
     if compressed:
         display_engine_activity_c(
+            rowlimit,
             c.view_server,
             c.view_server_url,
             c.admin_user,
@@ -332,6 +340,7 @@ def eng_activity_status(ctx, list, compressed):
         )
     else:
         display_engine_activity(
+            rowlimit,
             c.view_server,
             c.view_server_url,
             c.admin_user,

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/ops/monitor_engine_activity.py

@@ -51,20 +51,42 @@ disable_ssl_warnings = True
 
 
 def display_engine_activity(
-    server: str,
-    url: str,
-    user: str,
-    user_pass: str,
-    paging: bool,
+    row_limit: int = 0,
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    paging: bool = True,
     jupyter: bool = EGERIA_JUPYTER,
-    width=EGERIA_WIDTH,
+    width: int = EGERIA_WIDTH,
 ):
-    g_client = AutomatedCuration(server, url, user, user_pwd=user_pass)
+    """Display governance engine activity as a table.
+
+    Parameters
+    ----------
+    row_limit : int, opt, default = 0
+        If non-zero, limit the number of rows returned
+    view_server : str
+        The Egeria view server name.
+    view_url : str
+        The URL for the Egeria view server.
+    user : str
+        The user name for authenticating with the Egeria server.
+    user_pass : str
+        The user password for authenticating with the Egeria server.
+    paging : bool, default is True
+        Whether to enable paging mode when displaying the table.
+    jupyter : bool
+        Indicates if the environment is a Jupyter notebook.
+    width : int
+        The width of the console for table printing.
+    """
+    g_client = AutomatedCuration(view_server, view_url, user, user_pwd=user_pass)
 
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Engine Action Status for Platform {url} @ {time.asctime()}",
+            title=f"Engine Action Status for Platform {view_url} @ {time.asctime()}",
             style="bold white on black",
             row_styles=["bold white on black"],
             header_style="white on dark_blue",
@@ -72,7 +94,7 @@ def display_engine_activity(
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Engine Status for Server '{server}' @ Platform - {url}",
+            caption=f"Engine Status for Server '{view_server}' @ Platform - {view_url}",
             expand=True,
         )
         table.add_column("Requested Time")
@@ -105,7 +127,11 @@ def display_engine_activity(
                 key=lambda i: i.get("requestedTime", time.asctime()),
                 reverse=True,
             )
+            row_count = 0
             for action in sorted_action_status:
+                if row_limit > 0 and row_count >= row_limit:
+                    break
+                row_count += 1
                 requested_time = action.get("requestedTime", " ")
                 start_time = action.get("startTime", " ")
                 completion_time = action.get("completionTime", " ")
@@ -193,6 +219,9 @@ def display_engine_activity(
 
 def main_live():
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--rowlimit", default=0, help="Number of rows to return; 0 for all"
+    )
     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")
@@ -204,14 +233,18 @@ def main_live():
     url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    rowlimit = int(args.rowlimit) if args.rowlimit is not None else 0
 
     display_engine_activity(
-        server=server, url=url, user=userid, user_pass=user_pass, paging=False
+        rowlimit, server, url, user=userid, user_pass=user_pass, paging=False
     )
 
 
 def main_paging():
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--rowlimit", default=0, help="Number of rows to return; 0 for all"
+    )
     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")
@@ -223,9 +256,10 @@ def main_paging():
     url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    rowlimit = int(args.rowlimit) if args.rowlimit is not None else 0
 
     display_engine_activity(
-        server=server, url=url, user=userid, user_pass=user_pass, paging=True
+        rowlimit, server, url, user=userid, user_pass=user_pass, paging=True
     )
 
 

{pyegeria-1.5.1.1.37 → pyegeria-1.5.1.1.39}/pyegeria/commands/ops/monitor_engine_activity_c.py

@@ -54,6 +54,7 @@ disable_ssl_warnings = True
 
 
 def display_engine_activity_c(
+    row_limit: int = 0,
     view_server: str = EGERIA_VIEW_SERVER,
     view_url: str = EGERIA_VIEW_SERVER_URL,
     user: str = EGERIA_USER,
@@ -66,6 +67,8 @@ def display_engine_activity_c(
 
     Parameters
     ----------
+    row_limit : int, opt, default = 0
+        If non-zero, limit the number of rows returned
     view_server : str
         The Egeria view server name.
     view_url : str
@@ -125,7 +128,11 @@ def display_engine_activity_c(
                 key=lambda i: i.get("requestedTime", time.asctime()),
                 reverse=True,
             )
+            row_count = 0
             for action in sorted_action_status:
+                if row_limit > 0 and row_count >= row_limit:
+                    break
+                row_count += 1
                 requested_time = action.get("requestedTime", " ")[:-10]
                 start_time = action.get("startTime", " ")[:-10]
                 completion_time = action.get("completionTime", " ")[:-10]
@@ -229,6 +236,9 @@ def display_engine_activity_c(
 
 def main_live():
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--rowlimit", default=0, help="Number of rows to return; 0 for all"
+    )
     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")
@@ -240,14 +250,17 @@ def main_live():
     url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
-
+    rowlimit = int(args.rowlimit) if args.rowlimit is not None else 0
     display_engine_activity_c(
-        server=server, url=url, user=userid, user_pass=user_pass, paging=False
+        rowlimit, server, url, user=userid, user_pass=user_pass, paging=False
     )
 
 
 def main_paging():
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--rowlimit", default=0, help="Number of rows to return; 0 for all"
+    )
     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")
@@ -259,9 +272,10 @@ def main_paging():
     url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    rowlimit = int(args.rowlimit) if args.rowlimit is not None else 0
 
     display_engine_activity_c(
-        server=server, url=url, user=userid, user_pass=user_pass, paging=True
+        rowlimit, server, url, user=userid, user_pass=user_pass, paging=True
     )