pyegeria 0.6.7__tar.gz → 0.7.0__tar.gz

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

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

{pyegeria-0.6.7 → pyegeria-0.7.0}/examples/widgets/cat/get_project_structure.py

@@ -3,25 +3,22 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-A simple viewer for collections - provide the root and we display the hierarchy
+A simple viewer for project structure - provide the root and we display the hierarchy
 
 """
 
 import argparse
 import os
+
 from rich import print
+from rich.console import Console
+from rich.markdown import Markdown
 from rich.panel import Panel
 from rich.prompt import Prompt
-from rich.text import Text
 from rich.tree import Tree
-from rich.markdown import Markdown
-from rich.console import Console
 
-from pyegeria import (ProjectManager, MyProfile, UserNotAuthorizedException, PropertyServerException,
-                      InvalidParameterException)
-from pyegeria._exceptions import (
-    print_exception_response,
-)
+from pyegeria import (ProjectManager, UserNotAuthorizedException, PropertyServerException, InvalidParameterException)
+from pyegeria._exceptions import (print_exception_response, )
 
 disable_ssl_warnings = True
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -37,10 +34,13 @@ 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 project_structure_viewer(root: str, server_name: str, platform_url: str, user: str, user_password: str,
-                      jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
+                             jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH, timeout: int = 30):
     """ A simple collection viewer"""
-    def walk_project_hierarchy(project_client: ProjectManager, project_name: str, tree: Tree, root:bool = False) -> None:
+
+    def walk_project_hierarchy(project_client: ProjectManager, project_name: str, tree: Tree,
+                               root: bool = False) -> None:
         """Recursively build a Tree with collection contents."""
         t = None
         style = "bright_white on black"
@@ -50,12 +50,12 @@ def project_structure_viewer(root: str, server_name: str, platform_url: str, use
             proj_guid = project[0]['elementHeader']['guid']
             proj_props = project[0]['properties']
 
-            proj_type = proj_props.get('typeName','---')
+            proj_type = proj_props.get('typeName', '---')
             proj_unique = proj_props.get('qualifiedName', '---')
             proj_identifier = proj_props.get('identifier', '---')
-            proj_name = proj_props.get('name','---')
-            proj_desc = proj_props.get('description','---')
-            proj_status = proj_props.get('projectStatus','---')
+            proj_name = proj_props.get('name', '---')
+            proj_desc = proj_props.get('description', '---')
+            proj_status = proj_props.get('projectStatus', '---')
             proj_priority = proj_props.get('priority', '---')
             proj_start = proj_props.get('startDate', '---')[:-10]
             proj_props_md = (f"* Name: {proj_name}\n"
@@ -79,66 +79,31 @@ def project_structure_viewer(root: str, server_name: str, platform_url: str, use
             proj_props_md += f"\n### Team Members\n {member_md}"
 
         proj_props_out = Markdown(proj_props_md)
-        p = Panel(proj_props_out, style = style, title=project_name)
+        p = Panel(proj_props_out, style=style, title=project_name)
         t = tree.add(p)
 
-
         linked_projects = project_client.get_linked_projects(proj_guid)
         if type(linked_projects) is list:
             for proj in linked_projects:
                 child_md = ""
                 child_guid = proj['elementHeader']['guid']
                 child_name = proj['properties']['name']
-                # child_props = proj['properties']
-                # for key in child_props.keys():
-                #     child_md += f"* {key}: {child_props[key]}\n"
-                # child_md += f"* GUID: {child_guid}"
                 walk_project_hierarchy(project_client, child_name, t)
 
         else:
             return t
-        #     tt= tree.add(f"[bold magenta on black]No projects match {root_project_name}")
-
-            #
-            # branch = tt.add(f"[bold magenta on black]Members", style=style, guide_style=style)
-            # walk_collection_hierarchy(collection_client, member['qualifiedName'], branch),
-
-        # members = project_client.get_member_list(root_project_name)
-        # if members:
-        #     for member in members:
-        #         style = "bold white on black"
-        #         text_collection_name = Text(f"[bold white on black]Name: {member['name']}", style=style)
-        #         text_qualified_name = Text(f"* QualifiedName: {member['qualifiedName']}")
-        #         text_guid = Text(f"* GUID: {member['guid']}", "green")
-        #         text_collection_type = Text(f"* Collection Type: {member['collectionType']}")
-        #         text_description = Text(f"* Description: {member['description']}")
-        #         p = Panel.fit(f"{text_collection_name}[green]\n{text_qualified_name}\n{text_guid}\n"
-        #                       f"{text_collection_type}\n{text_description}")
-        #         tt = tree.add(p, style=style)
-        #
-        #
-        #         linked_projects = project_client.get_linked_projects()
-        #         if type(children) is list:
-        #             branch = tt.add(f"[bold magenta on black]Members", style=style, guide_style=style)
-        #             walk_collection_hierarchy(collection_client, member['qualifiedName'], branch),
-        # else:
-        #     tt = tree.add(f"[bold magenta on black]No collections match {root_collection_name}")
+
     try:
-        console = Console(width=EGERIA_WIDTH)
-        tree = Tree(f"[bold bright green on black]{root}",guide_style="bold bright_blue")
-        p_client = ProjectManager(server_name, platform_url,
-                                     user_id=user)
+        console = Console(width=width, force_terminal=not jupyter)
+        tree = Tree(f"[bold bright green on black]{root}", guide_style="bold bright_blue")
+        p_client = ProjectManager(server_name, platform_url, user_id=user)
 
-        token1= p_client.create_egeria_bearer_token(user, user_password)
+        token1 = p_client.create_egeria_bearer_token(user, user_password)
 
-        walk_project_hierarchy(p_client,root, tree, root = True)
+        walk_project_hierarchy(p_client, root, tree, root=True)
         print(tree)
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException
-    ) as e:
+    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
 
 
@@ -161,5 +126,7 @@ def main():
         project_structure_viewer(root_project, server, url, userid, user_pass)
     except (KeyboardInterrupt):
         pass
+
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.6.7 → pyegeria-0.7.0}/examples/widgets/cat/list_cert_types.py

@@ -50,7 +50,7 @@ def display_certifications(search_string: str, server: str, url: str, username:
     console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
     if (search_string is None) or ((len(search_string) < 3)) and (search_string != '*'):
         raise ValueError("Invalid Search String - must be greater than four characters long")
-    g_client = ClassificationManager(server, url, user_id=username,user_pwd=user_password )
+    g_client = ClassificationManager(server, url, user_id=username,user_pwd=user_password)
     token = g_client.create_egeria_bearer_token(username, user_password)
 
 

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

@@ -12,6 +12,8 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 import click
 from trogon import tui
 
+from examples.widgets.cat.get_project_structure import project_structure_viewer
+from examples.widgets.cat.list_cert_types import display_certifications
 from examples.widgets.cat.get_asset_graph import asset_viewer
 from examples.widgets.cat.get_collection import collection_viewer
 from examples.widgets.cat.get_tech_type_elements import tech_viewer
@@ -22,6 +24,7 @@ from examples.widgets.cat.list_projects import display_project_list
 from examples.widgets.cat.list_tech_types import display_tech_types
 from examples.widgets.cat.list_todos import display_to_dos
 from examples.widgets.cli.ops_config import Config
+
 from examples.widgets.ops.engine_actions import start_server as start_engine_host, \
     stop_server as stop_engine_host
 from examples.widgets.ops.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
@@ -361,6 +364,29 @@ def show_tech_type_templates(ctx, tech_type):
     template_viewer(tech_type, c.view_server, c.view_server_url, c.userid,
                     c.password, c.jupyter, c.width)
 
+@show.command('certification-types')
+@click.option('--search-string', default = 'CertificationType', help="")
+@click.pass_context
+def show_certification_types(ctx, search_string):
+    """Show certification types
+        - generally stay with the default..
+    """
+    c = ctx.obj
+    display_certifications(search_string, c.view_server, c.view_server_url, c.userid,
+                           c.password, c.timeout, c.jupyter, c.width)
+
+@show.command('project-structure')
+@click.option('--project', default = 'Clinical Trials Management',
+              help="Enter the root project to start from")
+@click.pass_context
+def show_project_structure(ctx, project):
+    """Show the structure of the project starting from a root project"""
+    c = ctx.obj
+    project_structure_viewer(project, c.view_server, c.view_server_url, c.userid,
+                           c.password, c.jupyter, c.width, c.timeout)
+
+
+
 
 @show.command('assets')
 @click.argument('search-string')

{pyegeria-0.6.7 → pyegeria-0.7.0}/examples/widgets/cli/egeria_cat.py

@@ -21,6 +21,8 @@ from examples.widgets.cat.list_glossary import display_glossary_terms
 from examples.widgets.cat.list_tech_types import display_tech_types
 from examples.widgets.cat.list_projects import display_project_list
 from examples.widgets.cat.list_todos import display_to_dos
+from examples.widgets.cat.get_project_structure import project_structure_viewer
+from examples.widgets.cat.list_cert_types import display_certifications
 
 # from pyegeria import ServerOps
 from examples.widgets.cli.ops_config import Config
@@ -188,6 +190,28 @@ def show_projects(ctx, search_string):
     display_project_list(search_string, c.view_server, c.view_server_url, c.userid,
                       c.password, False,c.jupyter, c.width)
 
+@show.command('certification-types')
+@click.option('--search-string', default = 'CertificationType', help="")
+@click.pass_context
+def show_certification_types(ctx, search_string):
+    """Show certification types
+        - generally stay with the default..
+    """
+    c = ctx.obj
+    display_certifications(search_string, c.view_server, c.view_server_url, c.userid,
+                           c.password, c.timeout, c.jupyter, c.width)
+
+@show.command('project-structure')
+@click.option('--project', default = 'Clinical Trials Management',
+              help="Enter the root project to start from")
+@click.pass_context
+def show_project_structure(ctx, project):
+    """Show the structure of the project starting from a root project"""
+    c = ctx.obj
+    project_structure_viewer(project, c.view_server, c.view_server_url, c.userid,
+                           c.password, c.jupyter, c.width, c.timeout)
+
+
 
 @show.command('to-dos')
 @click.option('--search-string', default='*',