pyegeria 1.5.1.0.21__py3-none-any.whl → 1.5.1.0.23__py3-none-any.whl

commands/cat/glossary_actions.py

@@ -7,6 +7,7 @@ Copyright Contributors to the ODPi Egeria project.
 Execute Glossary actions.
 
 """
+import csv
 import os
 import sys
 import time
@@ -111,7 +112,7 @@ def delete_glossary(server, url, userid, password, timeout, glossary_guid):
     try:
         m_client.delete_to_do(glossary_guid)
 
-        click.echo(f"Deleted Todo item {glossary_guid}")
+        click.echo(f"Deleted glossary: {glossary_guid}")
 
     except (InvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
@@ -156,7 +157,6 @@ def create_term(
     url,
     userid,
     password,
-    timeout,
     glossary_name,
     term_name,
     summary,
@@ -166,7 +166,8 @@ def create_term(
     usage,
     version,
     status,
-):
+    timeout: int = 120,
+) -> str:
     """Create a new term"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
@@ -175,7 +176,7 @@ def create_term(
             "class": "ReferenceableRequestBody",
             "elementProperties": {
                 "class": "GlossaryTermProperties",
-                "qualifiedName": f"GlossaryTerm: {term_name} : {datetime.now().isoformat()}",
+                "qualifiedName": f"GlossaryTerm: {term_name} - {datetime.now().isoformat()}",
                 "displayName": term_name,
                 "summary": summary,
                 "description": description,
@@ -205,6 +206,36 @@ def create_term(
         click.echo(
             f"Successfully created term {term_name} with GUID {term_guid}, in glossary {glossary_name}.\n"
         )
+        return term_guid
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
+
+@click.command("load-terms-from-file")
+@click.option("--glossary-name", help="Name of Glossary", 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")
+@click.option(
+    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+)
+@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")
+@click.argument("glossary-guid")
+def load_terms(
+    glossary_name, file_name, server, url, userid, password, timeout, glossary_guid
+):
+    """Delete the glossary specified"""
+    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
+    token = m_client.create_egeria_bearer_token()
+    try:
+        result = m_client.load_terms_from_file(glossary_name, file_name)
+
+        click.echo(
+            f"Loaded terms from  into glossary: {glossary_name} from {file_name}"
+        )
 
     except (InvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)

commands/cli/egeria.py

@@ -37,7 +37,12 @@ from commands.cat.list_deployed_database_schemas import (
 )
 from commands.cat.list_deployed_catalogs import list_deployed_catalogs
 from commands.cat.list_deployed_databases import list_deployed_databases
-from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
+from commands.cat.glossary_actions import (
+    create_glossary,
+    delete_glossary,
+    create_term,
+    load_terms,
+)
 from commands.my.todo_actions import (
     mark_todo_complete,
     reassign_todo,
@@ -984,6 +989,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.group("survey")

commands/cli/egeria_cat.py

@@ -18,7 +18,12 @@ from commands.cat.get_project_dependencies import project_dependency_viewer
 from commands.cat.get_project_structure import project_structure_viewer
 from commands.cat.get_tech_type_elements import tech_viewer
 from commands.cat.get_tech_type_template import template_viewer
-from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
+from commands.cat.glossary_actions import (
+    create_glossary,
+    delete_glossary,
+    create_term,
+    load_terms,
+)
 from commands.cat.list_archives import display_archive_list
 from commands.cat.list_assets import display_assets
 from commands.cat.list_cert_types import display_certifications
@@ -566,6 +571,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.group("survey")

commands/tech/list_tech_templates.py

@@ -49,7 +49,6 @@ def list_templates(
     tech_info_list: dict = []
 
     if type(tech_list) is list:
-        entry = {}
         for item in tech_list:
             if "deployedImplementationType" not in item["qualifiedName"]:
                 continue
@@ -66,7 +65,8 @@ def list_templates(
                 for template in templates:
                     t_list.append({"template": template["name"]})
                 entry[details["name"]] = t_list
-                print(json.dumps(entry, indent=2))
+                tech_info_list.append(entry)
+    return tech_info_list
 
 
 def display_templates_spec(
@@ -194,8 +194,8 @@ def main():
         search_string = Prompt.ask(
             "Enter the technology you are searching for:", default="*"
         )
-        display_templates_spec(search_string, server, url, userid, password)
-        # list_templates(search_string, server, url, userid, password)
+        # display_templates_spec(search_string, server, url, userid, password)
+        list_templates(search_string, server, url, userid, password)
     except KeyboardInterrupt:
         pass
 

pyegeria/glossary_manager_omvs.py

@@ -8,8 +8,11 @@ added in subsequent versions of the glossary_omvs module.
 """
 import asyncio
 import time
+import csv
 from datetime import datetime
 
+from pyegeria import InvalidParameterException
+
 # import json
 from pyegeria._client import Client
 from pyegeria._validators import (
@@ -1407,28 +1410,92 @@ class GlossaryManager(GlossaryBrowser):
 
     def load_terms_from_file(
         self, glossary_name: str, filename: str, upsert: bool = False
-    ) -> str:
+    ) -> [dict]:
         """This method loads glossary terms into the specified glossary from the indicated file."""
         # Check that glossary exists and get guid
         glossaries = self.get_glossaries_by_name(glossary_name)
         if type(glossaries) is not list:
             return "Unknown glossary"
         if len(glossaries) > 1:
+            glossary_error = (
+                "Multiple glossaries found - please use a qualified name from below\n"
+            )
             for g in glossaries:
-                glossary_error = (
-                    "Multiple glossaries found - please use the qualified name\n"
-                )
                 glossary_error += (
                     f"Display Name: {g['glossaryProperties']['displayName']}\tQualified Name:"
                     f" {g['glossaryProperties']['qualifiedName']}\n"
                 )
-                return glossary_error
-        glossary_guid = glossaries[0]["elementHeader"]["guid"]
+            raise InvalidParameterException(glossary_error)
+            sys.exit(1)
 
-        # Open file
+        # Now we know we have a single glossary so we can get the guid
+        glossary_guid = glossaries[0]["elementHeader"]["guid"]
+        term_info = []
+
+        term_properties = {
+            "Term Name",
+            "Qualified Name",
+            "Abbreviation",
+            "Summary",
+            "Description",
+            "Examples",
+            "Usage",
+            "Version Identifier",
+            "Status",
+        }
+        # process file
+        with open(filename, mode="r") as file:
+            # Create a CSV reader object
+            csv_reader = csv.DictReader(file)
+            headers = csv_reader.fieldnames
+            # check that the column headers are known
+            if all(header in term_properties for header in headers) is False:
+                raise InvalidParameterException("Invalid headers in CSV File")
+                sys.exit(1)
+
+            # process each row
+            for row in csv_reader:
+                term_name = row.get("Term Name", None)
+                qualified_name = row.get("Qualified Name", None)
+                abbrev = row.get("Abbreviation", None)
+                summary = row.get("Summary", None)
+                description = row.get("Description", None)
+                examples = row.get("Examples", None)
+                usage = row.get("Usage", None)
+                version = row.get("Version Identifier", "1.0")
+                status = row.get("Status", "DRAFT").upper()
+
+                # process the row
+                if term_name is None:
+                    continue
+                body = {
+                    "class": "ReferenceableRequestBody",
+                    "elementProperties": {
+                        "class": "GlossaryTermProperties",
+                        "qualifiedName": f"GlossaryTerm: {term_name} - {datetime.now().isoformat()}",
+                        "displayName": term_name,
+                        "summary": summary,
+                        "description": description,
+                        "abbreviation": abbrev,
+                        "examples": examples,
+                        "usage": usage,
+                        "publishVersionIdentifier": version,
+                    },
+                    "initialStatus": status,
+                }
 
-        # Insert terms into glossary
-        pass
+                # Add the term
+                term_guid = self.create_controlled_glossary_term(
+                    glossary_guid, body_slimmer(body)
+                )
+                term_info.append(
+                    {
+                        "term_name": term_name,
+                        "qualified_name": qualified_name,
+                        "term_guid": term_guid,
+                    }
+                )
+        return term_info
 
     async def _async_create_term_copy(
         self,

{pyegeria-1.5.1.0.21.dist-info → pyegeria-1.5.1.0.23.dist-info}/METADATA

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

{pyegeria-1.5.1.0.21.dist-info → pyegeria-1.5.1.0.23.dist-info}/RECORD

@@ -6,7 +6,7 @@ commands/cat/get_project_dependencies.py,sha256=B0JaMSUi0hzVgos1sTY2uUPGy1DzKEJM
 commands/cat/get_project_structure.py,sha256=n2GbNd07w1DTo7jTR8b2ewXRyNcat_2BcCBRyDMldwk,5969
 commands/cat/get_tech_type_elements.py,sha256=-m3Q0BoNqkCtV8h75vMwTcOV-_ymEXmnJcr4Ec7WMAw,6180
 commands/cat/get_tech_type_template.py,sha256=gMFVcgCIm09GQu1Vsc5ZUVH9XLhItAG1eVGZJrcnHeQ,6174
-commands/cat/glossary_actions.py,sha256=F5-NNiLvfHLbQKZ_RxS6XJ9HOAuXc75GMIAC5Xo0lJQ,7280
+commands/cat/glossary_actions.py,sha256=NL9Cd7dCjbcfz4OxYIT10yprfJWmRX8JwaA5_66GQBE,8585
 commands/cat/list_archives.py,sha256=FEZ2XYnQIWo2PztWqnj6unn0pbblPU0-bMbTyI3csv4,5464
 commands/cat/list_assets.py,sha256=bNwSaBDz661hfnc2Rn4j4HPHAugKvz0XwN9L1m4FVQk,6529
 commands/cat/list_cert_types.py,sha256=mbCls_EqC5JKG5rvS4o69k7KgZ6aNXlcqoJ3DtHsTFA,7127
@@ -20,8 +20,8 @@ commands/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFo
 commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
 commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-commands/cli/egeria.py,sha256=5ktUIbf5PIuHUQbcx_-HpI3Xolx38euvLT25AQhBWvE,31265
-commands/cli/egeria_cat.py,sha256=NwPCRTIjwQtna5vvjInT6L0krwp2c6k-Fm-oxN6qrnw,14800
+commands/cli/egeria.py,sha256=HeGF9WbUXZQjUFsjuHZDBFki8nt4QxRqDUpa-0uf3Jg,31327
+commands/cli/egeria_cat.py,sha256=r0eseanfHszfi0K26weWiQn0XstzwN7CoaNv9-zbqGg,14862
 commands/cli/egeria_my.py,sha256=9zIpUDLeA_R-0rgCSQfEZTtVmkxPcEAsYcCTn1wQFrE,6181
 commands/cli/egeria_ops.py,sha256=fxDXYWXRhexx06PdSLCp2FhgUtS13NdDpyg7ea775fc,11531
 commands/cli/egeria_tech.py,sha256=eTDHTHDVEYmr6gUPGfido_Uf7Fec0Nuyxlkhg4KAMAw,13160
@@ -67,7 +67,7 @@ commands/tech/list_registered_services.py,sha256=QzE_ebdopNkHWMxa-xc902GG6ac4Yw-
 commands/tech/list_related_elements.py,sha256=mcOy3RIGpIdshcT1o4Tr7Ck-c1dmAC8yBUOF5GAFYrM,7755
 commands/tech/list_related_specification.py,sha256=mWrKenXOskL4cl0DHjH2Z8M9-FJzjkzK62W-tsx3WDU,5918
 commands/tech/list_relationship_types.py,sha256=BlVzrPznZXqMVLN2-2vYEVRGeYsiJrqXxIJEikobyoo,5875
-commands/tech/list_tech_templates.py,sha256=uHifnvZNwsP9c4o8LunQ2UvwrYy2zneBEYce25h8e5U,7831
+commands/tech/list_tech_templates.py,sha256=doQtfSrbnluCzyCsq2PCDGKk5atDPXPDuu24YjCRxo0,7832
 commands/tech/list_valid_metadata_values.py,sha256=N3D0_BmREPszgde3uvvYdfzq7DJ46uMOv2t1vtncGsw,6333
 commands/tech/table_tech_templates.py,sha256=xa_mA10P_6Su3zRsvyoZhWoSUQ5LuyLTG1kNCumzxZA,7268
 commands/tech/x_list_related_elements.py,sha256=qBsf1619cecaMCTzG0MG22fAT32WNH2Z3CXrjo9z-5Y,5853
@@ -92,7 +92,7 @@ pyegeria/egeria_tech_client.py,sha256=7NfqpJFft5GR4NPRDVDw22L9caHbXB8fhx0TAf6qEo
 pyegeria/feedback_manager_omvs.py,sha256=B66e3ZCaC_dirb0mcb2Nz3PYh2ZKsoMAYNOb3euNiro,152931
 pyegeria/full_omag_server_config.py,sha256=LBnqUiz1ofBdlKBzECFs_pQbdJwcWigAukWHGJRR2nU,47340
 pyegeria/glossary_browser_omvs.py,sha256=NcitYaZJqwVODBO5zBtWpXPNUJJ3DKzEbRaOFSAyUlg,93554
-pyegeria/glossary_manager_omvs.py,sha256=QnnKPG1XkpZXK0GY7lK4p7i8nZICbWmqNep8_8jg3p4,112966
+pyegeria/glossary_manager_omvs.py,sha256=Ui3LXiI5kyYXpJ35sn2pI4gB5XoAOXEKr6fWsZlCZrI,115642
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
 pyegeria/platform_services.py,sha256=CJIOYIFEbcIGwdWlApAQcXxZTsdrhFtpJcm4O3p7dG0,41646
@@ -104,8 +104,8 @@ pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZi
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=tfCGXed5LLt59YA8uZNNtd9UJ-lRZfPU_uZxK31Yux0,65069
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-1.5.1.0.21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.0.21.dist-info/METADATA,sha256=G_lYwb0fY1gjNi8Xz6Naj5ceaPlo0-dyN74JikRiZNE,2998
-pyegeria-1.5.1.0.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.0.21.dist-info/entry_points.txt,sha256=soGMYF0lF6vxsFaQbX-PXAE7_wzALQblh6W04_E-F7o,4068
-pyegeria-1.5.1.0.21.dist-info/RECORD,,
+pyegeria-1.5.1.0.23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.0.23.dist-info/METADATA,sha256=XbpsIVNXd215mnvWA6JO43sYGsZIQGBHIm2EpvqAzsU,2998
+pyegeria-1.5.1.0.23.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.0.23.dist-info/entry_points.txt,sha256=eQF0CAWVQlHftl85JzL0pWSaQ1eURJ6MeI1I78FvAgQ,4127
+pyegeria-1.5.1.0.23.dist-info/RECORD,,

{pyegeria-1.5.1.0.21.dist-info → pyegeria-1.5.1.0.23.dist-info}/entry_points.txt

@@ -32,7 +32,6 @@ list_elements=commands.tech.list_elements:main
 list_elements_for_classification=commands.tech.list_elements_for_classification:main
 list_engine_activity=commands.ops.monitor_engine_activity:main_paging
 list_engine_activity_compressed=commands.ops.monitor_engine_activity_c:main_paging
-list_glossary=commands.cat.list_glossary:main
 list_gov_action_processes=commands.tech.list_gov_action_processes:main
 list_gov_eng_status=commands.ops.monitor_gov_eng_status:main_paging
 list_integ_daemon_status=commands.ops.monitor_integ_daemon_status:main_paging
@@ -45,11 +44,13 @@ list_relationship_types=commands.tech.list_relationship_types:main
 list_relationships=commands.cat.list_relationships:main
 list_tech_templates=commands.tech.list_tech_templates:main
 list_tech_types=commands.cat.list_tech_types:main
+list_terms=commands.cat.list_glossary:main
 list_todos=commands.cat.list_todos:main
 list_user_ids=commands.cat.list_user_ids:main
 list_valid_metadata_values=commands.tech.list_valid_metadata_values:main
 load_archive=commands.ops.load_archive:load_archive
 load_archive_tui=commands.ops.load_archive:tui
+load_terms_from_file=commands.cat.glossary_actions:load_terms
 mark_todo_complete=commands.my.todo_actions:mark_todo_complete
 monitor_asset_events=commands.ops.monitor_asset_events:main
 monitor_coco_status=commands.ops.monitor_coco_status:main