pyegeria 5.2.0.42.5__py3-none-any.whl → 5.2.0.42.7__py3-none-any.whl

pyegeria/commands/cat/glossary_actions.py

@@ -48,6 +48,7 @@ EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_WIDTH = os.environ.get("EGERIA_WIDTH", 200)
 EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", False)
 EGERIA_HOME_GLOSSARY_GUID = os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None)
+EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
 
 
 @click.command("create-glossary")
@@ -265,8 +266,11 @@ def delete_term(server, url, userid, password, timeout, term_guid):
 
 
 @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("--glossary_name", help="Name of Glossary", required=True)
+@click.option("--file_name", help="Path of CSV file", required=True)
+@click.option(
+    "--file_path", help="Path of CSV file", default=EGERIA_GLOSSARY_PATH, required=False
+)
 @click.option(
     "--verbose",
     is_flag=True,
@@ -288,6 +292,7 @@ def delete_term(server, url, userid, password, timeout, term_guid):
 @click.option("--timeout", default=60, help="Number of seconds to wait")
 def import_terms(
     glossary_name: str,
+    file_path: str,
     file_name: str,
     verbose: bool,
     upsert: bool,
@@ -302,7 +307,11 @@ def import_terms(
     token = m_client.create_egeria_bearer_token()
     try:
         result = m_client.load_terms_from_file(
-            glossary_name, file_name, upsert=upsert, verbose=verbose
+            glossary_name,
+            file_name,
+            file_path=file_path,
+            upsert=upsert,
+            verbose=verbose,
         )
 
         click.echo(
@@ -319,12 +328,15 @@ def import_terms(
 
 @click.command("export-terms")
 @click.option(
-    "--glossary-guid",
+    "--glossary_guid",
     default=EGERIA_HOME_GLOSSARY_GUID,
     help="GUID of Glossary to export",
     required=True,
 )
-@click.option("--file-name", help="Path of CSV file", required=True)
+@click.option("--file_name", help="Path of CSV file", required=True)
+@click.option(
+    "--file_path", help="Path of CSV file", default=EGERIA_GLOSSARY_PATH, required=False
+)
 @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"
@@ -332,12 +344,14 @@ 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: str, file_name, server, url, userid, password, timeout):
+def export_terms(
+    glossary_guid: str, file_name, file_path, 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()
     try:
-        result = m_client.export_glossary_to_csv(glossary_guid, file_name)
+        result = m_client.export_glossary_to_csv(glossary_guid, file_name, file_path)
 
         click.echo(
             f"Exported {result} terms  from glossary: {glossary_guid} into {file_name}"

pyegeria/commands/cli/egeria_cat.py

@@ -129,7 +129,8 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--width",
-    default=os.environ.get("EGERIA_WIDTH", "200"),
+    default=os.environ.get("EGERIA_WIDTH", 200),
+    type=int,
     help="Screen width, in characters, to use",
 )
 @click.option(

pyegeria/glossary_manager_omvs.py

@@ -1535,6 +1535,7 @@ class GlossaryManager(GlossaryBrowser):
         self,
         glossary_name: str,
         filename: str,
+        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
         upsert: bool = True,
         verbose: bool = True,
     ) -> List[dict] | None:
@@ -1544,6 +1545,9 @@ class GlossaryManager(GlossaryBrowser):
         ----------
             glossary_name : str
                 Name of the glossary to import terms into.
+            file_path: str, default is EGERIA_GLOSSARY_PATH if specified or None
+                If EGERIA_GLOSSARY_PATH environment variable is set, then it will be used in forming the
+                prepended to the filename parameter to form the full path to the file.
             filename: str
                 Path to the file to import terms from. File is assumed to be in CSV format. The path
                 is relative to where the python method is being called from.
@@ -1609,8 +1613,18 @@ class GlossaryManager(GlossaryBrowser):
             "Version Identifier",
             "Status",
         }
+
+        if file_path:
+            full_file_path = os.path.join(file_path, filename)
+        else:
+            full_file_path = filename
+
+        if not os.path.isfile(full_file_path):
+            raise FileNotFoundError(
+                f"Did not find file with path {file_path} and name {filename}"
+            )
         # process file
-        with open(filename, mode="r") as file:
+        with open(full_file_path, mode="r") as file:
             # Create a CSV reader object
             csv_reader = csv.DictReader(file)
             headers = csv_reader.fieldnames
@@ -1618,7 +1632,6 @@ class GlossaryManager(GlossaryBrowser):
             # 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 and validate values
             for row in csv_reader:
@@ -1759,7 +1772,10 @@ class GlossaryManager(GlossaryBrowser):
             return
 
     async def _async_export_glossary_to_csv(
-        self, glossary_guid: str, target_file: str
+        self,
+        glossary_guid: str,
+        target_file: str,
+        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
     ) -> int:
         """Export all the terms in a glossary to a CSV file. Async version
 
@@ -1769,6 +1785,9 @@ class GlossaryManager(GlossaryBrowser):
             Identity of the glossary to export.
         target_file: str
             Complete file name with path and extension to export to.
+        file_path: str, default is EGERIA_GLOSSARY_PATH if specified or None
+                If EGERIA_GLOSSARY_PATH environment variable is set, then it will be used in forming the
+                prepended to the filename parameter to form the full path to the file.
 
         Returns:
             int: Number of rows exported.
@@ -1787,8 +1806,12 @@ class GlossaryManager(GlossaryBrowser):
             "Version Identifier",
             "Status",
         ]
+        if file_path:
+            full_file_path = os.path.join(file_path, target_file)
+        else:
+            full_file_path = target_file
 
-        with open(target_file, mode="w") as file:
+        with open(full_file_path, mode="w") as file:
             csv_writer = csv.DictWriter(file, fieldnames=header)
             csv_writer.writeheader()
             count = 0

{pyegeria-5.2.0.42.5.dist-info → pyegeria-5.2.0.42.7.dist-info}/METADATA

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

{pyegeria-5.2.0.42.5.dist-info → pyegeria-5.2.0.42.7.dist-info}/RECORD

@@ -19,7 +19,7 @@ pyegeria/commands/cat/get_collection.py,sha256=dzgRIlMkQo0su-ZBdWaZ2txkC_J-bvass
 pyegeria/commands/cat/get_project_dependencies.py,sha256=B0JaMSUi0hzVgos1sTY2uUPGy1DzKEJMIbbYfMUWvQA,5981
 pyegeria/commands/cat/get_project_structure.py,sha256=n2GbNd07w1DTo7jTR8b2ewXRyNcat_2BcCBRyDMldwk,5969
 pyegeria/commands/cat/get_tech_type_elements.py,sha256=fD45AEQZUpUkw30Rt7CjovRjtWDxsACBG9KD1Ok3Yx0,6178
-pyegeria/commands/cat/glossary_actions.py,sha256=r7vMpo_w6RRFvJmq2IgasXnQMEMrOtTk2UmgIywAYtQ,12347
+pyegeria/commands/cat/glossary_actions.py,sha256=ijNciRjrhQbCrPBma3OrEQfvrzxm9z4Wj6fYRJQczhA,12745
 pyegeria/commands/cat/list_assets.py,sha256=VyMp33T7oGpnIer9g6YaxraYJXtpmbZwn--MIrjRVT4,6270
 pyegeria/commands/cat/list_cert_types.py,sha256=x3R7ydIgXQmQyObE2Ffvr3187acFlsN1fXD1vuznJrc,7123
 pyegeria/commands/cat/list_collections.py,sha256=I-0h_zFfbAUzmbnr8T0fGZEzsw9FQsrgozdn3s_hr4Y,5982
@@ -36,7 +36,7 @@ pyegeria/commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnU
 pyegeria/commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
 pyegeria/commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
 pyegeria/commands/cli/egeria.py,sha256=HdYIpNW4NOzcln-8d8EZUlTe-rTeJmWGfxhdHJqhS7k,45605
-pyegeria/commands/cli/egeria_cat.py,sha256=s0izjyu-jgdeVLhuZ6XUIsKTpjj75iTWsPFaeeDMxfo,16441
+pyegeria/commands/cli/egeria_cat.py,sha256=pmOYxiu3wU-SS_ueRwW9AbssfgI-VwQKGSKtYjofzEw,16453
 pyegeria/commands/cli/egeria_login_tui.py,sha256=m7gUiiPdeu2vxjiyxy-6OhAekSa5kVQnOUur2qyvbUA,9480
 pyegeria/commands/cli/egeria_my.py,sha256=XLd5ARwrVHZM7SGUKadJznb5KUULCmx2WIid3TKKmhY,6116
 pyegeria/commands/cli/egeria_ops.py,sha256=gVdLv5CgIyccZAAGS-RjwaW3cFrQOJJYhgWuMWQcl60,12580
@@ -212,7 +212,7 @@ pyegeria/egeria_tech_client.py,sha256=KMxo7Er6DNjXWPG_CVpWbNTOSJYhUSG4Vu_2GaFgG0
 pyegeria/feedback_manager_omvs.py,sha256=B66e3ZCaC_dirb0mcb2Nz3PYh2ZKsoMAYNOb3euNiro,152931
 pyegeria/full_omag_server_config.py,sha256=k3fUfopAFAE3OKkFR7zZPiki_FYj6j2xQ4oD2SVaefQ,47350
 pyegeria/glossary_browser_omvs.py,sha256=NcitYaZJqwVODBO5zBtWpXPNUJJ3DKzEbRaOFSAyUlg,93554
-pyegeria/glossary_manager_omvs.py,sha256=0IrLk7Dg2XL0ZCqmZj5lYOhZxMgXhuprUInRbg-stHI,130921
+pyegeria/glossary_manager_omvs.py,sha256=_oAY8AmEOGY8L-xIRv6WolLwsQ2Zu3hjZIJl0h6irho,132062
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/metadata_explorer_omvs.py,sha256=WwkFvAnDzJTw8dPos7j3wCG6gpQ0BjcMmYXl-ckjn28,88723
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
@@ -225,8 +225,8 @@ pyegeria/template_manager_omvs.py,sha256=Sw5xsQAhy7a48xFCg59mg9_nqyhawoS9v4WyF-P
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=kmcyXBsu99L25r16w9xVXqU_KwADsGuft4yPDZzyUds,65032
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-5.2.0.42.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.2.0.42.5.dist-info/METADATA,sha256=1CSX90n_vXDhc9J3TJ7SNf35jpAK7INHfVXzuaAOdZ4,2882
-pyegeria-5.2.0.42.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-5.2.0.42.5.dist-info/entry_points.txt,sha256=JK212otpaYZogRHHwMrHy3fQUpAsg_DC3LkRUl59V2s,5373
-pyegeria-5.2.0.42.5.dist-info/RECORD,,
+pyegeria-5.2.0.42.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.2.0.42.7.dist-info/METADATA,sha256=m4OVHsf4slKGFivxjlyzIGKcrVXzjLMMa__v28uUmmY,2882
+pyegeria-5.2.0.42.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-5.2.0.42.7.dist-info/entry_points.txt,sha256=JK212otpaYZogRHHwMrHy3fQUpAsg_DC3LkRUl59V2s,5373
+pyegeria-5.2.0.42.7.dist-info/RECORD,,