pyegeria 0.8.4.38__tar.gz → 0.8.4.40__tar.gz

{pyegeria-0.8.4.38 → pyegeria-0.8.4.40}/PKG-INFO

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

{pyegeria-0.8.4.38 → pyegeria-0.8.4.40}/commands/cat/get_asset_graph.py

@@ -20,22 +20,26 @@ from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
-    AssetCatalog
+    AssetCatalog,
 )
 
 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_INTEGRATION_DAEMON_URL = os.environ.get('EGERIA_INTEGRATION_DAEMON_URL', 'https://localhost:9443')
-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'))
+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_INTEGRATION_DAEMON_URL = os.environ.get(
+    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+)
+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"))
 
 disable_ssl_warnings = True
 
@@ -43,10 +47,17 @@ guid_list = []
 
 console = Console(width=EGERIA_WIDTH, force_terminal=(not EGERIA_JUPYTER))
 
-def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str, user_pass: str,
-                 jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
-    def build_classifications(classification: dict) -> Markdown:
 
+def asset_viewer(
+    asset_guid: str,
+    server_name: str,
+    platform_url: str,
+    user: str,
+    user_pass: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    def build_classifications(classification: dict) -> Markdown:
         class_md = ""
         for c in classification:
             c_type = c["classificationName"]
@@ -65,7 +76,7 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
 
     def build_nested_elements(nested_element: dict) -> Markdown:
         ne_md = " "
-        ne_header = nested_element['elementHeader']
+        ne_header = nested_element["elementHeader"]
         ne_created_by = ne_header["versions"]["createdBy"]
         ne_created_at = ne_header["versions"]["createTime"]
         ne_guid = ne_header["guid"]
@@ -80,9 +91,11 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
         if type(ne_props) is dict:
             for prop in ne_props.keys():
                 ne_prop_md += f"\t* {prop}: {ne_props[prop]}\n"
-        ne_md = (f"Nested Element of Type: {ne_type} with GUID:  {ne_guid} \n "
-                 f"* created by {ne_created_by} at time {ne_created_at}\n"
-                 f"\n* Properties:\n{ne_prop_md}\n")
+        ne_md = (
+            f"Nested Element of Type: {ne_type} with GUID:  {ne_guid} \n "
+            f"* created by {ne_created_by} at time {ne_created_at}\n"
+            f"\n* Properties:\n{ne_prop_md}\n"
+        )
 
         if ne_class_md is not None:
             ne_md += f"* {ne_class_md}"
@@ -91,8 +104,7 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
         return output
 
     try:
-        a_client = AssetCatalog(server_name, platform_url,
-                                user_id=user)
+        a_client = AssetCatalog(server_name, platform_url, user_id=user)
 
         token = a_client.create_egeria_bearer_token(user, user_pass)
         # asset_info = a_client.find_assets_in_domain(asset_name)
@@ -111,15 +123,28 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
 
         # print(f"\n{json.dumps(asset_graph, indent =2)}\n")
 
-        asset_name = asset_graph["properties"].get("displayName",'---')
-        qualified_name = asset_graph["properties"]["qualifiedName"]
-        resource_name = asset_graph['properties'].get("resourceName","---")
-
-        tree = Tree(f"{asset_name} ({asset_guid})", style="bold bright_white on black", guide_style="bold bright_blue")
+        asset_display_name = asset_graph["properties"].get("displayName", "---")
+        asset_display_description = asset_graph["properties"].get(
+            "displayDescription", "---"
+        )
+        asset_name = asset_graph["properties"].get("name", "---")
+        asset_resource_name = asset_graph["properties"].get("resourceName", "---")
+        asset_resource_description = asset_graph["properties"].get(
+            "resourceDescription", "---"
+        )
+        qualified_name = asset_graph["properties"].get("qualifiedName", "---")
+
+        tree = Tree(
+            f"{asset_name} ({asset_guid})",
+            style="bold bright_white on black",
+            guide_style="bold bright_blue",
+        )
         style = ""
-        asset_elements = asset_graph['elementHeader']
+        asset_elements = asset_graph["elementHeader"]
         asset_type = asset_elements["type"]["typeName"]
-        asset_deployed_imp_type = asset_graph.get("deployedImplementationType", "---")
+        asset_deployed_imp_type = asset_graph["properties"].get(
+            "deployedImplementationType", "---"
+        )
 
         asset_origin = asset_elements["origin"]["homeMetadataCollectionName"]
         asset_creation = asset_elements["versions"]["createTime"]
@@ -129,26 +154,48 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
         asset_relationships = asset_graph["relationships"]
         asset_class_md = build_classifications(asset_classifications)
 
-        asset_properties = asset_graph.get("extendedProperties", None)
-        if asset_properties is not None:
+        additional_properties = asset_graph["properties"].get(
+            "additionalProperties", None
+        )
+        if additional_properties is not None:
+            add_prop_md = "\n* Additional Properties:\n"
+            for prop in additional_properties:
+                add_prop_md = (
+                    f"{add_prop_md}\n\t* {prop}: {additional_properties[prop]}\n"
+                )
+        else:
+            add_prop_md = ""
+
+        extended_properties = asset_graph["properties"].get("extendedProperties", None)
+        if extended_properties is not None:
             prop_md = "\n* Extended Properties:\n"
-            for prop in asset_properties:
-                prop_md = f"{prop_md}\n\t* {prop}: {asset_properties[prop]}\n"
+            for prop in extended_properties:
+                prop_md = f"{prop_md}\n\t* {prop}: {extended_properties[prop]}\n"
         else:
             prop_md = ""
-        core_md = (f"**Type: {asset_type}  Created by: {asset_created_by} on {asset_creation}**\n"
-                   f"* Deployed Implementation Type: {asset_deployed_imp_type}\n"
-                   f"* Qualified Name: {qualified_name}\n "
-                   f"* Resource Name: {resource_name}\n"
-                   f"* Display Name: {asset_name}\n"
-                   f"* Asset Origin: {asset_origin}\n{prop_md}\n"
-                   )
+        core_md = (
+            f"**Type: {asset_type}  Created by: {asset_created_by} on {asset_creation}**\n"
+            f"* Deployed Implementation Type: {asset_deployed_imp_type}\n"
+            f"* Name: {asset_name}\n "
+            f"* Asset Resource Name: {asset_resource_name}\n"
+            f"* Asset Resource Description: {asset_resource_description}\n "
+            f"* Asset Display Name: {asset_display_name}\n"
+            f"* Asset Display Description: {asset_display_description}\n "
+            f"* Qualified Name: {qualified_name}\n "
+            f"* Asset Origin: {asset_origin}\n"
+            f" {prop_md}\n"
+            f" {add_prop_md}\n"
+        )
         core_md = Markdown(core_md)
 
         p1 = Panel.fit(core_md, style="bold bright_white")
         l2 = tree.add(p1)
         if asset_class_md is not None:
-            p2 = Panel.fit(Markdown(asset_class_md), style="bold bright_white", title="Classifications")
+            p2 = Panel.fit(
+                Markdown(asset_class_md),
+                style="bold bright_white",
+                title="Classifications",
+            )
             l2 = tree.add(p2)
 
         #
@@ -158,7 +205,9 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
             l2 = tree.add("Nested Elements", style="bold white")
             for el in asset_nested_elements:
                 asset_ne_md = build_nested_elements(el)
-                p3 = Panel.fit(asset_ne_md, style="bold bright_white", title="Nested Elements")
+                p3 = Panel.fit(
+                    asset_ne_md, style="bold bright_white", title="Nested Elements"
+                )
                 l2.add(p3)
 
         #
@@ -185,10 +234,12 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
                 relationship_created_by = relationship["versions"]["createdBy"]
                 relationship_creation_time = relationship["versions"]["createTime"]
                 relationship_properties = relationship.get("properties", "--- ")
-                relationship_md = (f"Relationship Type {relationship_type}\n"
-                                   f"* GUID: {relationship_guid}\n* Created by: {relationship_created_by} \n"
-                                   f"* Creation Time: {relationship_creation_time}\n"
-                                   f"* Properties: {relationship_properties}\n")
+                relationship_md = (
+                    f"Relationship Type {relationship_type}\n"
+                    f"* GUID: {relationship_guid}\n* Created by: {relationship_created_by} \n"
+                    f"* Creation Time: {relationship_creation_time}\n"
+                    f"* Properties: {relationship_properties}\n"
+                )
 
                 rel_md = (
                     f"* Relationship Type: {relationship_type}\n"
@@ -220,20 +271,25 @@ def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str
 
                 relationship_md += rel_end1_md + rel_end2_md
 
-                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white",
-                                               title="Asset Relationships")
+                relationship_panel = Panel.fit(
+                    Markdown(relationship_md),
+                    style="bold bright_white",
+                    title="Asset Relationships",
+                )
                 tree.add(relationship_panel)
         with console.screen():
             print("\n\n")
         print(tree)
 
     except (
-            InvalidParameterException,
-            PropertyServerException,
-            UserNotAuthorizedException
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
     ) as e:
         console.print_exception()
-        console.print("\n\n ======> Most likely the GUID you provided is either incorrect or not an asset\n[red bold]")
+        console.print(
+            "\n\n ======> Most likely the GUID you provided is either incorrect or not an asset\n[red bold]"
+        )
 
 
 def main():
@@ -252,7 +308,7 @@ def main():
     try:
         asset_guid = Prompt.ask("Enter the Asset GUID to view:", default="")
         asset_viewer(asset_guid, server, url, userid, user_pass)
-    except (KeyboardInterrupt) as e:
+    except KeyboardInterrupt as e:
         # console.print_exception()
         pass
     except Exception as e:

{pyegeria-0.8.4.38 → pyegeria-0.8.4.40}/commands/cat/list_archives.py

@@ -71,8 +71,9 @@ def display_archive_list(
         )
 
         table.add_column("Name")
+        table.add_column("Description")
         table.add_column("Path Name")
-        table.add_column("Creation Date")
+
         # table.add_column("Creator")
         # table.add_column("Description")
 
@@ -93,16 +94,14 @@ def display_archive_list(
             for archive in sorted_archives:
                 name = archive["properties"].get("name", "---")
                 path_name = archive["properties"].get("pathName", "---")
+                description = archive["properties"].get("description", "---")
                 creation_date_epoch = (
                     int(archive["properties"].get("storeCreateTime", 0)) / 1000
                 )
                 create_date = datetime.datetime.fromtimestamp(creation_date_epoch)
                 creator = "---"
-                description = "---"
 
-                table.add_row(
-                    name, path_name, create_date.strftime("%Y-%m-%d %H:%M:%S")
-                )
+                table.add_row(name, description, path_name)
 
         return table
 

{pyegeria-0.8.4.38 → pyegeria-0.8.4.40}/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.38 → pyegeria-0.8.4.40}/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.38 → pyegeria-0.8.4.40}/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.38 → pyegeria-0.8.4.40}/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.38 → pyegeria-0.8.4.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.8.4.38"
+version = "0.8.4.40"
 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"