pyegeria 1.5.1.1.6__py3-none-any.whl → 1.5.1.1.7__py3-none-any.whl

commands/cat/glossary_actions.py

@@ -13,10 +13,15 @@ import os
 import sys
 import time
 from datetime import datetime
+from rich import box
+from rich.console import Console
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.text import Text
 
 import click
 
-# from ops_config import Config, pass_config
+
 from pyegeria import EgeriaTech, body_slimmer
 from pyegeria._exceptions import (
     InvalidParameterException,
@@ -40,6 +45,8 @@ 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_WIDTH = os.environ.get("EGERIA_WIDTH", 200)
+EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", False)
 
 
 @click.command("create-glossary")
@@ -88,7 +95,7 @@ def create_glossary(
                 )
             sys.exit(0)
 
-        glossary_guid = m_client.create_glossary(name, language, description, usage)
+        glossary_guid = m_client.create_glossary(name, description, language, usage)
         print(f"New glossary {name} created with id of {glossary_guid}")
 
     except (InvalidParameterException, PropertyServerException) as e:
@@ -97,6 +104,64 @@ def create_glossary(
         m_client.close_session()
 
 
+@click.command("list-glossaries")
+@click.option("--search-string", default="*", help="Glossaries to search for")
+@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 list_glossaries(search_string, server, url, userid, password, timeout):
+    """List all glossaries"""
+    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
+    token = m_client.create_egeria_bearer_token()
+    try:
+        table = Table(
+            title=f"Glossary List @ {time.asctime()}",
+            style="bright_white on black",
+            header_style="bright_white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            caption=f"View Server '{server}' @ Platform - {url}",
+            expand=True,
+        )
+        table.add_column("Glossary Name")
+        table.add_column("Qualified Name / GUID")
+        table.add_column("Language")
+        table.add_column("Description")
+        table.add_column("Usage")
+
+        glossaries = m_client.find_glossaries(search_string)
+        if type(glossaries) is list:
+            sorted_glossary_list = sorted(
+                glossaries, key=lambda k: k["glossaryProperties"]["displayName"]
+            )
+            for glossary in sorted_glossary_list:
+                display_name = glossary["glossaryProperties"]["displayName"]
+                qualified_name = glossary["glossaryProperties"]["qualifiedName"]
+                guid = glossary["elementHeader"]["guid"]
+                q_name = f"{qualified_name}\n\n{guid}"
+                language = glossary["glossaryProperties"]["language"]
+                description = glossary["glossaryProperties"]["description"]
+                usage = glossary["glossaryProperties"]["usage"]
+                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,
+            )
+            console.print(table)
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
+
 @click.command("delete-glossary")
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
 @click.option(

commands/cat/{list_glossary.py → list_terms.py}

@@ -68,10 +68,10 @@ def display_glossary_terms(
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Glossary View Server '{server}' @ Platform - {url}",
+            caption=f"View Server '{server}' @ Platform - {url}",
             expand=True,
         )
-        table.add_column("Display Name")
+        table.add_column("Term Name")
         table.add_column("Qualified Name")
 
         table.add_column("Abbreviation")

commands/cli/egeria.py

@@ -20,7 +20,7 @@ from commands.cat.get_tech_type_elements import tech_viewer
 from commands.cat.get_tech_type_template import template_viewer
 from commands.cat.list_assets import display_assets
 from commands.cat.list_cert_types import display_certifications
-from commands.cat.list_glossary import display_glossary_terms
+from commands.cat.list_terms import display_glossary_terms
 from commands.cat.list_projects import display_project_list
 from commands.cat.list_relationships import list_relationships
 from commands.cat.list_tech_types import display_tech_types
@@ -40,6 +40,7 @@ from commands.cat.list_deployed_databases import list_deployed_databases
 from commands.cat.glossary_actions import (
     create_glossary,
     delete_glossary,
+    list_glossaries,
     create_term,
     load_terms,
 )
@@ -970,6 +971,8 @@ def list_databases(ctx):
     )
 
 
+show.add_command(list_glossaries)
+
 #
 #  Catalog User: Tell
 #

commands/cli/egeria_cat.py

@@ -23,6 +23,7 @@ from commands.cat.glossary_actions import (
     delete_glossary,
     create_term,
     load_terms,
+    list_glossaries,
 )
 from commands.cat.list_archives import display_archive_list
 from commands.cat.list_assets import display_assets
@@ -32,7 +33,7 @@ from commands.cat.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_terms import display_glossary_terms
 from commands.cat.list_projects import display_project_list
 from commands.cat.list_relationships import list_relationships
 from commands.cat.list_tech_types import display_tech_types
@@ -552,6 +553,8 @@ def list_databases(ctx):
     )
 
 
+show.add_command(list_glossaries)
+
 #
 #  Tell
 #

pyegeria/glossary_manager_omvs.py

@@ -10,6 +10,7 @@ import asyncio
 import time
 import csv
 from datetime import datetime
+from typing import List
 
 from pyegeria import InvalidParameterException
 
@@ -1417,7 +1418,7 @@ class GlossaryManager(GlossaryBrowser):
 
     def load_terms_from_file(
         self, glossary_name: str, filename: str, upsert: bool = False
-    ) -> [dict]:
+    ) -> List[dict]:
         """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)
@@ -1437,7 +1438,6 @@ class GlossaryManager(GlossaryBrowser):
 
         # Now we know we have a single glossary so we can get the guid
         glossary_guid = glossaries[0]["elementHeader"]["guid"]
-        term_info = []
 
         term_properties = {
             "Term Name",
@@ -1455,6 +1455,7 @@ class GlossaryManager(GlossaryBrowser):
             # Create a CSV reader object
             csv_reader = csv.DictReader(file)
             headers = csv_reader.fieldnames
+            term_info = []
             # check that the column headers are known
             if all(header in term_properties for header in headers) is False:
                 raise InvalidParameterException("Invalid headers in CSV File")
@@ -1473,23 +1474,23 @@ class GlossaryManager(GlossaryBrowser):
                 status = row.get("Status", "DRAFT").upper()
 
                 # process the row
-                if term_name is None:
+                if len(term_name) < 2:
                     term_info.append(
                         {
-                            {"term_name": "---"},
-                            {"qualified_name": "---"},
-                            {"term_guid": "---"},
-                            {"error": "missing term names - skipping"},
+                            "term_name": "---",
+                            "qualified_name": "---",
+                            "term_guid": "---",
+                            "error": "missing or invalid term names - skipping",
                         }
                     )
                     continue
                 if self.__validate_term_status__(status) is False:
                     term_info.append(
                         {
-                            {"term_name": "---"},
-                            {"qualified_name": "---"},
-                            {"term_guid": "---"},
-                            {"error": "invalid term status"},
+                            "term_name": "---",
+                            "qualified_name": "---",
+                            "term_guid": "---",
+                            "error": "invalid term status",
                         }
                     )
                     continue

{pyegeria-1.5.1.1.6.dist-info → pyegeria-1.5.1.1.7.dist-info}/METADATA

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

{pyegeria-1.5.1.1.6.dist-info → pyegeria-1.5.1.1.7.dist-info}/RECORD

@@ -6,22 +6,22 @@ commands/cat/get_project_dependencies.py,sha256=B0JaMSUi0hzVgos1sTY2uUPGy1DzKEJM
 commands/cat/get_project_structure.py,sha256=n2GbNd07w1DTo7jTR8b2ewXRyNcat_2BcCBRyDMldwk,5969
 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=KbSiMseXgQLdoT8TqXocl3WpE_gqalkxjxRuGZCzFw8,8775
+commands/cat/glossary_actions.py,sha256=cln_aGvkJ-aOZG_pHQE81G5MxHWILXKYYrDa4-HJJzY,11602
 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=HNAR8qXU7FWUxPJw6yBxmlsJ_eVXqsD_DrswKmY1iv0,8824
 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_terms.py,sha256=Eckpd4Y0RojuwWRy-dpft8dMtYQvHpe7bBvlsAAvbAE,5799
 commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
 commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-commands/cli/egeria.py,sha256=HeGF9WbUXZQjUFsjuHZDBFki8nt4QxRqDUpa-0uf3Jg,31327
-commands/cli/egeria_cat.py,sha256=r0eseanfHszfi0K26weWiQn0XstzwN7CoaNv9-zbqGg,14862
+commands/cli/egeria.py,sha256=2TUbDYeKoqU5ihFq2HbHxZjycwiW4rqdpv2ivDQEV6o,31380
+commands/cli/egeria_cat.py,sha256=ED--LsHKn94lxuyv8w46lhfnRNido-hOnbBBgrTwHMc,14915
 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
@@ -92,7 +92,7 @@ pyegeria/egeria_tech_client.py,sha256=7NfqpJFft5GR4NPRDVDw22L9caHbXB8fhx0TAf6qEo
 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=NcitYaZJqwVODBO5zBtWpXPNUJJ3DKzEbRaOFSAyUlg,93554
-pyegeria/glossary_manager_omvs.py,sha256=Nnk0cnpU4zJodIgEs7sqLTldd0fF2gKcMt2FBgSlAPI,116815
+pyegeria/glossary_manager_omvs.py,sha256=UImHe9UKaiMPazh_pvTEFroNIfVAG4rPtUrXrwN9DKk,116843
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
 pyegeria/platform_services.py,sha256=CJIOYIFEbcIGwdWlApAQcXxZTsdrhFtpJcm4O3p7dG0,41646
@@ -104,8 +104,8 @@ pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZi
 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.1.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.1.6.dist-info/METADATA,sha256=7Eisg_5cSqYJpOCf4ZkxAizYWVz5YR-ZMIw0hUdpfQw,2997
-pyegeria-1.5.1.1.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.1.6.dist-info/entry_points.txt,sha256=eQF0CAWVQlHftl85JzL0pWSaQ1eURJ6MeI1I78FvAgQ,4127
-pyegeria-1.5.1.1.6.dist-info/RECORD,,
+pyegeria-1.5.1.1.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.1.7.dist-info/METADATA,sha256=3d-S8G-NEnHy64vcqaQDw3bhwQ2e-WNDq72hWfPJ4jM,2997
+pyegeria-1.5.1.1.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.1.7.dist-info/entry_points.txt,sha256=aSpiaOuOEL1QBfuIGOaATzDCihpVOyvIK1XCQHK3uRc,4186
+pyegeria-1.5.1.1.7.dist-info/RECORD,,

{pyegeria-1.5.1.1.6.dist-info → pyegeria-1.5.1.1.7.dist-info}/entry_points.txt

@@ -32,6 +32,7 @@ list_elements=commands.tech.list_elements:main
 list_elements_for_classification=commands.tech.list_elements_for_classification:main
 list_engine_activity=commands.ops.monitor_engine_activity:main_paging
 list_engine_activity_compressed=commands.ops.monitor_engine_activity_c:main_paging
+list_glossaries=commands.cat.glossary_actions:list_glossaries
 list_gov_action_processes=commands.tech.list_gov_action_processes:main
 list_gov_eng_status=commands.ops.monitor_gov_eng_status:main_paging
 list_integ_daemon_status=commands.ops.monitor_integ_daemon_status:main_paging
@@ -44,7 +45,7 @@ list_relationship_types=commands.tech.list_relationship_types:main
 list_relationships=commands.cat.list_relationships:main
 list_tech_templates=commands.tech.list_tech_templates:main
 list_tech_types=commands.cat.list_tech_types:main
-list_terms=commands.cat.list_glossary:main
+list_terms=commands.cat.list_terms:main
 list_todos=commands.cat.list_todos:main
 list_user_ids=commands.cat.list_user_ids:main
 list_valid_metadata_values=commands.tech.list_valid_metadata_values:main