minor changes and updates - including to guids.

Signed-off-by: Dan Wolfson <[email protected]>

Author: dwolfson

examples/widgets/catalog_user/view_asset_graph.py

@@ -47,9 +47,9 @@ def build_classifications(classification: dict) -> Markdown:
             c_type = c["classificationName"]
             if c_type == "Anchors":
                 continue
-            class_md += f"* Classification: {c_type}\n"
+            class_md += f"\n* Classification: {c_type}\n"
             class_props = c.get("classificationProperties","---")
-            if type(class_props) is list:
+            if type(class_props) is dict:
                 for prop in class_props.keys():
                     class_md += f"\t* {prop}: {class_props[prop]}\n"
         if class_md == "":
@@ -70,14 +70,15 @@ def build_nested_elements(nested_element: dict) -> Markdown:
         ne_classifications = nested_element["classifications"]
         ne_class_md = build_classifications(ne_classifications)
         # ne_class_md = " " if ne_class_md is None else ne_class_md
-        ne_props = nested_element["properties"]
-
-        ne_prop_md = ""
-        for prop in ne_props.keys():
-            ne_prop_md += f"* {prop}: {ne_props[prop]}\n"
+        ne_props = nested_element.get("properties","---")
+        ne_prop_md = "\n"
+        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"{ne_prop_md}\n")
+                 f"\n* Properties:\n{ne_prop_md}\n")
+
         if ne_class_md is not None:
             ne_md += f"* {ne_class_md}"
 
@@ -167,16 +168,16 @@ def build_nested_elements(nested_element: dict) -> Markdown:
             rel_end1 = relationship["end1"]
             rel_end1_type = rel_end1["type"]["typeName"]
             rel_end1_guid = rel_end1["guid"]
-            rel_end1_unique_name = rel_end1["uniqueName"]
+            rel_end1_unique_name = rel_end1.get("uniqueName","---")
 
             rel_end2 = relationship["end2"]
             rel_end2_type = rel_end2["type"]["typeName"]
             rel_end2_guid = rel_end2["guid"]
-            rel_end2_unique_name = rel_end2["uniqueName"]
+            rel_end2_unique_name = rel_end2.get("uniqueName", "---")
 
             if (rel_end1_guid not in guid_list) or (rel_end2_guid not in guid_list):
-                rel_end1_class_md = build_classifications(rel_end1["classifications"])
-                rel_end2_class_md = build_classifications(rel_end2["classifications"])
+                # rel_end1_class_md = build_classifications(rel_end1["classifications"])
+                # rel_end2_class_md = build_classifications(rel_end2["classifications"])
 
                 relationship_guid = relationship["guid"]
                 relationship_type = relationship["type"]["typeName"]
@@ -201,8 +202,8 @@ def build_nested_elements(nested_element: dict) -> Markdown:
                     f"\t* Unique Name: {rel_end1_unique_name}\n"
                     )
 
-                if rel_end1_class_md is not None:
-                    rel_end1_md = rel_end1_class_md + rel_end1_md
+                # if rel_end1_class_md is not None:
+                #     rel_end1_md = rel_end1_class_md + rel_end1_md
 
                 rel_end2_md = (
                     f"* End2:\n"
@@ -211,8 +212,8 @@ def build_nested_elements(nested_element: dict) -> Markdown:
                     f"\t* Unique Name: {rel_end2_unique_name}\n"
                 )
 
-                if rel_end2_class_md is not None:
-                    rel_end1_md = rel_end2_class_md + rel_end1_md
+                # if rel_end2_class_md is not None:
+                #     rel_end1_md = rel_end2_class_md + rel_end1_md
                 #
                 # for prop in relationship_properties.keys():
                 #     relationship_md += f"* {prop}: {relationship_properties[prop]}\n"

pyegeria/Xloaded_resources_omvs.py

@@ -57,7 +57,7 @@ def __init__(
         Client.__init__(self, server_name, platform_url,
                         user_id, user_pwd, verify_flag)
 
-    def get_all_templates(self, server: str = None, start_from: int = 0, page_size: int = 0) -> list | str:
+    def get_all_templates(self, server: str = None, start_from: int = 0, page_size: int = max_paging_size) -> list | str:
         """ Get Loaded templates for the Server.
 
            Parameters
@@ -89,3 +89,4 @@ def get_all_templates(self, server: str = None, start_from: int = 0, page_size:
         return response.json().get("elementList", "No elements")
 
     # def get_all_assets_in_archives(self, asset_type: str = None, archive_id: str = None, server: str= None, page_start:int = 0, page_size = max_paging_size):
+

pyegeria/core_guids.py

@@ -13,7 +13,7 @@
 
 KEYSTORE_FILE_TEMPLATE_GUID = 'FBCFCC0C-1652-421F-B49B-C3E1C108768F'
 
-OSS_UNITY_CATALOG_FUNCTION_TEMPLATE_GUID = '4AE9F6DF-4678-4B0A-A492-4A982C8397FD'
+OSS_UNITY_CATALOG_FUNCTION_TEMPLATE_GUID = '5B72BD18-665D-4696-8EBB-F6D0885312E2'
 
 DATA_FILE_TEMPLATE_GUID = '66D8DDA9-00CF-4E59-938C-4B0583596B1E'
 
@@ -23,7 +23,7 @@
 
 POSTGRESQL_RELATIONAL_DATABASE_TEMPLATE_GUID = '3D398B3F-7AE6-4713-952A-409F3DEA8520'
 
-OSS_UNITY_CATALOG_VOLUME_TEMPLATE_GUID = '384386BA-83C0-4981-8553-4306AECE440F'
+OSS_UNITY_CATALOG_VOLUME_TEMPLATE_GUID = 'DFC0C928-0DB3-4EB4-A1F0-0760DAB168C5'
 
 PROGRAM_FILE_TEMPLATE_GUID = '32D27E9C-1FDF-455A-AD2A-42B4D7D99108'
 
@@ -55,7 +55,7 @@
 
 APACHE_KAFKA_SERVER_TEMPLATE_GUID = '5E1FF810-5418-43F7-B7C4-E6E062F9AFF7'
 
-OSS_UNITY_CATALOG_SCHEMA_TEMPLATE_GUID = 'A75CFB07-31FE-457E-9298-BE145DC93071'
+OSS_UNITY_CATALOG_SCHEMA_TEMPLATE_GUID = 'D68F5AA3-152E-40FA-8C16-E73DB8D925D6'
 
 EXECUTABLE_FILE_TEMPLATE_GUID = '3D99A163-7A13-4576-A212-784010A8302A'
 
@@ -69,6 +69,8 @@
 
 APPLE_MACBOOK_PRO_TEMPLATE_GUID = '32A9FD56-85C9-47FE-A211-9DA3871BF4DA'
 
+OSS_UNITY_CATALOG_TABLE_TEMPLATE_GUID = 'CB34184B-D6A9-4A27-9FD2-EA4C78978F9F'
+
 BUILD_INSTRUCTION_FILE_TEMPLATE_GUID = 'FBB2FA2E-8BCB-402E-9BE7-5C6DB9F2C504'
 
 SPREADSHEET_DATA_FILE_TEMPLATE_GUID = 'E4FABFF5-2BA9-4050-9076-6ED917970B4C'
@@ -83,8 +85,6 @@
 
 AVRO_DATA_FILE_TEMPLATE_GUID = '9F5BE428-058E-41DD-B506-3A222283B579'
 
-OSS_UNITY_CATALOG_TABLE_TEMPLATE_GUID = 'F5B12348-92AC-4A52-B8E0-B06CF215484E'
-
 FILE_TEMPLATE_GUID = 'AE3067C7-CC72-4A18-88E1-746803C2C86F'
 
 APACHE_KAFKA_TOPIC_TEMPLATE_GUID = 'EA8F81C9-C59C-47DE-9525-7CC59D1251E5'
@@ -103,19 +103,23 @@
 # Integration Connector GUIDS
 #
 
-PostgreSQL_Relational_Database_Integration_Connector_GUID = '70dcd0b7-9f06-48ad-ad44-ae4d7a7762aa'
 
-Landing_Area_File_Monitor_Integration_Connector_GUID = '1b98cdac-dd0a-4621-93db-99ef5a1098bc'
 
-FileFolder_Integration_Connector_GUID = 'cd6479e1-2fe7-4426-b358-8a0cf70be117'
+JDBC_RELATIONAL_DATABASE_INTEGRATION_CONNECTOR_GUID = '70DCD0B7-9F06-48AD-AD44-AE4D7A7762AA'
+
+POSTGRESQL_RELATIONAL_DATABASE_INTEGRATION_CONNECTOR_GUID = '70DCD0B7-9F06-48AD-AD44-AE4D7A7762AA'
+
+LANDING_AREA_FILE_MONITOR_INTEGRATION_CONNECTOR_GUID = '1B98CDAC-DD0A-4621-93DB-99EF5A1098BC'
+
+FILEFOLDER_INTEGRATION_CONNECTOR_GUID = 'CD6479E1-2FE7-4426-B358-8A0CF70BE117'
 
-OSS_Unity_Catalog_Catalog_Integration_Connector_GUID = '74dde22f-2249-4ea3-af2b-b39e73f79b81'
+OSS_UNITY_CATALOG_CATALOG_INTEGRATION_CONNECTOR_GUID = '74DDE22F-2249-4EA3-AF2B-B39E73F79B81'
 
-PostgreSQL_Server_Integration_Connector_GUID = '36f69fd0-54ba-4f59-8a44-11ccf2687a34'
+POSTGRESQL_SERVER_INTEGRATION_CONNECTOR_GUID = '36F69FD0-54BA-4F59-8A44-11CCF2687A34'
 
-Apache_Kafka_Server_Integration_Connector_GUID = 'fa1f711c-0b34-4b57-8e6e-16162b132b0c'
+APACHE_KAFKA_SERVER_INTEGRATION_CONNECTOR_GUID = 'FA1F711C-0B34-4B57-8E6E-16162B132B0C'
 
-Software_Server_Integration_Connector_GUID = 'b89d9a5a-2ea6-49bc-a4fc-e7df9f3ca93e'
+SOFTWARE_SERVER_INTEGRATION_CONNECTOR_GUID = 'B89D9A5A-2EA6-49BC-A4FC-E7DF9F3CA93E'
 
-OSS_Unity_Catalog_Server_Integration_Connector_GUID = '06d068d9-9e08-4e67-8c59-073bbf1013af'
+OSS_UNITY_CATALOG_SERVER_INTEGRATION_CONNECTOR_GUID = '06D068D9-9E08-4E67-8C59-073BBF1013AF'
 

pyegeria/server_operations.py

@@ -86,7 +86,7 @@ def get_active_configuration(self, server: str = None) -> dict | str:
 #
 #   Archive Files
 #
-    async def _async_add_archive_file(self, archive_file: str, server: str = None) -> None:
+    async def _async_add_archive_file(self, archive_file: str, server: str = None, timeout: int = 30) -> None:
         """
         Load the server with the contents of the indicated archive file.
 
@@ -95,7 +95,7 @@ async def _async_add_archive_file(self, archive_file: str, server: str = None) -
         archive_file: the name of the archive file to load
                 - note that the path is relative to the working directory of the platform.
         server : Use the server if specified. If None, use the default server associated with the Platform object.
-
+        timeout: Timeout in seconds. Defaults to 30 seconds.
         Returns
         -------
         Response object.  Also throws exceptions if no viable server or endpoint errors
@@ -110,9 +110,9 @@ async def _async_add_archive_file(self, archive_file: str, server: str = None) -
                 + "/instance/open-metadata-archives/file"
         )
 
-        await self._async_make_request("POST-DATA", url, archive_file)
+        await self._async_make_request("POST-DATA", url, archive_file, time_out=timeout)
 
-    def add_archive_file(self, archive_file: str, server: str = None) -> None:
+    def add_archive_file(self, archive_file: str, server: str = None, timeout:int = 30) -> None:
         """
         Load the server with the contents of the indicated archive file.
 
@@ -121,14 +121,15 @@ def add_archive_file(self, archive_file: str, server: str = None) -> None:
         archive_file: the name of the archive file to load
                 - note that the path is relative to the working directory of the platform.
         server : Use the server if specified. If None, use the default server associated with the Platform object.
+        timeout: Timeout in seconds. Defaults to 30 seconds.
 
         Returns
         -------
         Response object.  Also throws exceptions if no viable server or endpoint errors
 
         """
         loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._async_add_archive_file(archive_file, server))
+        loop.run_until_complete(self._async_add_archive_file(archive_file, server, timeout))
 
     async def _async_add_archive(self, archive_connection: str, server: str = None) -> None:
         """ Load the server with the contents of the indicated archive file.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.5.1"
+version = "0.5.5.10"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <[email protected]>"]
 readme = "README.md"

tests/test_automated_curation_omvs.py

@@ -19,7 +19,7 @@
 from rich.console import Console
 from rich.pretty import pprint
 
-from pyegeria import AutomatedCuration, PostgreSQL_Server_Integration_Connector_GUID
+from pyegeria import AutomatedCuration, POSTGRESQL_SERVER_INTEGRATION_CONNECTOR_GUID
 from pyegeria._exceptions import (InvalidParameterException, PropertyServerException, UserNotAuthorizedException,
                                   print_exception_response, )