pyegeria 5.3.0.dev4__py3-none-any.whl → 5.3.0.dev6__py3-none-any.whl

pyegeria/commands/cli/egeria.py

@@ -1396,21 +1396,6 @@ def show_user_ids(ctx):
     )
 
 
-@show_server.command("archives")
-@click.pass_context
-def archives(ctx):
-    """Display a list of archivest"""
-    c = ctx.obj
-    display_archive_list(
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        False,
-        c.jupyter,
-        c.width,
-    )
-
 
 @deployed_data.command("deployed-servers")
 @click.option(
@@ -1537,6 +1522,26 @@ def show_ops(ctx):
     """Display an Egeria Object"""
     pass
 
+@show_ops.group("repository")
+@click.pass_context
+def show_repo(ctx):
+    """Group of commands to show repository information"""
+    pass
+
+
+@show_repo.command("archives")
+@click.pass_context
+def show_archives(ctx):
+    c= ctx.obj
+    display_archive_list(
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        False,
+        c.jupyter,
+        c.width,
+    )
 
 @show_ops.group("platforms")
 @click.pass_context

pyegeria/commands/cli/egeria_my.py

@@ -124,6 +124,12 @@ from pyegeria.commands.my.todo_actions import (
     default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
     help="Glossary guid to use as the home glossary",
 )
+@click.option(
+    "--glossary_path",
+    default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
+    help="Path to glossary import/export files",
+)
+
 @click.pass_context
 def cli(
     ctx,
@@ -142,6 +148,8 @@ def cli(
     timeout,
     jupyter,
     width,
+    home_glossary_guid,
+    glossary_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -160,6 +168,8 @@ def cli(
         timeout,
         jupyter,
         width,
+        home_glossary_guid,
+        glossary_path,
     )
     ctx.max_content_width = 200
     ctx.ensure_object(Config)

pyegeria/commands/cli/egeria_ops.py

@@ -140,6 +140,11 @@ from pyegeria.commands.ops.list_archives import display_archive_list
     default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
     help="Glossary guid to use as the home glossary",
 )
+@click.option(
+    "--glossary_path",
+    default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
+    help="Path to glossary import/export files",
+)
 @click.pass_context
 def cli(
     ctx,
@@ -158,6 +163,8 @@ def cli(
     timeout,
     jupyter,
     width,
+    home_glossary_guid,
+    glossary_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -176,6 +183,8 @@ def cli(
         timeout,
         jupyter,
         width,
+        home_glossary_guid,
+        glossary_path
     )
     ctx.max_content_width = 200
     ctx.ensure_object(Config)
@@ -248,12 +257,17 @@ def show_startup_status(ctx):
         c.width,
     )
 
+@show.group("repository")
+@click.pass_context
+def show_repo(ctx):
+    """Group of commands to show repository information"""
+    pass
+
 
-@show_server.command("archives")
+@show_repo.command("archives")
 @click.pass_context
-def list_archives(ctx):
-    """Display a list of archives"""
-    c = ctx.obj
+def show_archives(ctx):
+    c= ctx.obj
     display_archive_list(
         c.view_server,
         c.view_server_url,

pyegeria/commands/cli/egeria_tech.py

@@ -139,6 +139,11 @@ from pyegeria.commands.tech.get_tech_type_template import template_viewer
     default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
     help="Glossary guid to use as the home glossary",
 )
+@click.option(
+    "--glossary_path",
+    default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
+    help="Path to glossary import/export files",
+)
 @click.pass_context
 def cli(
     ctx,
@@ -157,6 +162,8 @@ def cli(
     timeout,
     jupyter,
     width,
+    home_glossary_guid,
+    home_glossary_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -175,6 +182,8 @@ def cli(
         timeout,
         jupyter,
         width,
+        home_glossary_guid,
+        home_glossary_path,
     )
     ctx.max_content_width = 200
     ctx.ensure_object(Config)

pyegeria/commands/ops/monitor_integ_daemon_status.py

@@ -103,7 +103,6 @@ def display_integration_daemon_status(
 
     Nothing
     """
-    print(f"i={integ_server}\nv={view_server}\n")
     s_client = EgeriaTech(view_server, view_url, user, user_pass)
     token = s_client.create_egeria_bearer_token()
 
@@ -258,7 +257,6 @@ def main_live(paging: bool = False) -> None:
         "Enter the list of connectors you are interested in or '*' for all",
         default="*",
     )
-    print(f"i={integ_server}\nv={view_server}\n")
     display_integration_daemon_status(
         search_list=[search_list],
         integ_server=integ_server,

pyegeria/commands/ops/monitor_server_status.py

@@ -50,14 +50,14 @@ 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,
+    view_server: str = os.environ.get("EGERIA_VIEW_SERVER"),
+    view_server_url: str = os.environ.get("EGERIA_VIEW_SERVER_URL"),
+    username: str = os.environ.get("EGERIA_USER"),
+    user_pass: str = os.environ.get("EGERIA_USER_PASSWORD"),
+    jupyter: bool = os.environ.get("EGERIA_JUPYTER", "False"),
+    width: int = os.environ.get("EGERIA_WIDTH", 150),
 ):
-    p_client = RuntimeManager(view_server, url, username, user_pass)
+    p_client = RuntimeManager(view_server, view_server_url, username, user_pass)
     token = p_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
@@ -69,7 +69,7 @@ def display_status(
             header_style="white on dark_blue",
             title_style="bold white on black",
             caption_style="white on black",
-            caption=f"Server Status from Platform - '{url}'",
+            caption=f"Server Status from Platform - '{view_server_url}'",
             show_lines=True,
         )
 
@@ -175,7 +175,7 @@ def main():
     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(full, server, url, userid, user_pass)
+    display_status(full, args.server, args.url, userid, user_pass)
 
 
 if __name__ == "__main__":

{pyegeria-5.3.0.dev4.dist-info → pyegeria-5.3.0.dev6.dist-info}/METADATA

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

{pyegeria-5.3.0.dev4.dist-info → pyegeria-5.3.0.dev6.dist-info}/RECORD

@@ -35,12 +35,12 @@ pyegeria/commands/cat/list_terms.py,sha256=P0kkOP5oA3sBveDqwIECqqyZYuaKRhV4INRhx
 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=4oL4SnHV5TBY87DX659UCZh4YoNFw-hu_SNrZ_BoFXs,45825
+pyegeria/commands/cli/egeria.py,sha256=jp1iFt5iJtedgZj9XwssH_8xkf3gFcEFGFmHtsgx8Ss,45928
 pyegeria/commands/cli/egeria_cat.py,sha256=P6pd17KvldSYCWJJAu56_DX90NOBFuQBireZ0gCuPB4,16017
 pyegeria/commands/cli/egeria_login_tui.py,sha256=m7gUiiPdeu2vxjiyxy-6OhAekSa5kVQnOUur2qyvbUA,9480
-pyegeria/commands/cli/egeria_my.py,sha256=XLd5ARwrVHZM7SGUKadJznb5KUULCmx2WIid3TKKmhY,6116
-pyegeria/commands/cli/egeria_ops.py,sha256=gVdLv5CgIyccZAAGS-RjwaW3cFrQOJJYhgWuMWQcl60,12580
-pyegeria/commands/cli/egeria_tech.py,sha256=DllmvtwPdYLnztyxEVg3fCcUT9XMlXAdIJyU8qAilb0,15709
+pyegeria/commands/cli/egeria_my.py,sha256=ncLN1DM_P7A0N2J96lET64t4fW21ifpDr8S6yI2lZHQ,6389
+pyegeria/commands/cli/egeria_ops.py,sha256=rB2th7K5SAsbfAVR3R-U_rjeRkVK8oce7JS29vBt15w,12946
+pyegeria/commands/cli/egeria_tech.py,sha256=jkeA6CdAT8iOtqMXAWE4emsu1583VY2KUxIAQYmAPiU,15991
 pyegeria/commands/cli/ops_config.py,sha256=4ShMgVl2eJoQLqJTK4npAdeAeJuq3FE6qsqngXYON74,1331
 pyegeria/commands/cli/txt_custom_v2.tcss,sha256=ixkzpFyTZ5i3byFO9EmEAeJgzbEa7nZb_3iTgxNtVPk,232
 pyegeria/commands/doc/README.md,sha256=3TDtLjanw5Sn5fhw0apsYv2HS2Hd7NSdjLu3qTwwXBg,13941
@@ -171,10 +171,10 @@ pyegeria/commands/ops/monitor_asset_events.py,sha256=B5GKzsAeLUbn_uBKLDWKlnNpX5A
 pyegeria/commands/ops/monitor_engine_activity.py,sha256=8RX-3znYx-4oWsI8nGFwODkWZ5Fc4qPttam_twymcjs,9856
 pyegeria/commands/ops/monitor_engine_activity_c.py,sha256=kuSNeq0YaD9w8kjyijPxp5L4oa7_68IhsU6sFl16SAg,10747
 pyegeria/commands/ops/monitor_gov_eng_status.py,sha256=MijZMxdSpzJAr3-d3PlDJaIkIYKmabiWqEpzpNu5vEo,9856
-pyegeria/commands/ops/monitor_integ_daemon_status.py,sha256=QDePegHb6XxKa_Q5670UXMW_a9MHz1UqHFCrR63GBEI,11826
+pyegeria/commands/ops/monitor_integ_daemon_status.py,sha256=1-IUXlQtNZhxhO-FI8enYTHcRrjWx3APjLCDYB3hlEk,11726
 pyegeria/commands/ops/monitor_platform_status.py,sha256=fpv8rZxdkcmbQ5SXQpGpqoY_nyqpT7NmOWQSll0cq8Q,7173
 pyegeria/commands/ops/monitor_server_startup.py,sha256=0pwnhv761uuFHGJXVANa5RhQQPPTXFldJ45TfeT7qfk,3901
-pyegeria/commands/ops/monitor_server_status.py,sha256=LnBDSbMeuVojpyHfwHM4i9Vnt-y1JkfmTVEutR1xFRU,6873
+pyegeria/commands/ops/monitor_server_status.py,sha256=lXDDzNXEpkuREfC3xupLq2xusZVp_9J86J0ExfYZoDA,7124
 pyegeria/commands/ops/orig_monitor_server_list.py,sha256=Uhtn8lv7QVXJBi9DSR3Nelmz8TB0vOsat10nFS6Nu20,4637
 pyegeria/commands/ops/orig_monitor_server_status.py,sha256=45lS8flHhBAnP7sRzYIXy1iFXVlFERxNAj_nOeYwWU0,4019
 pyegeria/commands/ops/refresh_integration_daemon.py,sha256=WncX_E45Gq6xZF6Z_NlUXXVlrvDh549wRLAclTdCH7s,2962
@@ -225,8 +225,8 @@ pyegeria/template_manager_omvs.py,sha256=Sw5xsQAhy7a48xFCg59mg9_nqyhawoS9v4WyF-P
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=kmcyXBsu99L25r16w9xVXqU_KwADsGuft4yPDZzyUds,65032
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-5.3.0.dev4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.3.0.dev4.dist-info/METADATA,sha256=G4vfPKgJVH27hXKZSJHIkSzHGe-zOozx5H5hdVyrbM0,2675
-pyegeria-5.3.0.dev4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-5.3.0.dev4.dist-info/entry_points.txt,sha256=JK212otpaYZogRHHwMrHy3fQUpAsg_DC3LkRUl59V2s,5373
-pyegeria-5.3.0.dev4.dist-info/RECORD,,
+pyegeria-5.3.0.dev6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.3.0.dev6.dist-info/METADATA,sha256=qygEJ1qiEh4ND9BOG1_S0xZDGoKrtXLwkoIDXl_3rzU,2675
+pyegeria-5.3.0.dev6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-5.3.0.dev6.dist-info/entry_points.txt,sha256=JK212otpaYZogRHHwMrHy3fQUpAsg_DC3LkRUl59V2s,5373
+pyegeria-5.3.0.dev6.dist-info/RECORD,,