pyegeria 0.7.33__tar.gz → 0.7.35__tar.gz

{pyegeria-0.7.33 → pyegeria-0.7.35}/PKG-INFO

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

{pyegeria-0.7.33 → pyegeria-0.7.35}/examples/widgets/cli/egeria.py

@@ -991,8 +991,9 @@ def gov_eng_status(ctx, list):
 )
 @click.option(
     "--compressed",
-    type=bool,
-    default=True,
+    is_flag=True,
+    default=False,
+    show_default=True,
     help="Compressed combines some attributes into a single column",
 )
 @click.pass_context

{pyegeria-0.7.33 → pyegeria-0.7.35}/examples/widgets/cli/egeria_ops.py

@@ -284,12 +284,17 @@ def gov_eng_status(ctx, list):
 @engine_host.command("activity")
 @click.option(
     "--compressed",
-    type=bool,
-    default=True,
+    is_flag=True,
+    default=False,
+    show_default=True,
     help="Compressed combines some attributes into a single column",
 )
 @click.option(
-    "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
+    "--list",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    help="If True, a paged list will be shown",
 )
 @click.pass_context
 def eng_activity_status(ctx, list, compressed):

{pyegeria-0.7.33 → pyegeria-0.7.35}/examples/widgets/ops/monitor_engine_activity_c.py

@@ -78,13 +78,12 @@ def display_engine_activity_c(
         )
         table.add_column("Requested Time")
         table.add_column("Core Info")
+        table.add_column("Target Elements")
 
-        # table.add_column("Request Type")
         table.add_column("Action Status")
-        table.add_column("Target Element")
         table.add_column("Completion Time")
-        table.add_column("Process Name")
-        table.add_column("Completion Message")
+        table.add_column("Core Results")
+        # table.add_column("Completion Message")
 
         token = g_client.create_egeria_bearer_token()
         action_status = g_client.get_engine_actions()
@@ -106,9 +105,10 @@ def display_engine_activity_c(
                 reverse=True,
             )
             for action in sorted_action_status:
-                requested_time = action.get("requestedTime", " ")
-                start_time = action.get("startTime", " ")
-                completion_time = action.get("completionTime", " ")
+                requested_time = action.get("requestedTime", " ")[:-10]
+                start_time = action.get("startTime", " ")[:-10]
+                completion_time = action.get("completionTime", " ")[:-10]
+                completion_guards = action.get("completionGuards", " ")
 
                 engine_name = action["governanceEngineName"]
                 request_type = action["requestType"]
@@ -125,39 +125,52 @@ def display_engine_activity_c(
                 else:
                     action_status = f"[red]{action['actionStatus']}"
 
+                request_parameters_md = " "
+                request_parameters = action.get("requestParameters", "Empty")
+                if type(request_parameters) is dict:
+                    for key, value in request_parameters.items():
+                        request_parameters_md += f"\t* {key}: {value}\n"
+
                 targets = action.get("actionTargetElements", "Empty")
                 if type(targets) is list:
-                    tgt_tab = Table()
-                    tgt_tab.add_column("name")
-                    tgt_tab.add_column("guid", no_wrap=True)
-                    tgt_tab.add_column("type_name")
                     targets_md = ""
                     for target in targets:
                         t_name = target["actionTargetName"]
                         t_guid = target["actionTargetGUID"]
                         t_type = target["targetElement"]["type"]["typeName"]
-                        tgt_tab.add_row(t_name, t_guid, t_type)
+                        targets_md += (
+                            f"* Target Name: {t_name}\n"
+                            f"   * Target GUID: {t_guid}\n"
+                            f"   * Target Type: {t_type}\n"
+                        )
+
                     # target_element = json.dumps(target[0]["targetElement"]["elementProperties"]["propertiesAsStrings"])
-                    target_element = tgt_tab
+                    target_element = Markdown(f"{targets_md} ---\n")
                 else:
                     target_element = " "
 
-                process_name = action.get("processName", " ")
+                process_name = action.get("processName", "Null")
                 completion_message = action.get("completionMessage", " ")
-
+                core_results_md = (
+                    f"* Completion Guards: {completion_guards}\n"
+                    f"* Completion Message: {completion_message}"
+                )
+                core_results_out = Markdown(core_results_md)
                 core_info_md = (
                     f"* Start Time: {start_time}\n* Engine Name: {engine_name}\n* GUID: {action_guid}\n"
-                    f"* Request TYpe: {request_type}"
+                    f"* Request Type: {request_type}\n"
+                    f"* Process Name: {process_name}\n"
+                    f"---\n"
+                    f"* Request Parameters: \n{request_parameters_md}\n"
                 )
                 core_info_out = Markdown(core_info_md)
                 table.add_row(
                     requested_time,
                     core_info_out,
-                    action_status,
                     target_element,
+                    action_status,
                     completion_time,
-                    process_name,
-                    completion_message,
+                    core_results_out,
                 )
         else:
             print("Egeria integration daemon not running")

{pyegeria-0.7.33 → pyegeria-0.7.35}/pyproject.toml

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