pyegeria 1.5.1.1.42__tar.gz → 1.5.1.1.44__tar.gz

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/PKG-INFO

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

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/classification_manager_omvs.py

@@ -660,6 +660,15 @@ class ClassificationManager(Client):
         )
         return response
 
+    def get_actor_for_guid(self, guid: str) -> str:
+        """Get the name of the actor from the supplied guid."""
+        details = self.get_element_by_guid(guid)
+        if type(details) is str:
+            return details
+        if details["elementHeader"]["type"]["typeName"] != "UserIdentity":
+            return "GUID does not represent a UserIdentity"
+        return details["properties"]["userId"]
+
     async def _async_get_element_by_unique_name(
         self,
         name: str,
@@ -951,7 +960,7 @@ class ClassificationManager(Client):
             the requesting user is not authorized to issue this request.
         """
 
-        property_name = ["name", "qualifiedName", "title"]
+        property_name = ["name", "displayName", "title"]
         elements = await self._async_get_elements_by_property_value(
             name, property_name, None
         )

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/cat/glossary_actions.py

@@ -256,7 +256,7 @@ def create_term(
 @click.option("--userid", default=EGERIA_USER, help="Egeria user")
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 @click.option("--timeout", default=60, help="Number of seconds to wait")
-def load_terms(
+def import_terms(
     glossary_name, file_name, verbose, upsert, server, url, userid, password, timeout
 ):
     """Load terms from file into the glossary specified"""

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/cat/list_terms.py

@@ -25,7 +25,6 @@ from pyegeria import (
     UserNotAuthorizedException,
     EgeriaTech,
 )
-from pyegeria.glossary_browser_omvs import GlossaryBrowser
 
 disable_ssl_warnings = True
 
@@ -84,12 +83,19 @@ def display_glossary_terms(
     width : int
         The width of the console output. Defaults to EGERIA_WIDTH.
     """
+
+    console = Console(
+        style="bold bright_white on black", width=width, force_terminal=not jupyter
+    )
     g_client = EgeriaTech(view_server, view_url, user_id, user_pass)
     token = g_client.create_egeria_bearer_token()
     if (glossary_name is not None) and (glossary_name != "*"):
-        glossary_guid = g_client.__get_guid__(
-            glossary_guid, glossary_name, "qualifiedName", None, "Glossary"
-        )
+        glossary_guid = g_client.get_guid_for_name(glossary_name)
+        if glossary_guid == "No elements found":
+            console.print(
+                f"\nThe glossary name {glossary_name} was not found. Please try using the glossary guid"
+            )
+            sys.exit(0)
 
     def generate_table(search_string: str, glossary_guid: str = None) -> Table:
         """Make a new table."""
@@ -185,9 +191,6 @@ def display_glossary_terms(
         return table
 
     try:
-        console = Console(
-            style="bold bright_white on black", width=width, force_terminal=not jupyter
-        )
         with console.pager(styles=True):
             console.print(generate_table(search_string, glossary_guid))
 

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/cli/egeria.py

@@ -42,7 +42,7 @@ from pyegeria.commands.cat.glossary_actions import (
     create_glossary,
     delete_glossary,
     create_term,
-    load_terms,
+    import_terms,
     delete_term,
     export_terms,
 )
@@ -1037,7 +1037,7 @@ tell.add_command(mark_todo_complete)
 tell.add_command(reassign_todo)
 tell.add_command(delete_todo)
 tell.add_command(create_todo)
-tell.add_command(load_terms)
+tell.add_command(import_terms)
 tell.add_command(delete_term)
 tell.add_command(export_terms)
 

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/cli/egeria_cat.py

@@ -23,7 +23,7 @@ from pyegeria.commands.cat.glossary_actions import (
     delete_glossary,
     create_term,
     delete_term,
-    load_terms,
+    import_terms,
     export_terms,
 )
 from pyegeria.commands.cat.list_servers_deployed_imp import display_servers_by_dep_imp
@@ -619,7 +619,7 @@ tell.add_command(reassign_todo)
 tell.add_command(delete_todo)
 tell.add_command(create_todo)
 tell.add_command(delete_term)
-tell.add_command(load_terms)
+tell.add_command(import_terms)
 tell.add_command(export_terms)
 
 

pyegeria-1.5.1.1.44/pyegeria/commands/doc/command-overview.md

@@ -0,0 +1,92 @@
+# Overview
+
+# Command Line Interfaces
+
+## hey_egeria
+
+## hey_egeria_cat
+
+## hey_egeria_my
+
+## hey_egeria_ops
+
+## hey_egeria_tech
+
+# Command Reference
+
+| Command                            | Purpose | Cat | My | Ops | Tech | python |
+|------------------------------------|---------|-----|----|-----|------|--------|
+| change_todo_status                 |         |     | ✓  |     |      |        |
+| create_glossary                    |         | ✓   |    |     |      |        |
+| create_term                        |         | ✓   |    |     |      |        |
+| create_todo                        |         |     | ✓  |     |      |        |
+| export_terms_to_file               |         | ✓   |    |     |      |        |
+| get_asset_graph                    |         | ✓   |    |     |      |        |
+| get_collection                     |         | ✓   |    |     |      |        |
+| get_element_info                   |         |     |    |     | ✓    |        |
+| get_guid_info                      |         |     |    |     | ✓    |        |
+| get_project_dependencies           |         | ✓   |    |     |      |        |
+| get_project_structure              |         | ✓   |    |     |      |        |
+| get_tech_details                   |         |     |    |     | ✓    |        |
+| get_tech_type_elements             |         | ✓   |    |     |      |        |
+| get_tech_type_template             |         | ✓   |    |     |      |        |
+| hey_egeria                         |         |     |    |     |      |        |
+| hey_egeria_cat                     |         |     |    |     |      |        |
+| hey_egeria_my                      |         |     |    |     |      |        |
+| hey_egeria_ops                     |         |     |    |     |      |        |
+| hey_egeria_tech                    |         |     |    |     |      |        |
+| list_archives                      |         | ✓   |    |     |      |        |
+| list_asset_types                   |         |     |    |     | ✓    |        |
+| list_assets                        |         | ✓   |    |     |      |        |
+| list_catalog_targets               |         |     |    | ✓   |      | ✓      |
+| list_cert_types                    |         | ✓   |    |     |      |        |
+| list_deployed_catalogs             |         | ✓   |    |     |      | ✓      |
+| list_deployed_databases            |         | ✓   |    |     |      | ✓      |
+| list_deployed_schemas              |         | ✓   |    |     |      | ✓      |
+| list_deployed_servers              |         | ✓   |    |     |      |        |
+| list_element_graph                 |         |     |    |     | ✓    |        |
+| list_elements                      |         |     |    |     | ✓    |        |
+| list_elements_for_classification   |         |     |    |     | ✓    |        |
+| list_engine_activity               |         |     |    | ✓   |      |        |
+| list_engine_activity_compressed    |         |     |    | ✓   |      | ✓      |
+| list_glossaries                    |         | ✓   |    |     |      | ✓      |
+| list_gov_action_processes          |         |     |    |     | ✓    |        |
+| list_gov_eng_status                |         |     |    | ✓   |      | ✓      |
+| list_integ_daemon_status           |         |     |    | ✓   |      | ✓      |
+| list_my_profile                    |         |     | ✓  |     |      |        |
+| list_my_roles                      |         |     | ✓  |     |      |        |
+| list_projects                      |         | ✓   |    |     |      |        |
+| list_registered_services           |         |     |    |     | ✓    |        |
+| list_related_elements              |         |     |    |     | ✓    |        |
+| list_related_specification         |         |     |    |     | ✓    |        |
+| list_relationship_types            |         |     |    |     | ✓    |        |
+| list_relationships                 |         | ✓   |    |     |      |        |
+| list_tech_templates                |         |     |    |     | ✓    |        |
+| list_tech_types                    |         | ✓   |    |     |      |        |
+| list_terms                         |         | ✓   |    |     |      | ✓      |
+| list_todos                         |         | ✓   |    |     |      |        |
+| list_user_ids                      |         | ✓   |    |     |      |        |
+| list_valid_metadata_values         |         |     |    |     | ✓    |        |
+| load_archive                       |         |     |    | ✓   |      |        |
+| load_archive_tui                   |         |     |    | ✓   |      |        |
+| load_terms_from_file               |         | ✓   |    |     |      |        |
+| mark_todo_complete                 |         |     | ✓  |     |      |        |
+| monitor_asset_events               |         |     |    | ✓   |      |        |
+| monitor_coco_status                |         |     |    | ✓   |      |        |
+| monitor_engine_activity            |         |     |    | ✓   |      |        |
+| monitor_engine_activity_compressed |         |     |    | ✓   |      |        |
+| monitor_gov_eng_status             |         |     |    | ✓   |      |        |
+| monitor_integ_daemon_status        |         |     |    | ✓   |      |        |
+| monitor_my_todos                   |         |     | ✓  |     |      |        |
+| monitor_open_todos                 |         |     | ✓  |     |      |        |
+| monitor_platform_status            |         |     |    | ✓   |      |        |
+| monitor_server_list                |         |     |    | ✓   |      |        |
+| monitor_server_startup             |         |     |    | ✓   |      |        |
+| monitor_server_status              |         |     |    | ✓   |      |        |
+| reassign_todo                      |         |     | ✓  |     |      |        |
+| refresh_gov_eng_config             |         |     |    | ✓   |      |        |
+| refresh_integration_daemon         |         |     |    | ✓   |      |        |
+| restart_integration_daemon         |         |     |    | ✓   |      |        |
+| start_daemon                       |         |     |    | ✓   |      |        |
+| stop_daemon                        |         |     |    | ✓   |      |        |
+

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/my/list_my_profile.py

@@ -68,6 +68,7 @@ def display_my_profile(
 
         profile_props = my_profiles.get("profileProperties", "---")
         name = profile_props["fullName"]
+
         tree = Tree(
             Panel(f"Profile of {name}", title="Personal Profile"),
             expanded=True,
@@ -93,7 +94,10 @@ def display_my_profile(
 
         id_list_md = ""
         for identities in my_profiles["userIdentities"]:
-            id_list_md += f"* {identities['userIdentity']['properties']['userId']}\n"
+            id_list_md += (
+                f"* {identities['userIdentity']['properties']['userId']}\n"
+                f"* {identities['userIdentity']['elementHeader']['guid']}\n"
+            )
         t2 = tree.add(Panel(Markdown(id_list_md), title="Identities", expand=False))
 
         contact_methods = my_profiles["contactMethods"]

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/my/list_my_roles.py

@@ -6,7 +6,7 @@ Copyright Contributors to the ODPi Egeria project.
 Unit tests for the Utils helper functions using the Pytest framework.
 
 
-A simple display for my profile
+List the roles for a given user.
 """
 import os
 import argparse

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/my/monitor_my_todos.py

@@ -144,8 +144,8 @@ def display_my_todos(
         if type(my_roles) is list:
             for role in my_roles:
                 role_guid = role["elementHeader"]["guid"]
-                role_title = role["properties"].get("title", "No Title")
-                add_rows(table, role_guid, role_title)
+                role_id = role["properties"].get("roleId", "No Role Id")
+                add_rows(table, role_guid, role_id)
 
         # m_client.close_session()
         return table

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/my/monitor_open_todos.py

@@ -14,9 +14,11 @@ import time
 import sys
 from rich import box
 from rich.live import Live
+from rich.markdown import Markdown
 from rich.table import Table
 from rich.console import Console
 
+from pyegeria import EgeriaTech
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
@@ -57,7 +59,7 @@ def display_todos(
 ):
     console = Console(width=width, force_terminal=not jupyter)
 
-    m_client = MyProfile(server, url, user_id=user)
+    m_client = EgeriaTech(server, url, user_id=user)
     token = m_client.create_egeria_bearer_token(user, user_pass)
 
     def generate_table(search_string: str = "*") -> Table:
@@ -81,7 +83,7 @@ def display_todos(
         table.add_column("Due")
         table.add_column("Completion")
         table.add_column("Status")
-        table.add_column("Sponsor")
+        table.add_column("Assigned Actors")
 
         todo_items = m_client.find_to_do("*", starts_with=True)
         if type(todo_items) is str:
@@ -95,7 +97,7 @@ def display_todos(
             due = " "
             completed = " "
             status = " "
-            sponsor = " "
+            assigned = " "
         else:
             for item in todo_items:
                 props = item["properties"]
@@ -106,9 +108,15 @@ def display_todos(
                 due = props.get("dueTime", " ")
                 completed = props.get("completionTime", " ")
                 status = props.get("toDoStatus", "---")
-                # assigned_actors = item["assignedActors"]
-                # sponsor = assigned_actors[0].get("uniqueName", " ")
-                sponsor = "erinoverview"
+                assigned_actors = item["assignedActors"]
+
+                assigned = ""
+                if type(assigned_actors) is list:
+                    for actor in assigned_actors:
+                        actor_guid = actor["guid"]
+                        assigned += f"* {m_client.get_actor_for_guid(actor_guid)} "
+                assigned_out = Markdown(assigned)
+
                 if status in ("WAITING", "OPEN"):
                     status = f"[yellow]{status}"
                 elif status in ("INPROGRESS", "COMPLETE"):
@@ -117,7 +125,14 @@ def display_todos(
                     status = f"[red]{status}"
 
                 table.add_row(
-                    name, type_name, created, priority, due, completed, status, sponsor
+                    name,
+                    type_name,
+                    created,
+                    priority,
+                    due,
+                    completed,
+                    status,
+                    assigned_out,
                 )
 
         return table

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/commands/my/todo_actions.py

@@ -21,9 +21,9 @@ from pyegeria._exceptions import (
     print_exception_response,
 )
 
-erins_guid = "a588fb08-ae09-4415-bd5d-991882ceacba"
-peter_guid = "a187bc48-8154-491f-97b4-a2f3c3f1a00e"
-tanya_guid = "26ec1614-bede-4b25-a2a3-f8ed26db3aaa"
+erins_guid = "dcfd7e32-8074-4cdf-bdc5-9a6f28818a9d"
+peter_guid = "59f0232c-f834-4365-8e06-83695d238d2d"
+tanya_guid = "a987c2d2-c8b6-4882-b344-c47956d2de97"
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyegeria/glossary_manager_omvs.py

@@ -7,6 +7,7 @@ added in subsequent versions of the glossary_omvs module.
 
 """
 import asyncio
+import os
 import time
 import csv
 from datetime import datetime
@@ -1534,6 +1535,11 @@ class GlossaryManager(GlossaryBrowser):
         self, glossary_name: str, filename: str, upsert: bool = False
     ) -> List[dict]:
         """This method loads glossary terms into the specified glossary from the indicated file."""
+        # check that the file exists
+        if not os.path.exists(filename):
+            raise InvalidParameterException("File not found")
+            sys.exit(1)
+
         # Check that glossary exists and get guid
         glossaries = self.get_glossaries_by_name(glossary_name)
         if type(glossaries) is not list:
@@ -1597,6 +1603,7 @@ class GlossaryManager(GlossaryBrowser):
 
                 version = row.get("Version Identifier", "1.0")
                 status = row.get("Status", "DRAFT")
+                print(row)
                 status = status.upper()
 
                 # quality check the row

{pyegeria-1.5.1.1.42 → pyegeria-1.5.1.1.44}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "1.5.1.1.42"
+version = "1.5.1.1.44"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -102,6 +102,7 @@ pytest = "^8.2.2"
     stop_daemon = "pyegeria.commands.ops.engine_actions:stop_daemon"
 
     list_my_profile = "pyegeria.commands.my.list_my_profile:main"
+    list_my_roles = "pyegeria.commands.my.list_my_roles:main"
     monitor_open_todos = "pyegeria.commands.my.monitor_open_todos:main"
     monitor_my_todos = "pyegeria.commands.my.monitor_my_todos:main"
     create_todo = "pyegeria.commands.my.todo_actions:create_todo"