pyegeria 0.6.2__py3-none-any.whl → 0.6.4__py3-none-any.whl

examples/widgets/{catalog_user → cat}/list_projects.py

@@ -111,6 +111,9 @@ def display_project_list(project_name: str, server: str, url: str,
                 additional_properties = project.get('additionalProperties')
                 if additional_properties is not None:
                     props = json.dumps(additional_properties)
+
+
+
                 table.add_row(
                     name, description, classification, qualified_name, identifier, phase, health, status, start,
                     end, '---')

examples/widgets/cli/__init__.py

@@ -1 +1,13 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+A command line interface for Egeria Users - package info
+
+This is an emerging capability based on the **click** package. Feedback welcome!
+
+"""
+
 from .ops_config import Config

examples/widgets/cli/egeria.py

@@ -12,34 +12,34 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 import click
 from trogon import tui
 
-from examples.widgets.catalog_user.get_asset_graph import asset_viewer
-from examples.widgets.catalog_user.get_collection import collection_viewer
-from examples.widgets.catalog_user.get_tech_type_elements import tech_viewer
-from examples.widgets.catalog_user.get_tech_type_template import template_viewer
-from examples.widgets.catalog_user.list_assets import display_assets
-from examples.widgets.catalog_user.list_glossary import display_glossary_terms
-from examples.widgets.catalog_user.list_projects import display_project_list
-from examples.widgets.catalog_user.list_tech_types import display_tech_types
-from examples.widgets.catalog_user.list_todos import display_to_dos
+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
+from examples.widgets.cat.get_tech_type_template import template_viewer
+from examples.widgets.cat.list_assets import display_assets
+from examples.widgets.cat.list_glossary import display_glossary_terms
+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.operational.engine_actions import start_server as start_engine_host, \
+from examples.widgets.ops.engine_actions import start_server as start_engine_host, \
     stop_server as stop_engine_host
-from examples.widgets.operational.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
-                                                                     update_catalog_target, stop_server, start_server)
-from examples.widgets.operational.list_catalog_targets import display_catalog_targets
-from examples.widgets.operational.load_archive import load_archive
-from examples.widgets.operational.monitor_engine_activity import display_engine_activity
-from examples.widgets.operational.monitor_gov_eng_status import display_gov_eng_status
-from examples.widgets.operational.monitor_integ_daemon_status import display_integration_daemon_status
-from examples.widgets.operational.monitor_platform_status import display_status as p_display_status
-from examples.widgets.operational.monitor_server_list import display_status as display_list
-from examples.widgets.operational.monitor_server_status import display_status as s_display_status
-from examples.widgets.operational.refresh_integration_daemon import refresh_connector
-from examples.widgets.operational.restart_integration_daemon import restart_connector
-from examples.widgets.personal.list_my_profile import display_my_profile
-from examples.widgets.personal.list_my_roles import display_my_roles
-from examples.widgets.personal.monitor_my_todos import display_my_todos
-from examples.widgets.personal.monitor_open_todos import display_todos
+from examples.widgets.ops.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
+                                                             update_catalog_target, stop_server, start_server)
+from examples.widgets.ops.list_catalog_targets import display_catalog_targets
+from examples.widgets.ops.load_archive import load_archive
+from examples.widgets.ops.monitor_engine_activity import display_engine_activity
+from examples.widgets.ops.monitor_gov_eng_status import display_gov_eng_status
+from examples.widgets.ops.monitor_integ_daemon_status import display_integration_daemon_status
+from examples.widgets.ops.monitor_platform_status import display_status as p_display_status
+from examples.widgets.ops.monitor_server_list import display_status as display_list
+from examples.widgets.ops.monitor_server_status import display_status as s_display_status
+from examples.widgets.ops.refresh_integration_daemon import refresh_connector
+from examples.widgets.ops.restart_integration_daemon import restart_connector
+from examples.widgets.my.list_my_profile import display_my_profile
+from examples.widgets.my.list_my_roles import display_my_roles
+from examples.widgets.my.monitor_my_todos import display_my_todos
+from examples.widgets.my.monitor_open_todos import display_todos
 from examples.widgets.tech.get_guid_info import display_guid
 from examples.widgets.tech.get_tech_details import tech_details_viewer
 from examples.widgets.tech.list_asset_types import display_asset_types
@@ -97,16 +97,16 @@ def cli(ctx, server, url, view_server, view_server_url, integration_daemon, inte
 
 
 #
-#  Personal: Show
+#  my: Show
 #
-@cli.group('personal')
+@cli.group('my')
 @click.pass_context
-def personal(ctx):
+def my(ctx):
     "Work with my information"
     pass
 
 
-@personal.group("show")
+@my.group("show")
 @click.pass_context
 def show(ctx):
     """Display an Egeria Object"""
@@ -166,10 +166,10 @@ def show_open_todos(ctx):
 
 
 #
-#  Personal: Tell
+#  my: Tell
 #
 
-@personal.group('tell')
+@my.group('tell')
 @click.pass_context
 def tell(ctx):
     """Perform actions an Egeria Objects"""
@@ -177,16 +177,16 @@ def tell(ctx):
 
 
 #
-#  Technical User: Show
+#  tech User: Show
 #
-@cli.group("technical")
+@cli.group("tech")
 @click.pass_context
-def technical(ctx):
-    """Commands for Technical Users"""
+def tech(ctx):
+    """Commands for tech Users"""
     pass
 
 
-@technical.group("show")
+@tech.group("show")
 @click.pass_context
 def show(ctx):
     """Display an Egeria Object"""
@@ -204,7 +204,7 @@ def show_guid_infos(ctx, guid):
     """
     c = ctx.obj
     display_guid(guid, c.server, c.url,
-                 c.user_id, c.password, c.jupyter, c.width)
+                 c.userid, c.password, c.jupyter, c.width)
 
 
 @show.command('tech-types')
@@ -304,10 +304,10 @@ def valid_metadata_values(ctx, property, type_name):
 
 
 #
-#  Technical Users: Tell
+#  tech Users: Tell
 #
 
-@technical.group('tell')
+@tech.group('tell')
 @click.pass_context
 def tell(ctx):
     """Perform actions an Egeria Objects"""
@@ -318,14 +318,14 @@ def tell(ctx):
 #   Catalog User: Show
 #
 
-@cli.group('catalog_user')
+@cli.group('cat')
 @click.pass_context
-def catalog_user(ctx):
-    """Commands for the more technical user"""
+def cat(ctx):
+    """Commands for the more tech user"""
     pass
 
 
-@catalog_user.group("show")
+@cat.group("show")
 @click.pass_context
 def show(ctx):
     """Display an Egeria Object"""
@@ -442,7 +442,7 @@ def show_todos(ctx, search_string):
 #  Catalog User: Tell
 #
 
-@catalog_user.group('tell')
+@cat.group('tell')
 @click.pass_context
 def tell(ctx):
     """Perform actions an Egeria Objects"""

examples/widgets/cli/egeria_cat.py

@@ -12,15 +12,15 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 import click
 from trogon import tui
 
-from examples.widgets.catalog_user.get_asset_graph import asset_viewer
-from examples.widgets.catalog_user.get_collection import collection_viewer
-from examples.widgets.catalog_user.get_tech_type_elements import tech_viewer
-from examples.widgets.catalog_user.get_tech_type_template import template_viewer
-from examples.widgets.catalog_user.list_assets import display_assets
-from examples.widgets.catalog_user.list_glossary import display_glossary_terms
-from examples.widgets.catalog_user.list_tech_types import display_tech_types
-from examples.widgets.catalog_user.list_projects import display_project_list
-from examples.widgets.catalog_user.list_todos import display_to_dos
+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
+from examples.widgets.cat.get_tech_type_template import template_viewer
+from examples.widgets.cat.list_assets import display_assets
+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 pyegeria import ServerOps
 from examples.widgets.cli.ops_config import Config

examples/widgets/cli/{egeria_per.py → egeria_my.py}

@@ -14,10 +14,10 @@ from trogon import tui
 
 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_profile
-from examples.widgets.personal.list_my_roles import display_my_roles
+from examples.widgets.my.monitor_open_todos import display_todos
+from examples.widgets.my.monitor_my_todos import display_my_todos
+from examples.widgets.my.list_my_profile import display_my_profile
+from examples.widgets.my.list_my_roles import display_my_roles
 
 
 

examples/widgets/cli/egeria_ops.py

@@ -14,20 +14,20 @@ from trogon import tui
 
 # from pyegeria import ServerOps
 from examples.widgets.cli.ops_config import Config
-from examples.widgets.operational.engine_actions import start_server as start_engine_host, \
+from examples.widgets.ops.engine_actions import start_server as start_engine_host, \
     stop_server as stop_engine_host
-from examples.widgets.operational.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
-                                                                     update_catalog_target, stop_server, start_server)
-from examples.widgets.operational.list_catalog_targets import display_catalog_targets
-from examples.widgets.operational.load_archive import load_archive
-from examples.widgets.operational.monitor_engine_activity import display_engine_activity
-from examples.widgets.operational.monitor_gov_eng_status import display_gov_eng_status
-from examples.widgets.operational.monitor_integ_daemon_status import display_integration_daemon_status
-from examples.widgets.operational.monitor_platform_status import display_status as p_display_status
-from examples.widgets.operational.monitor_server_list import display_status as display_list
-from examples.widgets.operational.monitor_server_status import display_status as s_display_status
-from examples.widgets.operational.refresh_integration_daemon import refresh_connector
-from examples.widgets.operational.restart_integration_daemon import restart_connector
+from examples.widgets.ops.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
+                                                             update_catalog_target, stop_server, start_server)
+from examples.widgets.ops.list_catalog_targets import display_catalog_targets
+from examples.widgets.ops.load_archive import load_archive
+from examples.widgets.ops.monitor_engine_activity import display_engine_activity
+from examples.widgets.ops.monitor_gov_eng_status import display_gov_eng_status
+from examples.widgets.ops.monitor_integ_daemon_status import display_integration_daemon_status
+from examples.widgets.ops.monitor_platform_status import display_status as p_display_status
+from examples.widgets.ops.monitor_server_list import display_status as display_list
+from examples.widgets.ops.monitor_server_status import display_status as s_display_status
+from examples.widgets.ops.refresh_integration_daemon import refresh_connector
+from examples.widgets.ops.restart_integration_daemon import restart_connector
 
 
 # class Config(object):

examples/widgets/cli/egeria_tech.py

@@ -12,7 +12,7 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 import click
 from trogon import tui
 
-from examples.widgets.catalog_user.list_tech_types import display_tech_types
+from examples.widgets.cat.list_tech_types import display_tech_types
 from examples.widgets.cli.ops_config import Config
 from examples.widgets.tech.get_guid_info import display_guid
 from examples.widgets.tech.get_tech_details import tech_details_viewer
@@ -21,7 +21,7 @@ from examples.widgets.tech.list_registered_services import display_registered_sv
 from examples.widgets.tech.list_relationship_types import display_relationship_types
 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 examples.widgets.cat.get_tech_type_template import template_viewer
 
 
 # from pyegeria import ServerOps
@@ -106,7 +106,7 @@ def show_guid_infos(ctx, guid):
     """
     c = ctx.obj
     display_guid(guid, c.server, c.url,
-                 c.user_id, c.password, c.jupyter, c.width)
+                 c.userid, c.password, c.jupyter, c.width)
 
 
 @show.command('tech-types')

examples/widgets/cli/ops_config.py

@@ -26,6 +26,8 @@ class Config(object):
         self.verbose = verbose
         self.jupyter = jupyter
         self.width = width
+        self.server = server
+        self.url = url
 
 
 pass_config = click.make_pass_decorator(Config)

examples/widgets/{operational → ops}/monitor_engine_activity.py

@@ -103,9 +103,20 @@ def display_engine_activity(server: str, url: str, user: str, user_pass: str, pa
                 else:
                     action_status = f"[red]{action['actionStatus']}"
 
-                target = action.get("actionTargetElements", "Empty")
-                if type(target) is list:
-                    target_element = json.dumps(target[0]["targetElement"]["elementProperties"]["propertiesAsStrings"])
+                targets = action.get("actionTargetElements", "Empty")
+                if type(targets) is list:
+                    tgt_tab = Table()
+                    tgt_tab.add_column('name')
+                    tgt_tab.add_column('guid', no_wrap=True)
+                    tgt_tab.add_column('type_name')
+                    targets_md = ""
+                    for target in targets:
+                        t_name = target['actionTargetName']
+                        t_guid = target['actionTargetGUID']
+                        t_type = target['targetElement']['type']['typeName']
+                        tgt_tab.add_row(t_name, t_guid, t_type)
+                    # target_element = json.dumps(target[0]["targetElement"]["elementProperties"]["propertiesAsStrings"])
+                    target_element = tgt_tab
                 else:
                     target_element = " "
 

pyegeria/__init__.py

@@ -11,8 +11,9 @@ the server platform and servers.
 
 """
 
-from ._globals import (is_debug, disable_ssl_warnings, max_paging_size, TEMPLATE_GUIDS, INTEGRATION_GUIDS
-                       )
+from ._globals import (is_debug, disable_ssl_warnings, max_paging_size, TEMPLATE_GUIDS, INTEGRATION_GUIDS,
+                       default_time_out
+                      )
 
 if disable_ssl_warnings:
     from urllib3.exceptions import InsecureRequestWarning
@@ -47,6 +48,7 @@ from .runtime_manager_omvs import RuntimeManager
 from .action_author_omvs import GovernanceAuthor
 from .glossary_manager_omvs import GlossaryManager
 from .create_tech_guid_lists import build_global_guid_lists
+from .classification_manager_omvs import ClassificationManager
 
 
 #

pyegeria/_globals.py

@@ -13,6 +13,7 @@ is_debug = False
 disable_ssl_warnings = True
 enable_ssl_check = False
 max_paging_size = 500
+default_time_out = 30
 
 comment_types = (
     "ANSWER",

pyegeria/asset_catalog_omvs.py

@@ -9,16 +9,15 @@ Copyright Contributors to the ODPi Egeria project.
 
 """
 import asyncio
-from datetime import datetime
 import json
 
 from httpx import Response
 
-from pyegeria import Client, max_paging_size, body_slimmer, TEMPLATE_GUIDS, INTEGRATION_GUIDS
+from pyegeria import Client, max_paging_size, body_slimmer, TEMPLATE_GUIDS
 from pyegeria._exceptions import (
     InvalidParameterException,
 )
-from ._validators import validate_name, validate_guid, validate_search_string
+from ._validators import validate_search_string
 
 
 class AssetCatalog(Client):
@@ -34,9 +33,6 @@ class AssetCatalog(Client):
             when the user doesn't pass the user_id on a method call.
         user_pwd: str
             The password associated with the user_id. Defaults to None
-        verify_flag: bool
-            Flag to indicate if SSL Certificates should be verified in the HTTP requests.
-            Defaults to False.
 
     """
 
@@ -46,12 +42,10 @@ class AssetCatalog(Client):
             platform_url: str,
             user_id: str,
             user_pwd: str = None,
-            verify_flag: bool = False,
     ):
-        Client.__init__(self, server_name, platform_url, user_id, user_pwd, verify_flag)
+        Client.__init__(self, server_name, platform_url, user_id, user_pwd)
         self.cur_command_root = f"{platform_url}/servers/"
 
-
     async def _async_create_element_from_template(self, body: dict, server: str = None) -> str:
         """ Create a new metadata element from a template.  Async version.
              Parameters
@@ -304,9 +298,9 @@ class AssetCatalog(Client):
     #
 
     async def _async_find_assets_in_domain(self, search_string: str, start_from: int = 0,
-                                          page_size: int = max_paging_size, starts_with: bool = True,
-                                          ends_with: bool = False, ignore_case: bool = True,
-                                          server: str =  None, time_out:int = 60) -> list | str:
+                                           page_size: int = max_paging_size, starts_with: bool = True,
+                                           ends_with: bool = False, ignore_case: bool = True,
+                                           server: str = None, time_out: int = 60) -> list | str:
         """ Retrieve the list of engine action metadata elements that contain the search string. Async Version.
         Parameters
         ----------
@@ -366,9 +360,9 @@ class AssetCatalog(Client):
         return response.json().get("searchMatches", "no assets found")
 
     def find_assets_in_domain(self, search_string: str, start_from: int = 0,
-                                          page_size: int = max_paging_size, starts_with: bool = True,
-                                          ends_with: bool = False, ignore_case: bool = True,
-                                          server: str =  None, time_out:int = 60) -> list | str:
+                              page_size: int = max_paging_size, starts_with: bool = True,
+                              ends_with: bool = False, ignore_case: bool = True,
+                              server: str = None, time_out: int = 60) -> list | str:
         """ Retrieve the list of engine action metadata elements that contain the search string. Async Version.
         Parameters
         ----------
@@ -411,14 +405,13 @@ class AssetCatalog(Client):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_assets_in_domain(search_string,  start_from,page_size,
+            self._async_find_assets_in_domain(search_string, start_from, page_size,
                                               starts_with, ends_with, ignore_case, server, time_out)
         )
         return response
 
-
-    async def _async_get_asset_graph(self, asset_guid:str, server: str = None, start_from: int = 0,
-                                     page_size: int = max_paging_size) -> str| dict:
+    async def _async_get_asset_graph(self, asset_guid: str, server: str = None, start_from: int = 0,
+                                     page_size: int = max_paging_size) -> str | dict:
         """ Return all the elements that are anchored to an asset plus relationships between these elements and to
             other elements. Async Version.
            Parameters
@@ -456,7 +449,7 @@ class AssetCatalog(Client):
         return response.json().get("assetGraph", "no asset found")
 
     def get_asset_graph(self, asset_guid: str, server: str = None, start_from: int = 0,
-                               page_size: int = max_paging_size) -> str | dict:
+                        page_size: int = max_paging_size) -> str | dict:
         """ Return all the elements that are anchored to an asset plus relationships between these elements and to
             other elements.
            Parameters
@@ -488,13 +481,14 @@ class AssetCatalog(Client):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_asset_graph(asset_guid, server,start_from, page_size)
+            self._async_get_asset_graph(asset_guid, server, start_from, page_size)
         )
         return response
 
-    async def _async_get_assets_by_metadata_collection_id(self, metadata_collection_id:str, type_name: str = None,
+    async def _async_get_assets_by_metadata_collection_id(self, metadata_collection_id: str, type_name: str = None,
                                                           effective_time: str = None, server: str = None,
-                                                          start_from: int = 0, page_size: int = max_paging_size) -> str| list:
+                                                          start_from: int = 0,
+                                                          page_size: int = max_paging_size) -> str | list:
         """ Return a list of assets that come from the requested metadata collection. Can optionally
             specify an type name as a filter and an effective time. Async Version.
 
@@ -545,9 +539,9 @@ class AssetCatalog(Client):
         return response.json().get("assets", "no assets found")
 
     def get_assets_by_metadata_collection_id(self, metadata_collection_id: str, type_name: str = None,
-                                                    effective_time: str = None, server: str = None,
-                                                    start_from: int = 0,
-                                                    page_size: int = max_paging_size) -> str | list:
+                                             effective_time: str = None, server: str = None,
+                                             start_from: int = 0,
+                                             page_size: int = max_paging_size) -> str | list:
         """ Return a list of assets that come from the requested metadata collection. Can optionally
             specify an type name as a filter and an effective time. Async Version.
 
@@ -587,12 +581,12 @@ class AssetCatalog(Client):
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_get_assets_by_metadata_collection_id(metadata_collection_id, type_name,
-                                                             effective_time,server,start_from,
+                                                             effective_time, server, start_from,
                                                              page_size)
         )
         return response
 
-    async def _async_get_asset_catalog_types(self, server: str = None) -> str| dict:
+    async def _async_get_asset_catalog_types(self, server: str = None) -> str | dict:
         """ Return all the elements that are anchored to an asset plus relationships between these elements and to
             other elements. Async Version.
            Parameters
@@ -627,7 +621,7 @@ class AssetCatalog(Client):
 
         response = await self._async_make_request("GET", url)
 
-        return response.json().get('types',"No assets found")
+        return response.json().get('types', "No assets found")
 
     def get_asset_catalog_types(self, server: str = None) -> str | dict:
         """ Return all the elements that are anchored to an asset plus relationships between these elements and to
@@ -665,6 +659,7 @@ class AssetCatalog(Client):
         )
         return response
 
+
 if __name__ == "__main__":
     p = AssetCatalog("active-metadata-store", "https://127.0.0.1:9443", "garygeeke", verify_flag=False)
     response = p.get_assets_by_metadata_collection_id()