pyegeria 1.5.1.1.22__py3-none-any.whl → 1.5.1.1.24__py3-none-any.whl

pyegeria/commands/tech/list_tech_templates.py

@@ -1,27 +1,26 @@
 """This creates a templates guid file from the core metadata archive"""
-import json
 
-from rich.markdown import Markdown
-from rich.prompt import Prompt
-import os
-from pyegeria import AutomatedCuration
-from datetime import datetime
 import argparse
-import time
+import os
 import sys
+import time
+from typing import Union
+
+import nest_asyncio
 from rich import box
 from rich.console import Console
+from rich.prompt import Prompt
 from rich.table import Table
+from textual.widgets import DataTable
 
+from pyegeria import AutomatedCuration
 from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    RegisteredInfo,
 )
 
-
 console = Console()
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
@@ -69,6 +68,21 @@ def list_templates(
     return tech_info_list
 
 
+def add_row(
+    table: Union[Table, DataTable],
+    name: str,
+    template_name: str,
+    template_guid: str,
+    placeholder_table: Table,
+) -> Table | DataTable:
+    if isinstance(table, Table):
+        table.add_row(name, template_name, template_guid, placeholder_table)
+    elif isinstance(table, DataTable):
+        table.add_row(name, template_name, template_guid, placeholder_table)
+
+    return table
+
+
 def display_templates_spec(
     search_string: str,
     server: str,
@@ -77,31 +91,37 @@ def display_templates_spec(
     password: str,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
-):
+    data_table: bool = False,
+) -> Table | DataTable:
     a_client = AutomatedCuration(server, url, username)
+    nest_asyncio.apply()
     token = a_client.create_egeria_bearer_token(username, password)
     tech_list = a_client.find_technology_types(search_string, page_size=0)
 
-    def generate_table() -> Table:
+    def generate_table(data_table: bool) -> Table | DataTable:
         """Make a new table."""
-        table = Table(
-            title=f"Technology Templates for: {url} @ {time.asctime()}",
-            style="bold bright_white on black",
-            row_styles=["bold bright_white on black"],
-            header_style="white on dark_blue",
-            title_style="bold bright_white on black",
-            caption_style="white on black",
-            show_lines=True,
-            box=box.ROUNDED,
-            caption=f"Templates from Server '{server}' @ Platform - {url}",
-            expand=True,
-            # width=500
-        )
+        if data_table:
+            table = DataTable()
+            table.add_columns("Name", "Template Name", "Template GUID", "Placeholders")
+        else:
+            table = Table(
+                title=f"Technology Templates for: {url} @ {time.asctime()}",
+                style="bold bright_white on black",
+                row_styles=["bold bright_white on black"],
+                header_style="white on dark_blue",
+                title_style="bold bright_white on black",
+                caption_style="white on black",
+                show_lines=True,
+                box=box.ROUNDED,
+                caption=f"Templates from Server '{server}' @ Platform - {url}",
+                expand=True,
+                # width=500
+            )
 
-        table.add_column("Name", width=20)
-        table.add_column("Template Name", width=20)
-        table.add_column("Template GUID", width=38, no_wrap=True)
-        table.add_column("Placeholders")
+            table.add_column("Name", width=20)
+            table.add_column("Template Name", width=20)
+            table.add_column("Template GUID", width=38, no_wrap=True)
+            table.add_column("Placeholders")
 
         if type(tech_list) is list:
             for item in tech_list:
@@ -149,8 +169,9 @@ def display_templates_spec(
                                 placeholder_description,
                             )
 
-                        table.add_row(
-                            name, template_name, template_guid, placeholder_table
+                        # table.add_row(name, template_name, template_guid, placeholder_table)
+                        table = add_row(
+                            table, name, template_name, template_guid, placeholder_table
                         )
 
             return table
@@ -159,10 +180,13 @@ def display_templates_spec(
             sys.exit(1)
 
     try:
-        console = Console(width=width, force_terminal=not jupyter)
+        if data_table:
+            return generate_table(data_table)
+        else:
+            console = Console(width=width, force_terminal=not jupyter)
 
-        with console.pager(styles=True):
-            console.print(generate_table())
+            with console.pager(styles=True):
+                console.print(generate_table(data_table))
 
     except (
         InvalidParameterException,
@@ -194,11 +218,143 @@ def main():
         search_string = Prompt.ask(
             "Enter the technology you are searching for:", default="*"
         )
-        # display_templates_spec(search_string, server, url, userid, password)
-        list_templates(search_string, server, url, userid, password)
+        display_templates_spec(
+            search_string, server, url, userid, password, data_table=False
+        )
     except KeyboardInterrupt:
         pass
 
 
-if __name__ == "__main__":
-    main()
+# def display_templates_spec(
+#     search_string: str,
+#     server: str,
+#     url: str,
+#     username: str,
+#     password: str,
+#     jupyter: bool = EGERIA_JUPYTER,
+#     width: int = EGERIA_WIDTH,
+# ):
+#     a_client = AutomatedCuration(server, url, username)
+#     token = a_client.create_egeria_bearer_token(username, password)
+#     tech_list = a_client.find_technology_types(search_string, page_size=0)
+#
+#     def generate_table() -> Table:
+#         """Make a new table."""
+#         table = Table(
+#             title=f"Technology Templates for: {url} @ {time.asctime()}",
+#             style="bold bright_white on black",
+#             row_styles=["bold bright_white on black"],
+#             header_style="white on dark_blue",
+#             title_style="bold bright_white on black",
+#             caption_style="white on black",
+#             show_lines=True,
+#             box=box.ROUNDED,
+#             caption=f"Templates from Server '{server}' @ Platform - {url}",
+#             expand=True,
+#             # width=500
+#         )
+#
+#         table.add_column("Name", width=20)
+#         table.add_column("Template Name", width=20)
+#         table.add_column("Template GUID", width=38, no_wrap=True)
+#         table.add_column("Placeholders")
+#
+#         if type(tech_list) is list:
+#             for item in tech_list:
+#                 if "deployedImplementationType" not in item["qualifiedName"]:
+#                     continue
+#                 placeholder_table = Table(expand=False, show_lines=True)
+#                 placeholder_table.add_column("Name", width=20, no_wrap=True)
+#                 placeholder_table.add_column("Type", width=10)
+#                 placeholder_table.add_column("Required", width=10)
+#                 placeholder_table.add_column("Example", width=20)
+#                 placeholder_table.add_column("Description", width=40)
+#
+#                 name = item.get("name", "none")
+#
+#                 details = a_client.get_technology_type_detail(name)
+#                 if type(details) is str:
+#                     console.log(f"Missing details for - {name}: {details}")
+#                     continue
+#
+#                 templates = details.get("catalogTemplates", "Not Found")
+#                 if type(templates) is not str:
+#                     for template in templates:
+#                         template_name = template.get("name", None)
+#
+#                         template_name = (
+#                             f"{name}_Template"
+#                             if template_name is None
+#                             else template_name
+#                         )
+#
+#                         specification = template["specification"]["placeholderProperty"]
+#                         template_guid = template["relatedElement"]["guid"]
+#
+#                         for placeholder in specification:
+#                             placeholder_data_type = placeholder["dataType"]
+#                             placeholder_description = placeholder["description"]
+#                             placeholder_name = placeholder["placeholderPropertyName"]
+#                             placeholder_required = placeholder["required"]
+#                             placeholder_example = placeholder.get("example", None)
+#                             placeholder_table.add_row(
+#                                 placeholder_name,
+#                                 placeholder_data_type,
+#                                 placeholder_required,
+#                                 placeholder_example,
+#                                 placeholder_description,
+#                             )
+#
+#                         table.add_row(
+#                             name, template_name, template_guid, placeholder_table
+#                         )
+#
+#             return table
+#         else:
+#             print("Unknown technology type")
+#             sys.exit(1)
+#
+#     try:
+#         console = Console(width=width, force_terminal=not jupyter)
+#
+#         with console.pager(styles=True):
+#             console.print(generate_table())
+#
+#     except (
+#         InvalidParameterException,
+#         PropertyServerException,
+#         UserNotAuthorizedException,
+#     ) as e:
+#         print_exception_response(e)
+#         assert e.related_http_code != "200", "Invalid parameters"
+#     finally:
+#         a_client.close_session()
+#
+#
+# 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")
+#     parser.add_argument("--userid", help="User Id")
+#     parser.add_argument("--password", help="Password")
+#
+#     args = parser.parse_args()
+#
+#     server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+#     url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+#     userid = args.userid if args.userid is not None else EGERIA_USER
+#     password = args.password if args.password is not None else EGERIA_USER_PASSWORD
+#     guid = None
+#
+#     try:
+#         search_string = Prompt.ask(
+#             "Enter the technology you are searching for:", default="*"
+#         )
+#         # display_templates_spec(search_string, server, url, userid, password)
+#         list_templates(search_string, server, url, userid, password)
+#     except KeyboardInterrupt:
+#         pass
+#
+#
+# if __name__ == "__main__":
+#     main()

pyegeria/glossary_manager_omvs.py

@@ -1622,7 +1622,6 @@ class GlossaryManager(GlossaryBrowser):
                                 {
                                     "term_name": term_name,
                                     "qualified_name": qualified_name,
-                                    "term_guid": term_guid,
                                     "error": "Matching term not found - skipping",
                                 }
                             )

{pyegeria-1.5.1.1.22.dist-info → pyegeria-1.5.1.1.24.dist-info}/METADATA

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

{pyegeria-1.5.1.1.22.dist-info → pyegeria-1.5.1.1.24.dist-info}/RECORD

@@ -81,7 +81,7 @@ pyegeria/commands/tech/list_registered_services.py,sha256=QzE_ebdopNkHWMxa-xc902
 pyegeria/commands/tech/list_related_elements.py,sha256=mcOy3RIGpIdshcT1o4Tr7Ck-c1dmAC8yBUOF5GAFYrM,7755
 pyegeria/commands/tech/list_related_specification.py,sha256=mWrKenXOskL4cl0DHjH2Z8M9-FJzjkzK62W-tsx3WDU,5918
 pyegeria/commands/tech/list_relationship_types.py,sha256=BlVzrPznZXqMVLN2-2vYEVRGeYsiJrqXxIJEikobyoo,5875
-pyegeria/commands/tech/list_tech_templates.py,sha256=doQtfSrbnluCzyCsq2PCDGKk5atDPXPDuu24YjCRxo0,7832
+pyegeria/commands/tech/list_tech_templates.py,sha256=FIeYWnJY2bVUrfDQBJX2bpkp5cU7uPak52eJtB4vVu4,14146
 pyegeria/commands/tech/list_valid_metadata_values.py,sha256=N3D0_BmREPszgde3uvvYdfzq7DJ46uMOv2t1vtncGsw,6333
 pyegeria/commands/tech/table_tech_templates.py,sha256=xa_mA10P_6Su3zRsvyoZhWoSUQ5LuyLTG1kNCumzxZA,7268
 pyegeria/commands/tech/x_list_related_elements.py,sha256=qBsf1619cecaMCTzG0MG22fAT32WNH2Z3CXrjo9z-5Y,5853
@@ -95,7 +95,7 @@ pyegeria/egeria_tech_client.py,sha256=7NfqpJFft5GR4NPRDVDw22L9caHbXB8fhx0TAf6qEo
 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=NcitYaZJqwVODBO5zBtWpXPNUJJ3DKzEbRaOFSAyUlg,93554
-pyegeria/glossary_manager_omvs.py,sha256=10o8TThZvD9IZOU9NodaTz8j-FtSjR7p3er94RIB7Mc,126337
+pyegeria/glossary_manager_omvs.py,sha256=BWnSNiNuyjA6zQA2loLKxiMaUGnRazIg9RfQKg7kD5U,126277
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
 pyegeria/platform_services.py,sha256=CJIOYIFEbcIGwdWlApAQcXxZTsdrhFtpJcm4O3p7dG0,41646
@@ -107,8 +107,8 @@ pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZi
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=tfCGXed5LLt59YA8uZNNtd9UJ-lRZfPU_uZxK31Yux0,65069
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-1.5.1.1.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.1.22.dist-info/METADATA,sha256=yEHoxagZqOfG4aumCO8-amhpuE1Z7CpvlYTKaK8mizY,2998
-pyegeria-1.5.1.1.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.1.22.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
-pyegeria-1.5.1.1.22.dist-info/RECORD,,
+pyegeria-1.5.1.1.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.1.24.dist-info/METADATA,sha256=mTEyt5Vd1AOfU9SW6s9s473evYU-t1dH2SG88mgPtMw,2998
+pyegeria-1.5.1.1.24.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.1.24.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
+pyegeria-1.5.1.1.24.dist-info/RECORD,,