pyegeria 0.5.6.2__tar.gz → 0.5.6.3__tar.gz

{pyegeria-0.5.6.2 → pyegeria-0.5.6.3}/PKG-INFO

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

{pyegeria-0.5.6.2 → pyegeria-0.5.6.3}/examples/widgets/operational/monitor_eng_action_status.py

@@ -142,16 +142,14 @@ 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 (True) or Monitoring (False)")
+
     args = parser.parse_args()
 
     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_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
-    # print(f"Starting display_status_engine_actions with {server}, {url}, {userid}")
-    # print(f"Paging is {paging}")
+
     display_status_engine_actions(server=server, url=url, user=userid, user_pass=user_pass, paging=False)
 
 def main_paging():
@@ -160,16 +158,14 @@ def main_paging():
     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 (True) or Monitoring (False)")
+
     args = parser.parse_args()
 
     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_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
-    # print(f"Starting display_status_engine_actions with {server}, {url}, {userid}")
-    # print(f"Paging is {paging}")
+
     display_status_engine_actions(server=server, url=url, user=userid, user_pass=user_pass, paging=True)
 
 if __name__ == "__main_live__":

{pyegeria-0.5.6.2 → pyegeria-0.5.6.3}/examples/widgets/operational/monitor_gov_eng_status.py

@@ -21,7 +21,7 @@ from pyegeria import (
 )
 from rich.table import Table
 from rich.live import Live
-from rich import box
+from rich import box, Console
 from rich import console
 
 from pyegeria.server_operations import ServerOps
@@ -39,7 +39,7 @@ EGERIA_USER_PASSWORD = os.environ.get('EGERIA_USER_PASSWORD', 'secret')
 
 disable_ssl_warnings = True
 
-def display_gov_actions_status(server: str, url: str, username: str, user_pass:str):
+def display_gov_actions_status(server: str, url: str, username: str, user_pass:str, paging:bool):
     server_name = server
     s_client = ServerOps(server_name, url, username, user_pass)
 
@@ -86,10 +86,15 @@ def display_gov_actions_status(server: str, url: str, username: str, user_pass:s
         return table
 
     try:
-        with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
-            while True:
-                time.sleep(2)
-                live.update(generate_table())
+        if paging is True:
+            console = Console()
+            with console.pager():
+                console.print(generate_table())
+        else:
+            with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
+                while True:
+                    time.sleep(2)
+                    live.update(generate_table())
 
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
@@ -99,7 +104,7 @@ def display_gov_actions_status(server: str, url: str, username: str, user_pass:s
         s_client.close_session()
 
 
-def main():
+def main_live():
     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")
@@ -111,7 +116,25 @@ def main():
     url = args.url if args.url is not None else EGERIA_PLATFORM_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
-    display_gov_actions_status(server=server, url=url, username=userid, user_pass=user_pass)
+    display_gov_actions_status(server=server, url=url, username=userid, user_pass=user_pass, paging=False)
 
-if __name__ == "__main__":
-    main()
+def main_paging():
+    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_ENGINE_HOST
+    url = args.url if args.url is not None else EGERIA_PLATFORM_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
+    display_gov_actions_status(server=server, url=url, username=userid, user_pass=user_pass, paging=True)
+
+if __name__ == "__main_live__":
+    main_live()
+
+
+if __name__ == "__main_paging__":
+    main_paging()

{pyegeria-0.5.6.2 → pyegeria-0.5.6.3}/examples/widgets/operational/monitor_integ_daemon_status.py

@@ -16,7 +16,7 @@ import argparse
 import time
 from datetime import datetime
 
-from rich import box
+from rich import box, Console
 from rich.live import Live
 from rich.table import Table
 
@@ -43,7 +43,7 @@ disable_ssl_warnings = True
 
 
 def display_integration_daemon_status(integ_server: str, integ_url: str,
-                                      view_server:str, view_url: str, user: str, user_pass:str):
+                                      view_server:str, view_url: str, user: str, user_pass:str, paging: bool):
     s_client = ServerOps(integ_server, integ_url, user)
     a_client = AutomatedCuration(view_server, view_url, user, user_pass)
     token = a_client.create_egeria_bearer_token()
@@ -119,11 +119,16 @@ def display_integration_daemon_status(integ_server: str, integ_url: str,
         return table
 
     try:
-        with Live(generate_table(), refresh_per_second=4, screen=True) as live:
-            while True:
-                time.sleep(2)
-                live.update(generate_table())
-                live.console.pager()
+        if paging is True:
+            console = Console()
+            with console.pager():
+                console.print(generate_table())
+        else:
+            with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
+                while True:
+                    time.sleep(2)
+                    live.update(generate_table())
+
 
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
@@ -134,7 +139,27 @@ def display_integration_daemon_status(integ_server: str, integ_url: str,
         a_client.close_session()
 
 
-def main():
+def main_live():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--integ_server", help="Name of the integration server to display status for")
+    parser.add_argument("--integ_url", help="URL Platform to connect to")
+    parser.add_argument("--view_server", help="Name of the view server to use")
+    parser.add_argument("--view_url", help="view server URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+    args = parser.parse_args()
+
+    integ_server = args.integ_server if args.integ_server is not None else EGERIA_INTEGRATION_DAEMON
+    integ_url = args.integ_url if args.integ_url is not None else EGERIA_INTEGRATION_DAEMON_URL
+    view_server = args.view_server if args.view_server is not None else EGERIA_VIEW_SERVER
+    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
+    display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
+                                      view_server = view_server, view_url = view_url,
+                                      user=userid, user_pass = user_pass, paging = False)
+
+def main_paging():
     parser = argparse.ArgumentParser()
     parser.add_argument("--integ_server", help="Name of the integration server to display status for")
     parser.add_argument("--integ_url", help="URL Platform to connect to")
@@ -152,7 +177,9 @@ def main():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
                                       view_server = view_server, view_url = view_url,
-                                      user=userid, user_pass = user_pass)
+                                      user=userid, user_pass = user_pass, paging = True)
+if __name__ == "__main_live__":
+    main_live()
 
-if __name__ == "__main__":
-    main()
+if __name__ == "__main_paging__":
+    main_paging()

{pyegeria-0.5.6.2 → pyegeria-0.5.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.6.2"
+version = "0.5.6.3"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -58,8 +58,10 @@ pytest = "^8.2.2"
     monitor_coco_status = "examples.widgets.operational.monitor_coco_status:main"
     monitor_eng_action_status = "examples.widgets.operational.monitor_eng_action_status:main_live"
     list_eng_action_status = "examples.widgets.operational.monitor_eng_action_status:main_paging "
-    monitor_gov_eng_status = "examples.widgets.operational.monitor_gov_eng_status:main"
-    monitor_integ_daemon_status = "examples.widgets.operational.monitor_integ_daemon_status:main"
+    monitor_gov_eng_status = "examples.widgets.operational.monitor_gov_eng_status:main_live"
+    list_gov_eng_status = "examples.widgets.operational.monitor_gov_eng_status:main_paging"
+    monitor_integ_daemon_status = "examples.widgets.operational.monitor_integ_daemon_status:main_live"
+    list_integ_daemon_status = "examples.widgets.operational.monitor_integ_daemon_status:main_paging"
     monitor_platform_status = "examples.widgets.operational.monitor_platform_status:main"
     monitor_server_list = "examples.widgets.operational.monitor_server_list:main"
     monitor_server_status = "examples.widgets.operational.monitor_server_status:main"