pyegeria 0.5.8.19__tar.gz → 0.5.8.21__tar.gz

{pyegeria-0.5.8.19 → pyegeria-0.5.8.21}/PKG-INFO

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

{pyegeria-0.5.8.19 → pyegeria-0.5.8.21}/examples/widgets/catalog_user/get_asset_graph.py

@@ -14,6 +14,7 @@ from rich.markdown import Markdown
 from rich.panel import Panel
 from rich.prompt import Prompt
 from rich.tree import Tree
+from rich import print
 
 from pyegeria import (
     InvalidParameterException,
@@ -38,11 +39,9 @@ EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 disable_ssl_warnings = True
 
-# console = Console(width=EGERIA_WIDTH, force_terminal=(not EGERIA_JUPYTER))
-console = Console()
-
 guid_list = []
 
+console = Console(width=EGERIA_WIDTH, force_terminal=(not EGERIA_JUPYTER))
 
 def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str, user_pass: str,
                  jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
@@ -225,10 +224,9 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
                 relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white",
                                                title="Asset Relationships")
                 tree.add(relationship_panel)
-
         with console.screen():
             print("\n\n")
-            print(tree)
+        print(tree)
 
     except (
             InvalidParameterException,

{pyegeria-0.5.8.19 → pyegeria-0.5.8.21}/examples/widgets/cli/egeria_cat.py

@@ -127,7 +127,7 @@ def show_assets(ctx, search_string):
     """Find and display assets"""
     c = ctx.obj
     display_assets(search_string, c.view_server, c.view_server_url, c.userid,
-                   c.password, c.jupyter, c.width)
+                   c.password, 60,c.jupyter, c.width)
 
 
 @show.command('glossary_terms')

{pyegeria-0.5.8.19 → pyegeria-0.5.8.21}/examples/widgets/operational/list_catalog_targets.py

@@ -57,13 +57,13 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
             expand=True,
             # width = 200
         )
-        table.add_column("Name of Target", max_width=15)
-        table.add_column("Catalog Target Name", max_width=15)
-        table.add_column('Metadata Source Qualified Name')
-        table.add_column("Relationship GUID", no_wrap=True)
+        table.add_column("Name of Target")
+        table.add_column("Catalog Target")
+
+        # table.add_column("Relationship GUID", no_wrap=True)
         table.add_column('Configuration Properties')
         table.add_column('Template Properties')
-        table.add_column("Operational Instructions", max_width=15)
+        table.add_column("Operational Instructions", max_width=20)
         # table.add_column("Delete Method")
 
         if type(cat_targets) is list:
@@ -78,6 +78,9 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
                 # target_guid = target['catalogTargetElement']['guid']
                 connector_unique = target['catalogTargetElement']['uniqueName']
 
+                cat_target_out = Markdown(f"* Target Name: {target_name}\n* Target Source: {target_source}\n"
+                                          f"* Relationship Guid: {target_rel}")
+
                 config_props = target.get('configurationProperties', '---')
                 if type(config_props) is dict:
                     config_props_md = ''
@@ -97,7 +100,7 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
                     template_props_out = '---'
 
                 table.add_row(
-                    connector_unique, target_name, target_source, target_rel,
+                    connector_unique, cat_target_out,
                     config_props_out, template_props_out, op_instruct_out)
 
         return table

{pyegeria-0.5.8.19 → pyegeria-0.5.8.21}/examples/widgets/operational/monitor_integ_daemon_status.py

@@ -36,8 +36,8 @@ EGERIA_ADMIN_USER = os.environ.get('ADMIN_USER', 'garygeeke')
 EGERIA_ADMIN_PASSWORD = os.environ.get('ADMIN_PASSWORD', 'secret')
 EGERIA_USER = os.environ.get('EGERIA_USER', 'erinoverview')
 EGERIA_USER_PASSWORD = os.environ.get('EGERIA_USER_PASSWORD', 'secret')
-EGERIA_JUPYTER = os.environ.get('EGERIA_JUPYTER', False)
-EGERIA_WIDTH = os.environ.get('EGERIA_WIDTH', 200)
+EGERIA_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 disable_ssl_warnings = True
 

{pyegeria-0.5.8.19 → pyegeria-0.5.8.21}/pyproject.toml

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