pyegeria 5.2.1.1__py3-none-any.whl → 5.3__py3-none-any.whl

{pyegeria/commands → commands}/cli/egeria.py

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
 
-A command line interface for Egeria Users - all commands
+A object_action line interface for Egeria Users - all md_commands
 
 This is an emerging capability based on the **click** package. Feedback welcome!
 
@@ -15,105 +15,124 @@ 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
-from pyegeria.commands.cat.list_cert_types import display_certifications
-from pyegeria.commands.cat.list_terms import display_glossary_terms
-from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.tech.list_anchored_elements import display_anchored_elements
-from pyegeria.commands.tech.list_elements_x import list_elements_x
-from pyegeria.commands.tech.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
-from pyegeria.commands.ops.list_archives import display_archive_list
-from pyegeria.commands.cat.list_servers_deployed_imp import display_servers_by_dep_imp
-from pyegeria.commands.cli.ops_config import Config
-from pyegeria.commands.my.list_my_profile import display_my_profile
-from pyegeria.commands.my.list_my_roles import display_my_roles
-from pyegeria.commands.my.monitor_my_todos import display_my_todos
-from pyegeria.commands.my.monitor_open_todos import display_todos
-from pyegeria.commands.cat.list_deployed_database_schemas import (
-    list_deployed_database_schemas,
-)
-from pyegeria.commands.cat.list_collections import display_collections
-from pyegeria.commands.cat.list_deployed_catalogs import list_deployed_catalogs
-from pyegeria.commands.cat.list_deployed_databases import list_deployed_databases
-from pyegeria.commands.cat.glossary_actions import (
+from commands.cat.get_asset_graph import asset_viewer
+from commands.cat.get_collection import collection_viewer
+from commands.cat.get_project_dependencies import project_dependency_viewer
+from commands.cat.get_project_structure import project_structure_viewer
+from commands.cat.get_tech_type_elements import tech_viewer
+from commands.cat.glossary_actions import (
     create_glossary,
-    delete_glossary,
     create_term,
-    import_terms,
+    delete_glossary,
     delete_term,
-    export_terms,
+    export_terms_csv,
+    import_terms_csv,
+    create_category,
+    update_category,
+    delete_category,
+    add_term_to_category,
+    remove_term_from_category
+)
+
+from commands.cat.list_categories import display_categories
+from commands.cat.list_assets import display_assets
+from commands.cat.list_cert_types import display_certifications
+from commands.cat.list_collections import display_collections
+from commands.cat.list_deployed_catalogs import list_deployed_catalogs
+from commands.cat.list_deployed_database_schemas import (
+    list_deployed_database_schemas,
 )
-from pyegeria.commands.cat.list_glossaries import display_glossaries
-
-from pyegeria.commands.my.todo_actions import (
-    mark_todo_complete,
+from commands.cat.list_deployed_databases import list_deployed_databases
+from commands.cat.list_glossaries import display_glossaries
+from commands.cat.list_projects import display_project_list
+from commands.cat.list_deployed_servers import display_servers_by_dep_imp
+from commands.cat.list_tech_type_elements import list_tech_elements
+from commands.cat.list_tech_types import display_tech_types
+from commands.cat.list_terms import display_glossary_terms
+from commands.cat.list_todos import display_to_dos as list_todos
+from commands.cat.list_user_ids import list_user_ids
+
+from commands.cat.dr_egeria_md import process_markdown_file
+
+from commands.cli.ops_config import Config
+from commands.my.list_my_profile import display_my_profile
+from commands.my.list_my_roles import display_my_roles
+from commands.my.monitor_my_todos import display_my_todos
+from commands.my.monitor_open_todos import display_todos
+from commands.my.todo_actions import (
     change_todo_status,
-    reassign_todo,
-    delete_todo,
     create_todo,
+    delete_todo,
+    mark_todo_complete,
+    reassign_todo,
 )
-
-
-from pyegeria.commands.ops.gov_server_actions import (
+from commands.ops.gov_server_actions import (
     add_catalog_target,
-    remove_catalog_target,
-    update_catalog_target,
     refresh_gov_eng_config,
-    stop_server,
+    remove_catalog_target,
     start_server,
+    stop_server,
+    update_catalog_target,
 )
-from pyegeria.commands.ops.list_catalog_targets import display_catalog_targets
-from pyegeria.commands.ops.load_archive import load_archive
-from pyegeria.commands.ops.monitor_engine_activity import display_engine_activity
-from pyegeria.commands.ops.monitor_engine_activity_c import display_engine_activity_c
-from pyegeria.commands.ops.monitor_gov_eng_status import display_gov_eng_status
-from pyegeria.commands.ops.monitor_integ_daemon_status import (
+from commands.ops.list_archives import display_archive_list
+from commands.ops.list_catalog_targets import display_catalog_targets
+from commands.ops.load_archive import load_archive
+from commands.ops.monitor_engine_activity import display_engine_activity
+from commands.ops.monitor_engine_activity_c import display_engine_activity_c
+from commands.ops.monitor_gov_eng_status import display_gov_eng_status
+from commands.ops.monitor_integ_daemon_status import (
     display_integration_daemon_status,
 )
-from pyegeria.commands.ops.monitor_platform_status import (
+from commands.ops.monitor_platform_status import (
     display_status as p_display_status,
 )
-from pyegeria.commands.ops.monitor_server_status import (
+from commands.ops.monitor_server_startup import display_startup_status
+from commands.ops.monitor_server_status import (
     display_status as s_display_status,
 )
-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.tech.get_element_info import display_elements
-from pyegeria.commands.tech.get_guid_info import display_guid
-from pyegeria.commands.tech.get_tech_details import tech_details_viewer
-from pyegeria.commands.tech.list_asset_types import display_asset_types
-from pyegeria.commands.tech.list_elements_for_classification import (
+from commands.ops.refresh_integration_daemon import refresh_connector
+from commands.ops.restart_integration_daemon import restart_connector
+from commands.tech.get_element_info import display_elements
+from commands.tech.get_guid_info import display_guid
+from commands.tech.get_tech_details import tech_details_viewer
+from commands.tech.get_tech_type_template import template_viewer
+from commands.tech.list_all_om_type_elements import list_elements
+from commands.tech.list_all_om_type_elements_x import list_elements_x
+from commands.tech.list_all_related_elements import list_related_elements
+from commands.tech.list_anchored_elements import display_anchored_elements
+from commands.tech.list_asset_types import display_asset_types
+from commands.tech.list_elements_by_classification_by_property_value import (
+    find_elements_by_classification_by_prop_value,
+)
+from commands.tech.list_elements_by_property_value import (
+    find_elements_by_prop_value,
+)
+from commands.tech.list_elements_by_property_value_x import (
+    find_elements_by_prop_value_x,
+)
+from commands.tech.list_elements_for_classification import (
     list_classified_elements,
 )
-from pyegeria.commands.tech.list_elements import list_elements
-from pyegeria.commands.tech.list_registered_services import display_registered_svcs
-from pyegeria.commands.tech.list_related_specification import (
+from commands.tech.list_gov_action_processes import display_gov_processes
+from commands.tech.list_information_supply_chains import supply_chain_viewer
+from commands.tech.list_registered_services import display_registered_svcs
+from commands.tech.list_related_elements_with_prop_value import (
+    list_related_elements_with_prop_value,
+)
+from commands.tech.list_related_specification import (
     display_related_specification,
 )
-from pyegeria.commands.tech.list_related_elements import list_related_elements
-
-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.tech.list_gov_action_processes import display_gov_processes
-
+from commands.tech.list_relationship_types import display_relationship_types
+from commands.tech.list_relationships import list_relationships
+from commands.tech.list_solution_blueprints import blueprint_list
+from commands.tech.list_solution_components import solution_component_list
+from commands.tech.list_solution_roles import solution_role_list
+from commands.tech.list_tech_templates import display_templates_spec
+from commands.tech.list_valid_metadata_values import display_metadata_values
+from commands.tech.generic_actions import delete_element
 
 @tui()
-# @tui('menu', 'menu', 'A textual command line interface')
+# @tui('menu', 'menu', 'A textual object_action line interface')
 @click.version_option("0.5.2 ", prog_name="hey_egeria")
 @click.group()
 @click.option(
@@ -128,7 +147,7 @@ from pyegeria.commands.tech.list_gov_action_processes import display_gov_process
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -138,7 +157,7 @@ from pyegeria.commands.tech.list_gov_action_processes import display_gov_process
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -148,7 +167,7 @@ from pyegeria.commands.tech.list_gov_action_processes import display_gov_process
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(
@@ -200,6 +219,24 @@ from pyegeria.commands.tech.list_gov_action_processes import display_gov_process
     default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
     help="Path to glossary import/export files",
 )
+
+@click.option(
+    "--root_path",
+    default=os.environ.get("EGERIA_ROOT_PATH", "/home/jovyan"),
+    help="Root path to use for file operations",
+)
+
+@click.option(
+    "--inbox_path",
+    default=os.environ.get("EGERIA_INBOX_PATH", "loading-bay/dr_egeria_inbox"),
+    help="Path to outbox files",
+)
+@click.option(
+    "--outbox_path",
+    default=os.environ.get("EGERIA_OUTBOX_PATH", "distribution-hub/dr_egeria_outbox"),
+    help="Path to outbox files",
+)
+
 @click.pass_context
 def cli(
     ctx,
@@ -220,6 +257,9 @@ def cli(
     width,
     home_glossary_guid,
     glossary_path,
+    root_path,
+    inbox_path,
+    outbox_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -240,6 +280,9 @@ def cli(
         width,
         home_glossary_guid,
         glossary_path,
+        root_path,
+        inbox_path,
+        outbox_path
     )
     ctx.max_content_width = 250
     ctx.ensure_object(Config)
@@ -329,6 +372,7 @@ my_tell.add_command(mark_todo_complete)
 my_tell.add_command(reassign_todo)
 
 
+
 #
 #  tech User: Show
 #
@@ -338,6 +382,14 @@ def tech(ctx):
     """Commands for tech Users"""
     pass
 
+@tech.group("tell")
+@click.pass_context
+def tech_tell(ctx):
+    """Perform actions on Egeria Objects"""
+    pass
+
+
+tech_tell.add_command(delete_element)
 
 @tech.group("show")
 @click.pass_context
@@ -366,6 +418,12 @@ def show_elements(ctx):
     """Show information about Egeria elements"""
 
 
+@show_tech.group("supply-chains")
+@click.pass_context
+def show_supply_chains(ctx):
+    """Show information about Information Supply Chainss"""
+
+
 @show_elements.command("guid-info")
 @click.argument("guid", nargs=1)
 @click.pass_context
@@ -382,7 +440,7 @@ def show_guid_info(ctx, guid):
 @show_elements.command("anchored_elements")
 @click.pass_context
 @click.option(
-    "--search-string",
+    "--property_value",
     default="DeployedDatabaseSchema",
     help="value we are searching for",
 )
@@ -391,8 +449,8 @@ def show_guid_info(ctx, guid):
     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"""
+def list_anchored_elements(ctx, property_value: str, prop_list: str):
+    """List anchored elements with the specified properties"""
     c = ctx.obj
     if type(prop_list) is str:
         property_names = prop_list.split(",")
@@ -403,8 +461,8 @@ def list_anchored_elements(ctx, search_string: str, prop_list: str):
         print(f"\nError --> Invalid property list - must be a string or list")
         sys.exit(4)
     display_anchored_elements(
-        search_string,
-        [prop_list],
+        property_value,
+        [property_names],
         c.view_server,
         c.view_server_url,
         c.userid,
@@ -415,6 +473,200 @@ def list_anchored_elements(ctx, search_string: str, prop_list: str):
     )
 
 
+@show_elements.command("elements-by-classification")
+@click.option(
+    "--om-type",
+    default="Referenceable",
+    help="Open Metadata type to filter by",
+)
+@click.option(
+    "--classification",
+    default="GovernanceProject",
+    help="Classification to filter byt",
+)
+@click.pass_context
+def show_elements_by_classification(ctx, om_type, classification):
+    """Show elements by classification"""
+    c = ctx.obj
+    list_classified_elements(
+        om_type,
+        classification,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_elements.command("elements-by-classification-by-prop-value")
+@click.option(
+    "--classification",
+    default="GovernanceProject",
+    help="Classification to filter by",
+)
+@click.option(
+    "--property_value",
+    help="Property value to filter by",
+)
+@click.option(
+    "--property_names",
+    help="List of properties to search by",
+)
+@click.option(
+    "--om-type",
+    default="Referenceable",
+    help="Open Metadata type to filter by",
+)
+@click.pass_context
+def show_elements_by_classification_by_prop(
+    ctx, classification, property_value, property_names, om_type
+):
+    """Show elements by classification and property value"""
+    c = ctx.obj
+    find_elements_by_classification_by_prop_value(
+        om_type,
+        classification,
+        property_value,
+        [property_names],
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_elements.command("elements-by-prop-value")
+@click.option(
+    "--property_value",
+    help="Property value to filter by",
+)
+@click.option(
+    "--property_names",
+    help="List of properties to search by",
+)
+@click.option(
+    "--om-type",
+    default="Referenceable",
+    help="Open Metadata type to filter by",
+)
+@click.option(
+    "--extended",
+    is_flag=True,
+    default=False,
+    help="If True, feedback information is displayed",
+)
+@click.pass_context
+def show_elements_by_classification_by_prop(
+    ctx, property_value, property_names, om_type, extended
+):
+    """Show elements by classification and property value"""
+    c = ctx.obj
+    if extended:
+        find_elements_by_prop_value_x(
+            om_type,
+            property_value,
+            [property_names],
+            c.view_server,
+            c.view_server_url,
+            c.userid,
+            c.password,
+            c.jupyter,
+            c.width,
+        )
+    else:
+        find_elements_by_prop_value(
+            om_type,
+            property_value,
+            [property_names],
+            c.view_server,
+            c.view_server_url,
+            c.userid,
+            c.password,
+            c.jupyter,
+            c.width,
+        )
+
+
+@show_elements.command("related-elements")
+@click.option(
+    "--element-guid",
+    help="GUID of the Element to navigate from.",
+)
+@click.option(
+    "--om-type",
+    default="Referenceable",
+    help="Open metadata type to filter by.",
+)
+@click.option(
+    "--rel-type",
+    default="Certification",
+    help="Relationship type to follow.",
+)
+@click.pass_context
+def show_related_elements(ctx, element_guid, om_type, rel_type):
+    """Show all elements related to specified guid"""
+    c = ctx.obj
+    list_related_elements(
+        element_guid,
+        om_type,
+        rel_type,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_elements.command("related-elements_by_prop")
+@click.option(
+    "--element-guid",
+    help="GUID of the Element to navigate from.",
+)
+@click.option(
+    "--rel-type",
+    default="Certification",
+    help="Relationship type to follow.",
+)
+@click.option(
+    "--property_value",
+    help="Property value to filter by",
+)
+@click.option(
+    "--property_names",
+    help="List of properties to search by",
+)
+@click.option(
+    "--om-type",
+    default="Referenceable",
+    help="Open metadata type to filter by.",
+)
+@click.pass_context
+def show_related_elements(
+    ctx, element_guid, rel_type, property_value, property_names, om_type
+):
+    """Show elements related to specified guid and property value"""
+    c = ctx.obj
+    list_related_elements_with_prop_value(
+        element_guid,
+        rel_type,
+        property_value,
+        [property_names],
+        om_type,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show_elements.command("related-specifications")
 @click.pass_context
 @click.argument("element-guid")
@@ -534,7 +786,7 @@ def show_registered_services(ctx, services):
 @show_tech_info.command("relationship-types")
 @click.option(
     "--om-type",
-    default="AssetOwner",
+    default="Referenceable",
     help="Relationship type to get information about",
 )
 @click.pass_context
@@ -553,65 +805,6 @@ def show_relationship_types(ctx, om_type):
     )
 
 
-@show_elements.command("elements-by-classification")
-@click.option(
-    "--om-type",
-    default="Project",
-    help="Open Metadata type to filter by",
-)
-@click.option(
-    "--classification",
-    default="GovernanceProject",
-    help="Classification to filter byt",
-)
-@click.pass_context
-def show_elements_by_classification(ctx, om_type, classification):
-    """Show elements by classification"""
-    c = ctx.obj
-    list_classified_elements(
-        om_type,
-        classification,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
-
-
-@show_elements.command("related-elements")
-@click.option(
-    "--element-guid",
-    help="GUID of the Element to navigate from.",
-)
-@click.option(
-    "--om-type",
-    default="Project",
-    help="Open metadata type to filter by.",
-)
-@click.option(
-    "--rel-type",
-    default="Certification",
-    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"""
-    c = ctx.obj
-    list_related_elements(
-        element_guid,
-        om_type,
-        rel_type,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
-
-
 @show_tech_type.command("template-spec")
 @click.pass_context
 @click.option(
@@ -698,9 +891,9 @@ def valid_metadata_values(ctx, property, type_name):
     default=False,
     help="If True, feedback information is displayed",
 )
-@click.option("--om_type", default="Organization", help="Metadata type to query")
-def list_element_info(ctx, om_type, extended):
-    """Display elements of a specific Open Metadata Type"""
+@click.option("--om_type", default="Referenceable", help="Metadata type to query")
+def list_all_om_type_elements(ctx, om_type, extended):
+    """Display all elements of a specific Open Metadata Type"""
     c = ctx.obj
     if extended:
         list_elements_x(
@@ -742,7 +935,7 @@ def list_element_info(ctx):
 
 @show_elements.command("get-elements")
 @click.pass_context
-@click.option("--om_type", default="Project", help="Metadata type to query")
+@click.option("--om_type", default="Referenceable", help="Metadata type to query")
 def get_element_info(ctx, om_type):
     """Display a table of elements of an Open Metadata Type"""
     c = ctx.obj
@@ -757,6 +950,74 @@ def get_element_info(ctx, om_type):
     )
 
 
+@show_supply_chains.command("supply-chains")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_supply_chains(ctx, search_string):
+    """Display supply chains"""
+    c = ctx.obj
+    supply_chain_viewer(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_supply_chains.command("blueprints")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_blueprints(ctx, search_string):
+    """Display solution blueprints"""
+    c = ctx.obj
+    blueprint_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_supply_chains.command("solution-roles")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_solution_roles(ctx, search_string):
+    """Display solution roles"""
+    c = ctx.obj
+    solution_role_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_supply_chains.command("solution-components")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_solution_components(ctx, search_string):
+    """Display solution componentss"""
+    c = ctx.obj
+    solution_component_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 #
 #   Catalog User: Show
 #
@@ -779,7 +1040,7 @@ def show_cat(ctx):
 @show_cat.group("info")
 @click.pass_context
 def show_cat_info(ctx):
-    """Group of commands to show information about various Egeria objects"""
+    """Group of md_commands to show information about various Egeria objects"""
     pass
 
 
@@ -856,7 +1117,7 @@ def show_asset_graph(ctx, asset_guid):
 
     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'
+           asset-guid must be a valid asset guid. These can be found through other md_commands such as 'show tech-type-elements'
 
     """
     c = ctx.obj
@@ -894,8 +1155,14 @@ def glossary_group(ctx):
     default="*",
     help="Optionally restrict search to a specific named glossary",
 )
+@click.option(
+    "--output-format",
+    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    default="TABLE",
+    help="Display on screen as table, or as FORM or REPORT file",
+    )
 @click.pass_context
-def show_terms(ctx, search_string, glossary_guid, glossary_name):
+def show_terms(ctx, search_string, glossary_guid, glossary_name, output_format):
     """Find and display glossary terms"""
     c = ctx.obj
     display_glossary_terms(
@@ -908,13 +1175,42 @@ def show_terms(ctx, search_string, glossary_guid, glossary_name):
         c.password,
         c.jupyter,
         c.width,
+        output_format,
     )
 
+@glossary_group.command("glossary-categories")
+@click.option("--search_string", default="*", help="Name to search for categories")
+@click.option(
+    "--output-format",
+    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    default="TABLE",
+    help="Display on screen as table, or as FORM or REPORT file",
+    )
+@click.pass_context
+def categories(ctx, search_string, output_format):
+    """Display a list of categories"""
+    c = ctx.obj
+    display_categories(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+        output_format,
+    )
 
 @glossary_group.command("glossaries")
 @click.option("--search_string", default="*", help="Name to search for glossaries")
+@click.option(
+    "--output-format",
+    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    default="TABLE",
+    help="Display on screen as table, or as FORM or REPORT file",
+    )
 @click.pass_context
-def glossaries(ctx, search_string):
+def glossaries(ctx, search_string, output_format):
     """Display a list of glossaries"""
     c = ctx.obj
     display_glossaries(
@@ -925,6 +1221,7 @@ def glossaries(ctx, search_string):
         c.password,
         c.jupyter,
         c.width,
+        output_format,
     )
 
 
@@ -1167,6 +1464,18 @@ def tell_cat(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
+#
+# dr.egeria
+#
+@tell_cat.group("dr_egeria")
+@click.pass_context
+def dr_egeria(ctx):
+    """Execute Dr.Egeria actions"""
+    pass
+
+dr_egeria.add_command(process_markdown_file)
+
+
 
 @tell_cat.group("glossary")
 @click.pass_context
@@ -1179,9 +1488,13 @@ tell_glossary.add_command(create_glossary)
 tell_glossary.add_command(delete_glossary)
 tell_glossary.add_command(delete_term)
 tell_glossary.add_command(create_term)
-tell_glossary.add_command(import_terms)
-tell_glossary.add_command(export_terms)
-
+tell_glossary.add_command(import_terms_csv)
+tell_glossary.add_command(export_terms_csv)
+tell_glossary.add_command(create_category)
+tell_glossary.add_command(delete_category)
+tell_glossary.add_command(update_category)
+tell_glossary.add_command(add_term_to_category)
+tell_glossary.add_command(remove_term_from_category)
 
 @tell_cat.group("todo")
 @click.pass_context
@@ -1269,38 +1582,6 @@ def show_project_dependencies(ctx, project):
     )
 
 
-@glossary_group.command("glossary-terms")
-@click.option(
-    "--search-string",
-    default="*",
-    help="List glossary terms similar to search string - minimum of 4 characters",
-)
-@click.option(
-    "--glossary-guid",
-    default=None,
-    help="Optionally restrict search to glossary with the specified guid",
-)
-@click.option(
-    "--glossary-name",
-    default="*",
-    help="Optionally restrict search to a specific named glossary",
-)
-@click.pass_context
-def show_terms(ctx, search_string, glossary_guid, glossary_name):
-    """Find and display glossary terms"""
-    c = ctx.obj
-    display_glossary_terms(
-        search_string,
-        glossary_guid,
-        glossary_name,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
-
 
 @asset_group.command("asset-graph")
 @click.argument("asset_guid", nargs=1)
@@ -1310,7 +1591,7 @@ def show_asset_graph(ctx, asset_guid):
 
     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'
+           asset-guid must be a valid asset guid. These can be found through other md_commands such as 'show tech-type-elements'
 
     """
     c = ctx.obj
@@ -1396,22 +1677,6 @@ def show_user_ids(ctx):
     )
 
 
-@show_server.command("archives")
-@click.pass_context
-def archives(ctx):
-    """Display a list of archivest"""
-    c = ctx.obj
-    display_archive_list(
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        False,
-        c.jupyter,
-        c.width,
-    )
-
-
 @deployed_data.command("deployed-servers")
 @click.option(
     "--search-string",
@@ -1479,23 +1744,6 @@ def databases(ctx):
     )
 
 
-@glossary_group.command("glossaries")
-@click.option("--search_string", default="*", help="Name to search for glossaries")
-@click.pass_context
-def glossaries(ctx, search_string):
-    """Display a list of glossaries"""
-    c = ctx.obj
-    display_glossaries(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
-
-
 # @tell_cat.group("survey")
 # @click.pass_context
 # def survey(ctx):
@@ -1504,7 +1752,7 @@ def glossaries(ctx, search_string):
 #     pass
 #
 #
-# @survey.command("survey-uc-server")
+# @survey.object_action("survey-uc-server")
 # @click.pass_context
 # @click.option(
 #     "--uc_endpoint",
@@ -1538,10 +1786,32 @@ def show_ops(ctx):
     pass
 
 
+@show_ops.group("repository")
+@click.pass_context
+def show_repo(ctx):
+    """Group of md_commands to show repository information"""
+    pass
+
+
+@show_repo.command("archives")
+@click.pass_context
+def show_archives(ctx):
+    c = ctx.obj
+    display_archive_list(
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        False,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show_ops.group("platforms")
 @click.pass_context
 def show_platform(ctx):
-    """Group of commands to show information about Egeria platforms"""
+    """Group of md_commands to show information about Egeria platforms"""
     pass
 
 
@@ -1558,7 +1828,7 @@ def show_platform_status(ctx):
 @show_ops.group("servers")
 @click.pass_context
 def show_server(ctx):
-    """Group of commands to show information about Egeria servers"""
+    """Group of md_commands to show information about Egeria servers"""
     pass
 
 
@@ -1602,7 +1872,7 @@ def show_startup_status(ctx):
 @show_ops.group("engines")
 @click.pass_context
 def engine_host(ctx):
-    """Group of commands to show information about Egeria engines"""
+    """Group of md_commands to show information about Egeria engines"""
     pass
 
 
@@ -1615,18 +1885,13 @@ def engine_host(ctx):
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
-@click.option(
-    "--engine-host",
-    default="engine-host",
-    help="Name of the Engine Host to get status for",
-)
 @click.pass_context
-def gov_eng_status(ctx, engine_list, engine_host, list):
+def gov_eng_status(ctx, engine_list, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(
         [engine_list],
-        engine_host=engine_host,
+        engine_host=c.engine_host,
         view_server=c.view_server,
         url=c.view_server_url,
         username=c.userid,
@@ -1686,7 +1951,7 @@ def eng_activity_status(ctx, rowlimit: int, list: bool, compressed: bool):
 @show_ops.group("integrations")
 @click.pass_context
 def integrations(ctx):
-    """Group of commands to show information about Egeria integrations"""
+    """Group of md_commands to show information about Egeria integrations"""
     pass
 
 
@@ -1753,7 +2018,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 md_commands to an integration_daemon"""
     pass
 
 
@@ -1764,16 +2029,11 @@ def tell_integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-@click.option(
-    "--server",
-    default="integration-daemon",
-    help="Name of the integration server to refresh",
-)
-def refresh_connectors(ctx, server, connector):
+def refresh_connectors(ctx, connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     refresh_connector(
-        connector, server, c.view_server_url, c.view_server, c.userid, c.password
+        connector, c.integration_daemon, c.integration_daemon_urll, c.view_server, c.userid, c.password
     )
 
 
@@ -1784,16 +2044,12 @@ def refresh_connectors(ctx, server, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-@click.option(
-    "--server",
-    default="integration-daemon",
-    help="Name of the integration server to refresh",
-)
+
 def restart_connectors(ctx, server, connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     restart_connector(
-        connector, server, c.view_server_url, c.view_server, c.userid, c.password
+        connector, c.integration_daemon, c.integration_daemon_url, c.view_server, c.userid, c.password
     )
 
 
@@ -1818,7 +2074,7 @@ servers.add_command(stop_server)
 @tell_ops.group("engine-host")
 @click.pass_context
 def engine_host(ctx):
-    """Group of commands to an engine-host"""
+    """Group of md_commands to an engine-host"""
     pass
 
 
@@ -1830,7 +2086,7 @@ engine_host.add_command(refresh_gov_eng_config)
 @tell_ops.group("repository")
 @click.pass_context
 def repository(ctx):
-    """Group of commands to a repository"""
+    """Group of md_commands to a repository"""
     pass