pyegeria 0.8.4.39__tar.gz → 0.8.4.41__tar.gz

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/PKG-INFO

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

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/commands/cli/egeria_tech.py

@@ -27,6 +27,8 @@ from commands.tech.get_element_info import display_elements
 from commands.tech.list_related_specification import (
     display_related_specification,
 )
+from commands.tech.list_related_elements import list_related_elements
+from commands.tech.list_elements_for_classification import list_classified_elements
 
 
 # from pyegeria import ServerOps
@@ -330,6 +332,65 @@ def show_relationship_types(ctx, rel_type):
     )
 
 
+@show.command("elements-by-classification")
+@click.option(
+    "--om-type",
+    default="Project",
+    help="Open Metadata type to filter by",
+)
+@click.option(
+    "--classification",
+    default="GovernanceProject",
+    help="Classification to filter byt",
+)
+@click.pass_context
+def show_elements_by_classification(ctx, om_type, classification):
+    """Show information about the specified relationship type"""
+    c = ctx.obj
+    list_classified_elements(
+        om_type,
+        classification,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show.command("related-elements")
+@click.option(
+    "--element-guid",
+    help="GUID of the Element to navigate from.",
+)
+@click.option(
+    "--om-type",
+    default="Project",
+    help="Open metadata type to filter by.",
+)
+@click.option(
+    "--rel-type",
+    default="Certification",
+    help="Relationship type to follow.",
+)
+@click.pass_context
+def show_relationship_types(ctx, element_guid, om_type, rel_type):
+    """Show information about the specified relationship type"""
+    c = ctx.obj
+    list_related_elements(
+        element_guid,
+        om_type,
+        rel_type,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show.command("tech-templates")
 @click.pass_context
 @click.option(

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/commands/ops/load_archive.py

@@ -50,7 +50,7 @@ EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 )
 @click.option("--userid", default=EGERIA_USER, help="Egeria admin user")
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria admin password")
-@click.option("--timeout", default=60, help="Number of seconds to wait")
+@click.option("--timeout", default=120, help="Number of seconds to wait")
 def load_archive(file, server, view_server, url, userid, password, timeout):
     """Load an Open Metadata Archive"""
 
@@ -65,6 +65,10 @@ def load_archive(file, server, view_server, url, userid, password, timeout):
         click.echo(f"Loaded archive: {file}")
 
     except (InvalidParameterException, PropertyServerException) as e:
+        print(
+            f"Perhaps there was a timeout? If so, the command will complete despite the exception\n"
+            f"===> You can check by rerunning the command in a few minutes"
+        )
         print_exception_response(e)
 
 

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/commands/tech/list_elements.py

@@ -14,7 +14,7 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    ClassificationManager,
+    EgeriaTech,
 )
 
 
@@ -44,8 +44,15 @@ def list_elements(
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    c_client = ClassificationManager(server, url, user_id=username, user_pwd=password)
+    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
     token = c_client.create_egeria_bearer_token()
+
+    om_typedef = c_client.get_typedef_by_name(om_type)
+    if type(om_typedef) is str:
+        print(
+            f"The type name '{om_type}' is not known to the Egeria platform at {url} - {server}"
+        )
+        sys.exit(1)
     elements = c_client.get_elements(om_type)
 
     def generate_table() -> Table:
@@ -70,6 +77,7 @@ def list_elements(
         table.add_column("Home Store")
         table.add_column("GUID", width=38, no_wrap=True)
         table.add_column("Properties")
+        table.add_column("Classifications")
 
         if type(elements) is list:
             for element in elements:
@@ -79,14 +87,36 @@ def list_elements(
                 el_home = header["origin"]["homeMetadataCollectionName"]
                 el_create_time = header["versions"]["createTime"][:-10]
                 el_guid = header["guid"]
+                el_class = header.get("classifications", "---")
 
                 el_props_md = ""
                 for prop in element["properties"].keys():
                     el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
-
                 el_props_out = Markdown(el_props_md)
+
+                c_md = ""
+                if type(el_class) is list:
+                    for classification in el_class:
+                        classification_name = classification.get(
+                            "classificationName", "---"
+                        )
+                        c_md = f"* **{classification_name}**\n"
+                        class_props = classification.get(
+                            "classificationProperties", "---"
+                        )
+                        if type(class_props) is dict:
+                            for prop in class_props.keys():
+                                c_md += f"  * **{prop}**: {class_props[prop]}\n"
+                c_md_out = Markdown(c_md)
+
                 table.add_row(
-                    el_q_name, el_type, el_create_time, el_home, el_guid, el_props_out
+                    el_q_name,
+                    el_type,
+                    el_create_time,
+                    el_home,
+                    el_guid,
+                    el_props_out,
+                    c_md_out,
                 )
 
             return table

pyegeria-0.8.4.41/commands/tech/list_elements_for_classification.py

@@ -0,0 +1,174 @@
+"""This creates a templates guid file from the core metadata archive"""
+from jedi import Project
+from rich.markdown import Markdown
+from rich.prompt import Prompt
+import os
+import argparse
+import time
+import sys
+from rich import box
+from rich.console import Console
+from rich.table import Table
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    EgeriaTech,
+)
+from tests.test_classification_manager_omvs import element_guid
+
+console = Console()
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+
+def list_classified_elements(
+    om_type: str,
+    classification: str,
+    server: str,
+    url: str,
+    username: str,
+    password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
+    token = c_client.create_egeria_bearer_token()
+
+    om_typedef = c_client.get_typedef_by_name(om_type)
+    if type(om_typedef) is str:
+        print(
+            f"The type name '{om_type}' is not known to the Egeria platform at {url} - {server}"
+        )
+        sys.exit(1)
+
+    elements = c_client.get_elements_by_classification(classification, om_type)
+
+    def generate_table() -> Table:
+        """Make a new table."""
+        table = Table(
+            caption=f"Metadata Elements for: {url} - {server} @ {time.asctime()}",
+            style="bold bright_white on black",
+            row_styles=["bold bright_white on black"],
+            header_style="white on dark_blue",
+            title_style="bold bright_white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            title=f"Elements for Open Metadata Type: '{om_type}' ",
+            expand=True,
+            # width=500
+        )
+
+        table.add_column("Qualified Name")
+        table.add_column("Type")
+        table.add_column("Created")
+        table.add_column("Home Store")
+        table.add_column("GUID", width=38, no_wrap=True)
+        table.add_column("Properties")
+        table.add_column("Classifications")
+
+        if type(elements) is list:
+            for element in elements:
+                header = element["elementHeader"]
+                el_q_name = element["properties"].get("qualifiedName", "---")
+                el_type = header["type"]["typeName"]
+                el_home = header["origin"]["homeMetadataCollectionName"]
+                el_create_time = header["versions"]["createTime"][:-10]
+                el_guid = header["guid"]
+                el_class = header.get("classifications", "---")
+
+                el_props_md = ""
+                for prop in element["properties"].keys():
+                    el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
+                el_props_out = Markdown(el_props_md)
+
+                c_md = ""
+                if type(el_class) is list:
+                    for classification in el_class:
+                        classification_name = classification.get(
+                            "classificationName", "---"
+                        )
+                        c_md = f"* **{classification_name}**\n"
+                        class_props = classification.get(
+                            "classificationProperties", "---"
+                        )
+                        if type(class_props) is dict:
+                            for prop in class_props.keys():
+                                c_md += f"  * **{prop}**: {class_props[prop]}\n"
+                c_md_out = Markdown(c_md)
+
+                table.add_row(
+                    el_q_name,
+                    el_type,
+                    el_create_time,
+                    el_home,
+                    el_guid,
+                    el_props_out,
+                    c_md_out,
+                )
+
+            return table
+        else:
+            print("No instances found")
+            sys.exit(1)
+
+    try:
+        console = Console(width=width, force_terminal=not jupyter)
+
+        with console.pager(styles=True):
+            console.print(generate_table())
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+        print("\n\nPerhaps the type name isn't known")
+    finally:
+        c_client.close_session()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="Password")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_USER
+    password = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    try:
+        om_type = Prompt.ask(
+            "Enter the Open Metadata Type to find elements of:", default="Project"
+        )
+        classification = Prompt.ask("Enter the classification to filter by: ")
+        list_classifiedd_elements(
+            om_type, classification, server, url, userid, password
+        )
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/commands/tech/list_elements_x.py

@@ -14,8 +14,9 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    ClassificationManager,
-    FeedbackManager,
+    # ClassificationManager,
+    # FeedbackManager,
+    EgeriaTech,
 )
 
 
@@ -45,12 +46,15 @@ def list_elements_x(
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    c_client = ClassificationManager(server, url, user_id=username, user_pwd=password)
+    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
     token = c_client.create_egeria_bearer_token()
-    f_client = FeedbackManager(
-        server, url, user_id=username, user_pwd=password, token=token
-    )
 
+    om_typedef = c_client.get_typedef_by_name(om_type)
+    if type(om_typedef) is str:
+        print(
+            f"The type name '{om_type}' is not known to the Egeria platform at {url} - {server}"
+        )
+        sys.exit(1)
     elements = c_client.get_elements(om_type)
 
     def generate_table() -> Table:
@@ -93,7 +97,7 @@ def list_elements_x(
 
                 el_props_out = Markdown(el_props_md)
 
-                tags = f_client.get_attached_tags(el_guid)
+                tags = c_client.get_attached_tags(el_guid)
                 tags_md = "Tags:\n"
                 if type(tags) is list:
                     for tag in tags:
@@ -106,7 +110,7 @@ def list_elements_x(
                 else:
                     tags_md = "---"
 
-                likes = f_client.get_attached_likes(el_guid)
+                likes = c_client.get_attached_likes(el_guid)
                 likes_md = "Likes:\b"
                 if type(likes) is list:
                     for like in likes:

pyegeria-0.8.4.41/commands/tech/list_related_elements.py

@@ -0,0 +1,176 @@
+"""This creates a templates guid file from the core metadata archive"""
+from jedi import Project
+from rich.markdown import Markdown
+from rich.prompt import Prompt
+import os
+import argparse
+import time
+import sys
+from rich import box
+from rich.console import Console
+from rich.table import Table
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    EgeriaTech,
+)
+from tests.test_classification_manager_omvs import element_guid
+
+console = Console()
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+
+def list_related_elements(
+    element_guid: str,
+    om_type: str,
+    relationship_type: str,
+    server: str,
+    url: str,
+    username: str,
+    password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
+    token = c_client.create_egeria_bearer_token()
+
+    om_typedef = c_client.get_typedef_by_name(om_type)
+    if type(om_typedef) is str:
+        print(
+            f"The type name '{om_type}' is not known to the Egeria platform at {url} - {server}"
+        )
+        sys.exit(1)
+
+    elements = c_client.get_related_elements(element_guid, relationship_type, om_type)
+
+    def generate_table() -> Table:
+        """Make a new table."""
+        table = Table(
+            caption=f"Metadata Elements for: {url} - {server} @ {time.asctime()}",
+            style="bold bright_white on black",
+            row_styles=["bold bright_white on black"],
+            header_style="white on dark_blue",
+            title_style="bold bright_white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            title=f"Elements for Open Metadata Type: '{om_type}' ",
+            expand=True,
+            # width=500
+        )
+
+        table.add_column("Qualified Name")
+        table.add_column("Type")
+        table.add_column("Created")
+        table.add_column("Home Store")
+        table.add_column("GUID", width=38, no_wrap=True)
+        table.add_column("Properties")
+        table.add_column("Classifications")
+
+        if type(elements) is list:
+            for element in elements:
+                header = element["elementHeader"]
+                el_q_name = element["properties"].get("qualifiedName", "---")
+                el_type = header["type"]["typeName"]
+                el_home = header["origin"]["homeMetadataCollectionName"]
+                el_create_time = header["versions"]["createTime"][:-10]
+                el_guid = header["guid"]
+                el_class = header.get("classifications", "---")
+
+                el_props_md = ""
+                for prop in element["properties"].keys():
+                    el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
+                el_props_out = Markdown(el_props_md)
+
+                c_md = ""
+                if type(el_class) is list:
+                    for classification in el_class:
+                        classification_name = classification.get(
+                            "classificationName", "---"
+                        )
+                        c_md = f"* **{classification_name}**\n"
+                        class_props = classification.get(
+                            "classificationProperties", "---"
+                        )
+                        if type(class_props) is dict:
+                            for prop in class_props.keys():
+                                c_md += f"  * **{prop}**: {class_props[prop]}\n"
+                c_md_out = Markdown(c_md)
+
+                table.add_row(
+                    el_q_name,
+                    el_type,
+                    el_create_time,
+                    el_home,
+                    el_guid,
+                    el_props_out,
+                    c_md_out,
+                )
+
+            return table
+        else:
+            print("No instances found")
+            sys.exit(1)
+
+    try:
+        console = Console(width=width, force_terminal=not jupyter)
+
+        with console.pager(styles=True):
+            console.print(generate_table())
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+        print("\n\nPerhaps the type name isn't known")
+    finally:
+        c_client.close_session()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="Password")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_USER
+    password = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    try:
+        element_guid = Prompt.ask("Guid of base element")
+        om_type = Prompt.ask(
+            "Enter the Open Metadata Type to find elements of:", default="Project"
+        )
+        relationship_type = Prompt.ask("Enter the relationship type to follow: ")
+        list_related_elements(
+            element_guid, om_type, relationship_type, server, url, userid, password
+        )
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/pyegeria/feedback_manager_omvs.py

@@ -83,7 +83,7 @@ def element_response(response: dict, element_type: str, detailed_response: bool)
 
 
 def elements_response(response: dict, element_type: str, detailed_response: bool):
-    print(response)
+    # print(response)
     if detailed_response:
         return response
     elif not element_type in response:

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/pyegeria/runtime_manager_omvs.py

@@ -1096,7 +1096,7 @@ class RuntimeManager(Client):
         archive_file: str,
         server_guid: str = None,
         server_name: str = None,
-        time_out: int = 60,
+        time_out: int = 120,
     ) -> None:
         """Add a new open metadata archive to running OMAG Server's repository.
             An open metadata archive contains metadata types and instances.  This operation loads an open metadata archive
@@ -1141,7 +1141,7 @@ class RuntimeManager(Client):
         archive_file: str,
         server_guid: str = None,
         server_name: str = None,
-        time_out: int = 60,
+        time_out: int = 120,
     ) -> None:
         """Add a new open metadata archive to running OMAG Server's repository.
             An open metadata archive contains metadata types and instances.  This operation loads an open metadata archive
@@ -1247,7 +1247,7 @@ class RuntimeManager(Client):
         return
 
     async def _async_activate_server_with_stored_config(
-        self, server_guid: str = None, server_name: str = None
+        self, server_guid: str = None, server_name: str = None, timeout: int = 120
     ) -> None:
         """Activate the named OMAG server using the appropriate configuration document found in the
             configuration store. Async version.
@@ -1275,11 +1275,11 @@ class RuntimeManager(Client):
         server_guid = self.__get_guid__(server_guid, server_name)
         url = f"{self.runtime_command_root}/omag-servers/{server_guid}/instance"
 
-        await self._async_make_request("POST", url)
+        await self._async_make_request("POST", url, time_out=timeout)
         return
 
     def activate_server_with_stored_config(
-        self, server_guid: str = None, server_name: str = None
+        self, server_guid: str = None, server_name: str = None, timeout: int = 120
     ) -> None:
         """Activate the named OMAG server using the appropriate configuration document found in the
             configuration store.
@@ -1306,7 +1306,9 @@ class RuntimeManager(Client):
         """
         loop = asyncio.get_event_loop()
         loop.run_until_complete(
-            self._async_activate_server_with_stored_config(server_guid, server_name)
+            self._async_activate_server_with_stored_config(
+                server_guid, server_name, timeout
+            )
         )
         return
 

{pyegeria-0.8.4.39 → pyegeria-0.8.4.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.8.4.39"
+version = "0.8.4.41"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -102,7 +102,7 @@ pytest = "^8.2.2"
 
     hey_egeria_ops = "commands.cli.egeria_ops:cli"
     hey_egeria_cat = "commands.cli.egeria_cat:cli"
-    hey_egeria_tech = "commands.cli.egeria_cat:cli"
+    hey_egeria_tech = "commands.cli.egeria_tech:cli"
     hey_egeria_my = "commands.cli.egeria_my:cli"
     hey_egeria = "commands.cli.egeria:cli"