pyegeria 1.5.1.1.25__py3-none-any.whl → 1.5.1.1.26__py3-none-any.whl

pyegeria/commands/cat/__init__.py

@@ -0,0 +1 @@
+from glossary_actions import display_glossaries

pyegeria/commands/cli/egeria.py

@@ -1114,6 +1114,11 @@ def engine_host(ctx):
 
 
 @engine_host.command("status")
+@click.options(
+    "--engine-list",
+    default=["*"],
+    help="Enter the list of connectors you are interested in or ['*'] for all",
+)
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
@@ -1123,10 +1128,11 @@ def engine_host(ctx):
     help="Name of the Engine Host to get status for",
 )
 @click.pass_context
-def gov_eng_status(ctx, engine_host, list):
+def gov_eng_status(ctx, engine_list, engine_host, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(
+        engine_list,
         engine_host,
         c.view_server,
         c.view_server_url,
@@ -1183,6 +1189,11 @@ def integrations(ctx):
 
 
 @integrations.command("status")
+@click.option(
+    "--connector-list",
+    default=["*"],
+    help="Enter the list of connectors you are interested in or ['*'] for all",
+)
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
@@ -1190,10 +1201,11 @@ def integrations(ctx):
     "--sorted", type=bool, default=True, help="If True, the table will be sorted"
 )
 @click.pass_context
-def integrations_status(ctx, list, sorted):
+def integrations_status(ctx, connector_list, list, sorted):
     """Display integration-daemon status information"""
     c = ctx.obj
     display_integration_daemon_status(
+        connector_list,
         c.integration_daemon,
         c.integration_daemon_url,
         c.view_server,

pyegeria/commands/cli/egeria_ops.py

@@ -271,6 +271,11 @@ def engine_host(ctx):
 
 
 @engine_host.command("status")
+@click.options(
+    "--engine-list",
+    default=["*"],
+    help="Enter the list of connectors you are interested in or ['*'] for all",
+)
 @click.option(
     "--engine-host",
     default="engine-host",
@@ -280,11 +285,12 @@ def engine_host(ctx):
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
 @click.pass_context
-def gov_eng_status(ctx, engine_host, list):
+def gov_eng_status(ctx, engine_list, engine_host, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(
-        c.engine_host,
+        engine_list,
+        engine_host,
         c.view_server,
         c.view_server_url,
         c.userid,
@@ -344,14 +350,20 @@ def integrations(ctx):
 
 
 @integrations.command("status")
+@click.option(
+    "--connector-list",
+    default=["*"],
+    help="Enter the list of connectors you are interested in or ['*'] for all",
+)
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
 @click.pass_context
-def integrations_status(ctx, list):
+def integrations_status(ctx, connector_list, list):
     """Display integration-daemon status information"""
     c = ctx.obj
     display_integration_daemon_status(
+        connector_list,
         c.integration_daemon,
         c.integration_daemon_url,
         c.view_server,

pyegeria/commands/ops/monitor_gov_eng_status.py

@@ -16,6 +16,7 @@ from rich import box
 from rich.console import Console
 from rich.live import Live
 from rich.markdown import Markdown
+from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
@@ -51,21 +52,23 @@ disable_ssl_warnings = True
 
 
 def display_gov_eng_status(
-    engine_host: str,
-    view_server: str,
-    url: str,
-    username: str,
-    user_pass: str,
-    paging: bool,
+    search_list: list[str] = ["*"],
+    engine_host: str = EGERIA_ENGINE_HOST,
+    view_server: str = EGERIA_VIEW_SERVER,
+    url: str = EGERIA_VIEW_SERVER_URL,
+    username: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    paging: bool = True,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
+    sort: bool = True,
 ):
     console = Console(width=EGERIA_WIDTH)
 
     s_client = EgeriaTech(view_server, url, username, user_pass)
     token = s_client.create_egeria_bearer_token()
 
-    def generate_table() -> Table:
+    def generate_table(search_list: list[str]) -> Table:
         """Make a new table."""
         table = Table(
             title=f"Governance Engine Status @ {time.asctime()}",
@@ -86,14 +89,25 @@ def display_gov_eng_status(
         table.add_column("Engine Status")
         table.add_column("Request Types")
 
-        eng_host_guid = s_client.get_guid_for_name(engine_host)
-        gov_eng_status = s_client.get_server_report(eng_host_guid)
-        eng_summaries = gov_eng_status["governanceEngineSummaries"]
-        sorted_gov_eng_status = sorted(
-            eng_summaries, key=lambda k: k.get("governanceEngineName", " ")
+        # eng_host_guid = s_client.get_guid_for_name(engine_host)
+        gov_eng_status = s_client.get_server_report(
+            server_guid=None, server_name=engine_host
         )
-        for engine in sorted_gov_eng_status:
+        eng_summaries = gov_eng_status["governanceEngineSummaries"]
+
+        if sort is True:
+            engine_info = sorted(
+                eng_summaries, key=lambda k: k.get("governanceEngineName", " ")
+            )
+        else:
+            engine_info = eng_summaries
+
+        for engine in engine_info:
             gov_eng = engine["governanceEngineName"]
+
+            if (gov_eng not in search_list) and (search_list != ["*"]):
+                # if specific engines are requested and it doesn't match, then skip
+                continue
             eng_type = engine.get("governanceEngineTypeName", " ")
 
             eng_desc = engine.get("governanceEngineDescription", " ")
@@ -115,24 +129,23 @@ def display_gov_eng_status(
 
             table.add_row(gov_eng, eng_type, eng_desc, eng_status, eng_req_type_out)
 
-        table.caption = f"Server {engine_host} running on {url}"
         return table
 
     try:
         if paging is True:
             console = Console(width=width, force_terminal=not jupyter)
             with console.pager():
-                console.print(generate_table())
+                console.print(generate_table(search_list))
         else:
             with Live(
-                generate_table(),
+                generate_table(search_list),
                 refresh_per_second=1,
                 screen=True,
                 vertical_overflow="visible",
             ) as live:
                 while True:
                     time.sleep(2)
-                    live.update(generate_table())
+                    live.update(generate_table(search_list))
 
     except (
         InvalidParameterException,
@@ -157,7 +170,7 @@ def main_live():
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
-    parser.add_argument("--paging", help="Paging")
+    # parser.add_argument("--paging", help="Paging")
     args = parser.parse_args()
 
     engine_host = (
@@ -169,8 +182,15 @@ def main_live():
     url = args.url if args.url is not None else EGERIA_ENGINE_HOST_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
-    paging = args.paging if args.paging is not None else False
-    display_gov_eng_status(engine_host, view_server, url, userid, user_pass, paging)
+    paging = False
+
+    search_list = Prompt.ask(
+        "Enter the list of engines you are interested in or ['*'] for all",
+        default=["*"],
+    )
+    display_gov_eng_status(
+        search_list, engine_host, view_server, url, userid, user_pass, paging
+    )
 
 
 def main_paging():
@@ -193,9 +213,14 @@ def main_paging():
     url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    paging = True
+    search_list = Prompt.ask(
+        "Enter the list of engines you are interested in or ['*'] for all",
+        default=["*"],
+    )
 
     display_gov_eng_status(
-        engine_host, view_server, url, userid, user_pass, paging=True
+        search_list, engine_host, view_server, url, userid, user_pass, paging
     )
 
 

pyegeria/commands/ops/monitor_integ_daemon_status.py

@@ -15,6 +15,7 @@ import time
 from rich import box
 from rich.console import Console
 from rich.live import Live
+from rich.prompt import Prompt
 from rich.table import Table
 import nest_asyncio
 from typing import Union
@@ -47,8 +48,8 @@ EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
 disable_ssl_warnings = True
 
 
-
 def display_integration_daemon_status(
+    search_list: list[str] = ["*"],
     integ_server: str = EGERIA_INTEGRATION_DAEMON,
     integ_url: str = EGERIA_INTEGRATION_DAEMON_URL,
     view_server: str = EGERIA_VIEW_SERVER,
@@ -61,8 +62,9 @@ def display_integration_daemon_status(
     sort: bool = True,
 ):
     s_client = EgeriaTech(view_server, view_url, user, user_pass)
+    token = s_client.create_egeria_bearer_token()
 
-    def generate_table() -> Table:
+    def generate_table(search_list: list[str]) -> Table:
         """Make a new table."""
         table = Table(
             title=f"Integration Daemon Status @ {time.asctime()}",
@@ -84,7 +86,6 @@ def display_integration_daemon_status(
         table.add_column("Target Element", min_width=20)
         table.add_column("Exception Message", min_width=10)
 
-        token = s_client.create_egeria_bearer_token()
         # server_guid = s_client.get_guid_for_name(integ_server)
         daemon_status = s_client.get_server_report(None, integ_server)
 
@@ -98,6 +99,11 @@ def display_integration_daemon_status(
 
         for connector in connector_reports:
             connector_name = connector.get("connectorName", "---")
+
+            if (connector_name not in search_list) and (search_list != ["*"]):
+                # if specific connectors are requested and it doesn't match, then skip
+                continue
+
             connector_status = connector.get("connectorStatus", "---")
             connector_guid = connector.get("connectorGUID", "---")
             last_refresh_time = connector.get("lastRefreshTime", "---")[:-10]
@@ -144,23 +150,24 @@ def display_integration_daemon_status(
                 targets_out,
                 exception_msg,
             )
+
         return table
 
     try:
         if paging is True:
             console = Console(width=width, force_terminal=not jupyter)
             with console.pager():
-                console.print(generate_table())
+                console.print(generate_table(search_list))
         else:
             with Live(
-                generate_table(),
+                generate_table(search_list),
                 refresh_per_second=1,
                 screen=True,
                 vertical_overflow="visible",
             ) as live:
                 while True:
                     time.sleep(2)
-                    live.update(generate_table())
+                    live.update(generate_table(search_list))
 
     except (
         InvalidParameterException,
@@ -202,14 +209,19 @@ def main_live():
     view_url = args.view_url if args.view_url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    search_list = Prompt.ask(
+        "Enter the list of connectors you are interested in or ['*'] for all",
+        default=["*"],
+    )
     display_integration_daemon_status(
+        search_list=search_list,
         integ_server=integ_server,
         integ_url=integ_url,
         view_server=view_server,
         view_url=view_url,
         user=userid,
         user_pass=user_pass,
-        paging=False,
+        paging=True,
     )
 
 
@@ -239,7 +251,12 @@ def main_paging():
     view_url = args.view_url if args.view_url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    search_list = Prompt.ask(
+        "Enter the list of connectors you are interested in or ['*'] for all",
+        default="[*]",
+    )
     display_integration_daemon_status(
+        search_list=search_list,
         integ_server=integ_server,
         integ_url=integ_url,
         view_server=view_server,

{pyegeria-1.5.1.1.25.dist-info → pyegeria-1.5.1.1.26.dist-info}/METADATA

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

{pyegeria-1.5.1.1.25.dist-info → pyegeria-1.5.1.1.26.dist-info}/RECORD

@@ -13,7 +13,7 @@ pyegeria/commands/.DS_Store,sha256=nBgW7MKJ6b4wSWyEEeGYHWwC8QJAiteQaWKM9PoNRzY,6
 pyegeria/commands/README.md,sha256=zNfWZppDxoKqTJeRtcewzku9z1m6_hKacCyQUQw1iq4,1974
 pyegeria/commands/__init__.py,sha256=7y3p5oQ2c0C1465oIgSA_123W1uo7Wqwk91LXccUgrw,17
 pyegeria/commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiqRY,967
-pyegeria/commands/cat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyegeria/commands/cat/__init__.py,sha256=w7b-hlPvrfBYhXJpj8oXPvm0RYB3JM6T6uDI7KbKW4s,48
 pyegeria/commands/cat/get_asset_graph.py,sha256=4AO4KlCgb7vbMihJK7W_GAnrd4J9sKwc4kXxa2ZrRW4,12447
 pyegeria/commands/cat/get_collection.py,sha256=v7hCeEDcAQmcjM9qepuk8gg_RnYra3_v009AJOunkKk,5005
 pyegeria/commands/cat/get_project_dependencies.py,sha256=B0JaMSUi0hzVgos1sTY2uUPGy1DzKEJMIbbYfMUWvQA,5981
@@ -34,10 +34,10 @@ pyegeria/commands/cat/list_terms.py,sha256=zNo8oQo4y3cGIYikBnD9gutPLecwyF8Q3XaOL
 pyegeria/commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 pyegeria/commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
 pyegeria/commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-pyegeria/commands/cli/egeria.py,sha256=CXFDHpuSwASzfbh_9Z2MTQuZzK5ANZdFIB3PBnRODZk,32024
+pyegeria/commands/cli/egeria.py,sha256=An7y4Dy03-inkRiat9pAP8RLcqcpy36GQj20XeY6M7E,32376
 pyegeria/commands/cli/egeria_cat.py,sha256=-rfM7WKtXwV0OkMF0gMN2YF9lcrtLtSb9TToKoZPR_w,15316
 pyegeria/commands/cli/egeria_my.py,sha256=Memyxzhrn_i3nMNRor-5N40_SKJJMzylA4iQgBW3T4g,6235
-pyegeria/commands/cli/egeria_ops.py,sha256=-UqtD4TDv_hhHFSjF0flF55Zo6UFbQcUCYBW_ZMLkx0,11648
+pyegeria/commands/cli/egeria_ops.py,sha256=aI3BU7btQa0ZrT3LDXto4gLWzLn2qoS4r499eHoAntc,11998
 pyegeria/commands/cli/egeria_tech.py,sha256=iq5D-dl0KW1HbNG8AolJSZoR6hTLp90RD_JjHxVj9Pk,13313
 pyegeria/commands/cli/ops_config.py,sha256=m4AfPjf-fR4EBTx8Dc2mcgrfWwAxb30YGeV-v79bg4U,1450
 pyegeria/commands/my/README.md,sha256=ZheFhj_VoPMhcWjW3pGchHB0vH_A9PklSmrSkzKdrcQ,844
@@ -56,8 +56,8 @@ pyegeria/commands/ops/load_archive.py,sha256=ZsJmQ-2cywsiO5RYHQXFF72wrlBK18jvAky
 pyegeria/commands/ops/monitor_asset_events.py,sha256=cjdlVqE0XYnoRW3aorNbsVkjByDXefPBnllaZLelGls,3838
 pyegeria/commands/ops/monitor_engine_activity.py,sha256=m18OSnRoo5ut0WKKOWNoFGXJW_npjp6hzHK3RUQG8T0,8479
 pyegeria/commands/ops/monitor_engine_activity_c.py,sha256=rSEUD3elhsiYdUhQRn613OM_R4VecFb0uq39MhYhltQ,9371
-pyegeria/commands/ops/monitor_gov_eng_status.py,sha256=HOcPLqOqceVjxbYqAtYK0fjlJBJxsR9SxbfKzwwUz8c,7237
-pyegeria/commands/ops/monitor_integ_daemon_status.py,sha256=JCKQdyK4u60nXyuZlXY1GL1X1EJOvgHPZ3xp_uQUObQ,9309
+pyegeria/commands/ops/monitor_gov_eng_status.py,sha256=wQ8KBjPJXYUVob7jxgpsS40x8J4wXzt41dmsBnygD-M,8017
+pyegeria/commands/ops/monitor_integ_daemon_status.py,sha256=-qOHNTmuzflUNxuSifZT_seCTyVKDJPrrIIXj17o7xY,9961
 pyegeria/commands/ops/monitor_platform_status.py,sha256=xmngiuQK9X6X4-stGSITzfMSAdqpswVk-DY7kh8M0P0,6401
 pyegeria/commands/ops/monitor_server_startup.py,sha256=0pwnhv761uuFHGJXVANa5RhQQPPTXFldJ45TfeT7qfk,3901
 pyegeria/commands/ops/monitor_server_status.py,sha256=eeZY4o_HwrH-csrhHPi95LLGu00j6AYl48A7fDYTG34,6061
@@ -107,8 +107,8 @@ pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZi
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=tfCGXed5LLt59YA8uZNNtd9UJ-lRZfPU_uZxK31Yux0,65069
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-1.5.1.1.25.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.1.25.dist-info/METADATA,sha256=3PAeOdZRNVUdeQ6iNqwsiUBVG_rqpUf7eAEp5RCqBBQ,2998
-pyegeria-1.5.1.1.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.1.25.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
-pyegeria-1.5.1.1.25.dist-info/RECORD,,
+pyegeria-1.5.1.1.26.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.1.26.dist-info/METADATA,sha256=k34zz3ctsWFwyUDp7nvIEO2z_71uWpa-VZa0AFRUBvI,2998
+pyegeria-1.5.1.1.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.1.26.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
+pyegeria-1.5.1.1.26.dist-info/RECORD,,