pyegeria 1.5.1.1.18__tar.gz → 1.5.1.1.21__tar.gz

{pyegeria-1.5.1.1.18 → pyegeria-1.5.1.1.21}/PKG-INFO

@@ -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 → pyegeria-1.5.1.1.21}/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-1.5.1.1.18 → pyegeria-1.5.1.1.21}/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-1.5.1.1.18 → pyegeria-1.5.1.1.21}/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-1.5.1.1.18 → pyegeria-1.5.1.1.21}/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-1.5.1.1.18 → pyegeria-1.5.1.1.21}/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-1.5.1.1.18 → pyegeria-1.5.1.1.21}/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-1.5.1.1.18 → pyegeria-1.5.1.1.21}/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 → pyegeria-1.5.1.1.21}/pyproject.toml

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