pyegeria 0.8.4.39__py3-none-any.whl → 0.8.4.40__py3-none-any.whl

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

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/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/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.dist-info → pyegeria-0.8.4.40.dist-info}/METADATA

@@ -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.dist-info → pyegeria-0.8.4.40.dist-info}/RECORD

@@ -52,8 +52,8 @@ commands/tech/get_element_info.py,sha256=Rauespy7ZfyKtLh_H8XWgYTpPijsqlUGm-zeb7K
 commands/tech/get_guid_info.py,sha256=HfwcGAFALFIpy4AJAgQHU__Fv1fjprh1G1xB5AjlZ80,4282
 commands/tech/get_tech_details.py,sha256=p5OgSKep3VOuuZmQXE2OSYhE-kvnI18TBcQ-PU5kEAw,6023
 commands/tech/list_asset_types.py,sha256=LG7e8yjewQ_SX8SjzEiEii_-hDvmAJKyLN8iDjbch50,4162
-commands/tech/list_elements.py,sha256=cafGJMwvWTK5TkUNMPkPdSaTGqws0uQknyA_iywFjNQ,4834
-commands/tech/list_elements_x.py,sha256=mVAwl7QLPjiKCN_zWZpJIK4H_bwuT4hla8mUB8bJcgA,6370
+commands/tech/list_elements.py,sha256=QWL465PoaMznSuLS_SV7Ubq_B7nwEPPTNYut2NYiDtQ,5996
+commands/tech/list_elements_x.py,sha256=k5jkekB7wh6cbzjn7FnwL7pKrPFq_oE-x36c_Z1FuSo,6500
 commands/tech/list_registered_services.py,sha256=QzE_ebdopNkHWMxa-xc902GG6ac4Yw-ln8i8NUsgHVA,6542
 commands/tech/list_related_specification.py,sha256=mWrKenXOskL4cl0DHjH2Z8M9-FJzjkzK62W-tsx3WDU,5918
 commands/tech/list_relationship_types.py,sha256=BlVzrPznZXqMVLN2-2vYEVRGeYsiJrqXxIJEikobyoo,5875
@@ -77,7 +77,7 @@ pyegeria/egeria_client.py,sha256=gZjo_Z8n7r05KJnQgJuQibGOvCA90JCDlzyFRGkZV-I,336
 pyegeria/egeria_config_client.py,sha256=Zm31u4e7o8mXTV93qD0IHluQuG73jYbArPFqypjaMso,1328
 pyegeria/egeria_my_client.py,sha256=XHwbFmSZXJClKDBFV8_fyK9CWaap2FndurRjywKPQiU,1549
 pyegeria/egeria_tech_client.py,sha256=7NfqpJFft5GR4NPRDVDw22L9caHbXB8fhx0TAf6qEoo,2440
-pyegeria/feedback_manager_omvs.py,sha256=yvZ36nA_AIFsqyU-lysMWHHgqEnucti3ztfkqMxDCT0,152929
+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=AnBRp6KKw0507ABz_WmknVL94zLzYzJ4saXrghFlpmw,93455
 pyegeria/glossary_manager_omvs.py,sha256=VaPUROcVR5AjgkXeFx63e_10h0QzUeMt3JppHrhlq2M,111926
@@ -86,13 +86,13 @@ pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,3
 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=aDLJauaRKoZP8ike-NiMH71zRVFmLC5-mCZEzM7cgLM,74149
+pyegeria/runtime_manager_omvs.py,sha256=TYFbCpbCfgu-JqAxl2qdVPYZlUiTxeHqd4L8lNap-3I,74248
 pyegeria/server_operations.py,sha256=ciH890hYT85YQ6OpByn4w7s3a7TtvWZpIG5rkRqbcI0,16766
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=raBU_bK0oMhOqjOUTSbU_OZuGKsYqRoiFbtUwz4OtZI,29060
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-0.8.4.39.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-0.8.4.39.dist-info/METADATA,sha256=E77MPfsyC_PUoY4zSE6pzkmLjUI_UbJku8y23jQZ6_g,2868
-pyegeria-0.8.4.39.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-0.8.4.39.dist-info/entry_points.txt,sha256=R8sNzclWZN542SufuVlx9HDia23PlSVnJioUkzCWg4I,3349
-pyegeria-0.8.4.39.dist-info/RECORD,,
+pyegeria-0.8.4.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-0.8.4.40.dist-info/METADATA,sha256=S848dKDNgxHA9sXkELQLtCCoYiWltZdhN6XdAP-ydsA,2868
+pyegeria-0.8.4.40.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-0.8.4.40.dist-info/entry_points.txt,sha256=DUPkeIWOd5H0m7_0Czt2P340RnePXcE-VAcact9B1Hc,3350
+pyegeria-0.8.4.40.dist-info/RECORD,,

{pyegeria-0.8.4.39.dist-info → pyegeria-0.8.4.40.dist-info}/entry_points.txt

@@ -15,7 +15,7 @@ hey_egeria=commands.cli.egeria:cli
 hey_egeria_cat=commands.cli.egeria_cat:cli
 hey_egeria_my=commands.cli.egeria_my:cli
 hey_egeria_ops=commands.cli.egeria_ops:cli
-hey_egeria_tech=commands.cli.egeria_cat:cli
+hey_egeria_tech=commands.cli.egeria_tech:cli
 list_archives=commands.cat.list_archives:main
 list_asset_types=commands.tech.list_asset_types:main
 list_assets=commands.cat.list_assets:main