pyegeria 1.5.1.1.18__py3-none-any.whl → 1.5.1.1.21__py3-none-any.whl

pyegeria/_client.py

@@ -10,7 +10,7 @@ import asyncio
 import inspect
 import json
 import os
-
+from pyegeria import body_slimmer
 import httpx
 from httpx import AsyncClient, Response
 
@@ -654,6 +654,72 @@ class Client:
                             integration_guids[display_name] = resource_guid
                             # print(f"Added {display_name} integration connector with GUID {integration_guids[display_name]}")
 
+    async def __async__get_guid__(
+        self,
+        guid: str = None,
+        name: str = None,
+        property_name: str = "qualifiedName",
+        tech_type: str = None,
+    ) -> str:
+        """Helper function to return a server_guid - one of server_guid or server_name should
+        contain information. If both are None, an exception will be thrown. If both contain
+        values, server_guid will be used. If the tech_type is supplied and the property_name is qualifiedName
+        then the name will be pre-pended with the tech_type name to form a qualifiedName.
+
+        An InvalidParameter Exception is thrown if multiple matches
+        are found for the given property name. If this occurs, use a qualified name for the property name.
+        Async version.
+        """
+        if guid:
+            return guid
+        if name:
+            if (tech_type) and (property_name == "qualifiedName"):
+                name = f"{tech_type}:{name}"
+
+            body = {
+                "class": "NameRequestBody",
+                "name": name,
+                "namePropertyName": property_name,
+                "forLineage": False,
+                "forDuplicateProcessing": False,
+                "effectiveTime": None,
+            }
+            url = (
+                f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/classification-manager/"
+                f"elements/guid-by-unique-name?forLineage=false&forDuplicateProcessing=false"
+            )
+
+            response: Response = await self._async_make_request(
+                "POST", url, body_slimmer(body), time_out=self.time_out
+            )
+
+            return response.json().get("guid", "No elements found")
+        else:
+            raise InvalidParameterException(
+                "Neither server_guid nor server_name were provided - please provide."
+            )
+
+    def __get_guid__(
+        self,
+        guid: str = None,
+        name: str = None,
+        property_name: str = "qualifiedName",
+        tech_type: str = None,
+    ) -> str:
+        """Helper function to return a server_guid - one of server_guid or server_name should
+        contain information. If both are None, an exception will be thrown. If both contain
+        values, server_guid will be used. If the tech_type is supplied and the property_name is qualifiedName
+        then the name will be pre-pended with the tech_type name to form a qualifiedName.
+
+        An InvalidParameter Exception is thrown if multiple matches
+        are found for the given property name. If this occurs, use a qualified name for the property name.
+        """
+        loop = asyncio.get_event_loop()
+        result = loop.run_until_complete(
+            self.__async__get_guid__(guid, name, property_name, tech_type)
+        )
+        return result
+
 
 if __name__ == "__main__":
     print("Main-__client")

pyegeria/commands/cat/glossary_actions.py

@@ -88,12 +88,22 @@ def create_glossary(
 
         existing_glossary = m_client.find_glossaries(name)
         if type(existing_glossary) is list:
-            click.echo(f"\nFound {len(existing_glossary)} existing Glossaries\n")
+            click.echo(
+                f"\nFound {len(existing_glossary)} existing Glossaries with a similar name!\n"
+            )
             for glossary in existing_glossary:
-                click.echo(
-                    f"\tFound glossary: {glossary['glossaryProperties']['qualifiedName']} with id of {glossary['elementHeader']['guid']}\n"
-                )
-            sys.exit(0)
+                if (
+                    glossary["glossaryProperties"]["qualifiedName"]
+                    == "Glossary:" + name
+                ):
+                    click.echo(
+                        f"\tFound existing glossary: {glossary['glossaryProperties']['qualifiedName']} with id of {glossary['elementHeader']['guid']}\n"
+                    )
+                    sys.exit(0)
+                else:
+                    click.echo(
+                        "Found glossaries with similar names but different qualifiedNames...proceeding\n"
+                    )
 
         glossary_guid = m_client.create_glossary(name, description, language, usage)
         print(f"New glossary {name} created with id of {glossary_guid}")
@@ -104,7 +114,7 @@ def create_glossary(
         m_client.close_session()
 
 
-@click.command("list-glossaries")
+@click.command("glossaries")
 @click.option("--search-string", default="*", help="Glossaries to search for")
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
 @click.option(

pyegeria/commands/cat/list_terms.py

@@ -23,6 +23,7 @@ from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
+    EgeriaTech,
 )
 from pyegeria.glossary_browser_omvs import GlossaryBrowser
 
@@ -46,7 +47,8 @@ EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
 
 def display_glossary_terms(
     search_string: str,
-    guid: str,
+    glossary_guid: str,
+    glossary_name: str,
     server: str,
     url: str,
     username: str,
@@ -54,10 +56,18 @@ def display_glossary_terms(
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    g_client = GlossaryBrowser(server, url, username, user_password)
+    """Display glossary terms in a table"""
+    g_client = EgeriaTech(server, url, username, user_password)
     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",
+            "Glossary",
+        )
 
-    def generate_table(search_string: str = "*") -> Table:
+    def generate_table(search_string: str, glossary_guid: str = None) -> Table:
         """Make a new table."""
         table = Table(
             title=f"Glossary Definitions for Terms like  {search_string} @ {time.asctime()}",
@@ -82,7 +92,7 @@ def display_glossary_terms(
 
         terms = g_client.find_glossary_terms(
             search_string,
-            guid,
+            glossary_guid,
             starts_with=False,
             ends_with=False,
             status_filter=[],
@@ -149,7 +159,7 @@ def display_glossary_terms(
             style="bold bright_white on black", width=width, force_terminal=not jupyter
         )
         with console.pager(styles=True):
-            console.print(generate_table(search_string))
+            console.print(generate_table(search_string, glossary_guid))
 
     except (
         InvalidParameterException,
@@ -167,7 +177,7 @@ def main():
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
     parser.add_argument("--guid", help="GUID of glossary to search")
-    parser.add_argument("--sustainability", help="Set True for Sustainability Glossary")
+
     args = parser.parse_args()
 
     server = args.server if args.server is not None else EGERIA_VIEW_SERVER
@@ -175,11 +185,17 @@ def main():
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     guid = args.guid if args.guid is not None else None
-    guid = sus_guid if args.sustainability else None
 
     try:
         search_string = Prompt.ask("Enter the term you are searching for:", default="*")
-        display_glossary_terms(search_string, guid, server, url, userid, user_pass)
+        glossary_name = Prompt.ask(
+            "Enter the name of the glossary to search or '*' for all glossaries:",
+            default="*",
+        )
+        display_glossary_terms(
+            search_string, guid, glossary_name, server, url, userid, user_pass
+        )
+
     except KeyboardInterrupt:
         pass
 

pyegeria/commands/cli/egeria.py

@@ -790,17 +790,23 @@ def show_assets(ctx, search_string):
     help="List glossary terms similar to search string - minimum of 4 characters",
 )
 @click.option(
-    "--glossary_guid",
+    "--glossary-guid",
     default=None,
     help="Optionally restrict search to glossary with the specified guid",
 )
+@click.option(
+    "--glossary-name",
+    default="*",
+    help="Optionally restrict search to a specific named glossary",
+)
 @click.pass_context
-def show_terms(ctx, search_string, glossary_guid):
+def show_terms(ctx, search_string, glossary_guid, glossary_name):
     """Find and display glossary terms"""
     c = ctx.obj
     display_glossary_terms(
         search_string,
         glossary_guid,
+        glossary_name,
         c.view_server,
         c.view_server_url,
         c.userid,

pyegeria/commands/cli/egeria_cat.py

@@ -288,17 +288,23 @@ def show_assets(ctx, search_string):
     help="List glossary terms similar to search string - minimum of 4 characters",
 )
 @click.option(
-    "--glossary_guid",
+    "--glossary-guid",
     default=None,
     help="Optionally restrict search to glossary with the specified guid",
 )
+@click.option(
+    "--glossary-name",
+    default="*",
+    help="Optionally restrict search to a specific named glossary",
+)
 @click.pass_context
-def show_terms(ctx, search_string, glossary_guid):
+def show_terms(ctx, search_string, glossary_guid, glossary_name):
     """Find and display glossary terms"""
     c = ctx.obj
     display_glossary_terms(
         search_string,
         glossary_guid,
+        glossary_name,
         c.view_server,
         c.view_server_url,
         c.userid,

pyegeria/glossary_manager_omvs.py

@@ -103,7 +103,7 @@ class GlossaryManager(GlossaryBrowser):
             "class": "ReferenceableRequestBody",
             "elementProperties": {
                 "class": "GlossaryProperties",
-                "qualifiedName": f"Glossary:{display_name}-{time.asctime()}",
+                "qualifiedName": f"Glossary:{display_name}",
                 "displayName": display_name,
                 "description": description,
                 "language": language,

pyegeria/runtime_manager_omvs.py

@@ -58,72 +58,6 @@ class RuntimeManager(Client):
             "Default Local OMAG Server Platform"  # this from the core content archive
         )
 
-    async def __async__get_guid__(
-        self,
-        guid: str = None,
-        name: str = None,
-        property_name: str = "qualifiedName",
-        tech_type: str = None,
-    ) -> str:
-        """Helper function to return a server_guid - one of server_guid or server_name should
-        contain information. If both are None, an exception will be thrown. If both contain
-        values, server_guid will be used. If the tech_type is supplied and the property_name is qualifiedName
-        then the name will be pre-pended with the tech_type name to form a qualifiedName.
-
-        An InvalidParameter Exception is thrown if multiple matches
-        are found for the given property name. If this occurs, use a qualified name for the property name.
-        Async version.
-        """
-        if guid:
-            return guid
-        if name:
-            if (tech_type) and (property_name == "qualifiedName"):
-                name = f"{tech_type}:{name}"
-
-            body = {
-                "class": "NameRequestBody",
-                "name": name,
-                "namePropertyName": property_name,
-                "forLineage": False,
-                "forDuplicateProcessing": False,
-                "effectiveTime": None,
-            }
-            url = (
-                f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/classification-manager/"
-                f"elements/guid-by-unique-name?forLineage=false&forDuplicateProcessing=false"
-            )
-
-            response: Response = await self._async_make_request(
-                "POST", url, body_slimmer(body), time_out=self.time_out
-            )
-
-            return response.json().get("guid", "No elements found")
-        else:
-            raise InvalidParameterException(
-                "Neither server_guid nor server_name were provided - please provide."
-            )
-
-    def __get_guid__(
-        self,
-        guid: str = None,
-        name: str = None,
-        property_name: str = "qualifiedName",
-        tech_type: str = None,
-    ) -> str:
-        """Helper function to return a server_guid - one of server_guid or server_name should
-        contain information. If both are None, an exception will be thrown. If both contain
-        values, server_guid will be used. If the tech_type is supplied and the property_name is qualifiedName
-        then the name will be pre-pended with the tech_type name to form a qualifiedName.
-
-        An InvalidParameter Exception is thrown if multiple matches
-        are found for the given property name. If this occurs, use a qualified name for the property name.
-        """
-        loop = asyncio.get_event_loop()
-        result = loop.run_until_complete(
-            self.__async__get_guid__(guid, name, property_name, tech_type)
-        )
-        return result
-
     #
     #   Cohorts
     #

{pyegeria-1.5.1.1.18.dist-info → pyegeria-1.5.1.1.21.dist-info}/METADATA

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

{pyegeria-1.5.1.1.18.dist-info → pyegeria-1.5.1.1.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
 pyegeria/__init__.py,sha256=mZOa16y_LUUZevlHVQY-X_q0ZE2mEcgAE-eoe16DLls,21893
-pyegeria/_client.py,sha256=hwmsTTzaRttb-oML351vdDpcpnlEBPudGnqp72VpRYs,26025
+pyegeria/_client.py,sha256=yVo08itjEr2z6XGr6f81Xx0o4FFCtm8Gsx0Kg-3Dw3k,28863
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=NJ7vAhmvusK1ENvY2MMrBB6A6TgpYjzS9QJxFH56b8c,18470
 pyegeria/_globals.py,sha256=1Uc8392wjbiVN5L__RzxC1-U97RMXj77_iUsMSgeAjQ,638
@@ -9,6 +9,7 @@ pyegeria/asset_catalog_omvs.py,sha256=NUF9C3s_zs9pTfIZyRJlqMCKrhZASJPH08EXzzjki7
 pyegeria/automated_curation_omvs.py,sha256=BwNuF7XQJAV-POvzaWwFh0TS5yRnHZZPhlayvtIMlwY,130243
 pyegeria/classification_manager_omvs.py,sha256=3yInuRy7Cf43oSFZ8BuzcIgtGSm5BfvlKYqtWKRMlPU,186678
 pyegeria/collection_manager_omvs.py,sha256=kye2kjthNnmwxMZhHQKV0xoHbxcNPWjNzRAYOItj_gY,99201
+pyegeria/commands/.DS_Store,sha256=nBgW7MKJ6b4wSWyEEeGYHWwC8QJAiteQaWKM9PoNRzY,6148
 pyegeria/commands/README.md,sha256=zNfWZppDxoKqTJeRtcewzku9z1m6_hKacCyQUQw1iq4,1974
 pyegeria/commands/__init__.py,sha256=7y3p5oQ2c0C1465oIgSA_123W1uo7Wqwk91LXccUgrw,17
 pyegeria/commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiqRY,967
@@ -19,7 +20,7 @@ pyegeria/commands/cat/get_project_dependencies.py,sha256=B0JaMSUi0hzVgos1sTY2uUP
 pyegeria/commands/cat/get_project_structure.py,sha256=n2GbNd07w1DTo7jTR8b2ewXRyNcat_2BcCBRyDMldwk,5969
 pyegeria/commands/cat/get_tech_type_elements.py,sha256=-m3Q0BoNqkCtV8h75vMwTcOV-_ymEXmnJcr4Ec7WMAw,6180
 pyegeria/commands/cat/get_tech_type_template.py,sha256=gMFVcgCIm09GQu1Vsc5ZUVH9XLhItAG1eVGZJrcnHeQ,6174
-pyegeria/commands/cat/glossary_actions.py,sha256=_0iC1ss_fNGG1DYE5MV7wVUn07wMEDklVJ-nMU-DO6A,13498
+pyegeria/commands/cat/glossary_actions.py,sha256=7DT4yMYMpNl8G6vYYGCunrRZx16402-Udn06ElWM6oA,13905
 pyegeria/commands/cat/list_archives.py,sha256=FEZ2XYnQIWo2PztWqnj6unn0pbblPU0-bMbTyI3csv4,5464
 pyegeria/commands/cat/list_assets.py,sha256=bNwSaBDz661hfnc2Rn4j4HPHAugKvz0XwN9L1m4FVQk,6529
 pyegeria/commands/cat/list_cert_types.py,sha256=mbCls_EqC5JKG5rvS4o69k7KgZ6aNXlcqoJ3DtHsTFA,7127
@@ -29,12 +30,12 @@ pyegeria/commands/cat/list_deployed_databases.py,sha256=HE8nG-mIlxa9iSUEH-n71o-G
 pyegeria/commands/cat/list_projects.py,sha256=Jzs-DtIpPhCH-gY4PYT6mnRBWnEf4m18TFfcw8UymNU,8011
 pyegeria/commands/cat/list_relationships.py,sha256=U9f78cOi4HyaacqNaFSMq_7rRxVcEczvwPv468GYw3Q,5869
 pyegeria/commands/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFoh0,4609
-pyegeria/commands/cat/list_terms.py,sha256=Goa5z7y6lfzJNp_YW5r6A9GWKHFXIulzd8lipCSZjsc,6801
+pyegeria/commands/cat/list_terms.py,sha256=zNo8oQo4y3cGIYikBnD9gutPLecwyF8Q3XaOLiLg7tA,7212
 pyegeria/commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 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=Ym434efkazLNEdFVm5j4jV-Wm69WKM9YJ1ag66E4szg,31861
-pyegeria/commands/cli/egeria_cat.py,sha256=PmUE0uZgyMcxWHJae9gFMMtHWqUKNuHDwvOFn70b34Q,15153
+pyegeria/commands/cli/egeria.py,sha256=CXFDHpuSwASzfbh_9Z2MTQuZzK5ANZdFIB3PBnRODZk,32024
+pyegeria/commands/cli/egeria_cat.py,sha256=-rfM7WKtXwV0OkMF0gMN2YF9lcrtLtSb9TToKoZPR_w,15316
 pyegeria/commands/cli/egeria_my.py,sha256=Memyxzhrn_i3nMNRor-5N40_SKJJMzylA4iQgBW3T4g,6235
 pyegeria/commands/cli/egeria_ops.py,sha256=-UqtD4TDv_hhHFSjF0flF55Zo6UFbQcUCYBW_ZMLkx0,11648
 pyegeria/commands/cli/egeria_tech.py,sha256=iq5D-dl0KW1HbNG8AolJSZoR6hTLp90RD_JjHxVj9Pk,13313
@@ -94,20 +95,20 @@ 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=s9BxAa2UJk5kinS6-U9H6xKqZUG-lp7aqHdNdStaGLs,126294
+pyegeria/glossary_manager_omvs.py,sha256=GZyudT2zCeJNH6aGBEYRqA5U1puPEPtfMpgFOTuc_fQ,126277
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
 pyegeria/platform_services.py,sha256=CJIOYIFEbcIGwdWlApAQcXxZTsdrhFtpJcm4O3p7dG0,41646
 pyegeria/project_manager_omvs.py,sha256=Y7Lyqh4jIujJrr_Ub7feo904FN_uz4R10T4hKhqE1Uw,67499
 pyegeria/registered_info.py,sha256=y0-LgDIQXpph0lEWxIOG3_HsqX_Z2iAIb3xu4Aa4B70,6344
-pyegeria/runtime_manager_omvs.py,sha256=Ex29vbL4iQo2pDgd3zIKyVwGknn6MFRIEB5naIoLD5s,76162
+pyegeria/runtime_manager_omvs.py,sha256=E7LLbJyGXtBC1ze241MWYdG4rk5iBRQcX9NEJrMXIUA,73357
 pyegeria/server_operations.py,sha256=ciH890hYT85YQ6OpByn4w7s3a7TtvWZpIG5rkRqbcI0,16766
 pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZimJtE,42450
 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.1.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.1.18.dist-info/METADATA,sha256=5Lc8p2HXv42jgVgzL_M1NuVlNw1vDXdIsAkPXraQkMI,2998
-pyegeria-1.5.1.1.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.1.18.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
-pyegeria-1.5.1.1.18.dist-info/RECORD,,
+pyegeria-1.5.1.1.21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.1.21.dist-info/METADATA,sha256=TmOUUKk56OgTctP9SaZevPAAj6ANRdOxRXtH-4S63j8,2998
+pyegeria-1.5.1.1.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.1.21.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
+pyegeria-1.5.1.1.21.dist-info/RECORD,,