pyegeria 0.8.4.25__py3-none-any.whl → 0.8.4.26__py3-none-any.whl

commands/cli/egeria_ops.py

@@ -120,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",
@@ -386,9 +384,6 @@ 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")
@@ -431,8 +426,6 @@ 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")

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",

commands/ops/gov_server_actions.py

@@ -125,13 +125,11 @@ def refresh_gov_eng_config(ctx):
 
 @click.command("start")
 @click.pass_context
-@click.option("--server", default=None, help="OMAG Server to start")
+@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
-    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:

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

commands/ops/monitor_server_status.py

@@ -3,44 +3,63 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-Unit tests for the Utils helper functions using the Pytest framework.
+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,
-    ServerOps
+    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(server: str, url: str, username: str, user_pass: str, jupyter: bool = EGERIA_JUPYTER,
-                   width: int = EGERIA_WIDTH):
-    p_client = ServerOps(server, url, username, user_pass)
+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."""
@@ -51,27 +70,58 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
             header_style="white on dark_blue",
             title_style="bold white on black",
             caption_style="white on black",
-            caption=f"Server Status for Platform - '{url}'",
+            caption=f"Server Status from 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",
-                          )
+        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
 
@@ -81,7 +131,11 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
                 time.sleep(2)
                 live.update(generate_table())
 
-    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
         print_exception_response(e)
     except KeyboardInterrupt:
         pass
@@ -91,18 +145,20 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
 
 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()
 
-    server = args.server if args.server is not None else EGERIA_METADATA_STORE
+    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(server, url, userid, user_pass)
+    display_status(extended, server, url, userid, user_pass)
 
 
 if __name__ == "__main__":

commands/ops/orig_monitor_server_status.py

@@ -0,0 +1,109 @@
+#!/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
+"""
+import argparse
+import os
+import time
+
+from rich.live import Live
+from rich.table import Table
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    ServerOps
+)
+
+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(server: str, url: str, username: str, user_pass: str, jupyter: bool = EGERIA_JUPYTER,
+                   width: int = EGERIA_WIDTH):
+    p_client = ServerOps(server, url, username, user_pass)
+
+    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 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())
+
+    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("--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()
+
+    server = args.server if args.server is not None else EGERIA_METADATA_STORE
+    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(server, url, userid, user_pass)
+
+
+if __name__ == "__main__":
+    main()

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.25.dist-info → pyegeria-0.8.4.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.25
+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.25.dist-info → pyegeria-0.8.4.26.dist-info}/RECORD

@@ -19,8 +19,8 @@ commands/cli/__init__.py,sha256=6d_R0KZBNnJy9EBz9J2xvGFlx-3j_ZPqPCxKgdvYeDQ,291
 commands/cli/egeria.py,sha256=PrWt07cTZSNqyBrJifMnvCWH0vor4zcydsIznQJqPQM,28302
 commands/cli/egeria_cat.py,sha256=LWspOYRcdJIIx2n9wvhBhkNnACGDIpFTWfsoVTGeiV0,12957
 commands/cli/egeria_my.py,sha256=9zIpUDLeA_R-0rgCSQfEZTtVmkxPcEAsYcCTn1wQFrE,6181
-commands/cli/egeria_ops.py,sha256=0kIBvxnS4slJzKfxg6KrJ1-UJ4IYHQfN1OPKIQ3ArG8,11230
-commands/cli/egeria_tech.py,sha256=PfEIf8pLgbCiPlUikZss97R78XOue0P3aZG5PswUtQ4,11161
+commands/cli/egeria_ops.py,sha256=rcHD8RN9BJL7H8RBXlP1QvV_pzJPm-k4YODnfLF-yqw,11020
+commands/cli/egeria_tech.py,sha256=AbRx_wDP4935zAECOgCY0rL8v8AySWxNvkG9Z_mm-SY,11161
 commands/cli/ops_config.py,sha256=m4AfPjf-fR4EBTx8Dc2mcgrfWwAxb30YGeV-v79bg4U,1450
 commands/my/README.md,sha256=ZheFhj_VoPMhcWjW3pGchHB0vH_A9PklSmrSkzKdrcQ,844
 commands/my/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,7 +33,7 @@ commands/my/todo_actions.py,sha256=uihltirrAPtwYNygnNBAVWgfS0W7acoETz1_h3XW_4o,8
 commands/ops/README.md,sha256=PJsSDcvMv6E6og6y-cwvxFX5lhCII0UCwgKiM1T17MQ,1595
 commands/ops/__init__.py,sha256=SCfzF3-aMx8EpqLWmH7JQf13gTmMAtHRbg69oseLvi8,480
 commands/ops/engine_actions.py,sha256=00s_wkzs0zlZ6PyZ0J5J9lHhw4Viyzbeox7b1K1lmyc,4609
-commands/ops/gov_server_actions.py,sha256=tRcAW_TExuRm__gSBcx4SMqVC8LplTutvwNzIGJ_xGU,5714
+commands/ops/gov_server_actions.py,sha256=xF0QWSP7JtxpcA-L8DfbVjtgHgqBocgBN5qIE5Rmm9A,5631
 commands/ops/list_catalog_targets.py,sha256=0FIZqZu7DSh7tnrme6EOhNiVvK8wyvN1iTZKEDuwTmw,6620
 commands/ops/load_archive.py,sha256=duf3wq2ANRBiOj9KTFsw8TseEkJLKdzITAeTCjsMvI0,2453
 commands/ops/monitor_asset_events.py,sha256=cjdlVqE0XYnoRW3aorNbsVkjByDXefPBnllaZLelGls,3838
@@ -42,9 +42,10 @@ commands/ops/monitor_engine_activity.py,sha256=m18OSnRoo5ut0WKKOWNoFGXJW_npjp6hz
 commands/ops/monitor_engine_activity_c.py,sha256=rSEUD3elhsiYdUhQRn613OM_R4VecFb0uq39MhYhltQ,9371
 commands/ops/monitor_gov_eng_status.py,sha256=_eIN_3J8PZjgZH4D1Pc0Z_kUOd0pVd6dGP7jUgXG5wg,6640
 commands/ops/monitor_integ_daemon_status.py,sha256=u15-tvGveO7_yV7JJmYkxiEDnq5KBk8J4hkw0id_LFA,9224
-commands/ops/monitor_platform_status.py,sha256=hn96QuOjCndSDWl1-DAzk9O8D68YoRP1ALOlVfWVQgo,6400
+commands/ops/monitor_platform_status.py,sha256=xmngiuQK9X6X4-stGSITzfMSAdqpswVk-DY7kh8M0P0,6401
 commands/ops/monitor_server_list.py,sha256=Uhtn8lv7QVXJBi9DSR3Nelmz8TB0vOsat10nFS6Nu20,4637
-commands/ops/monitor_server_status.py,sha256=A-8hMDfbscdcq-b1OD4wKn0tphumX8WIK-Hz8uPoFkc,3974
+commands/ops/monitor_server_status.py,sha256=KWkFXivHfHa1rggRoaIBSSgECQAwJ4vDgjjVMvp56RY,6145
+commands/ops/orig_monitor_server_status.py,sha256=A-8hMDfbscdcq-b1OD4wKn0tphumX8WIK-Hz8uPoFkc,3974
 commands/ops/refresh_integration_daemon.py,sha256=9dZX-AHJ7yILohj005TRIC9tC349RRwwxRmqVLD2ZTE,2991
 commands/ops/restart_integration_daemon.py,sha256=PN48zVDywjNJznmpVWEcBXBD3xhWDw1dMyKLIs9nWzU,2992
 commands/tech/README.md,sha256=nxDnfr3BCiGgW5G1VxWxiwUWJXIe5wreNuUeRyIt_hY,1343
@@ -87,13 +88,13 @@ pyegeria/my_profile_omvs.py,sha256=eDnDK8LQIg7yrmiG8x20xMw-Yu6xuL0yXRm0vSc4T8k,4
 pyegeria/platform_services.py,sha256=hlbbG1iGuMj7JhLkz60V9xaG4m0pheYvs0bhbjF64rE,41624
 pyegeria/project_manager_omvs.py,sha256=OCdJKECI0sTZWgXcQ5TcupK5JPxHJG78-kHXyflDu1k,74521
 pyegeria/registered_info.py,sha256=3PbmqKusFX5m9KYVwbT69PIN1oSL4PhZDbbU_an7dvE,6356
-pyegeria/runtime_manager_omvs.py,sha256=zGrm7XAwRsRYNgG1a7huM1jVroGGuhAeF2qi_K1YOU4,61922
+pyegeria/runtime_manager_omvs.py,sha256=nqcATjrFGCxtYDe10u3PnJ7aVSdTwlxTk_DFzMKlWMw,61920
 pyegeria/server_operations.py,sha256=ciH890hYT85YQ6OpByn4w7s3a7TtvWZpIG5rkRqbcI0,16766
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=6Hc4g9BOS8w1ILfTG3_A1tfIX3HLtpgZZvcC-z9GePU,36185
 pyegeria/x_action_author_omvs.py,sha256=za472slZ5tN9Pkd-ukyHS5Sn6MlKkJyIlbLlU3bL_Go,6451
-pyegeria-0.8.4.25.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-0.8.4.25.dist-info/METADATA,sha256=oLkdOsN67ebuQ2T-2BiUQdub6hNNlNJlZId8YT94K2E,2820
-pyegeria-0.8.4.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-0.8.4.25.dist-info/entry_points.txt,sha256=CkFcA_eJ_pXLSlpZ7AAPDiNVHyFuW0tDHc_y9LTlLx8,3344
-pyegeria-0.8.4.25.dist-info/RECORD,,
+pyegeria-0.8.4.26.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-0.8.4.26.dist-info/METADATA,sha256=jkJSoG6WdgsKbfEK0yv_TkfwTdXNp3Q5YbYXfqlCaSI,2820
+pyegeria-0.8.4.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-0.8.4.26.dist-info/entry_points.txt,sha256=CkFcA_eJ_pXLSlpZ7AAPDiNVHyFuW0tDHc_y9LTlLx8,3344
+pyegeria-0.8.4.26.dist-info/RECORD,,