pyegeria 1.5.1.1.43__tar.gz → 1.5.1.1.45__tar.gz

{pyegeria-1.5.1.1.43 → pyegeria-1.5.1.1.45}/PKG-INFO

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

{pyegeria-1.5.1.1.43 → pyegeria-1.5.1.1.45}/pyegeria/classification_manager_omvs.py

@@ -960,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.43 → pyegeria-1.5.1.1.45}/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.43 → pyegeria-1.5.1.1.45}/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.43 → pyegeria-1.5.1.1.45}/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.43 → pyegeria-1.5.1.1.45}/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.43 → pyegeria-1.5.1.1.45}/pyegeria/commands/my/monitor_open_todos.py

@@ -114,8 +114,8 @@ def display_todos(
                 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)}\n"
-                    assigned_out = Markdown(assigned)
+                        assigned += f"* {m_client.get_actor_for_guid(actor_guid)} "
+                assigned_out = Markdown(assigned)
 
                 if status in ("WAITING", "OPEN"):
                     status = f"[yellow]{status}"

{pyegeria-1.5.1.1.43 → pyegeria-1.5.1.1.45}/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:
@@ -1579,6 +1585,8 @@ class GlossaryManager(GlossaryBrowser):
             for row in csv_reader:
                 # Parse the file. When the value '---' is encountered, make the value None.git+https:
                 term_name = row.get("Term Name", None)
+                if term_name is None:
+                    continue
                 qualified_name = row.get("Qualified Name", None)
                 abbrev_in = row.get("Abbreviation", None)
                 abbrev = None if abbrev_in == "---" else abbrev_in
@@ -1597,6 +1605,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.43 → pyegeria-1.5.1.1.45}/pyproject.toml

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