pyegeria 0.5.8.16__tar.gz → 0.5.8.17__tar.gz

{pyegeria-0.5.8.16 → pyegeria-0.5.8.17}/PKG-INFO

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

{pyegeria-0.5.8.16 → pyegeria-0.5.8.17}/examples/widgets/catalog_user/get_asset_graph.py

@@ -21,6 +21,7 @@ from pyegeria import (
     UserNotAuthorizedException,
     AssetCatalog
 )
+
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9092')
 EGERIA_PLATFORM_URL = os.environ.get('EGERIA_PLATFORM_URL', 'https://localhost:9443')
@@ -32,16 +33,18 @@ 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 = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 disable_ssl_warnings = True
 
-console = Console(width=200)
-
+console = Console(width=EGERIA_WIDTH, force_terminal=(not EGERIA_JUPYTER))
 
 guid_list = []
 
-def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, user_pass:str):
 
+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):
     def build_classifications(classification: dict) -> Markdown:
 
         class_md = ""
@@ -50,7 +53,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
             if c_type == "Anchors":
                 continue
             class_md += f"\n* Classification: {c_type}\n"
-            class_props = c.get("classificationProperties","---")
+            class_props = c.get("classificationProperties", "---")
             if type(class_props) is dict:
                 for prop in class_props.keys():
                     class_md += f"\t* {prop}: {class_props[prop]}\n"
@@ -72,7 +75,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
         ne_classifications = nested_element["classifications"]
         ne_class_md = build_classifications(ne_classifications)
         # ne_class_md = " " if ne_class_md is None else ne_class_md
-        ne_props = nested_element.get("properties","---")
+        ne_props = nested_element.get("properties", "---")
         ne_prop_md = "\n"
         if type(ne_props) is dict:
             for prop in ne_props.keys():
@@ -90,7 +93,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
     try:
 
         a_client = AssetCatalog(server_name, platform_url,
-                                     user_id=user)
+                                user_id=user)
 
         token = a_client.create_egeria_bearer_token(user, user_pass)
         # asset_info = a_client.find_assets_in_domain(asset_name)
@@ -109,7 +112,6 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
 
         # print(f"\n{json.dumps(asset_graph, indent =2)}\n")
 
-
         asset_name = asset_graph["displayName"]
         qualified_name = asset_graph["qualifiedName"]
         resource_name = asset_graph["resourceName"]
@@ -118,18 +120,17 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
         style = ""
 
         asset_type = asset_graph["type"]["typeName"]
-        asset_deployed_imp_type = asset_graph.get("deployedImplementationType","---")
+        asset_deployed_imp_type = asset_graph.get("deployedImplementationType", "---")
 
         asset_origin = asset_graph["origin"]["homeMetadataCollectionName"]
         asset_creation = asset_graph["versions"]["createTime"]
         asset_created_by = asset_graph["versions"]["createdBy"]
         asset_classifications = asset_graph["classifications"]
-        asset_nested_elements = asset_graph.get("anchoredElements","----")
+        asset_nested_elements = asset_graph.get("anchoredElements", "----")
         asset_relationships = asset_graph["relationships"]
         asset_class_md = build_classifications(asset_classifications)
 
-
-        asset_properties = asset_graph.get("extendedProperties",None)
+        asset_properties = asset_graph.get("extendedProperties", None)
         if asset_properties is not None:
             prop_md = "\n* Extended Properties:\n"
             for prop in asset_properties:
@@ -137,28 +138,28 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
         else:
             prop_md = ""
         core_md = (f"**Type: {asset_type}  Created by: {asset_created_by} on {asset_creation}**\n"
-               f"* Deployed Implementation Type: {asset_deployed_imp_type}\n"
-               f"* Qualified Name: {qualified_name}\n "
-               f"* Resource Name: {resource_name}\n"
-               f"* Display Name: {asset_name}\n"
-               f"* Asset Origin: {asset_origin}\n{prop_md}\n"
-               )
+                   f"* Deployed Implementation Type: {asset_deployed_imp_type}\n"
+                   f"* Qualified Name: {qualified_name}\n "
+                   f"* Resource Name: {resource_name}\n"
+                   f"* Display Name: {asset_name}\n"
+                   f"* Asset Origin: {asset_origin}\n{prop_md}\n"
+                   )
         core_md = Markdown(core_md)
 
-        p1 = Panel.fit(core_md, style = "bold bright_white")
+        p1 = Panel.fit(core_md, style="bold bright_white")
         l2 = tree.add(p1)
         if asset_class_md is not None:
-            p2 = Panel.fit(Markdown(asset_class_md), style = "bold bright_white", title = "Classifications")
+            p2 = Panel.fit(Markdown(asset_class_md), style="bold bright_white", title="Classifications")
             l2 = tree.add(p2)
 
         #
         # Nested Assets
         #
         if type(asset_nested_elements) is list:
-            l2 = tree.add("Nested Elements", style = "bold white")
+            l2 = tree.add("Nested Elements", style="bold white")
             for el in asset_nested_elements:
                 asset_ne_md = build_nested_elements(el)
-                p3 = Panel.fit(asset_ne_md, style = "bold bright_white", title="Nested Elements")
+                p3 = Panel.fit(asset_ne_md, style="bold bright_white", title="Nested Elements")
                 l2.add(p3)
 
         #
@@ -169,7 +170,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
             rel_end1 = relationship["end1"]
             rel_end1_type = rel_end1["type"]["typeName"]
             rel_end1_guid = rel_end1["guid"]
-            rel_end1_unique_name = rel_end1.get("uniqueName","---")
+            rel_end1_unique_name = rel_end1.get("uniqueName", "---")
 
             rel_end2 = relationship["end2"]
             rel_end2_type = rel_end2["type"]["typeName"]
@@ -184,13 +185,12 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
                 relationship_type = relationship["type"]["typeName"]
                 relationship_created_by = relationship["versions"]["createdBy"]
                 relationship_creation_time = relationship["versions"]["createTime"]
-                relationship_properties = relationship.get("properties","--- ")
+                relationship_properties = relationship.get("properties", "--- ")
                 relationship_md = (f"Relationship Type {relationship_type}\n"
                                    f"* GUID: {relationship_guid}\n* Created by: {relationship_created_by} \n"
                                    f"* Creation Time: {relationship_creation_time}\n"
                                    f"* Properties: {relationship_properties}\n")
 
-
                 rel_md = (
                     f"* Relationship Type: {relationship_type}\n"
                     f"* Relationship GUID: {relationship_guid}\n"
@@ -201,7 +201,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
                     f"\t* Type: {rel_end1_type}\n"
                     f"\t* GUID: {rel_end1_guid}\n"
                     f"\t* Unique Name: {rel_end1_unique_name}\n"
-                    )
+                )
 
                 # if rel_end1_class_md is not None:
                 #     rel_end1_md = rel_end1_class_md + rel_end1_md
@@ -221,7 +221,8 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
 
                 relationship_md += rel_end1_md + rel_end2_md
 
-                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white", title = "Asset Relationships")
+                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white",
+                                               title="Asset Relationships")
                 tree.add(relationship_panel)
 
         with console.screen():
@@ -229,13 +230,14 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
             print(tree)
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException
+            InvalidParameterException,
+            PropertyServerException,
+            UserNotAuthorizedException
     ) as e:
         console.print_exception()
         console.print("\n\n ======> Most likely the GUID you provided is either incorrect or not an asset\n[red bold]")
 
+
 def main():
     parser = argparse.ArgumentParser()
 
@@ -251,10 +253,11 @@ def main():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     try:
         asset_guid = Prompt.ask("Enter the Asset GUID to view:", default="")
-        asset_viewer(asset_guid,server, url, userid, user_pass)
+        asset_viewer(asset_guid, server, url, userid, user_pass)
     except (KeyboardInterrupt) as e:
         # console.print_exception()
         pass
 
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.5.8.16 → pyegeria-0.5.8.17}/examples/widgets/cli/egeria_ops.py

@@ -144,7 +144,7 @@ def gov_eng_status(ctx, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(c.engine_host, c.engine_host_url,
-                           c.userid, c.password,
+                           c.admin_user, c.admin_user_password,
                            list, c.jupyter, c.width)
 
 
@@ -155,7 +155,7 @@ def eng_activity_status(ctx, list):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
     display_engine_activity(c.view_server, c.view_server_url,
-                            c.userid, c.password,
+                            c.admin_user, c.admin_user_password,
                             list, c.jupyter, c.width)
 
 

{pyegeria-0.5.8.16 → pyegeria-0.5.8.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.8.16"
+version = "0.5.8.17"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -54,13 +54,13 @@ pytest = "^8.2.2"
     get_asset_graph = "examples.widgets.catalog_user.get_asset_graph:main"
     get_collection = "examples.widgets.catalog_user.get_collection:main"
     list_glossary = "examples.widgets.catalog_user.list_glossary:main"
+    get_tech_type_elements = "examples.widgets.catalog_user.get_tech_type_elements:main"
+    get_tech_type_template = "examples.widgets.catalog_user.get_tech_type_template:main"
 
-    get_tech_type_elements = "examples.widgets.operational.get_tech_type_elements:main"
-    get_tech_type_template = "examples.widgets.operational.get_tech_type_template:main"
     monitor_asset_events = "examples.widgets.operational.monitor_asset_events:main"
     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_engine_activity = "examples.widgets.operational.monitor_engine_activity:main_live"
+    list_engine_activity = "examples.widgets.operational.monitor_engine_activity:main_paging "
     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"