Significant changes as the dependency management was moved from venv to poetry. To make it work

I had to move the pyegeria folder to the root directory (removing src). I also updated all the widgets
to add a main function so that they can each be entry points allowing them to be called
as commenads when installed with pipx.

A number of other fixes.

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

Author: dwolfson

examples/__init__.py

@@ -1,4 +1,9 @@
 """
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Pyegeria examples package
 
-examples
 """
+
+

examples/Doc_Samples/Create_Collection_Sample.py renamed to examples/doc_samples/Create_Collection_Sample.py

@@ -16,7 +16,7 @@
 view_server = 'view-server'
 platform_url = 'https://localhost:9443'
 user = 'erinoverview'
-console = Console()
+console = Console(width=200)
 
 try:
     c_client = CollectionManager(view_server, platform_url,
@@ -40,7 +40,7 @@
                                                display_name, description, collection_type,
                                                is_own_anchor)
     # Create first folder for Agriculture Insights
-    parent_guid = "97bbfe07-6696-4550-bf8b-6b577d25bef0"
+    parent_guid = "f53ea7c8-3107-4477-8459-9bc63f9e69af"
     parent_relationship_type_name = "CollectionMembership"
     display_name = "Agriculture Insights Collection"
     description = "A folder for agricultural insights data product collections"

examples/Doc_Samples/Create_Sustainability_Collection_Sample.py renamed to examples/doc_samples/Create_Sustainability_Collection_Sample.py

@@ -118,7 +118,7 @@ def generate_table(search_string:str = '*') -> Table:
         print_exception_response(e)
         assert e.related_http_code != "200", "Invalid parameters"
 
-if __name__ == "__main__":
+def main():
     sus_guid = "f9b78b26-6025-43fa-9299-a905cc6d1575"
     parser = argparse.ArgumentParser()
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -135,4 +135,7 @@ def generate_table(search_string:str = '*') -> Table:
     guid = sus_guid  if args.sustainability else None
 
     search_string = Prompt.ask("Enter the asset you are searching for:", default="*")
-    display_assets(search_string, guid,server, url, userid)
+    display_assets(search_string, guid,server, url, userid)
+
+if __name__ == "__main__":
+    main()

examples/widgets/catalog_user/list_assets.py

@@ -40,7 +40,7 @@
 
 def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str):
 
-    def build_classifications(classification: dict) -> str:
+    def build_classifications(classification: dict) -> Markdown:
 
         class_md = ""
         for c in classification:
@@ -49,7 +49,7 @@ def build_classifications(classification: dict) -> str:
                 continue
             class_md += f"* Classification: {c_type}\n"
             class_props = c.get("classificationProperties","---")
-            if type(class_props) is dict:
+            if type(class_props) is list:
                 for prop in class_props.keys():
                     class_md += f"\t* {prop}: {class_props[prop]}\n"
         if class_md == "":
@@ -125,6 +125,7 @@ def build_nested_elements(nested_element: dict) -> Markdown:
         asset_relationships = asset_graph["relationships"]
         asset_class_md = build_classifications(asset_classifications)
 
+
         asset_properties = asset_graph["extendedProperties"]
         prop_md = "\n* Extended Properties:\n"
         for prop in asset_properties:
@@ -189,24 +190,24 @@ def build_nested_elements(nested_element: dict) -> Markdown:
                     f"* Created by: {relationship_created_by} at time {relationship_creation_time}\n"
                 )
                 rel_end1_md = (
-                    f"\n**End1:**\n"
-                    f"\n\t* Type: {rel_end1_type}\n"
+                    f"* End1:\n"
+                    f"\t* Type: {rel_end1_type}\n"
                     f"\t* GUID: {rel_end1_guid}\n"
                     f"\t* Unique Name: {rel_end1_unique_name}\n"
                     )
 
-                # if rel_end1_class_md is not None:
-                #     rel_end1_md =  rel_end1_md + rel_end1_class_md
+                if rel_end1_class_md is not None:
+                    rel_end1_md = rel_end1_class_md + rel_end1_md
 
                 rel_end2_md = (
-                    f"\n**End2:**\n"
-                    f"\n\t* Type: {rel_end2_type}\n"
+                    f"* End2:\n"
+                    f"\t* Type: {rel_end2_type}\n"
                     f"\t* GUID: {rel_end2_guid}\n"
                     f"\t* Unique Name: {rel_end2_unique_name}\n"
                 )
 
-                # if rel_end2_class_md is not None:
-                #     rel_end1_md = rel_end1_md + rel_end2_class_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"
@@ -228,7 +229,7 @@ def build_nested_elements(nested_element: dict) -> Markdown:
         print_exception_response(e)
 
 
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser()
 
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -242,3 +243,6 @@ def build_nested_elements(nested_element: dict) -> Markdown:
 
     asset_guid = Prompt.ask("Enter the Asset GUID to view:", default="8e35b39e-6ee7-4d60-aff5-4b09406c5e79")
     asset_viewer(asset_guid,server, url, userid)
+
+if __name__ == "__main__":
+    main()

examples/widgets/catalog_user/view_asset_graph.py

@@ -63,7 +63,7 @@ def walk_collection_hierarchy(collection_client: CollectionManager, root_collect
         print_exception_response(e)
 
 
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser()
 
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -77,3 +77,6 @@ def walk_collection_hierarchy(collection_client: CollectionManager, root_collect
 
     root_collection = Prompt.ask("Enter the Root Collection to start from:", default="Digital Products Root")
     collection_viewer(root_collection, server, url, userid)
+
+if __name__ == "__main__":
+    main()

examples/widgets/catalog_user/view_collection.py

@@ -115,7 +115,7 @@ def generate_table(search_string:str = '*') -> Table:
         print_exception_response(e)
         assert e.related_http_code != "200", "Invalid parameters"
 
-if __name__ == "__main__":
+def main():
     sus_guid = "f9b78b26-6025-43fa-9299-a905cc6d1575"
     parser = argparse.ArgumentParser()
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -132,4 +132,7 @@ def generate_table(search_string:str = '*') -> Table:
     guid = sus_guid  if args.sustainability else None
 
     search_string = Prompt.ask("Enter the term you are searching for:", default="*")
-    display_glossary_terms(search_string, guid,server, url, userid)
+    display_glossary_terms(search_string, guid,server, url, userid)
+
+if __name__ == "__main__":
+    main()

examples/widgets/catalog_user/view_glossary.py

@@ -11,17 +11,13 @@
 """
 
 import argparse
-import httpx
 import json
-import time
 
-from rich import box
 from rich import print
 from rich.console import Console
 from rich.prompt import Prompt
 from rich.text import Text
 from rich.tree import Tree
-from rich.json import JSON
 
 from pyegeria import (
     InvalidParameterException,
@@ -30,7 +26,6 @@
     print_exception_response,
     Client
 )
-from pyegeria import ProjectManager
 
 
 def display_guid(guid: str, server: str, url: str, username: str):
@@ -63,11 +58,12 @@ def display_guid(guid: str, server: str, url: str, username: str):
 
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException, ValueError) as e:
         if type(e) is str:
-            print(e)
+           print(e)
         else:
+            console.print(f"\n Looks like the GUID isn't know...detailed message follows\n")
             print_exception_response(e)
 
-if __name__ == "__main__":
+def main():
 
     parser = argparse.ArgumentParser()
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -83,4 +79,7 @@ def display_guid(guid: str, server: str, url: str, username: str):
 
     guid = Prompt.ask("Enter the GUID to retrieve:", default=None)
 
-    display_guid(guid, server, url, userid)
+    display_guid(guid, server, url, userid)
+
+if __name__ == "__main__":
+    main()

examples/widgets/developer/get_guid_info.py

@@ -7,33 +7,19 @@
 
 """
 
-import time
 import argparse
 
-from rich.box import Box
-from rich.markdown import Markdown
+from rich import print
+from rich.panel import Panel
 from rich.prompt import Prompt
-
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
-)
-from rich.table import Table
-from rich.live import Live
 from rich.text import Text
 from rich.tree import Tree
-from rich.markdown import Markdown
 
-from rich import print
-from rich.console import Group
-from rich.panel import Panel
-from rich import box, align
-from rich.layout import Layout
-import rich
-from pyegeria import (CollectionManager, UserNotAuthorizedException, PropertyServerException,
+from pyegeria import (UserNotAuthorizedException, PropertyServerException,
                       InvalidParameterException, AutomatedCuration)
+from pyegeria._exceptions import (
+    print_exception_response,
+)
 
 disable_ssl_warnings = True
 
@@ -95,7 +81,7 @@ def view_tech_details(a_client: AutomatedCuration, root_collection_name: str, tr
         print_exception_response(e)
 
 
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser()
 
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -109,3 +95,6 @@ def view_tech_details(a_client: AutomatedCuration, root_collection_name: str, tr
 
     tech = Prompt.ask("Enter the Technology to start from:", default="PostgreSQL Server")
     tech_viewer(tech,server, url, userid)
+
+if __name__ == "__main__":
+    main()

examples/widgets/developer/get_tech_details.py

@@ -74,7 +74,7 @@ def generate_table() -> Table:
         r_client.close_session()
 
 
-if __name__ == "__main__":
+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")
@@ -89,3 +89,6 @@ def generate_table() -> Table:
     guid = None
 
     display_asset_types(server, url, userid)
+
+if __name__ == "__main__":
+    main()