pyegeria 5.3.0.dev3__tar.gz → 5.3.0.dev5__tar.gz

{pyegeria-5.3.0.dev3 → pyegeria-5.3.0.dev5}/PKG-INFO

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

{pyegeria-5.3.0.dev3 → pyegeria-5.3.0.dev5}/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-5.3.0.dev3 → pyegeria-5.3.0.dev5}/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-5.3.0.dev3 → pyegeria-5.3.0.dev5}/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-5.3.0.dev3 → pyegeria-5.3.0.dev5}/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-5.3.0.dev3 → pyegeria-5.3.0.dev5}/pyegeria/commands/ops/monitor_integ_daemon_status.py

@@ -36,7 +36,7 @@ EGERIA_VIEW_SERVER = os.environ.get("EGERIA_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 = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -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-5.3.0.dev3 → pyegeria-5.3.0.dev5}/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,
         )
 

{pyegeria-5.3.0.dev3 → pyegeria-5.3.0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.3.0.dev3"
+version = "5.3.0.dev5"
 
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]