pyegeria 0.8.4.39__tar.gz → 0.8.4.40__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.39
+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.39 → 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.39 → 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.39 → 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.39 → 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.39 → pyegeria-0.8.4.40}/pyproject.toml

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