pyegeria 0.8.4.46__tar.gz → 0.8.4.49__tar.gz

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/PKG-INFO

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

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/commands/cli/egeria.py

@@ -57,6 +57,8 @@ from commands.ops.monitor_server_status import (
 )
 from commands.ops.refresh_integration_daemon import refresh_connector
 from commands.ops.restart_integration_daemon import restart_connector
+from commands.ops.monitor_server_startup import display_startup_status
+
 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
@@ -986,6 +988,21 @@ def show_server_status(ctx, full):
     )
 
 
+@show_server.command("startup")
+@click.pass_context
+def show_startup_status(ctx):
+    """Display a live status view of Egeria servers for the specified Egeria platform"""
+    c = ctx.obj
+    display_startup_status(
+        c.server,
+        c.url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show.group("engines")
 @click.pass_context
 def engine_host(ctx):

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/commands/cli/egeria_ops.py

@@ -39,6 +39,7 @@ from commands.ops.monitor_server_status import (
 )
 from commands.ops.refresh_integration_daemon import refresh_connector
 from commands.ops.restart_integration_daemon import restart_connector
+from commands.ops.monitor_server_startup import display_startup_status
 
 
 # class Config(object):
@@ -247,6 +248,21 @@ def show_server_status(ctx, full):
     )
 
 
+@show_server.command("startup")
+@click.pass_context
+def show_startup_status(ctx):
+    """Display a live status view of Egeria servers for the specified Egeria platform"""
+    c = ctx.obj
+    display_startup_status(
+        c.server,
+        c.url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show.group("engines")
 @click.pass_context
 def engine_host(ctx):

pyegeria-0.8.4.49/commands/ops/monitor_server_startup.py

@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Unit tests for the Utils helper functions using the Pytest framework.
+
+
+A simple server status display using the OMAS services.
+"""
+import os
+import time
+import argparse
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    ServerOps,
+)
+from rich.table import Table
+from rich.live import Live
+
+
+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_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", "220"))
+
+
+def display_startup_status(
+    server: str,
+    url: str,
+    username: str,
+    password: str = EGERIA_USER_PASSWORD,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    p_client = ServerOps(server, url, username)
+
+    def generate_table() -> Table:
+        """Make a new table."""
+        table = Table(
+            title=f"Server Status for Platform - {time.asctime()}",
+            # style = "black on grey66",
+            header_style="white on dark_blue",
+            caption=f"Server Status for Platform - '{url}'",
+            # show_lines=True,
+        )
+
+        table.add_column("Known Server")
+        table.add_column("Status")
+
+        known_server_list = p_client.get_known_servers()
+        active_server_list = p_client.get_active_server_list()
+        if len(known_server_list) == 0:
+            return table
+
+        for server in known_server_list:
+            if server in active_server_list:
+                status = "Active"
+            else:
+                status = "Inactive"
+
+            table.add_row(
+                server,
+                "[red]Inactive" if status == "Inactive" else "[green]Active",
+            )
+        # 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())
+                # services = p_client.get_server_status(server)['serverStatus']['services']
+                # for service in services:
+                #     service_name = service['serviceName']
+                #     service_status = service['serviceStatus']
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+        assert e.related_http_code != "200", "Invalid parameters"
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    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")
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else "active-metadata-store"
+    url = args.url if args.url is not None else "https://localhost:9443"
+    userid = args.userid if args.userid is not None else "garygeeke"
+
+    display_startup_status(server, url, userid)
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/commands/tech/list_related_elements.py

@@ -97,12 +97,14 @@ def list_related_elements(
                     f"* Created: {el_create_time}\n"
                 )
                 rel_header_out = Markdown(rel_header_md)
+                rel_props = element.get("relationshipProperties", "---")
 
                 rel_props_md = ""
-                for prop in element["relationshipProperties"].keys():
-                    rel_props_md += (
-                        f"* **{prop}**: {element['relationshipProperties'][prop]}\n"
-                    )
+                if type(rel_props) is list:
+                    for prop in rel_props.keys():
+                        rel_props_md += (
+                            f"* **{prop}**: {element['relationshipProperties'][prop]}\n"
+                        )
                 rel_props_out = Markdown(rel_props_md)
 
                 c_md = ""

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/pyegeria/automated_curation_omvs.py

@@ -366,10 +366,10 @@ class AutomatedCuration(Client):
         Returns
         -------
         str
-            The GUID of the Postgres server element.
+            The GUID of the File Folder element.
         """
         body = {
-            "templateGUID": TEMPLATE_GUIDS["FileFolder"],
+            "templateGUID": TEMPLATE_GUIDS["File System Directory"],
             "isOwnAnchor": "true",
             "placeholderPropertyValues": {
                 "directoryPathName": path_name,
@@ -416,7 +416,7 @@ class AutomatedCuration(Client):
         Returns
         -------
         str
-            The GUID of the Postgres server element.
+            The GUID of the File Folder element.
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/pyegeria/runtime_manager_omvs.py

@@ -1247,7 +1247,7 @@ class RuntimeManager(Client):
         return
 
     async def _async_activate_server_with_stored_config(
-        self, server_guid: str = None, server_name: str = None, timeout: int = 120
+        self, server_guid: str = None, server_name: str = None, timeout: int = 240
     ) -> None:
         """Activate the named OMAG server using the appropriate configuration document found in the
             configuration store. Async version.
@@ -1260,6 +1260,7 @@ class RuntimeManager(Client):
             Identity of the server to act on. If not specified, server_name must be.
         server_name: str, default = None
             Name of server to act on. If not specified, server_guid must be.
+        timeout: int, optional, default = 240 seconds
 
         Returns
         -------
@@ -1279,7 +1280,7 @@ class RuntimeManager(Client):
         return
 
     def activate_server_with_stored_config(
-        self, server_guid: str = None, server_name: str = None, timeout: int = 120
+        self, server_guid: str = None, server_name: str = None, timeout: int = 240
     ) -> None:
         """Activate the named OMAG server using the appropriate configuration document found in the
             configuration store.
@@ -1292,6 +1293,7 @@ class RuntimeManager(Client):
             Identity of the server to act on. If not specified, server_name must be.
         server_name: str, default = None
             Name of server to act on. If not specified, server_guid must be.
+        timeout: int, optional, default = 240 seconds
 
         Returns
         -------

{pyegeria-0.8.4.46 → pyegeria-0.8.4.49}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.8.4.46"
+version = "0.8.4.49"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -81,6 +81,7 @@ pytest = "^8.2.2"
     list_integ_daemon_status = "commands.ops.monitor_integ_daemon_status:main_paging"
     monitor_platform_status = "commands.ops.monitor_platform_status:main"
     monitor_server_list = "commands.ops.orig_monitor_server_list:main"
+    monitor_server_startup = "commands.ops.monitor_server_startup:main"
     monitor_server_status = "commands.ops.monitor_server_status:main"
     refresh_integration_daemon = "commands.ops.refresh_integration_daemon:main"
     restart_integration_daemon = "commands.ops.restart_integration_daemon:main"