pyegeria 0.7.0__tar.gz → 0.7.3__tar.gz

{pyegeria-0.7.0 → pyegeria-0.7.3}/PKG-INFO

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

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/doc_samples/Create_Collection_Sample.py

@@ -40,7 +40,7 @@ try:
                                                display_name, description, collection_type,
                                                is_own_anchor)
     # Create first folder for Agriculture Insights
-    parent_guid = "f53ea7c8-3107-4477-8459-9bc63f9e69af"
+    parent_guid = response
     parent_relationship_type_name = "CollectionMembership"
     display_name = "Agriculture Insights Collection"
     description = "A folder for agricultural insights data product collections"

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/widgets/cat/get_asset_graph.py

@@ -65,14 +65,14 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
 
     def build_nested_elements(nested_element: dict) -> Markdown:
         ne_md = " "
-
-        ne_created_by = nested_element["versions"]["createdBy"]
-        ne_created_at = nested_element["versions"]["createTime"]
-        ne_guid = nested_element["guid"]
+        ne_header = nested_element['elementHeader']
+        ne_created_by = ne_header["versions"]["createdBy"]
+        ne_created_at = ne_header["versions"]["createTime"]
+        ne_guid = ne_header["guid"]
         guid_list.append(ne_guid)
 
-        ne_type = nested_element["type"]["typeName"]
-        ne_classifications = nested_element["classifications"]
+        ne_type = ne_header["type"]["typeName"]
+        ne_classifications = ne_header["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", "---")

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/widgets/cat/list_assets.py

@@ -102,10 +102,11 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
             match_tab.add_column("GUID", no_wrap=True, width=36)
             match_tab.add_column("Properties")
 
-            for match in nested:
+            for match_t in nested:
+                match = match_t['elementHeader']
                 match_type_name = match['type']['typeName']
                 matching_guid = match['guid']
-                match_props = match['properties']
+                match_props = match_t['properties']
                 match_details_md = ""
                 for key in match_props.keys():
                     match_details_md += f"* {key}: {match_props[key]}\n"

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/widgets/cli/egeria.py

@@ -499,14 +499,14 @@ def survey_uc_server(ctx, uc_endpoint):
 #  Operations: Show
 #
 
-@cli.group('operations')
+@cli.group('ops')
 @click.pass_context
-def operations(ctx):
+def ops(ctx):
     """ Commands to understand and manage operations"""
     pass
 
 
-@operations.group("show")
+@ops.group("show")
 @click.pass_context
 def show(ctx):
     """Display an Egeria Object"""
@@ -610,7 +610,7 @@ def integrations_status(ctx, connector):
 #  Operations: Tell
 #
 
-@operations.group('tell')
+@ops.group('tell')
 @click.pass_context
 def tell(ctx):
     """Perform actions an Egeria Objects"""

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/widgets/my/list_my_profile.py

@@ -41,7 +41,7 @@ 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'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '150'))
 
 def display_my_profile(server: str, url: str, username: str, user_pass:str,
                         jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
@@ -71,13 +71,13 @@ def display_my_profile(server: str, url: str, username: str, user_pass:str,
                     for k in profile_props[key].keys():
                         p_md += f"\t* {k}: {profile_props[key][k]}\n"
                     profile_props_md += p_md
-            t1 = tree.add(Panel(Markdown(profile_props_md),title="Profile Properties"))
+            t1 = tree.add(Panel(Markdown(profile_props_md),title="Profile Properties", expand=False))
 
 
         id_list_md=""
         for identities in my_profiles["userIdentities"]:
             id_list_md += f"* {identities['userIdentity']['properties']['userId']}\n"
-        t2 = tree.add(Panel(Markdown(id_list_md), title="Identities"))
+        t2 = tree.add(Panel(Markdown(id_list_md), title="Identities", expand=False))
 
         contact_methods = my_profiles['contactMethods']
         for method in contact_methods:
@@ -85,7 +85,7 @@ def display_my_profile(server: str, url: str, username: str, user_pass:str,
             contact_methods_md = ""
             for key in contact.keys():
                 contact_methods_md += f"* {key}: {contact[key]}\n"
-            t3 = tree.add(Panel(Markdown(contact_methods_md), title="Contact Methods"))
+            t3 = tree.add(Panel(Markdown(contact_methods_md), title="Contact Methods", expand=False))
 
         my_roles = my_profiles["roles"]
         table = Table(
@@ -105,7 +105,7 @@ def display_my_profile(server: str, url: str, username: str, user_pass:str,
             table.add_row(
                 role_type, role, role_guid
             )
-        t4 = tree.add(Panel(table, title="Roles" ),expanded=True)
+        t4 = tree.add(Panel(table, title="Roles", expand=False ),expanded=True)
 
         print(tree)
 

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/widgets/ops/list_catalog_targets.py

@@ -41,8 +41,10 @@ EGERIA_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
 EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 
+
 def display_catalog_targets(connector: str, server: str, url: str, username: str, user_password: str,
                             jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
+    console = Console(force_terminal=not jupyter, width=width, soft_wrap=True)
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(

{pyegeria-0.7.0 → pyegeria-0.7.3}/examples/widgets/tech/get_guid_info.py

@@ -24,7 +24,7 @@ from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
-    Client
+    Client, ClassificationManager
 )
 
 
@@ -48,12 +48,16 @@ def display_guid(guid: str, server: str, url: str, username: str, user_password:
     c = Client(server, url, user_id=username)
     url = (f"{url}/servers/{server}/open-metadata/repository-services/users/{username}/"
            f"instances/entity/{guid}")
+    # c =  ClassificationManager(server, url)
+
+    bearer_token = c.create_egeria_bearer_token(username, user_password)
 
     try:
         console = Console(width=width, force_terminal=not jupyter, style="bold white on black")
         r = c.make_request("GET", url)
         if r.status_code == 200:
             pass
+        # r = c.retrieve_instance_for_guid(guid)
         e = r.json()['entity']
         p = e['properties']['instanceProperties']
 

{pyegeria-0.7.0 → pyegeria-0.7.3}/pyproject.toml

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