pyegeria 0.8.4.24__tar.gz → 0.8.4.26__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.24
+Version: 0.8.4.26
 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.26}/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.26}/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
@@ -121,9 +120,7 @@ from commands.ops.restart_integration_daemon import restart_connector
     envvar="EGERIA_ADMIN_PASSWORD",
     help="Egeria admin password",
 )
-@click.option(
-    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
-)
+@click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
 @click.option(
     "--password",
     default="secret",

{pyegeria-0.8.4.24 → pyegeria-0.8.4.26}/commands/cli/egeria_tech.py

@@ -112,7 +112,7 @@ from commands.tech.list_related_specification import (
     help="Egeria admin password",
 )
 @click.option(
-    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
+    "--userid", default="peterprofile", envvar="EGERIA_USER", help="Egeria user"
 )
 @click.option(
     "--password",

pyegeria-0.8.4.24/commands/ops/integration_daemon_actions.py → pyegeria-0.8.4.26/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,11 @@ 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="simple-metadata-store", help="OMAG Server to start")
 def start_server(ctx, server):
     """Start or restart an engine-host from its known configuration"""
     c = ctx.obj
+
     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.26}/commands/ops/monitor_platform_status.py

@@ -114,7 +114,7 @@ def display_status(
                             server_status = "UNKNOWN"
                             status_flag = "[bright yellow]"
 
-                        server_list = (
+                        server_list += (
                             f"{status_flag}{server_types[server_type]}: {server_name}\n"
                         )
                         # server_list = server_list + serv

pyegeria-0.8.4.26/commands/ops/monitor_server_status.py

@@ -0,0 +1,165 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Display the server status of all registered servers across all platforms.
+
+Note: This implementation is using the platform-report. A more complex platform environment may require
+reimplementing from a server only perspective using get_servers_by_dep_impl_type() to find the guids and
+then get_server_by_guid() to get the status. Less efficient but may be more robust for some environments.
+
+
+
+A simple server status display
+"""
+import argparse
+import os
+import sys
+import time
+
+from rich.live import Live
+from rich.table import Table
+
+from examples.doc_samples.Create_Sustainability_Collection_Sample import description
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    RuntimeManager,
+)
+
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
+    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+)
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+
+def display_status(
+    extended: bool,
+    view_server: str,
+    url: str,
+    username: str,
+    user_pass: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    p_client = RuntimeManager(view_server, url, username, user_pass)
+    token = p_client.create_egeria_bearer_token()
+
+    def generate_table() -> Table:
+        """Make a new table."""
+        table = Table(
+            title=f"Server Status for Platform - {time.asctime()}",
+            style="bold white on black",
+            row_styles=["bold white on black"],
+            header_style="white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
+            caption=f"Server Status from Platform - '{url}'",
+            # show_lines=True,
+        )
+
+        table.add_column("Known Server")
+        table.add_column("Status")
+        if extended:
+            table.add_column("Description")
+            table.add_column("Server Type")
+            table.add_column("Last Started")
+
+        platform_list = p_client.get_platforms_by_type()
+        if type(platform_list) is str:
+            print("No OMAG Server Platforms found?")
+            sys.exit(1)
+
+        for platform in platform_list:
+            platform_name = platform["properties"].get("displayName", "---")
+            platform_guid = platform["elementHeader"]["guid"]
+            platform_desc = platform["properties"].get("resourceDescription", "---")
+            p_server_list = ""
+
+            platform_report = p_client.get_platform_report(platform_guid)
+            servers = platform_report.get("omagservers", None)
+            for p_server in servers:
+                server_name = p_server.get("serverName", "--- ")
+                server_type = p_server.get("serverType", "--- ")
+                server_desc = p_server.get("description", "--- ")
+                last_start_time = p_server.get("lastStartTime", "--- ")
+
+                server_status = p_server.get("serverActiveStatus", "UNKNOWN")
+                if server_status in ("RUNNING", "STARTING"):
+                    status = "Active"
+                elif server_status in ("INACTIVE", "STOPPING"):
+                    status = "Inactive"
+                else:
+                    status = "UNKNOWN"
+
+                if extended:
+                    table.add_row(
+                        server_name,
+                        "[red]Inactive" if status == "Inactive" else "[green]Active",
+                        server_desc,
+                        server_type,
+                        last_start_time,
+                    )
+                else:
+                    table.add_row(
+                        server_name,
+                        "[red]Inactive" "" if status == "Inactive" else "[green]Active",
+                        # server_status,
+                    )
+        # p_client.close_session()
+        return table
+
+    try:
+        with Live(generate_table(), refresh_per_second=4, screen=True) as live:
+            while True:
+                time.sleep(2)
+                live.update(generate_table())
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+    except KeyboardInterrupt:
+        pass
+    finally:
+        p_client.close_session()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--extended", help="Extended Information?")
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+    args = parser.parse_args()
+
+    extended = args.extended if args.extended is not None else True
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_ADMIN_USER
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    display_status(extended, server, url, userid, user_pass)
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-0.8.4.24 → pyegeria-0.8.4.26}/pyegeria/runtime_manager_omvs.py

@@ -1763,7 +1763,7 @@ class RuntimeManager(Client):
 
         response = await self._async_make_request("POST", url, body)
 
-        return response.json().get("elements", "No platforms found")
+        return response.json().get("elements", "No servers found")
 
     def get_servers_by_dep_impl_type(
         self,

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

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