pyegeria 5.2__py3-none-any.whl → 5.2.0.2__py3-none-any.whl

pyegeria/commands/cli/egeria.py

@@ -9,19 +9,14 @@ A command line interface for Egeria Users - all commands
 This is an emerging capability based on the **click** package. Feedback welcome!
 
 """
-import os
-import sys
-
 import click
 from trogon import tui
 
-from pyegeria.commands.cli.egeria_login_tui import login
 from pyegeria.commands.cat.get_asset_graph import asset_viewer
 from pyegeria.commands.cat.get_collection import collection_viewer
 from pyegeria.commands.cat.get_project_dependencies import project_dependency_viewer
 from pyegeria.commands.cat.get_project_structure import project_structure_viewer
 from pyegeria.commands.cat.get_tech_type_elements import tech_viewer
-from pyegeria.commands.cat.list_tech_type_elements import list_tech_elements
 from pyegeria.commands.cli.egeria_ops import show_server
 from pyegeria.commands.tech.get_tech_type_template import template_viewer
 from pyegeria.commands.cat.list_assets import display_assets
@@ -118,83 +113,87 @@ from pyegeria.commands.tech.list_gov_action_processes import display_gov_process
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default="active-metadata-store",
+    envvar="EGERIA_METADATA_STORE",
     help="Egeria metadata store to work with",
 )
 @click.option(
     "--url",
-    default=os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443"),
+    default="https://localhost:9443",
+    envvar="EGERIA_PLATFORM_URL",
     help="URL of Egeria metadata store platform to connect to",
 )
 @click.option(
-    "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    "--integration-daemon",
+    default="integration-daemon",
+    envvar="EGERIA_INTEGRATION_DAEMON",
     help="Egeria integration daemon to work with",
 )
 @click.option(
     "--integration_daemon_url",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"),
+    default="https://localhost:9443",
+    envvar="EGERIA_INTEGRATION_DAEMON_URL",
     help="URL of Egeria integration daemon platform to connect to",
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default="view-server",
+    envvar="EGERIA_VIEW_SERVER",
     help="Egeria view server to work with",
 )
 @click.option(
     "--view_server_url",
-    default=os.environ.get("EGERIA_VIEW_SERVER_URL", "https://localhost:9443"),
+    default="https://localhost:9443",
+    envvar="EGERIA_VIEW_SERVER_URL",
     help="URL of Egeria view server platform to connect to",
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default="engine-host",
+    envvar="EGERIA_ENGINE_HOST",
     help="Egeria engine host to work with",
 )
 @click.option(
     "--engine_host_url",
-    default=os.environ.get("EGERIA_ENGINE_HOST_URL", "https://localhost:9443"),
+    default="https://localhost:9443",
+    envvar="EGERIA_ENGINE_HOST_URL",
     help="URL of Egeria engine host platform to connect to",
 )
 @click.option(
     "--admin_user",
-    default=os.environ.get("EGERIA_ADMIN_USER", "garygeeke"),
+    default="garygeeke",
+    envvar="EGERIA_ADMIN_USER",
     help="Egeria admin user",
 )
 @click.option(
     "--admin_user_password",
-    default=os.environ.get("EGERIA_ADMIN_PASSWORD", "secret"),
+    default="secret",
+    envvar="EGERIA_ADMIN_PASSWORD",
     help="Egeria admin password",
 )
 @click.option(
-    "--userid",
-    default=os.environ.get("EGERIA_USER", "erinoverview"),
-    help="Egeria user",
+    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
 )
 @click.option(
     "--password",
-    default=os.environ.get("EGERIA_USER_PASSWORD", "secret"),
+    default="secret",
+    envvar="EGERIA_PASSWORD",
     help="Egeria user password",
 )
 @click.option("--timeout", default=60, help="Number of seconds to wait")
 @click.option(
     "--jupyter",
     is_flag=True,
-    type=bool,
-    default=os.environ.get("EGERIA_JUPYTER", False),
+    default=False,
+    envvar="EGERIA_JUPYTER",
     help="Enable for rendering in a Jupyter terminal",
 )
 @click.option(
     "--width",
-    default=os.environ.get("EGERIA_WIDTH", 200),
-    type=int,
+    default=200,
+    envvar="EGERIA_WIDTH",
     help="Screen width, in characters, to use",
 )
-@click.option(
-    "--home_glossary_guid",
-    default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
-    help="Glossary guid to use as the home glossary",
-)
 @click.pass_context
 def cli(
     ctx,
@@ -213,7 +212,6 @@ def cli(
     timeout,
     jupyter,
     width,
-    home_glossary_guid,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -232,9 +230,8 @@ def cli(
         timeout,
         jupyter,
         width,
-        home_glossary_guid,
     )
-    ctx.max_content_width = 250
+    ctx.max_content_width = 200
     ctx.ensure_object(Config)
 
 
@@ -272,7 +269,11 @@ def show_my_profile(ctx):
 @my_show.command("my-roles")
 @click.pass_context
 def show_my_roles(ctx):
-    """Display my roles"""
+    """Display my profiles
+
+    Usage: show my-profile
+
+    """
     c = ctx.obj
     display_my_roles(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -362,8 +363,8 @@ def show_elements(ctx):
 @show_elements.command("guid-info")
 @click.argument("guid", nargs=1)
 @click.pass_context
-def show_guid_info(ctx, guid):
-    """Display guid information
+def show_guid_infos(ctx, guid):
+    """Display a live status view of known platforms
 
     Usage: show guid-info <a guid>
 
@@ -372,37 +373,22 @@ def show_guid_info(ctx, guid):
     display_guid(guid, c.server, c.url, c.userid, c.password, c.jupyter, c.width)
 
 
-@show_elements.command("anchored_elements")
+@show_elements.command("anchored-elements")
 @click.pass_context
+@click.option("--search-string", help="value we are searching for")
 @click.option(
-    "--search-string",
-    default="DeployedDatabaseSchema",
-    help="value we are searching for",
-)
-@click.option(
-    "--prop-list",
-    default="anchorTypeName",
-    help="List of properties we are searching",
+    "--prop-list", default="anchorTypeName", help="List of properties we are searching"
 )
 def list_anchored_elements(ctx, search_string: str, prop_list: str):
     """List elements with the specified properties"""
     c = ctx.obj
-    if type(prop_list) is str:
-        property_names = prop_list.split(",")
-    elif type(prop_list) is list:
-        property_names = prop_list
-    else:
-        property_names = []
-        print(f"\nError --> Invalid property list - must be a string or list")
-        sys.exit(4)
     display_anchored_elements(
         search_string,
-        [prop_list],
+        prop_list,
         c.view_server,
         c.view_server_url,
         c.userid,
         c.password,
-        c.timeout,
         c.jupyter,
         c.width,
     )
@@ -484,7 +470,7 @@ def show_tech_type_templates(ctx, tech_type):
 @show_tech_info.command("asset-types")
 @click.pass_context
 def show_asset_types(ctx):
-    """Display asset types"""
+    """Display engine-host status information"""
     c = ctx.obj
     display_asset_types(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -526,16 +512,16 @@ def show_registered_services(ctx, services):
 
 @show_tech_info.command("relationship-types")
 @click.option(
-    "--om-type",
+    "--rel-type",
     default="AssetOwner",
     help="Relationship type to get information about",
 )
 @click.pass_context
-def show_relationship_types(ctx, om_type):
-    """Show information about the specified relationship types"""
+def show_relationship_types(ctx, rel_type):
+    """Show information about the specified relationship type"""
     c = ctx.obj
     display_relationship_types(
-        om_type,
+        rel_type,
         c.view_server,
         c.view_server_url,
         c.userid,
@@ -559,7 +545,7 @@ def show_relationship_types(ctx, om_type):
 )
 @click.pass_context
 def show_elements_by_classification(ctx, om_type, classification):
-    """Show elements by classification"""
+    """Show information about the specified relationship type"""
     c = ctx.obj
     list_classified_elements(
         om_type,
@@ -589,8 +575,8 @@ def show_elements_by_classification(ctx, om_type, classification):
     help="Relationship type to follow.",
 )
 @click.pass_context
-def show_related_elements(ctx, element_guid, om_type, rel_type):
-    """Show elements related to specified guid"""
+def show_relationship_types(ctx, element_guid, om_type, rel_type):
+    """Show information about the specified relationship type"""
     c = ctx.obj
     list_related_elements(
         element_guid,
@@ -720,7 +706,7 @@ def list_element_info(ctx, om_type, extended):
 @show_tech_info.command("processes")
 @click.pass_context
 def list_element_info(ctx):
-    """Display the governance action processes"""
+    """Display the valid metadata values for a property and type"""
     c = ctx.obj
     list_elements(
         "GovernanceActionProcess",
@@ -737,7 +723,7 @@ def list_element_info(ctx):
 @click.pass_context
 @click.option("--om_type", default="Project", help="Metadata type to query")
 def get_element_info(ctx, om_type):
-    """Display a table of elements of an Open Metadata Type"""
+    """Display a table of elements for an Open Metadata Type"""
     c = ctx.obj
     display_elements(
         om_type,
@@ -758,7 +744,7 @@ def get_element_info(ctx, om_type):
 @cli.group("cat")
 @click.pass_context
 def cat(ctx):
-    """Commands for all users"""
+    """Commands for the more tech user"""
     pass
 
 
@@ -790,11 +776,11 @@ def show_tech_types(ctx, tech_type):
 @show_cat_info.command("collections")
 @click.option("--collection", default="*", help="Collection to search for")
 @click.pass_context
-def show_collections(ctx, collection):
+def show_collections(ctx, collections):
     """List Collections"""
     c = ctx.obj
     display_collections(
-        collection, c.view_server, c.view_server_url, c.userid, c.password
+        collections, c.view_server, c.view_server_url, c.userid, c.password
     )
 
 
@@ -805,7 +791,7 @@ def asset_group(ctx):
     pass
 
 
-@asset_group.command("elements-of-tech-type")
+@asset_group.command("elements-of-type")
 @click.option(
     "--tech_type",
     default="PostgreSQL Server",
@@ -879,7 +865,7 @@ def glossary_group(ctx):
 )
 @click.option(
     "--glossary-guid",
-    default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
+    default=None,
     help="Optionally restrict search to glossary with the specified guid",
 )
 @click.option(
@@ -908,7 +894,7 @@ def show_terms(ctx, search_string, glossary_guid, glossary_name):
 @click.option("--search_string", default="*", help="Name to search for glossaries")
 @click.pass_context
 def glossaries(ctx, search_string):
-    """Display a list of glossaries"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     display_glossaries(
         search_string,
@@ -921,15 +907,15 @@ def glossaries(ctx, search_string):
     )
 
 
-@show_cat_info.command("collection-graph")
+@show_cat_info.command("collection")
 @click.option(
     "--root_collection",
-    default="Coco Pharmaceuticals Governance Domains",
+    default="Root Sustainability Collection",
     help="View of tree of collections from a given root",
 )
 @click.pass_context
-def show_collection(ctx, root_collection):
-    """Display collection graph"""
+def show_asset_graph(ctx, root_collection):
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     collection_viewer(
         root_collection,
@@ -971,7 +957,9 @@ def show_projects(ctx, search_string):
 @click.option("--search-string", default="CertificationType", help="")
 @click.pass_context
 def show_certification_types(ctx, search_string):
-    """Show certification types"""
+    """Show certification types
+    - generally stay with the default.
+    """
     c = ctx.obj
     display_certifications(
         search_string,
@@ -1053,7 +1041,7 @@ def show_project_dependencies(ctx, project):
 )
 @click.pass_context
 def show_todos(ctx, search_string, status):
-    """Display list of To Dost"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_todos(
         search_string,
@@ -1070,7 +1058,7 @@ def show_todos(ctx, search_string, status):
 @show_cat_info.command("user-ids")
 @click.pass_context
 def show_todos(ctx):
-    """Display a list of known user-ids"""
+    """Display a list of known user ids"""
     c = ctx.obj
     list_user_ids(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -1204,7 +1192,9 @@ def show_tech_types(ctx, tech_type):
 @click.option("--search-string", default="CertificationType", help="")
 @click.pass_context
 def show_certification_types(ctx, search_string):
-    """Show certification types"""
+    """Show certification types
+    - generally stay with the default..
+    """
     c = ctx.obj
     display_certifications(
         search_string,
@@ -1325,11 +1315,30 @@ def show_asset_graph(ctx, asset_guid):
     help="Specific tech type to get elements for",
 )
 @click.pass_context
-def list_tech_type_elements(ctx, tech_type):
+def show_tech_type_elements(ctx, tech_type):
     """List technology type elements"""
     c = ctx.obj
-    list_tech_elements(
-        tech_type, c.view_server, c.view_server_url, c.userid, c.password
+    tech_viewer(tech_type, c.view_server, c.view_server_url, c.userid, c.password)
+
+
+@show_cat_info.command("collection")
+@click.option(
+    "--root_collection",
+    default="Root Sustainability Collection",
+    help="View of tree of collections from a given root",
+)
+@click.pass_context
+def show_asset_graph(ctx, root_collection):
+    """Display information about a collection"""
+    c = ctx.obj
+    collection_viewer(
+        root_collection,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -1365,7 +1374,7 @@ def show_projects(ctx, search_string):
 )
 @click.pass_context
 def show_todos(ctx, search_string, status):
-    """Display a list of To Dos"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_todos(
         search_string,
@@ -1392,7 +1401,7 @@ def show_user_ids(ctx):
 @show_server.command("archives")
 @click.pass_context
 def archives(ctx):
-    """Display a list of archivest"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     display_archive_list(
         c.view_server,
@@ -1413,7 +1422,6 @@ def archives(ctx):
 )
 @click.pass_context
 def show_deployed_servers(ctx, search_string):
-    """Show list of deployed servers"""
     c = ctx.obj
     display_servers_by_dep_imp(
         search_string,
@@ -1432,7 +1440,7 @@ def show_deployed_servers(ctx, search_string):
 )
 @click.pass_context
 def deployed_schemas(ctx, search_catalog):
-    """Display a list of deployed schemas"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_database_schemas(
         search_catalog,
@@ -1449,7 +1457,7 @@ def deployed_schemas(ctx, search_catalog):
 @click.option("--search_server", default="*", help="Server to search for catalogs")
 @click.pass_context
 def catalogs(ctx, search_server):
-    """Display a list of deployed catalogs"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_catalogs(
         search_server,
@@ -1465,7 +1473,7 @@ def catalogs(ctx, search_server):
 @deployed_data.command("databases")
 @click.pass_context
 def databases(ctx):
-    """Display a list of deployed databases"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_databases(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -1476,7 +1484,7 @@ def databases(ctx):
 @click.option("--search_string", default="*", help="Name to search for glossaries")
 @click.pass_context
 def glossaries(ctx, search_string):
-    """Display a list of glossaries"""
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
     display_glossaries(
         search_string,
@@ -1619,14 +1627,14 @@ def gov_eng_status(ctx, engine_list, engine_host, list):
     c = ctx.obj
     display_gov_eng_status(
         [engine_list],
-        engine_host=engine_host,
-        view_server=c.view_server,
-        url=c.view_server_url,
-        username=c.userid,
-        user_pass=c.password,
-        paging=list,
-        jupyter=c.jupyter,
-        width=c.width,
+        engine_host,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        list,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -1697,7 +1705,7 @@ def integrations(ctx):
 )
 @click.pass_context
 def integrations_status(ctx, connector_list, list, sorted):
-    """Display integration_daemon status information"""
+    """Display integration-daemon status information"""
     c = ctx.obj
     display_integration_daemon_status(
         [connector_list],
@@ -1716,7 +1724,7 @@ def integrations_status(ctx, connector_list, list, sorted):
 
 @integrations.command("targets")
 @click.pass_context
-@click.argument("--connector", nargs=1)
+@click.argument("connector", nargs=1)
 def integrations_status(ctx, connector):
     """Display Catalog Targets for a connector"""
     c = ctx.obj
@@ -1746,7 +1754,7 @@ def tell_ops(ctx):
 @tell_ops.group("integration-daemon")
 @click.pass_context
 def tell_integration_daemon(ctx):
-    """Group of commands to an integration_daemon"""
+    """Group of commands to an integration-daemon"""
     pass
 
 
@@ -1830,8 +1838,4 @@ def repository(ctx):
 repository.add_command(load_archive)
 
 if __name__ == "__main__":
-    while True:
-        try:
-            cli()
-        except Exception as e:
-            click.echo(f"Error: {e}")
+    cli()