pyegeria 5.4.0.28__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

commands/cli/egeria.py

@@ -18,9 +18,10 @@ from loguru import logger
 
 from pyegeria import config_logging,  settings
 
-from commands.cat.list_format_set import execute_format_set_action
+from commands.cat.my_reports import start_exp2
+from commands.cat.run_report import list_generic
 from commands.cat.get_asset_graph import asset_viewer
-from commands.cat.get_collection import collection_viewer
+from commands.cat.get_collection_tree 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
@@ -31,14 +32,18 @@ from commands.cat.glossary_actions import (
     delete_term,
     export_terms_csv,
     import_terms_csv,
-    create_category,
-    update_category,
-    delete_category,
-    add_term_to_category,
-    remove_term_from_category
+    update_term,
+    update_term_status,
+)
+
+from commands.cat.collection_actions import (
+    create_collection,
+    delete_collection,
+    update_collection,
+    add_element_to_collection,
+    remove_element_from_collection
 )
 
-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
@@ -81,10 +86,10 @@ from commands.ops.gov_server_actions 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 (
+from commands.ops.monitor_active_engine_activity import display_engine_activity
+from commands.ops.monitor_engine_activity import display_engine_activity_c
+from commands.ops.monitor_engine_status import display_gov_eng_status
+from commands.ops.monitor_daemon_status import (
     display_integration_daemon_status,
 )
 from commands.ops.monitor_platform_status import (
@@ -133,14 +138,29 @@ 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
+from commands.tech.element_actions import delete_element
+
+import sys
+
+# Enable remote debugging (set to True when debugging)
+ENABLE_DEBUG = False
+#
+# if ENABLE_DEBUG:
+#     try:
+#         import pydevd_pycharm
+#
+#         pydevd_pycharm.settrace('localhost', port=5678, stdout_to_server=True, stderr_to_server=True)
+#     except ImportError:
+#         print("pydevd-pycharm not installed. Install with: pip install pydevd-pycharm")
+#     except Exception as e:
+#         print(f"Could not connect to debugger: {e}")
+
 
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 app_settings = settings
 app_config = app_settings.Environment
-config_logging()
-
+# config_logging()
 
 @tui()
 # @tui('menu', 'menu', 'A textual object_action line interface')
@@ -282,7 +302,7 @@ def cli(
         inbox_path,
         outbox_path
     )
-    ctx.max_content_width = 250
+    ctx.max_content_width = 300
     ctx.ensure_object(Config)
 
 
@@ -303,6 +323,19 @@ def my_show(ctx):
     pass
 
 
+@my_show.command("my-reports")
+@click.pass_context
+def show_my_reports(ctx):
+    """Display my profiles
+
+    Usage: show my-profile
+
+    """
+    c = ctx.obj
+    start_exp2(
+        # c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
+    )
+
 @my_show.command("my-profile")
 @click.pass_context
 def show_my_profile(ctx):
@@ -564,17 +597,8 @@ def show_elements_by_classification_by_prop(
     """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,
-        )
+        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,
@@ -608,17 +632,8 @@ def show_elements_by_classification_by_prop(
 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,
-    )
+    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")
@@ -695,9 +710,7 @@ def show_tech_types(ctx, search_string):
     """
 
     c = ctx.obj
-    display_tech_types(
-        search_string, c.view_server, c.view_server_url, c.userid, c.password
-    )
+    display_tech_types(search_string, c.view_server, c.view_server_url, c.userid, c.password)
 
 
 @show_tech_type.command("details")
@@ -706,15 +719,7 @@ def show_tech_types(ctx, search_string):
 def show_tech_details(ctx, tech_name):
     """Show technology type details"""
     c = ctx.obj
-    tech_details_viewer(
-        tech_name,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    tech_details_viewer(tech_name, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 @show_tech_type.command("templates")
@@ -751,7 +756,7 @@ def show_asset_types(ctx):
 @show_tech_info.command("registered-services")
 @click.option(
     "--services",
-    type=click.Choice(
+    type_name = click.Choice(
         [
             "all",
             "access-services",
@@ -770,15 +775,7 @@ def show_asset_types(ctx):
 def show_registered_services(ctx, services):
     """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,
-    )
+    display_registered_svcs(services, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 @show_tech_info.command("relationship-types")
@@ -791,16 +788,8 @@ def show_registered_services(ctx, services):
 def show_relationship_types(ctx, om_type):
     """Show information about the specified relationship types"""
     c = ctx.obj
-    display_relationship_types(
-        om_type,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        False,
-        c.jupyter,
-        c.width,
-    )
+    display_relationship_types(om_type, c.view_server, c.view_server_url, c.userid, c.password, False, c.jupyter,
+                               c.width)
 
 
 @show_tech_type.command("template-spec")
@@ -937,15 +926,7 @@ def list_element_info(ctx):
 def get_element_info(ctx, om_type):
     """Display a table of elements of an Open Metadata Type"""
     c = ctx.obj
-    display_elements(
-        om_type,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    display_elements(om_type, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 @show_supply_chains.command("supply-chains")
@@ -954,15 +935,7 @@ def get_element_info(ctx, om_type):
 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,
-    )
+    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")
@@ -971,15 +944,7 @@ def list_supply_chains(ctx, search_string):
 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,
-    )
+    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")
@@ -1005,15 +970,7 @@ def list_solution_roles(ctx, search_string):
 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,
-    )
+    solution_component_list(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 #
@@ -1034,6 +991,81 @@ def show_cat(ctx):
     """Display an Egeria Object"""
     pass
 
+@show_cat.group("data_designer")
+@click.pass_context
+def show_cat_design(ctx):
+    """Group of commands for Egeria Data Designer"""
+    pass
+
+
+@show_cat_design.command("data-fields")
+@click.option("--output-format", default = "TABLE", help="Output format type")
+@click.option('--search-string', default="*", help="Search string")
+@click.pass_context
+def show_data_fields(ctx, output_format, search_string):
+    """Report on Data Fields"""
+    c = ctx.obj
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
+    list_generic(
+        "Data-Fields", output_format = output_format, view_server = c.view_server, view_url= c.view_server_url,
+        user = c.userid, user_pass = c.password, params = {"search_string": search_string}, render_table = True
+    )
+
+
+@show_cat_design.command("data-structures")
+@click.option("--output-format", default = "TABLE", help="Output format type")
+@click.option('--search-string', default="*", help="Search string")
+@click.pass_context
+def show_data_structures(ctx, output_format, search_string):
+    """Reporton Data Structures"""
+    c = ctx.obj
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
+    list_generic(
+        "Data-Structures", output_format = output_format, view_server = c.view_server, view_url= c.view_server_url,
+        user = c.userid, user_pass = c.password, params = {"search_string": search_string}, render_table = True
+    )
+
+@show_cat_design.command("data-classes")
+@click.option("--output-format", default = "TABLE", help="Output format type")
+@click.option('--search-string', default="*", help="Search string")
+@click.pass_context
+def show_data_classes(ctx, output_format, search_string):
+    """Dynamically generate output based on a format set"""
+    c = ctx.obj
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
+    list_generic(
+        "Data-Classes", output_format = output_format, view_server = c.view_server, view_url= c.view_server_url,
+        user = c.userid, user_pass = c.password, params = {"search_string": search_string}, render_table = True
+    )
+
+@show_cat_design.command("data-dictionaries")
+@click.option("--output-format", default = "TABLE", help="Output format type")
+@click.option('--search-string', default="*", help="Search string")
+@click.pass_context
+def show_data_dictionaries(ctx, output_format, search_string):
+    """Report on Data Dictionaries"""
+    c = ctx.obj
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
+    list_generic(
+        "Data-Dictionaries", output_format = output_format, view_server = c.view_server, view_url= c.view_server_url,
+        user = c.userid, user_pass = c.password, params = {"search_string": search_string}, render_table = True
+    )
+
+@show_cat_design.command("data-specifications")
+@click.option("--output-format", default = "TABLE", help="Output format type")
+@click.option('--search-string', default="*", help="Search string")
+@click.pass_context
+def show_data_specs(ctx, output_format, search_string):
+    """Report on Data Specifications"""
+    c = ctx.obj
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
+    list_generic(
+        "Data-Specifications", output_format = output_format, view_server = c.view_server, view_url= c.view_server_url,
+        user = c.userid, user_pass = c.password, params = {"search_string": search_string}, render_table = True
+    )
+
+
+
 
 @show_cat.group("info")
 @click.pass_context
@@ -1041,18 +1073,18 @@ def show_cat_info(ctx):
     """Group of md_commands to show information about various Egeria objects"""
     pass
 
-@show_cat_info.command("list-output-set")
-@click.option("--format-set", help="Format set to output")
+@show_cat_info.command("Run Report")
+@click.option("--report", help="Report to output", default="Digital-Products")
 @click.option("--output-format", default = "TABLE", help="Output format type")
 @click.option('--search-string', default="*", help="Search string")
 @click.pass_context
-def show_format_set(ctx, format_set, output_format, search_string):
+def show_format_set(ctx, report, output_format, search_string):
     """Dynamically generate output based on a format set"""
     c = ctx.obj
     logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
-    execute_format_set_action(
-        format_set, c.view_server, c.view_server_url,
-        c.userid, c.password, output_format, search_string = search_string
+    list_generic(
+        report, output_format = output_format, view_server = c.view_server, view_url = c.view_server_url,
+        user = c.userid, user_pass = c.password, params = {"search_string": search_string},render_table = True
     )
 
 
@@ -1062,9 +1094,7 @@ def show_format_set(ctx, format_set, output_format, search_string):
 def show_tech_types(ctx, tech_type):
     """List deployed technology types"""
     c = ctx.obj
-    display_tech_types(
-        tech_type, c.view_server, c.view_server_url, c.userid, c.password
-    )
+    display_tech_types(tech_type, c.view_server, c.view_server_url, c.userid, c.password)
 
 
 @show_cat_info.command("collections")
@@ -1169,7 +1199,7 @@ def glossary_group(ctx):
 )
 @click.option(
     "--output-format",
-    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    type_name = click.Choice(["FORM", "REPORT", "TABLE"]),
     default="TABLE",
     help="Display on screen as table, or as FORM or REPORT file",
     )
@@ -1177,47 +1207,16 @@ def glossary_group(ctx):
 def show_terms(ctx, search_string, glossary_guid, glossary_name, output_format):
     """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,
-        output_format,
-    )
+    display_glossary_terms(search_string, glossary_guid, glossary_name, c.view_server, c.view_server_url, c.userid,
+                           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"]),
+    type_name = click.Choice(["FORM", "REPORT", "TABLE"]),
     default="TABLE",
     help="Display on screen as table, or as FORM or REPORT file",
     )
@@ -1289,16 +1288,7 @@ def show_projects(ctx, search_string):
 def show_certification_types(ctx, search_string):
     """Show certification types"""
     c = ctx.obj
-    display_certifications(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.timeout,
-        c.jupyter,
-        c.width,
-    )
+    display_certifications(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.timeout, c.jupyter)
 
 
 @show_cat_info.command("asset-types")
@@ -1359,7 +1349,7 @@ def show_project_dependencies(ctx, project):
 @click.option("--search-string", default="*", help="View the list of To-Do items")
 @click.option(
     "--status",
-    type=click.Choice(
+    type_name = click.Choice(
         ["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED", "None"],
         case_sensitive=False,
     ),
@@ -1410,15 +1400,8 @@ def deployed_data(ctx):
 def show_deployed_servers(ctx, search_string):
     """Display deployed servers"""
     c = ctx.obj
-    display_servers_by_dep_imp(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    display_servers_by_dep_imp(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter,
+                               c.width)
 
 
 @deployed_data.command("deployed-schemas")
@@ -1460,9 +1443,7 @@ def list_catalogs(ctx, search_server):
 def list_databases(ctx):
     """Display deployed databases"""
     c = ctx.obj
-    list_deployed_databases(
-        c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
-    )
+    list_deployed_databases(c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 #
@@ -1502,11 +1483,21 @@ tell_glossary.add_command(delete_term)
 tell_glossary.add_command(create_term)
 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_glossary.add_command(update_term)
+tell_glossary.add_command(update_term_status )
+
+@tell_cat.group("collection")
+@click.pass_context
+def tell_collections(ctx):
+    """Perform actions on collections"""
+    pass
+
+tell_collections.add_command(create_collection)
+tell_collections.add_command(delete_collection)
+tell_collections.add_command(update_collection)
+tell_collections.add_command(add_element_to_collection)
+tell_collections.add_command(remove_element_from_collection)
+
 
 @tell_cat.group("todo")
 @click.pass_context
@@ -1527,9 +1518,7 @@ tell_cat_todo.add_command(create_todo)
 def show_tech_types(ctx, tech_type):
     """List deployed technology types"""
     c = ctx.obj
-    display_tech_types(
-        tech_type, c.view_server, c.view_server_url, c.userid, c.password
-    )
+    display_tech_types(tech_type, c.view_server, c.view_server_url, c.userid, c.password)
 
 
 @show_cat_info.command("certification-types")
@@ -1538,16 +1527,7 @@ def show_tech_types(ctx, tech_type):
 def show_certification_types(ctx, search_string):
     """Show certification types"""
     c = ctx.obj
-    display_certifications(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.timeout,
-        c.jupyter,
-        c.width,
-    )
+    display_certifications(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.timeout, c.jupyter)
 
 
 @show_project_group.command("project-structure")
@@ -1655,7 +1635,7 @@ def show_projects(ctx, search_string):
 @click.option("--search-string", default="*", help="View the list of To-Do items")
 @click.option(
     "--status",
-    type=click.Choice(
+    type_name = click.Choice(
         ["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED", "None"],
         case_sensitive=False,
     ),
@@ -1699,15 +1679,8 @@ def show_user_ids(ctx):
 def show_deployed_servers(ctx, search_string):
     """Show list of deployed servers"""
     c = ctx.obj
-    display_servers_by_dep_imp(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    display_servers_by_dep_imp(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter,
+                               c.width)
 
 
 @deployed_data.command("deployed-schemas")
@@ -1751,9 +1724,7 @@ def catalogs(ctx, search_server):
 def databases(ctx):
     """Display a list of deployed databases"""
     c = ctx.obj
-    list_deployed_databases(
-        c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
-    )
+    list_deployed_databases(c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 # @tell_cat.group("survey")
@@ -1833,7 +1804,7 @@ def show_platform_status(ctx):
     """Display a live status view of known platforms"""
     c = ctx.obj
     p_display_status(
-        c.view_server, c.view_server_url, c.admin_user, c.admin_user_password
+        c.view_server, c.view_server_url, c.userid, c.password
     )
 
 
@@ -1941,8 +1912,8 @@ def eng_activity_status(ctx, rowlimit: int, list: bool, compressed: bool):
             rowlimit,
             c.view_server,
             c.view_server_url,
-            c.admin_user,
-            c.admin_user_password,
+            c.userid,
+            c.password,
             list,
             c.jupyter,
             c.width,
@@ -1952,8 +1923,8 @@ def eng_activity_status(ctx, rowlimit: int, list: bool, compressed: bool):
             rowlimit,
             c.view_server,
             c.view_server_url,
-            c.admin_user,
-            c.admin_user_password,
+            c.userid,
+            c.password,
             list,
             c.jupyter,
             c.width,
@@ -2004,15 +1975,7 @@ def integrations_status(ctx, connector_list, list, sorted):
 def integrations_status(ctx, connector):
     """Display Catalog Targets for a connector"""
     c = ctx.obj
-    display_catalog_targets(
-        connector,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    display_catalog_targets(connector, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 #