pyegeria 1.5.1.1.7__tar.gz → 1.5.1.1.9__tar.gz

{pyegeria-1.5.1.1.7 → pyegeria-1.5.1.1.9}/PKG-INFO

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

{pyegeria-1.5.1.1.7 → pyegeria-1.5.1.1.9}/commands/cat/glossary_actions.py

@@ -113,7 +113,22 @@ def create_glossary(
 @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 list_glossaries(search_string, server, url, userid, password, timeout):
+@click.option(
+    "--jupyter",
+    is_flag=True,
+    default=False,
+    envvar="EGERIA_JUPYTER",
+    help="Enable for rendering in a Jupyter terminal",
+)
+@click.option(
+    "--width",
+    default=200,
+    envvar="EGERIA_WIDTH",
+    help="Screen width, in characters, to use",
+)
+def list_glossaries(
+    search_string, server, url, userid, password, timeout, jupyter, width
+):
     """List all glossaries"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
@@ -151,8 +166,8 @@ def list_glossaries(search_string, server, url, userid, password, timeout):
                 table.add_row(display_name, q_name, language, description, usage)
             console = Console(
                 style="bold bright_white on black",
-                width=EGERIA_WIDTH,
-                force_terminal=not EGERIA_JUPYTER,
+                width=width,
+                force_terminal=not jupyter,
             )
             console.print(table)
 
@@ -284,9 +299,9 @@ def create_term(
 @click.option("--file-name", help="Path of CSV file", required=True)
 @click.option(
     "--verbose",
-    type=bool,
+    is_flag=True,
     default=False,
-    help="If true, result descriptions are provided",
+    help="If set, result descriptions are provided",
 )
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
 @click.option(

{pyegeria-1.5.1.1.7 → pyegeria-1.5.1.1.9}/commands/cat/list_terms.py

@@ -72,11 +72,13 @@ def display_glossary_terms(
             expand=True,
         )
         table.add_column("Term Name")
-        table.add_column("Qualified Name")
-
+        table.add_column("Qualified Name / GUID")
+        table.add_column("Glossary")
         table.add_column("Abbreviation")
         table.add_column("Summary")
         table.add_column("Description")
+        table.add_column("Version Id")
+        # table.add_column("Status")
 
         terms = g_client.find_glossary_terms(
             search_string,
@@ -103,17 +105,27 @@ def display_glossary_terms(
                 return table
 
             display_name = Text(props["displayName"], style=style)
-            qualified_name = Text(props["qualifiedName"], style=style)
+            qualified_name = props["qualifiedName"]
+            term_guid = term["elementHeader"]["guid"]
+            q_name = Text(f"{qualified_name}\n\t\t\t&\n{term_guid}", style=style)
             abbrev = Text(props.get("abbreviation", " "), style=style)
             summary = Text(props.get("summary", " "), style=style)
             description = Text(props.get("description", " "), style=style)
+            version = Text(props.get("publishVersionIdentifier", " "), style=style)
+
+            glossary_info = g_client.get_glossary_for_term(term_guid)
+
+            glossary_name = glossary_info["glossaryProperties"].get("displayName", " ")
 
             table.add_row(
                 display_name,
-                qualified_name,
+                q_name,
+                glossary_name,
                 abbrev,
                 summary,
                 description,
+                version,
+                # status,
                 style="bold white on black",
             )
 

{pyegeria-1.5.1.1.7 → pyegeria-1.5.1.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "1.5.1.1.7"
+version = "1.5.1.1.9"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"