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

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

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
 
-A command line interface for Egeria operations.
+A object_action line interface for Egeria operations.
 
 This is an emerging capability based on the **click** package. Feedback welcome!
 
@@ -15,35 +15,33 @@ import click
 from trogon import tui
 
 # from pyegeria import ServerOps
-from pyegeria.commands.cli.ops_config import Config
-
-from pyegeria.commands.ops.gov_server_actions import (
+from commands.cli.ops_config import Config
+from commands.ops.gov_server_actions import (
     add_catalog_target,
-    remove_catalog_target,
-    update_catalog_target,
     refresh_gov_eng_config,
+    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.ops.list_archives import display_archive_list
-
+from commands.ops.refresh_integration_daemon import refresh_connector
+from commands.ops.restart_integration_daemon import restart_connector
 
 # class Config(object):
 #     def __init__(self, server: str = None, url: str = None, userid:str = None, password:str = None,
@@ -60,12 +58,12 @@ from pyegeria.commands.ops.list_archives import display_archive_list
 
 
 @tui()
-# @tui('menu', 'menu', 'A textual command line interface')
+# @tui('menu', 'menu', 'A textual object_action line interface')
 @click.version_option("0.0.1", prog_name="egeria_ops")
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -75,7 +73,7 @@ from pyegeria.commands.ops.list_archives import display_archive_list
 )
 @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(
@@ -85,7 +83,7 @@ from pyegeria.commands.ops.list_archives import display_archive_list
 )
 @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(
@@ -95,7 +93,7 @@ from pyegeria.commands.ops.list_archives import display_archive_list
 )
 @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(
@@ -140,6 +138,11 @@ from pyegeria.commands.ops.list_archives import display_archive_list
     default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
     help="Glossary guid to use as the home glossary",
 )
+@click.option(
+    "--glossary_path",
+    default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
+    help="Path to glossary import/export files",
+)
 @click.pass_context
 def cli(
     ctx,
@@ -158,6 +161,8 @@ def cli(
     timeout,
     jupyter,
     width,
+    home_glossary_guid,
+    glossary_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -176,6 +181,8 @@ def cli(
         timeout,
         jupyter,
         width,
+        home_glossary_guid,
+        glossary_path,
     )
     ctx.max_content_width = 200
     ctx.ensure_object(Config)
@@ -191,7 +198,7 @@ def show(ctx):
 @show.group("platforms")
 @click.pass_context
 def show_platforms(ctx):
-    """Group of commands to show information about Egeria platforms"""
+    """Group of md_commands to show information about Egeria platforms"""
     pass
 
 
@@ -208,7 +215,7 @@ def show_platform_status(ctx):
 @show.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
 
 
@@ -249,10 +256,16 @@ def show_startup_status(ctx):
     )
 
 
-@show_server.command("archives")
+@show.group("repository")
 @click.pass_context
-def list_archives(ctx):
-    """Display a list of archives"""
+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,
@@ -268,7 +281,7 @@ def list_archives(ctx):
 @show.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
 
 
@@ -278,21 +291,16 @@ def engine_host(ctx):
     default="*",
     help="Enter the list of connectors you are interested in or ['*'] for all",
 )
-@click.option(
-    "--engine-host",
-    default="engine-host",
-    help="Name of the Engine Host to get status for",
-)
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
 @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,
@@ -356,7 +364,7 @@ def eng_activity_status(ctx, rowlimit: int, list: bool, compressed: bool):
 @show.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
 
 
@@ -430,7 +438,7 @@ servers.add_command(stop_server)
 @tell.group("integration-daemon")
 @click.pass_context
 def integration_daemon(ctx):
-    """Group of commands to an integration_daemon"""
+    """Group of md_commands to an integration_daemon"""
     pass
 
 
@@ -441,16 +449,12 @@ def 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_url, c.view_server, c.userid, c.password
     )
 
 
@@ -461,16 +465,11 @@ 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 restart",
-)
-def restart_connectors(ctx, server, connector):
+def restart_connectors(ctx,  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
     )
 
 
@@ -482,7 +481,7 @@ integration_daemon.add_command(update_catalog_target)
 @tell.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
 
 
@@ -492,7 +491,7 @@ engine_host.add_command(refresh_gov_eng_config)
 @tell.group("repository")
 @click.pass_context
 def repository(ctx):
-    """Group of commands to a repository"""
+    """Group of md_commands to a repository"""
     pass