pyegeria 1.5.1.1.28__tar.gz → 1.5.1.1.30__tar.gz

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.30}/PKG-INFO

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

pyegeria-1.5.1.1.30/pyegeria/commands/__init__.py

@@ -0,0 +1,12 @@
+"""
+
+Widgets
+"""
+
+from .ops.monitor_gov_eng_status import display_gov_eng_status
+from .ops.monitor_integ_daemon_status import display_integration_daemon_status
+from .cat.list_glossaries import display_glossaries
+from .cat.list_terms import display_glossary_terms
+from .ops.table_integ_daemon_status import (
+    display_integration_daemon_status as table_integ_daemon_status,
+)

pyegeria-1.5.1.1.30/pyegeria/commands/cat/__init__.py

@@ -0,0 +1,5 @@
+from .list_glossaries import display_glossaries
+from .list_terms import display_glossary_terms
+from .list_deployed_catalogs import list_deployed_catalogs
+from .list_deployed_database_schemas import list_deployed_database_schemas
+from .list_deployed_databases import list_deployed_databases

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.30}/pyegeria/commands/cat/glossary_actions.py

@@ -117,94 +117,6 @@ def create_glossary(
         m_client.close_session()
 
 
-def display_glossaries(
-    search_string: str,
-    server: str,
-    url: str,
-    userid: str,
-    password: str,
-    timeout: int,
-    jupyter: bool,
-    width: int,
-):
-    list_glossaries(
-        search_string, server, url, userid, password, timeout, jupyter, width
-    )
-
-
-@click.command("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")
-@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()
-    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", width=38, no_wrap=True)
-        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=width,
-                force_terminal=not 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(

pyegeria-1.5.1.1.30/pyegeria/commands/cat/list_glossaries.py

@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Unit tests for the Utils helper functions using the Pytest framework.
+
+
+A simple display for glossary terms
+"""
+import argparse
+import os
+import sys
+import time
+
+from rich import box
+from rich.console import Console
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.text import Text
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    EgeriaTech,
+    print_exception_response,
+)
+
+disable_ssl_warnings = True
+
+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 display_glossaries(
+    search_string: str,
+    server: str,
+    url: str,
+    userid: str,
+    password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    """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", width=38, no_wrap=True)
+        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=width,
+                force_terminal=not jupyter,
+            )
+            console.print(table)
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_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="User 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
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    try:
+        search_string = Prompt.ask(
+            "Enter the glossary you are searching for or '*' for all:", default="*"
+        )
+
+        display_glossaries(search_string, server, url, userid, user_pass)
+
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.30}/pyegeria/commands/cli/egeria.py

@@ -40,11 +40,12 @@ from pyegeria.commands.cat.list_deployed_databases import list_deployed_database
 from pyegeria.commands.cat.glossary_actions import (
     create_glossary,
     delete_glossary,
-    list_glossaries,
     create_term,
     load_terms,
     export_terms,
 )
+from pyegeria.commands.cat.list_glossaries import display_glossaries
+
 from pyegeria.commands.my.todo_actions import (
     mark_todo_complete,
     reassign_todo,
@@ -978,7 +979,22 @@ def list_databases(ctx):
     )
 
 
-show.add_command(list_glossaries)
+@show.command("list-glossaries")
+@click.option("--search_string", default="*", help="Name to search for glossaries")
+@click.pass_context
+def list_glossaries(ctx, search_string):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    display_glossaries(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
 
 #
 #  Catalog User: Tell

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.30}/pyegeria/commands/cli/egeria_cat.py

@@ -23,9 +23,9 @@ from pyegeria.commands.cat.glossary_actions import (
     delete_glossary,
     create_term,
     load_terms,
-    list_glossaries,
     export_terms,
 )
+from pyegeria.commands.cat.list_glossaries import display_glossaries
 from pyegeria.commands.cat.list_archives import display_archive_list
 from pyegeria.commands.cat.list_assets import display_assets
 from pyegeria.commands.cat.list_cert_types import display_certifications
@@ -550,6 +550,23 @@ def list_catalogs(ctx, search_server):
     )
 
 
+@show.command("list-glossaries")
+@click.option("--search_string", default="*", help="Name to search for glossaries")
+@click.pass_context
+def list_glossaries(ctx, search_string):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    display_glossaries(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show.command("list-databases")
 @click.pass_context
 def list_databases(ctx):
@@ -560,8 +577,6 @@ def list_databases(ctx):
     )
 
 
-show.add_command(list_glossaries)
-
 #
 #  Tell
 #

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.30}/pyegeria/commands/ops/__init__.py

@@ -4,12 +4,12 @@ Copyright Contributors to the ODPi Egeria project.
 
 
 """
-
-from monitor_integ_daemon_status import display_integration_daemon_status
-from monitor_gov_eng_status import display_gov_eng_status
-from monitor_platform_status import display_status as display_platform_status
-from monitor_server_status import display_status as display_server_status
-from monitor_engine_activity_c import display_engine_activity_c
+#
+# from .monitor_integ_daemon_status import display_integration_daemon_status
+# from .monitor_gov_eng_status import display_gov_eng_status
+# from .monitor_platform_status import display_status as display_platform_status
+# from .monitor_server_status import display_status as display_server_status
+# from .monitor_engine_activity_c import display_engine_activity_c
 
 # import monitor_server_status
 # import monitor_server_list

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "1.5.1.1.28"
+version = "1.5.1.1.30"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -73,7 +73,7 @@ pytest = "^8.2.2"
     create_glossary = "pyegeria.commands.cat.glossary_actions:create_glossary"
     delete_glossary = "pyegeria.commands.cat.glossary_actions:delete_glossary"
     create_term = "pyegeria.commands.cat.glossary_actions:create_term"
-    list_glossaries = "pyegeria.commands.cat.glossary_actions:list_glossaries"
+    list_glossaries = "pyegeria.commands.cat.list_glossaries:main"
     load_terms_from_file = "pyegeria.commands.cat.glossary_actions:load_terms"
     export_terms_to_file = "pyegeria.commands.cat.glossary_actions:export_terms"
 

pyegeria-1.5.1.1.28/pyegeria/commands/__init__.py

@@ -1,14 +0,0 @@
-"""
-
-Widgets
-"""
-
-# from ops.monitor_gov_eng_status import display_gov_eng_status
-# from ops.monitor_integ_daemon_status import display_integration_daemon_status
-# from cat.glossary_actions import display_glossaries
-# from cat.list_terms import display_glossary_terms
-# from ops.table_integ_daemon_status import display_integration_daemon_status
-import ops
-import cat
-import tech
-import my

pyegeria-1.5.1.1.28/pyegeria/commands/cat/__init__.py

@@ -1,5 +0,0 @@
-from glossary_actions import display_glossaries
-from list_terms import display_glossary_terms
-from list_deployed_catalogs import list_deployed_catalogs
-from list_deployed_database_schemas import list_deployed_database_schemas
-from list_deployed_databases import list_deployed_databases