pyegeria 0.5.8.27__tar.gz → 0.5.9.2__tar.gz

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/PKG-INFO

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

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/examples/widgets/catalog_user/get_asset_graph.py

@@ -91,7 +91,6 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
         return output
 
     try:
-
         a_client = AssetCatalog(server_name, platform_url,
                                 user_id=user)
 
@@ -112,20 +111,20 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
 
         # 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"]
+        asset_name = asset_graph["properties"].get("displayName",'---')
+        qualified_name = asset_graph["properties"]["qualifiedName"]
+        resource_name = asset_graph['properties'].get("resourceName","---")
 
         tree = Tree(f"{asset_name} ({asset_guid})", style="bold bright_white on black", guide_style="bold bright_blue")
         style = ""
-
-        asset_type = asset_graph["type"]["typeName"]
+        asset_elements = asset_graph['elementHeader']
+        asset_type = asset_elements["type"]["typeName"]
         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_origin = asset_elements["origin"]["homeMetadataCollectionName"]
+        asset_creation = asset_elements["versions"]["createTime"]
+        asset_created_by = asset_elements["versions"]["createdBy"]
+        asset_classifications = asset_elements["classifications"]
         asset_nested_elements = asset_graph.get("anchoredElements", "----")
         asset_relationships = asset_graph["relationships"]
         asset_class_md = build_classifications(asset_classifications)

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/examples/widgets/catalog_user/list_assets.py

@@ -80,18 +80,21 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
             return table
 
         for element in assets:
-            display_name = element.get("resourceName",'---')
-            # qualified_name = element["qualifiedName"] # we decided that qualified name wasn't useful
-            type_name = element["type"]["typeName"]
-            tech_type = element.get("deployedImplementationType",'---')
-            guid = element["guid"]
+            properties = element['properties']
+            header = element['elementHeader']
+            nested = element.get('matchingElements','---')
+
+            display_name = properties.get("displayName",'---')
+            # qualified_name = properties["qualifiedName"] # we decided that qualified name wasn't useful
+            type_name = header["type"]["typeName"]
+            tech_type = properties.get("deployedImplementationType",'---')
+            guid = header["guid"]
             #### We decided that path wasn't useful
             # path_name = element.get("extendedProperties", None)
             # if path_name:
             #     path = path_name.get("pathName"," ")
             # else:
             #     path = " "
-            matches = element['matchingElements']
             match_md = ""
 
             match_tab = Table(expand=True)
@@ -99,7 +102,7 @@ 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 matches:
+            for match in nested:
                 match_type_name = match['type']['typeName']
                 matching_guid = match['guid']
                 match_props = match['properties']

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/examples/widgets/cli/egeria_my.py

@@ -17,6 +17,7 @@ from examples.widgets.cli.ops_config import Config
 from examples.widgets.personal.monitor_open_todos import display_todos
 from examples.widgets.personal.monitor_my_todos import display_my_todos
 from examples.widgets.personal.list_my_profile import display_my_profiles
+from examples.widgets.personal.list_my_roles import display_my_roles
 
 
 
@@ -100,6 +101,18 @@ def show_my_profile(ctx):
     display_my_profiles( c.view_server, c.view_server_url,
                  c.userid, c.password, c.jupyter, c.width)
 
+@show.command('my-roles')
+@click.pass_context
+def show_my_roles(ctx):
+    """Display my profiles
+
+    Usage: show my-profile
+
+    """
+    c = ctx.obj
+    display_my_roles( c.view_server, c.view_server_url,
+                 c.userid, c.password, c.jupyter, c.width)
+
 
 @show.command('my-to-dos')
 @click.pass_context

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/examples/widgets/cli/egeria_tech.py

@@ -19,8 +19,9 @@ from examples.widgets.tech.get_tech_details import tech_details_viewer
 from examples.widgets.tech.list_asset_types import display_asset_types
 from examples.widgets.tech.list_registered_services import display_registered_svcs
 from examples.widgets.tech.list_relationship_types import display_relationship_types
-from examples.widgets.tech.list_tech_templates import display_tech_templates
+from examples.widgets.tech.list_tech_templates import display_templates_spec
 from examples.widgets.tech.list_valid_metadata_values import display_metadata_values
+from examples.widgets.catalog_user.get_tech_type_template import template_viewer
 
 
 # from pyegeria import ServerOps
@@ -177,10 +178,19 @@ def show_relationship_types(ctx, rel_type):
 @show.command("tech-templates")
 @click.pass_context
 @click.option('--search-string', default='*', help='Technology type to get information about')
-def integrations_status(ctx, search_string):
-    """Display template information about the specified technologyr"""
+def tech_templates(ctx, search_string):
+    """Display template information about the specified technology."""
     c = ctx.obj
-    display_tech_templates(search_string, c.view_server, c.view_server_url,
+    template_viewer(search_string, c.view_server, c.view_server_url,
+                           c.userid, c.password, c.jupyter, c.width)
+
+@show.command("tech-template-spec")
+@click.pass_context
+@click.option('--search-string', default='*', help='Technology type to get information about')
+def tech_template_spec(ctx, search_string):
+    """Display template specification information about the specified technology."""
+    c = ctx.obj
+    display_templates_spec(search_string, c.view_server, c.view_server_url,
                            c.userid, c.password, c.jupyter, c.width)
 
 
@@ -188,7 +198,7 @@ def integrations_status(ctx, search_string):
 @click.pass_context
 @click.option('--property', default='projectHealth', help='Metadata property to query')
 @click.option('--type-name', default='Project', help='Metadata type to query')
-def integrations_status(ctx, property, type_name):
+def valid_metadata_values(ctx, property, type_name):
     """Display the valid metadata values for a property and type"""
     c = ctx.obj
     display_metadata_values(property, type_name, c.view_server, c.view_server_url,

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/examples/widgets/operational/monitor_platform_status.py

@@ -7,7 +7,7 @@ Display the status of cataloged platforms and servers.
 """
 
 import argparse
-import os
+import os, sys
 import time
 
 from rich.console import Console
@@ -72,14 +72,18 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
             "Engine Host Server": "EngineHost",
             "Integration Daemon": "Integration"
         }
+        try:
+            platform_list = r_client.get_platforms_by_type()
+            if type(platform_list) is str:
+                print("No OMAG Server Platforms found?")
+                sys.exit(1)
+
+            for platform in platform_list:
+                platform_name = platform['properties'].get("displayName", '---')
+                platform_guid = platform['elementHeader']["guid"]
+                platform_desc = platform['properties'].get("resourceDescription",'---')
+                server_list = ""
 
-        platform_list = r_client.get_platforms_by_type()
-        for platform in platform_list:
-            platform_name = platform['properties']["name"]
-            platform_guid = platform['elementHeader']["guid"]
-            platform_desc = platform['properties']["description"]
-            server_list = ""
-            try:
                 platform_report = r_client.get_platform_report(platform_guid)
                 platform_url = platform_report.get('platformURLRoot', " ")
                 platform_origin = platform_report.get("platformOrigin", " ")
@@ -103,13 +107,14 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
                         serv = f"{status_flag}{server_types[server_type]}: {server_name}\n"
                         server_list = server_list + serv
 
-                table.add_row(platform_name, platform_url, platform_origin, platform_desc,
-                              platform_started, server_list, style="bold white on black")
-            except (Exception) as e:
-                # console.print_exception(e)
-                platform_url = " "
-                platform_origin = " "
-                platform_started = " "
+                    table.add_row(platform_name, platform_url, platform_origin, platform_desc,
+                                  platform_started, server_list, style="bold white on black")
+
+        except (Exception) as e:
+        # console.print_exception(e)
+            platform_url = " "
+            platform_origin = " "
+            platform_started = " "
 
         return table
 

pyegeria-0.5.9.2/examples/widgets/personal/list_my_profile.py

@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Unit tests for the Utils helper functions using the Pytest framework.
+
+
+A simple display for my profile
+"""
+import os
+import argparse
+import time
+import sys
+
+from rich import box, print
+from rich.console import Console
+from rich.table import Table
+from rich.tree import Tree
+from rich.panel import Panel
+from rich.markdown import Markdown
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+)
+from pyegeria.my_profile_omvs import MyProfile
+
+disable_ssl_warnings = True
+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')
+EGERIA_VIEW_SERVER = os.environ.get('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_URL = os.environ.get('EGERIA_INTEGRATION_DAEMON_URL', 'https://localhost:9443')
+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', '250'))
+
+def display_my_profile(server: str, url: str, username: str, user_pass:str,
+                        jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
+
+    try:
+        m_client = MyProfile(server, url, user_id=username, user_pwd=user_pass)
+        token = m_client.create_egeria_bearer_token(username, user_pass)
+        my_profiles = m_client.get_my_profile()
+        if type(my_profiles) is str:
+            print(f"No profiles found for {username}")
+            sys.exit(1)
+
+        console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
+
+        profile_props = my_profiles.get('profileProperties','---')
+        name = profile_props["fullName"]
+        tree = Tree(Panel(f"Profile of {name}",title = "Personal Profile"),
+                    expanded=True,style="bright_white on black", guide_style="bold bright_blue")
+
+        profile_props_md = f"\n* GUID: {my_profiles["elementHeader"]["guid"]}\n"
+        if type(profile_props) is dict:
+            for key in profile_props.keys():
+                if type(profile_props[key]) is str:
+                    profile_props_md += f"* {key}: {profile_props[key]}\n"
+                elif type(profile_props[key]) is dict:
+                    p_md = '\n* Additional Details:\n'
+                    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"))
+
+
+        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"))
+
+        contact_methods = my_profiles['contactMethods']
+        for method in contact_methods:
+            contact = method['properties']
+            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"))
+
+        my_roles = my_profiles["roles"]
+        table = Table(
+            title = f" Roles of {name}",
+            show_lines= True,
+            box=box.ROUNDED,
+            expand= True,
+        )
+        table.add_column("Role Type")
+        table.add_column("Role")
+        table.add_column("Role GUID")
+        for a_role in my_roles:
+            my_role_props = a_role["properties"]
+            role_type = my_role_props["typeName"]
+            role = my_role_props.get("title"," ")
+            role_guid = a_role["elementHeader"]["guid"]
+            table.add_row(
+                role_type, role, role_guid
+            )
+        t4 = tree.add(Panel(table, title="Roles" ),expanded=True)
+
+        print(tree)
+
+    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_USER
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    display_my_profile(server, url, userid, user_pass)
+
+if __name__ == "__main__":
+    main()

pyegeria-0.5.8.27/examples/widgets/personal/list_my_profile.py → pyegeria-0.5.9.2/examples/widgets/personal/list_my_roles.py

@@ -40,7 +40,7 @@ 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'))
 
-def display_my_profiles(server: str, url: str, username: str, user_pass:str,
+def display_my_roles(server: str, url: str, username: str, user_pass:str,
                         jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
 
     m_client = MyProfile(server, url, user_id=username, user_pwd=user_pass)
@@ -128,7 +128,7 @@ def main():
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 
-    display_my_profiles(server, url, userid, user_pass)
+    display_my_roles(server, url, userid, user_pass)
 
 if __name__ == "__main__":
     main()

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/examples/widgets/tech/list_tech_templates.py

@@ -36,7 +36,7 @@ EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 
 
-def display_tech_templates(search_string:str, server: str,
+def display_templates_spec(search_string:str, server: str,
                        url: str, username: str, password: str, jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH
 ):
 
@@ -141,7 +141,7 @@ def main():
 
     try:
         search_string = Prompt.ask("Enter the technology you are searching for:", default="*")
-        display_tech_templates(search_string, server, url, userid, password)
+        display_templates_spec(search_string, server, url, userid, password)
     except(KeyboardInterrupt):
         pass
 

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/pyegeria/collection_manager_omvs.py

@@ -2328,7 +2328,7 @@ class CollectionManager(Client):
             return False
         # finally, construct a list of  member information
         for member_rel in members:
-            member_guid = member_rel['member']['guid']
+            member_guid = member_rel['elementHeader']['guid']
             member_resp = await self._async_get_collection(member_guid)
             member = member_resp['element']
             # print(json.dumps(member, indent = 4))

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/pyegeria/runtime_manager_omvs.py

@@ -198,7 +198,7 @@ class RuntimeManager(Client):
             }
 
         response = await self._async_make_request("POST", url, body)
-        return response.json().get('elementList','No platforms found')
+        return response.json().get('elements','No platforms found')
 
     def get_platforms_by_type(self, filter: str = None, server:str = None, effective_time: str = None,
                               start_from: int = 0, page_size: int = max_paging_size ) -> str | list:
@@ -293,7 +293,7 @@ class RuntimeManager(Client):
             }
 
         response = await self._async_make_request("POST", url, body)
-        return response.json().get('elementList','No platforms found')
+        return response.json().get('elements','No platforms found')
 
 
     def get_platform_templates_by_type(self, filter: str = None, server:str = None, effective_time: str = None,
@@ -438,7 +438,7 @@ class RuntimeManager(Client):
         else:
             response = await self._async_make_request("POST", url)
 
-        return response.json().get('elementList','No platforms found')
+        return response.json().get('elements','No platforms found')
 
     def get_platform_by_guid(self, platform_guid: str = None, server: str = None,
                                 effective_time: str = None) -> str | list:
@@ -506,7 +506,7 @@ class RuntimeManager(Client):
         if server is None:
            server = self.server_name
 
-        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/servers/{server_guid}")
+        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/software-servers/{server_guid}")
 
         if effective_time is not None:
             body = {
@@ -517,7 +517,7 @@ class RuntimeManager(Client):
         else:
             response = await self._async_make_request("POST", url)
 
-        return response.json().get('elementList','No server found')
+        return response.json().get('elements','No server found')
 
     def get_server_by_guid(self, server_guid: str, server: str = None,
                                 effective_time: str = None) -> str | dict:
@@ -585,7 +585,7 @@ class RuntimeManager(Client):
         if server is None:
            server = self.server_name
 
-        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/servers/by-name?"
+        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/software-servers/by-name?"
                f"startFrom={start_from}&pageSize={page_size}")
 
         if effective_time is None:
@@ -599,7 +599,7 @@ class RuntimeManager(Client):
             }
         response = await self._async_make_request("POST", url, body)
 
-        return response.json().get('elementList','No platforms found')
+        return response.json().get('elements','No platforms found')
 
     def get_servers_by_name(self, filter: str, server: str = None) -> str | list:
         """ Returns the list of servers with a particular name.  The name is specified in the filter.
@@ -678,14 +678,14 @@ class RuntimeManager(Client):
         if filter == '*':
             filter = None
 
-        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/servers/"
+        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/software-servers/"
                f"by-deployed-implementation-type?startFrom={start_from}&pageSize={page_size}")
 
         body = body_slimmer({ "filter": filter, "effective_time": effective_time})
 
         response = await self._async_make_request("POST", url, body)
 
-        return response.json().get('elementList','No platforms found')
+        return response.json().get('elements','No platforms found')
 
     def get_servers_by_dep_impl_type(self, filter: str = "*", server:str = None, effective_time: str = None,
                                      start_from: int = 0, page_size: int = max_paging_size ) -> str | list:
@@ -768,14 +768,14 @@ class RuntimeManager(Client):
         if filter == '*':
             filter = None
 
-        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/servers/"
+        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/software-servers/"
                f"by-deployed-implementation-type?startFrom={start_from}&pageSize={page_size}&getTemplates=true")
 
         body = body_slimmer({ "filter": filter, "effective_time": effective_time})
 
         response = await self._async_make_request("POST", url, body)
 
-        return response.json().get('elementList','No platforms found')
+        return response.json().get('elements','No platforms found')
 
     def get_server_templates_by_dep_impl_type(self, filter: str = "*", server:str = None, effective_time: str = None,
                                      start_from: int = 0, page_size: int = max_paging_size ) -> str | list:
@@ -854,7 +854,7 @@ class RuntimeManager(Client):
         if server is None:
            server = self.server_name
 
-        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/servers/{server_guid}")
+        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/software-servers/{server_guid}")
 
         if effective_time is not None:
             body = {
@@ -929,11 +929,11 @@ class RuntimeManager(Client):
         if server is None:
             server = self.server_name
 
-        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/servers/{server_guid}/report")
+        url = (f"{self.platform_url}/servers/{server}/api/open-metadata/runtime-manager/software-servers/{server_guid}/report")
 
         response = await self._async_make_request("GET", url)
 
-        return response.json().get('elementList', 'No server found')
+        return response.json().get('elements', 'No server found')
 
 
     def get_server_report(self, server_guid: str = None, server: str = None) -> str | list:

{pyegeria-0.5.8.27 → pyegeria-0.5.9.2}/pyproject.toml

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