pyegeria 0.5.9.5__tar.gz → 0.6__tar.gz

{pyegeria-0.5.9.5 → pyegeria-0.6}/PKG-INFO

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

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/catalog_user/list_assets.py

@@ -46,7 +46,7 @@ disable_ssl_warnings = True
 def display_assets(search_string: str, server: str, url: str, username: str, user_password: str, time_out: int = 60,
                    jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
     console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
-    if (search_string is None) or (len(search_string) < 4):
+    if (search_string is None) or (len(search_string) < 3):
         raise ValueError("Invalid Search String - must be greater than four characters long")
     g_client = AssetCatalog(server, url, username)
     token = g_client.create_egeria_bearer_token(username, user_password)

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/catalog_user/list_todos.py

@@ -77,6 +77,7 @@ def display_to_dos(search_string: str, server: str, url: str, username: str, use
             priority = " "
             due = " "
             completed = " "
+
             status = " "
             sponsor = " "
         else:

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/cli/egeria.py

@@ -72,7 +72,7 @@ from examples.widgets.tech.list_valid_metadata_values import display_metadata_va
 @click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
 @click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
               help='Egeria admin password')
-@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--userid', default='erinoverview', envvar='EGERIA_USER', help='Egeria user')
 @click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
               help='Egeria user password')
 @click.option('--timeout', default=60, help='Number of seconds to wait')

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/cli/egeria_cat.py

@@ -63,7 +63,7 @@ from examples.widgets.cli.ops_config import Config
 @click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
 @click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
               help='Egeria admin password')
-@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--userid', default='erinoverview', envvar='EGERIA_USER', help='Egeria user')
 @click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
               help='Egeria user password')
 @click.option('--timeout', default=60, help='Number of seconds to wait')

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/cli/egeria_ops.py

@@ -66,7 +66,7 @@ from examples.widgets.operational.restart_integration_daemon import restart_conn
 @click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
 @click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
               help='Egeria admin password')
-@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--userid', default='erinoverview', envvar='EGERIA_USER', help='Egeria user')
 @click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
               help='Egeria user password')
 @click.option('--timeout', default=60, help='Number of seconds to wait')

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/cli/egeria_per.py

@@ -58,7 +58,7 @@ from examples.widgets.personal.list_my_roles import display_my_roles
 @click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
 @click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
               help='Egeria admin password')
-@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--userid', default='erinoverview', envvar='EGERIA_USER', help='Egeria user')
 @click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
               help='Egeria user password')
 @click.option('--timeout', default=60, help='Number of seconds to wait')

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/cli/egeria_tech.py

@@ -64,7 +64,7 @@ from examples.widgets.catalog_user.get_tech_type_template import template_viewer
 @click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
 @click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
               help='Egeria admin password')
-@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--userid', default='erinoverview', envvar='EGERIA_USER', help='Egeria user')
 @click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
               help='Egeria user password')
 @click.option('--timeout', default=60, help='Number of seconds to wait')

{pyegeria-0.5.9.5 → pyegeria-0.6}/examples/widgets/personal/monitor_my_todos.py

@@ -72,10 +72,10 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
                 name = props["name"]
                 todo_type_name = props.get("toDoType", " ")
                 todo_guid = item["elementHeader"].get("guid", "---")
-                created = props.get("creationTime", " ")
-                priority = str(props.get("priority", " "))
+                created = props.get("creationTime", "---")
+                priority = str(props.get("priority", "---"))
                 due = props.get("dueTime", " ")
-                completed = props.get("completionTime", " ")
+                completed = props.get("completionTime", "---")
                 status = props.get("status")
 
                 for actor in item["assignedActors"]:

pyegeria-0.6/examples/widgets/personal/my_profile_actions.py

@@ -0,0 +1,120 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+
+This script restarts an integration daemon.
+
+"""
+
+import os
+from rich import print, print_json
+from rich.console import Console
+
+import click
+from pyegeria import ServerOps, AutomatedCuration, INTEGRATION_GUIDS, Platform
+from pyegeria._exceptions import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+)
+
+
+@click.command('add-todo')
+@click.argument('integration-connector')
+@click.argument('metadata-element-guid')
+@click.argument('catalog-target-name')
+@click.pass_context
+def add_catalog_target(ctx, integration_connector: str, metadata_element_guid:str, catalog_target_name:str)-> str:
+    """Add catalog targets to the specified integration connector"""
+    try:
+        if integration_connector not in INTEGRATION_GUIDS.keys():
+            click.echo('Integration connector is not known')
+
+        c = ctx.obj
+        a_client = AutomatedCuration(c.view_server, c.view_server_url, c.userid, c.password)
+        token = a_client.create_egeria_bearer_token()
+
+        guid = a_client.add_catalog_target(INTEGRATION_GUIDS[integration_connector], metadata_element_guid,
+                                           catalog_target_name)
+
+        click.echo(f"Added catalog target to {integration_connector} with a return guid of {guid}")
+
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+
+
+
+@click.command('remove-target')
+@click.argument('relationship-guid')
+@click.pass_context
+def remove_catalog_target(ctx, relationship_guid: str):
+    """Remove the catalog target specified by the relationship guidr"""
+    try:
+        c = ctx.obj
+        a_client = AutomatedCuration(c.view_server, c.view_server_url, c.userid, c.password)
+        token = a_client.create_egeria_bearer_token()
+
+        a_client.remove_catalog_target(relationship_guid)
+
+        click.echo(f"Removed catalog target with relationship guid of {relationship_guid}")
+
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+
+
+@click.command('update-target')
+@click.argument('relationship-guid')
+@click.argument('catalog-target-name')
+@click.pass_context
+def update_catalog_target(ctx, relationship_guid: str, catalog_target_name:str):
+    """Update the catalog target specified by the relationship guid """
+    try:
+        c = ctx.obj
+        a_client = AutomatedCuration(c.view_server, c.view_server_url, c.userid, c.password)
+        token = a_client.create_egeria_bearer_token()
+
+        guid = a_client.update_catalog_target(relationship_guid, catalog_target_name)
+
+        click.echo(f"Update catalog target with relationship guid of  {relationship_guid} to a catalog target name of "
+                   f"{catalog_target_name} with a return guid of {guid}")
+
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+
+
+@click.command('stop')
+@click.pass_context
+def stop_server(ctx):
+    """Stop an integration daemon"""
+    try:
+        c = ctx.obj
+        p_client = Platform(c.integration_daemon, c.integration_daemon_url, c.userid, c.password)
+
+        p_client.shutdown_server()
+
+        click.echo(f"Stopped server {c.integration_daemon}")
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+
+
+@click.command('start')
+@click.pass_context
+def start_server(ctx):
+    """Start or restart an integration daemon from its known configuration """
+    try:
+        c = ctx.obj
+        p_client = Platform(c.integration_daemon, c.integration_daemon_url, c.userid, c.password)
+
+        p_client.activate_server_stored_config()
+
+        click.echo(f"Started server {c.integration_daemon}")
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+

{pyegeria-0.5.9.5 → pyegeria-0.6}/pyegeria/my_profile_omvs.py

@@ -156,7 +156,7 @@ class MyProfile(Client):
 
         response = await self._async_make_request("POST", url, body)
 
-        return response.json().get("toDoElements", "No entries found")
+        return response.json().get("elements", "No entries found")
 
     def get_assigned_actions(self, actor_guid: str, status: str = "OPEN", server_name: str = None, start_from: int = 0,
                              page_size: int = 100) -> list | str:
@@ -472,7 +472,7 @@ class MyProfile(Client):
 
         response = await self._async_make_request("GET", url)
         # return response.text if response is not None else "No Results"
-        return json.loads(response.text).get("toDoElement", "No TODO returned")
+        return json.loads(response.text).get("elements", "No TODO returned")
 
     def get_to_do(self, todo_guid: str, server_name: str = None) -> dict | str:
         """ Get a To-Do item. Async version.
@@ -773,7 +773,7 @@ class MyProfile(Client):
 
         response = await self._async_make_request("POST", url, body)
         # return response.text
-        return response.json().get("toDoElements", "No ToDos found")
+        return response.json().get("elements", "No ToDos found")
 
     def find_to_do(self, search_string: str, server_name: str = None, status: str = "OPEN",
                    starts_with: bool = False, ends_with: bool = False, ignore_case: bool = True,
@@ -861,7 +861,7 @@ class MyProfile(Client):
                f"{todo_type}?startFrom={start_from}&pageSize={page_size}")
 
         response = await self._async_make_request("POST", url, body)
-        return response.json().get("toDoElements","No ToDos found")
+        return response.json().get("elements","No ToDos found")
 
     def get_to_dos_by_type(self, todo_type: str,  server_name: str = None, status: str = "OPEN",
                            start_from: int = 0, page_size: int = 100) -> list | str:

{pyegeria-0.5.9.5 → pyegeria-0.6}/pyproject.toml

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