pyegeria 1.5.1.1.49__py3-none-any.whl → 1.5.1.1.51__py3-none-any.whl

pyegeria/commands/cli/egeria_cat.py

@@ -17,7 +17,6 @@ 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.get_tech_type_template import template_viewer
 from pyegeria.commands.cat.glossary_actions import (
     create_glossary,
     delete_glossary,
@@ -28,7 +27,6 @@ from pyegeria.commands.cat.glossary_actions import (
 )
 from pyegeria.commands.cat.list_servers_deployed_imp import display_servers_by_dep_imp
 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
 from pyegeria.commands.cat.list_deployed_catalogs import list_deployed_catalogs
@@ -38,7 +36,6 @@ from pyegeria.commands.cat.list_deployed_database_schemas import (
 from pyegeria.commands.cat.list_deployed_databases import list_deployed_databases
 from pyegeria.commands.cat.list_terms import display_glossary_terms
 from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.cat.list_relationships import list_relationships
 from pyegeria.commands.cat.list_tech_types import display_tech_types
 from pyegeria.commands.cat.list_todos import display_to_dos as list_todos
 from pyegeria.commands.cat.list_user_ids import list_user_ids
@@ -211,11 +208,18 @@ def cli(
 
 @cli.group("show")
 def show():
-    """Display an Egeria Object"""
+    """Display Egeria Objects"""
     pass
 
 
-@show.command("tech-types")
+@show.group("info")
+@click.pass_context
+def info(ctx):
+    """Group of commands to show information about various Egeria objects"""
+    pass
+
+
+@info.command("tech-types")
 @click.option("--tech_type", default="*", help="Tech type to search for")
 @click.pass_context
 def show_tech_types(ctx, tech_type):
@@ -226,7 +230,14 @@ def show_tech_types(ctx, tech_type):
     )
 
 
-@show.command("tech-type-elements")
+@show.group("assets")
+@click.pass_context
+def asset_group(ctx):
+    """Show assets known to Egerias"""
+    pass
+
+
+@asset_group.command("tech-type-elements")
 @click.option(
     "--tech_type",
     default="PostgreSQL Server",
@@ -239,51 +250,60 @@ def show_tech_type_elements(ctx, tech_type):
     tech_viewer(tech_type, c.view_server, c.view_server_url, c.userid, c.password)
 
 
-@show.command("tech-type-templates")
-@click.option(
-    "--tech-type",
-    default="PostgreSQL Server",
-    help="Specific tech type to get elements for",
-)
+@asset_group.command("assets")
+@click.argument("search-string")
 @click.pass_context
-def show_tech_type_templates(ctx, tech_type):
-    """List technology type templates"""
+def show_assets(ctx, search_string):
+    """Find and display assets
+
+    Usage: show assets <search-string>
+
+           search-string must be greater than four characters.
+    """
     c = ctx.obj
-    template_viewer(
-        tech_type,
+    display_assets(
+        search_string,
         c.view_server,
         c.view_server_url,
         c.userid,
         c.password,
+        60,
         c.jupyter,
         c.width,
     )
 
 
-@show.command("assets")
-@click.argument("search-string")
+@asset_group.command("asset-graph")
+@click.argument("asset_guid", nargs=1)
 @click.pass_context
-def show_assets(ctx, search_string):
-    """Find and display assets
+def show_asset_graph(ctx, asset_guid):
+    """Display a tree graph of information about an asset
 
-    Usage: show assets <search-string>
+    Usage: show asset-graph <asset-guid>
+
+           asset-guid must be a valid asset guid. These can be found through other commands such as 'show tech-type-elements'
 
-           search-string must be greater than four characters.
     """
     c = ctx.obj
-    display_assets(
-        search_string,
+    asset_viewer(
+        asset_guid,
         c.view_server,
         c.view_server_url,
         c.userid,
         c.password,
-        60,
         c.jupyter,
         c.width,
     )
 
 
-@show.command("glossary-terms")
+@show.group("glossary")
+@click.pass_context
+def glossary_group(ctx):
+    """Show glossary information"""
+    pass
+
+
+@glossary_group.command("glossary-terms")
 @click.option(
     "--search-string",
     default="*",
@@ -316,20 +336,14 @@ def show_terms(ctx, search_string, glossary_guid, glossary_name):
     )
 
 
-@show.command("asset-graph")
-@click.argument("asset_guid", nargs=1)
+@glossary_group.command("glossaries")
+@click.option("--search_string", default="*", help="Name to search for glossaries")
 @click.pass_context
-def show_asset_graph(ctx, asset_guid):
-    """Display a tree graph of information about an asset
-
-    Usage: show asset-graph <asset-guid>
-
-           asset-guid must be a valid asset guid. These can be found through other commands such as 'show tech-type-elements'
-
-    """
+def glossaries(ctx, search_string):
+    """Display a tree graph of information about an asset"""
     c = ctx.obj
-    asset_viewer(
-        asset_guid,
+    display_glossaries(
+        search_string,
         c.view_server,
         c.view_server_url,
         c.userid,
@@ -339,7 +353,7 @@ def show_asset_graph(ctx, asset_guid):
     )
 
 
-@show.command("collection")
+@info.command("collection")
 @click.option(
     "--root_collection",
     default="Root Sustainability Collection",
@@ -360,7 +374,14 @@ def show_asset_graph(ctx, root_collection):
     )
 
 
-@show.command("projects")
+@show.group("projects")
+@click.pass_context
+def projects(ctx):
+    """Show project information in Egeria"""
+    pass
+
+
+@projects.command("projects")
 @click.option("--search-string", default="*", help="List Projects by Search String")
 @click.pass_context
 def show_projects(ctx, search_string):
@@ -378,7 +399,7 @@ def show_projects(ctx, search_string):
     )
 
 
-@show.command("certification-types")
+@info.command("certification-types")
 @click.option("--search-string", default="CertificationType", help="")
 @click.pass_context
 def show_certification_types(ctx, search_string):
@@ -398,7 +419,7 @@ def show_certification_types(ctx, search_string):
     )
 
 
-@show.command("project-structure")
+@projects.command("project-structure")
 @click.option(
     "--project",
     default="Clinical Trials Management",
@@ -420,7 +441,7 @@ def show_project_structure(ctx, project):
     )
 
 
-@show.command("project-dependencies")
+@projects.command("project-dependencies")
 @click.option(
     "--project",
     default="Clinical Trials Management",
@@ -442,29 +463,7 @@ def show_project_dependencies(ctx, project):
     )
 
 
-@show.command("relationships")
-@click.option(
-    "--relationship",
-    default="Certification",
-    help="Relationship type name to search for.",
-)
-@click.pass_context
-def show_relationships(ctx, relationship):
-    """Show the structure of the project starting from a root project"""
-    c = ctx.obj
-    list_relationships(
-        relationship,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.timeout,
-        c.jupyter,
-        c.width,
-    )
-
-
-@show.command("to-dos")
+@info.command("to-dos")
 @click.option("--search-string", default="*", help="View the list of To-Do items")
 @click.option(
     "--status",
@@ -474,7 +473,7 @@ def show_relationships(ctx, relationship):
     ),
     help="Enter an optional status filter",
     required=False,
-    default=None,
+    default="NONE",
 )
 @click.pass_context
 def show_todos(ctx, search_string, status):
@@ -492,7 +491,7 @@ def show_todos(ctx, search_string, status):
     )
 
 
-@show.command("user-ids")
+@info.command("user-ids")
 @click.pass_context
 def show_todos(ctx):
     """Display a tree graph of information about an asset"""
@@ -502,23 +501,14 @@ def show_todos(ctx):
     )
 
 
-@show.command("archives")
+@show.group("deployed-data")
 @click.pass_context
-def list_archives(ctx):
-    """Display a tree graph of information about an asset"""
-    c = ctx.obj
-    display_archive_list(
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        False,
-        c.jupyter,
-        c.width,
-    )
+def deployed_data(ctx):
+    """Show deployed data resources known to Egeria"""
+    pass
 
 
-@show.command("deployed-servers")
+@deployed_data.command("deployed-servers")
 @click.option(
     "--search-string",
     default="*",
@@ -538,7 +528,7 @@ def show_deployed_servers(ctx, search_string):
     )
 
 
-@show.command("deployed-schemas")
+@deployed_data.command("deployed-schemas")
 @click.option("--catalog", default="*", help="What database or catalog to search")
 @click.pass_context
 def deployed_schemas(ctx, catalog):
@@ -555,7 +545,7 @@ def deployed_schemas(ctx, catalog):
     )
 
 
-@show.command("catalogs")
+@deployed_data.command("catalogs")
 @click.option("--search_server", default="*", help="Server to search for catalogs")
 @click.pass_context
 def list_catalogs(ctx, search_server):
@@ -572,24 +562,7 @@ def list_catalogs(ctx, search_server):
     )
 
 
-@show.command("glossaries")
-@click.option("--search_string", default="*", help="Name to search for glossaries")
-@click.pass_context
-def 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("databases")
+@deployed_data.command("databases")
 @click.pass_context
 def list_databases(ctx):
     """Display a tree graph of information about an asset"""
@@ -611,26 +584,42 @@ def tell(ctx):
     pass
 
 
-tell.add_command(create_glossary)
-tell.add_command(delete_glossary)
-tell.add_command(create_term)
-tell.add_command(mark_todo_complete)
-tell.add_command(reassign_todo)
-tell.add_command(delete_todo)
-tell.add_command(create_todo)
-tell.add_command(delete_term)
-tell.add_command(import_terms)
-tell.add_command(export_terms)
+@tell.group("glossary")
+@click.pass_context
+def tell_glossary(ctx):
+    """Perform glossary actions"""
+    pass
 
 
-@tell.group("survey")
+tell_glossary.add_command(create_glossary)
+tell_glossary.add_command(delete_glossary)
+tell_glossary.add_command(create_term)
+tell_glossary.add_command(import_terms)
+tell_glossary.add_command(export_terms)
+
+
+@tell.group("todo")
 @click.pass_context
-def survey(ctx):
-    """Refresh the specified integration connector or ALL connectors if not specified"""
-    c = ctx.obj
+def tell_todo(ctx):
+    """Perform todo actions"""
     pass
 
 
+tell_todo.add_command(mark_todo_complete)
+tell_todo.add_command(reassign_todo)
+tell_todo.add_command(delete_todo)
+tell_todo.add_command(create_todo)
+tell_todo.add_command(delete_term)
+
+
+# @tell.group("survey")
+# @click.pass_context
+# def survey(ctx):
+#     """Refresh the specified integration connector or ALL connectors if not specified"""
+#     c = ctx.obj
+#     pass
+
+
 # @survey.command("survey-uc-server")
 # @click.pass_context
 # @click.option(

pyegeria/commands/cli/egeria_ops.py

@@ -40,6 +40,7 @@ from pyegeria.commands.ops.monitor_server_status import (
 from pyegeria.commands.ops.refresh_integration_daemon import refresh_connector
 from pyegeria.commands.ops.restart_integration_daemon import restart_connector
 from pyegeria.commands.ops.monitor_server_startup import display_startup_status
+from pyegeria.commands.ops.list_archives import display_archive_list
 
 
 # class Config(object):
@@ -204,12 +205,12 @@ def show(ctx):
 
 @show.group("platforms")
 @click.pass_context
-def show_platform(ctx):
+def show_platforms(ctx):
     """Group of commands to show information about Egeria platforms"""
     pass
 
 
-@show_platform.command("status")
+@show_platforms.command("status")
 @click.pass_context
 def show_platform_status(ctx):
     """Display a live status view of known platforms"""
@@ -263,6 +264,22 @@ def show_startup_status(ctx):
     )
 
 
+@show_server.command("archives")
+@click.pass_context
+def list_archives(ctx):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    display_archive_list(
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        False,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show.group("engines")
 @click.pass_context
 def engine_host(ctx):

pyegeria/commands/cli/egeria_tech.py

@@ -21,7 +21,7 @@ from pyegeria.commands.tech.list_registered_services import display_registered_s
 from pyegeria.commands.tech.list_relationship_types import display_relationship_types
 from pyegeria.commands.tech.list_tech_templates import display_templates_spec
 from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_values
-from pyegeria.commands.cat.get_tech_type_template import template_viewer
+from pyegeria.commands.tech.get_tech_type_template import template_viewer
 from pyegeria.commands.tech.list_elements import list_elements
 from pyegeria.commands.tech.get_element_info import display_elements
 from pyegeria.commands.tech.list_related_specification import (
@@ -32,6 +32,7 @@ from pyegeria.commands.tech.list_elements_for_classification import (
     list_classified_elements,
 )
 from pyegeria.commands.tech.list_gov_action_processes import display_gov_processes
+from pyegeria.commands.tech.get_tech_type_template import template_viewer
 
 # from pyegeria import ServerOps
 
@@ -199,7 +200,27 @@ def show(ctx):
     pass
 
 
-@show.command("guid-info")
+@show.group("info")
+@click.pass_context
+def show_info(ctx):
+    """Show various Egeria information"""
+    pass
+
+
+@show.group("tech-types")
+@click.pass_context
+def show_tech(ctx):
+    """Show information about Egeria technology types"""
+    pass
+
+
+@show.group("elements")
+@click.pass_context
+def show_elements(ctx):
+    """Show information about Egeria elements"""
+
+
+@show_elements.command("guid-info")
 @click.argument("guid", nargs=1)
 @click.pass_context
 def show_guid_infos(ctx, guid):
@@ -212,7 +233,7 @@ def show_guid_infos(ctx, guid):
     display_guid(guid, c.server, c.url, c.userid, c.password, c.jupyter, c.width)
 
 
-@show.command("related-specifications")
+@show_elements.command("related-specifications")
 @click.pass_context
 @click.argument("element-guid")
 def show_related_specifications(ctx, element_guid):
@@ -229,7 +250,7 @@ def show_related_specifications(ctx, element_guid):
     )
 
 
-@show.command("tech-types")
+@show_tech.command("tech-types")
 @click.option("--search-string", default="*", help="Tech type to search for")
 @click.pass_context
 def show_tech_types(ctx, search_string):
@@ -247,7 +268,7 @@ def show_tech_types(ctx, search_string):
     )
 
 
-@show.command("tech-details")
+@show_tech.command("tech-details")
 @click.argument("tech-name")
 @click.pass_context
 def show_tech_details(ctx, tech_name):
@@ -269,7 +290,28 @@ def show_tech_details(ctx, tech_name):
     )
 
 
-@show.command("asset-types")
+@show_tech.command("tech-type-templates")
+@click.option(
+    "--tech-type",
+    default="PostgreSQL Server",
+    help="Specific tech type to get elements for",
+)
+@click.pass_context
+def show_tech_type_templates(ctx, tech_type):
+    """List technology type templates"""
+    c = ctx.obj
+    template_viewer(
+        tech_type,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_info.command("asset-types")
 @click.pass_context
 def show_asset_types(ctx):
     """Display engine-host status information"""
@@ -279,7 +321,7 @@ def show_asset_types(ctx):
     )
 
 
-@show.command("registered-services")
+@show_info.command("registered-services")
 @click.option(
     "--services",
     type=click.Choice(
@@ -312,7 +354,7 @@ def show_registered_services(ctx, services):
     )
 
 
-@show.command("relationship-types")
+@show_info.command("relationship-types")
 @click.option(
     "--rel-type",
     default="AssetOwner",
@@ -334,7 +376,7 @@ def show_relationship_types(ctx, rel_type):
     )
 
 
-@show.command("elements-by-classification")
+@show_elements.command("elements-by-classification")
 @click.option(
     "--om-type",
     default="Project",
@@ -361,7 +403,7 @@ def show_elements_by_classification(ctx, om_type, classification):
     )
 
 
-@show.command("related-elements")
+@show_elements.command("related-elements")
 @click.option(
     "--element-guid",
     help="GUID of the Element to navigate from.",
@@ -393,7 +435,7 @@ def show_relationship_types(ctx, element_guid, om_type, rel_type):
     )
 
 
-@show.command("tech-templates")
+@show_tech.command("tech-templates")
 @click.pass_context
 @click.option(
     "--search-string", default="*", help="Technology type to get information about"
@@ -412,7 +454,7 @@ def tech_templates(ctx, search_string):
     )
 
 
-@show.command("tech-template-spec")
+@show_tech.command("tech-template-spec")
 @click.pass_context
 @click.option(
     "--search-string", default="*", help="Technology type to get information about"
@@ -431,7 +473,7 @@ def tech_template_spec(ctx, search_string):
     )
 
 
-@show.command("gov-action-processes")
+@show_info.command("gov-action-processes")
 @click.pass_context
 @click.option("--search-string", default="*", help="Search string")
 def gov_action_processes(ctx, search_string):
@@ -448,7 +490,7 @@ def gov_action_processes(ctx, search_string):
     )
 
 
-@show.command("valid-metadata-values")
+@show_info.command("valid-metadata-values")
 @click.pass_context
 @click.option("--property", default="projectHealth", help="Metadata property to query")
 @click.option("--type-name", default="Project", help="Metadata type to query")
@@ -468,7 +510,7 @@ def valid_metadata_values(ctx, property, type_name):
     )
 
 
-@show.command("elements")
+@show_elements.command("elements")
 @click.pass_context
 @click.option("--om_type", default="Organization", help="Metadata type to query")
 def list_element_info(ctx, om_type):
@@ -485,7 +527,7 @@ def list_element_info(ctx, om_type):
     )
 
 
-@show.command("processes")
+@show_info.command("processes")
 @click.pass_context
 def list_element_info(ctx):
     """Display the valid metadata values for a property and type"""
@@ -501,7 +543,7 @@ def list_element_info(ctx):
     )
 
 
-@show.command("get-elements")
+@show_elements.command("get-elements")
 @click.pass_context
 @click.option("--om_type", default="Project", help="Metadata type to query")
 def get_element_info(ctx, om_type):
@@ -523,11 +565,11 @@ def get_element_info(ctx, om_type):
 #
 
 
-@cli.group("tell")
-@click.pass_context
-def tell(ctx):
-    """Perform actions an Egeria Objects"""
-    pass
+# @cli.group("tell")
+# @click.pass_context
+# def tell(ctx):
+#     """Perform actions an Egeria Objects"""
+#     pass
 
 
 if __name__ == "__main__":