pyegeria 0.5.8.23__tar.gz → 0.5.8.25__tar.gz

{pyegeria-0.5.8.23 → pyegeria-0.5.8.25}/PKG-INFO

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

{pyegeria-0.5.8.23 → pyegeria-0.5.8.25}/examples/widgets/catalog_user/list_glossary.py

@@ -8,28 +8,23 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 A simple display for glossary terms
 """
+import argparse
 import os
 import time
-import json
-import argparse
+
+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,
-    print_exception_response,
 )
-from rich.table import Table
-from rich.live import Live
-from rich import box
-from rich.prompt import Prompt
-from rich.tree import Tree
-from rich import print
-from rich.console import Console
-
-
-from pyegeria.server_operations import ServerOps
-from pyegeria._deprecated_gov_engine import GovEng
 from pyegeria.glossary_browser_omvs import GlossaryBrowser
+
 disable_ssl_warnings = True
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -47,18 +42,17 @@ EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 
 def display_glossary_terms(search_string: str, guid: str, server: str, url: str, username: str, user_password: str,
-                           jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH ):
-
+                           jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
     g_client = GlossaryBrowser(server, url)
     token = g_client.create_egeria_bearer_token(username, user_password)
 
-    def generate_table(search_string:str = '*') -> Table:
+    def generate_table(search_string: str = '*') -> Table:
         """Make a new table."""
         table = Table(
             title=f"Glossary Definitions for Terms like  {search_string} @ {time.asctime()}",
-            style="bold white on black",
-            row_styles=["bold white on black"],
-            header_style="white on dark_blue",
+            style="bright_white on black",
+            # row_styles="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,
@@ -73,25 +67,25 @@ def display_glossary_terms(search_string: str, guid: str, server: str, url: str,
         table.add_column("Summary")
         table.add_column("Description")
 
-        terms = g_client.find_glossary_terms(search_string, guid, starts_with=True,
+        terms = g_client.find_glossary_terms(search_string, guid, starts_with=False,
                                              ends_with=False, status_filter=[], page_size=500)
+        style = "bright_white on black"
         if type(terms) is str:
             return table
 
         for term in terms:
-            props = term.get("glossaryTermProperties","None")
+            props = term.get("glossaryTermProperties", "None")
             if props == "None":
                 return table
 
-            display_name = props["displayName"]
-            qualified_name = props["qualifiedName"]
-            abbrev = props.get("abbreviation"," ")
-            summary = props.get("summary", " ")
-            description = props.get("description", " ")
-
+            display_name = Text(props["displayName"], style=style)
+            qualified_name = Text(props["qualifiedName"], style=style)
+            abbrev = Text(props.get("abbreviation", " "), style=style)
+            summary = Text(props.get("summary", " "), style=style)
+            description = Text(props.get("description", " "), style=style)
 
             table.add_row(
-                display_name,qualified_name, abbrev, summary, description, style="bold white on black"
+                display_name, qualified_name, abbrev, summary, description, style="bold white on black"
             )
 
         g_client.close_session()
@@ -102,7 +96,7 @@ def display_glossary_terms(search_string: str, guid: str, server: str, url: str,
         #     while True:
         #         time.sleep(2)
         #         live.update(generate_table(search_string))
-        console = Console(style="bold white on black", width=width, force_terminal=not jupyter)
+        console = Console(style="bold bright_white on black", width=width, force_terminal=not jupyter)
         with console.pager(styles=True):
             console.print(generate_table(search_string))
 
@@ -110,6 +104,7 @@ def display_glossary_terms(search_string: str, guid: str, server: str, url: str,
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         console.print_exception()
 
+
 def main():
     sus_guid = "f9b78b26-6025-43fa-9299-a905cc6d1575"
     parser = argparse.ArgumentParser()
@@ -126,12 +121,14 @@ def main():
     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
     guid = args.guid if args.guid is not None else None
-    guid = sus_guid  if args.sustainability else None
+    guid = sus_guid if args.sustainability else None
 
     try:
         search_string = Prompt.ask("Enter the term you are searching for:", default="*")
-        display_glossary_terms(search_string, guid,server, url, userid, user_pass)
+        display_glossary_terms(search_string, guid, server, url, userid, user_pass)
     except(KeyboardInterrupt):
         pass
+
+
 if __name__ == "__main__":
-    main()
+    main()

pyegeria-0.5.8.25/examples/widgets/cli/egeria_my.py

@@ -0,0 +1,140 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+A command line interface for Egeria Users - of individual relevance
+
+This is an emerging capability based on the **click** package. Feedback welcome!
+
+"""
+import click
+from trogon import tui
+
+from examples.widgets.cli.ops_config import Config
+
+from examples.widgets.personal.monitor_open_todos import display_todos
+from examples.widgets.personal.monitor_my_todos import display_my_todos
+from examples.widgets.personal.list_my_profile import display_my_profiles
+
+
+
+# class Config(object):
+#     def __init__(self, server: str = None, url: str = None, userid:str = None, password:str = None,
+#                  timeout:int = 30, paging: bool = False):
+#         self.server = server
+#         self.url = url
+#         self.userid = userid
+#         self.password = password
+#         self.timeout = timeout
+#         self.paging = paging
+#
+#
+# pass_config = click.make_pass_decorator(Config)
+
+# @tui
+@tui('menu', 'menu', 'A textual command line interface')
+@click.version_option("0.0.1", prog_name="egeria_ops")
+@click.group()
+@click.option('--server', default='active-metadata-store', envvar='EGERIA_METADATA_STORE',
+              help='Egeria metadata store to work with')
+@click.option('--url', default='https://localhost:9443', envvar='EGERIA_PLATFORM_URL',
+              help='URL of Egeria metadata store platform to connect to')
+@click.option('--integration-daemon', default='integration-daemon', envvar='EGERIA_INTEGRATION_DAEMON',
+              help='Egeria integration daemon to work with')
+@click.option('--integration_daemon_url', default='https://localhost:9443', envvar='EGERIA_INTEGRATION_DAEMON_URL',
+              help='URL of Egeria integration daemon platform to connect to')
+@click.option('--view_server', default='view-server', envvar='EGERIA_VIEW_SERVER',
+              help='Egeria view server to work with')
+@click.option('--view_server_url', default='https://localhost:9443', envvar='EGERIA_VIEW_SERVER_URL',
+              help='URL of Egeria view server platform to connect to')
+@click.option('--engine_host', default='engine-host', envvar='EGERIA_ENGINE_HOST',
+              help='Egeria engine host to work with')
+@click.option('--engine_host_url', default='https://localhost:9443', envvar='EGERIA_ENGINE_HOST_URL',
+              help='URL of Egeria engine host platform to connect to')
+@click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
+@click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
+              help='Egeria admin password')
+@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
+              help='Egeria user password')
+@click.option('--timeout', default=60, help='Number of seconds to wait')
+@click.option('--verbose', is_flag=True, default=False, help='Enable verbose mode')
+@click.option('--paging', is_flag=True, default=False, help='Enable paging snapshots vs live updates')
+@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')
+@click.pass_context
+def cli(ctx, server, url, view_server, view_server_url, integration_daemon, integration_daemon_url,
+        engine_host, engine_host_url, admin_user, admin_user_password, userid, password, timeout, paging,
+        verbose, jupyter, width):
+    """An Egeria Command Line interface for Operations """
+    ctx.obj = Config(server, url, view_server, view_server_url, integration_daemon,
+                     integration_daemon_url, engine_host, engine_host_url,
+                     admin_user, admin_user_password, userid, password,
+                     timeout, paging, verbose, jupyter, width)
+    ctx.max_content_width = 200
+    ctx.ensure_object(Config)
+    if verbose:
+        click.echo(f"we are in verbose mode - server is {server}")
+
+
+@cli.group("show")
+@click.pass_context
+def show(ctx):
+    """Display an Egeria Object"""
+    pass
+
+
+@show.command('my-profile')
+@click.pass_context
+def show_my_profile(ctx):
+    """Display my profiles
+
+    Usage: show my-profile
+
+    """
+    c = ctx.obj
+    display_my_profiles( c.view_server, c.view_server_url,
+                 c.userid, c.password, c.jupyter, c.width)
+
+
+@show.command('my-to-dos')
+@click.pass_context
+def show_my_todos(ctx):
+    """Show my To-Dos
+
+    Usage: show my-to-dos
+
+    """
+    c = ctx.obj
+    display_my_todos(c.view_server, c.view_server_url,
+                       c.userid, c.password, c.jupyter, c.width)
+
+
+@show.command('open-to-dos')
+@click.pass_context
+def show_open_todos(ctx):
+    """Display a live status view of Egeria servers for the specified Egeria platform
+
+    Usage: show tech-details <tech-name>
+
+           tech-name is a valid technology name (see 'show tech-types')
+    """
+    c = ctx.obj
+    display_todos( c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
+
+#
+#  Tell
+#
+
+@cli.group('tell')
+@click.pass_context
+def tell(ctx):
+    """Perform actions an Egeria Objects"""
+    pass
+
+
+if __name__ == '__main__':
+    cli()

{pyegeria-0.5.8.23 → pyegeria-0.5.8.25}/examples/widgets/cli/egeria_tech.py

@@ -108,12 +108,20 @@ def show_guid_infos(ctx, guid):
 
 
 @show.command('tech-types')
-@click.option('--tech_type', default='*', help='Tech type to search for')
+@click.option('--search-string', default='*', help='Tech type to search for')
 @click.pass_context
-def show_tech_types(ctx, tech_type):
-    """List deployed technology types"""
+def show_tech_types(ctx, search_string):
+    """List deployed technology types
+
+    Usage: show tech-types <optional search-string>
+
+    All tech-types will be returned if no search-string is specified.
+
+    """
+
+
     c = ctx.obj
-    display_tech_types(tech_type, c.view_server, c.view_server_url,
+    display_tech_types(search_string, c.view_server, c.view_server_url,
                        c.userid, c.password)
 
 
@@ -148,7 +156,7 @@ def show_asset_types(ctx):
                                 case_sensitive=False), default='all', help='Which service group to display')
 @click.pass_context
 def show_registered_services(ctx, services):
-    """Show information about a registered servicese"""
+    """Show information about a registered services"""
     c = ctx.obj
     display_registered_svcs(services, c.view_server, c.view_server_url,
                             c.userid, c.password, c.jupyter, c.width)

{pyegeria-0.5.8.23/examples/widgets/personal_organizer → pyegeria-0.5.8.25/examples/widgets/personal}/list_my_profile.py

@@ -37,8 +37,11 @@ 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_my_profiles(server: str, url: str, username: str, user_pass:str):
+def display_my_profiles(server: str, url: str, username: str, user_pass:str,
+                        jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
 
     m_client = MyProfile(server, url, user_id=username, user_pwd=user_pass)
     token = m_client.create_egeria_bearer_token(username, user_pass)
@@ -102,7 +105,7 @@ def display_my_profiles(server: str, url: str, username: str, user_pass:str):
         #     while True:
         #         time.sleep(2)
         #         live.update(generate_table())
-        console = Console()
+        console = Console(width=width, force_terminal=not jupyter)
         with console.pager():
             console.print(generate_table())
 

{pyegeria-0.5.8.23/examples/widgets/personal_organizer → pyegeria-0.5.8.25/examples/widgets/personal}/monitor_my_todos.py

@@ -15,6 +15,7 @@ import time
 from rich import box
 from rich.live import Live
 from rich.table import Table
+from rich.console import Console
 
 from pyegeria import (
     InvalidParameterException,
@@ -35,11 +36,17 @@ 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'))
 
 disable_ssl_warnings = True
 
 
-def display_todos(server: str, url: str, user: str, user_pass:str):
+def display_my_todos(server: str, url: str, user: str, user_pass:str,
+                  jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
+
+    console = Console(width=width, force_terminal=not jupyter)
+
     m_client = MyProfile(server, url, user_id=user)
     token = m_client.create_egeria_bearer_token(user, user_pass)
 
@@ -131,7 +138,6 @@ def display_todos(server: str, url: str, user: str, user_pass:str):
             while True:
                 time.sleep(2)
                 live.update(generate_table())
-                live.console.pager()
 
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
@@ -156,7 +162,7 @@ def main():
 
     try:
         print(f"Starting display_todos with {server}, {url}, {userid}")
-        display_todos(server=server, url=url, user=userid, user_pass=user_pass)
+        display_my_todos(server=server, url=url, user=userid, user_pass=user_pass)
     except KeyboardInterrupt:
         pass
 

{pyegeria-0.5.8.23/examples/widgets/personal_organizer → pyegeria-0.5.8.25/examples/widgets/personal}/monitor_open_todos.py

@@ -15,7 +15,7 @@ import sys
 from rich import box
 from rich.live import Live
 from rich.table import Table
-from rich import console
+from rich.console import Console
 
 from pyegeria._exceptions import (
     InvalidParameterException,
@@ -38,18 +38,25 @@ 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_todos(server: str , url: str, user: str, user_pass:str):
+def display_todos(server: str , url: str, user: str, user_pass:str,
+                  jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
+
+    console = Console(width=width, force_terminal=not jupyter)
+
     m_client = MyProfile(server, url, user_id=user)
     token = m_client.create_egeria_bearer_token(user, user_pass)
 
     def generate_table(search_string:str = '*') -> Table:
         """Make a new table."""
         table = Table(
+            header_style="bright_white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
             title=f"Open ToDos for Platform {url} @ {time.asctime()}",
-            # style = "black on grey66",
-            header_style="white on dark_blue",
             show_lines=True,
             box=box.ROUNDED,
             caption=f"ToDos for Server '{server}' @ Platform - {url}",

{pyegeria-0.5.8.23 → pyegeria-0.5.8.25}/examples/widgets/tech/list_registered_services.py

@@ -79,7 +79,7 @@ def display_registered_svcs(service: str, server: str, url: str,
         table.add_column("Service  Development Status")
         table.add_column("URL Marker")
         table.add_column("Description")
-        table.add_column("Wiki")
+        table.add_column("Wiki",no_wrap=True)
         table.add_column("Server Type")
         table.add_column("Partner Service Name")
         table.add_column("Partner Service Type")

{pyegeria-0.5.8.23 → pyegeria-0.5.8.25}/examples/widgets/tech/list_tech_templates.py

@@ -51,7 +51,7 @@ def display_tech_templates(search_string:str, server: str,
             style="bold bright_white on black",
             row_styles=["bold bright_white on black"],
             header_style="white on dark_blue",
-            title_style="bold white on black",
+            title_style="bold bright_white on black",
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,

{pyegeria-0.5.8.23 → pyegeria-0.5.8.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.8.23"
+version = "0.5.8.25"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -19,7 +19,7 @@ packages = [
     { include = "examples/widgets/catalog_user" },
     { include = "examples/widgets/tech" },
     { include = "examples/widgets/operational"},
-    { include = "examples/widgets/personal_organizer"},
+    { include = "examples/widgets/personal"},
     { include = "examples/doc_samples"},
     { include = "examples/widgets/cli"}
     ]
@@ -77,17 +77,17 @@ pytest = "^8.2.2"
     load_archive_tui = "examples.widgets.operational.load_archive:tui"
     list_catalog_targets = "examples.widgets.operational.list_catalog_targets:main"
 
-    list_my_profile = "examples.widgets.personal_organizer.list_my_profile:main"
-
-    monitor_open_todos = "examples.widgets.personal_organizer.monitor_open_todos:main"
-    monitor_my_todos = "examples.widgets.personal_organizer.monitor_my_todos:main"
+    list_my_profile = "examples.widgets.personal.list_my_profile:main"
+    monitor_open_todos = "examples.widgets.personal.monitor_open_todos:main"
+    monitor_my_todos = "examples.widgets.personal.monitor_my_todos:main"
 
     egeria_ops = "examples.widgets.cli.egeria_ops:cli"
-    egeria_ops_menu = "examples.widgets.cli.egeria_ops:menu"
+#    egeria_ops_menu = "examples.widgets.cli.egeria_ops:menu"
     egeria_cat = "examples.widgets.cli.egeria_cat:cli"
-    egeria_cat_menu = "examples.widgets.cli.egeria_cat:menu"
+#    egeria_cat_menu = "examples.widgets.cli.egeria_cat:menu"
     egeria_tech = "examples.widgets.cli.egeria_cat:cli"
-    egeria_tech_menu = "examples.widgets.cli.egeria_cat:menu"
+#    egeria_tech_menu = "examples.widgets.cli.egeria_cat:menu"
+    egeria_my = "examples.widgets.cli.egeria_my:cli"
 
     get_guid_info = "examples.widgets.tech.get_guid_info:main"
     get_tech_details = "examples.widgets.tech.get_tech_details:main"