pyegeria 1.5.1.1.48__py3-none-any.whl → 1.5.1.1.50__py3-none-any.whl

pyegeria/commands/cat/glossary_actions.py

@@ -248,11 +248,9 @@ def delete_term(server, url, userid, password, timeout, term_guid):
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
     try:
-        term_guid = term_guid.trim()
+        term_guid = term_guid.strip()
         term_info = m_client.get_terms_by_guid(term_guid)
-        click.echo(
-            f"Found term with GUID: {term_guid} and Display Name: {term_info['glossaryTermProperties']['displayName']}"
-        )
+
         m_client.delete_term(term_guid)
 
         click.echo(
@@ -265,13 +263,13 @@ def delete_term(server, url, userid, password, timeout, term_guid):
         m_client.close_session()
 
 
-@click.command("load-terms-from-file")
+@click.command("import-terms")
 @click.option("--glossary-name", help="Name of Glossary", required=True)
 @click.option("--file-name", help="Path of CSV file", required=True)
 @click.option(
     "--verbose",
     is_flag=True,
-    default=False,
+    default=True,
     help="If set, result descriptions are provided",
 )
 @click.option(
@@ -288,19 +286,23 @@ def delete_term(server, url, userid, password, timeout, term_guid):
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 @click.option("--timeout", default=60, help="Number of seconds to wait")
 def import_terms(
-    glossary_name, file_name, verbose, upsert, server, url, userid, password, timeout
+    glossary_name: str,
+    file_name: str,
+    verbose: bool,
+    upsert: bool,
+    server: str,
+    url: str,
+    userid: str,
+    password: str,
+    timeout: int,
 ):
     """Load terms from file into the glossary specified"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
     try:
-        if os.path.exists(file_name):
-            print(f"Found file at: {file_name}\n")
-        else:
-            print(f"File not found at: {file_name}\n")
-            sys.exit(0)
-
-        result = m_client.load_terms_from_file(glossary_name, file_name, upsert=upsert)
+        result = m_client.load_terms_from_file(
+            glossary_name, file_name, upsert=upsert, verbose=verbose
+        )
 
         click.echo(
             f"Loaded terms from  into glossary: {glossary_name} from {file_name}"
@@ -314,7 +316,7 @@ def import_terms(
         m_client.close_session()
 
 
-@click.command("export-terms-to-file")
+@click.command("export-terms")
 @click.option("--glossary-guid", help="GUID of Glossary to export", required=True)
 @click.option("--file-name", help="Path of CSV file", required=True)
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
@@ -324,7 +326,7 @@ def import_terms(
 @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 export_terms(glossary_guid, file_name, server, url, userid, password, timeout):
+def export_terms(glossary_guid: str, file_name, server, url, userid, password, timeout):
     """Export the glossary specified"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()