pyegeria 0.8.4.24__tar.gz → 0.8.4.25__tar.gz

{pyegeria-0.8.4.24 → pyegeria-0.8.4.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.24
+Version: 0.8.4.25
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

{pyegeria-0.8.4.24 → pyegeria-0.8.4.25}/commands/cli/egeria.py

@@ -32,14 +32,12 @@ 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.ops.engine_actions import (
-    start_daemon as start_engine_host,
-    stop_daemon as stop_engine_host,
-)
-from commands.ops.integration_daemon_actions import (
+
+from commands.ops.gov_server_actions import (
     add_catalog_target,
     remove_catalog_target,
     update_catalog_target,
+    refresh_gov_eng_config,
     stop_server,
     start_server,
 )
@@ -1161,8 +1159,8 @@ def engine_host(ctx):
     pass
 
 
-engine_host.add_command(start_engine_host)
-engine_host.add_command(stop_engine_host)
+engine_host.add_command(start_server)
+engine_host.add_command(stop_server)
 
 
 @tell.group("repository")

{pyegeria-0.8.4.24 → pyegeria-0.8.4.25}/commands/cli/egeria_ops.py

@@ -14,15 +14,14 @@ from trogon import tui
 
 # from pyegeria import ServerOps
 from commands.cli.ops_config import Config
-from commands.ops.integration_daemon_actions import (
-    start_server,
-    stop_server,
-    refresh_gov_eng_config,
-)
-from commands.ops.integration_daemon_actions import (
+
+from commands.ops.gov_server_actions import (
     add_catalog_target,
     remove_catalog_target,
     update_catalog_target,
+    refresh_gov_eng_config,
+    start_server,
+    stop_server,
 )
 from commands.ops.list_catalog_targets import display_catalog_targets
 from commands.ops.load_archive import load_archive
@@ -387,6 +386,9 @@ def servers(ctx):
 
 servers.add_command(start_server)
 servers.add_command(stop_server)
+servers.add_command(refresh_gov_eng_config)
+
+CONTEXT_SETTINGS = dict(default_map={"runserver": {"port": 5000}})
 
 
 @tell.group("integration-daemon")
@@ -429,6 +431,8 @@ def restart_connectors(ctx, connector):
 integration_daemon.add_command(add_catalog_target)
 integration_daemon.add_command(remove_catalog_target)
 integration_daemon.add_command(update_catalog_target)
+integration_daemon.add_command(start_server)
+integration_daemon.add_command(stop_server)
 
 
 @tell.group("engine-host")

pyegeria-0.8.4.24/commands/ops/integration_daemon_actions.py → pyegeria-0.8.4.25/commands/ops/gov_server_actions.py

@@ -104,57 +104,8 @@ def update_catalog_target(ctx, relationship_guid: str, catalog_target_name: str)
         print_exception_response(e)
 
 
-# @click.command("stop")
-# @click.pass_context
-# def stop_server(ctx):
-#     """Stop an integration daemon"""
-#     try:
-#         c = ctx.obj
-#         p_client = Platform(
-#             c.integration_daemon, c.integration_daemon_url, c.userid, c.password
-#         )
-#
-#         p_client.shutdown_server()
-#
-#         click.echo(f"Stopped server {c.integration_daemon}")
-#     except (InvalidParameterException, PropertyServerException) as e:
-#         print_exception_response(e)
-#
-#
-# @click.command("start")
-# @click.pass_context
-# def start_server(ctx):
-#     """Start or restart an integration daemon from its known configuration"""
-#     try:
-#         c = ctx.obj
-#         p_client = Platform(
-#             c.integration_daemon, c.integration_daemon_url, c.userid, c.password
-#         )
-#
-#         p_client.activate_server_stored_config()
-#
-#         click.echo(f"Started server {c.integration_daemon}")
-#
-#     except (InvalidParameterException, PropertyServerException) as e:
-#         print_exception_response(e)
 @click.command("refresh-gov-eng-config")
 @click.pass_context
-# @click.option(
-#     "--engine-host", default=EGERIA_ENGINE_HOST, help="Engine Host to refresh"
-# )
-# @click.option(
-#     "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
-# )
-# @click.option(
-#     "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
-# )
-# @click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
-# @click.option(
-#     "--password",
-#     default="secret",
-#     envvar="EGERIA_PASSWORD",
-#     help="Egeria user password",
-# )
 def refresh_gov_eng_config(ctx):
     """Start or restart an engine-host from its known configuration"""
     c = ctx.obj
@@ -174,23 +125,13 @@ def refresh_gov_eng_config(ctx):
 
 @click.command("start")
 @click.pass_context
-@click.option("--server", help="OMAG Server to start")
-# @click.option(
-#     "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
-# )
-# @click.option(
-#     "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
-# )
-# @click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
-# @click.option(
-#     "--password",
-#     default="secret",
-#     envvar="EGERIA_USER_PASSWORD",
-#     help="Egeria user password",
-# )
+@click.option("--server", default=None, help="OMAG Server to start")
 def start_server(ctx, server):
     """Start or restart an engine-host from its known configuration"""
     c = ctx.obj
+    if server is None:
+        click.echo(c.parent.info_name)
+        server = "simple-metadata-store"
     p_client = EgeriaTech(c.view_server, c.view_server_url, c.userid, c.password)
     token = p_client.create_egeria_bearer_token()
     try:

{pyegeria-0.8.4.24 → pyegeria-0.8.4.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.8.4.24"
+version = "0.8.4.25"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"