pyegeria 5.3.3.14.dev3__tar.gz → 5.3.3.15__tar.gz

{pyegeria-5.3.3.14.dev3 → pyegeria-5.3.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.3.3.14.dev3
+Version: 5.3.3.15
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance

{pyegeria-5.3.3.14.dev3 → pyegeria-5.3.3.15}/pyegeria/commands/cli/egeria.py

@@ -56,6 +56,7 @@ from pyegeria.commands.cat.glossary_actions import (
 )
 from pyegeria.commands.cat.list_glossaries import display_glossaries
 
+
 from pyegeria.commands.my.todo_actions import (
     mark_todo_complete,
     change_todo_status,
@@ -117,6 +118,12 @@ from pyegeria.commands.tech.list_tech_templates import display_templates_spec
 from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_values
 from pyegeria.commands.tech.list_gov_action_processes import display_gov_processes
 
+from pyegeria.commands.tech.list_information_supply_chains import supply_chain_viewer
+from pyegeria.commands.tech.list_solution_roles import solution_role_list
+from pyegeria.commands.tech.list_solution_blueprints import blueprint_list
+from pyegeria.commands.tech.list_solution_components import solution_component_list
+
+
 
 @tui()
 # @tui('menu', 'menu', 'A textual command line interface')
@@ -371,6 +378,10 @@ def show_tech_type(ctx):
 def show_elements(ctx):
     """Show information about Egeria elements"""
 
+@show.group("supply-chains")
+@click.pass_context
+def show_supply_chains(ctx):
+    """Show information about Information Supply Chainss"""
 
 @show_elements.command("guid-info")
 @click.argument("guid", nargs=1)
@@ -892,6 +903,72 @@ def get_element_info(ctx, om_type):
     )
 
 
+@show_supply_chains.command("supply-chains")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_supply_chains(ctx, search_string):
+    """Display supply chains"""
+    c = ctx.obj
+    supply_chain_viewer(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_supply_chains.command("blueprints")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_blueprints(ctx, search_string):
+    """Display solution blueprints"""
+    c = ctx.obj
+    blueprint_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+@show_supply_chains.command("solution-roles")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_solution_roles(ctx, search_string):
+    """Display solution roles"""
+    c = ctx.obj
+    solution_component_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+@show_supply_chains.command("solution-components")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_solution_components(ctx, search_string):
+    """Display solution componentss"""
+    c = ctx.obj
+    solution_component_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 #
 #   Catalog User: Show
 #

{pyegeria-5.3.3.14.dev3 → pyegeria-5.3.3.15}/pyegeria/commands/cli/egeria_tech.py

@@ -43,6 +43,12 @@ from pyegeria.commands.tech.list_elements_for_classification import (
 from pyegeria.commands.tech.list_gov_action_processes import display_gov_processes
 from pyegeria.commands.tech.get_tech_type_template import template_viewer
 
+from pyegeria.commands.tech.list_information_supply_chains import supply_chain_viewer
+from pyegeria.commands.tech.list_solution_roles import solution_role_list
+from pyegeria.commands.tech.list_solution_blueprints import blueprint_list
+from pyegeria.commands.tech.list_solution_components import solution_component_list
+
+
 @tui()
 @click.version_option("0.0.1", prog_name="egeria_ops")
 @click.group()
@@ -199,6 +205,11 @@ def show_tech(ctx):
 def show_elements(ctx):
     """Show information about Egeria elements"""
 
+@show.group("supply-chains")
+@click.pass_context
+def show_supply_chains(ctx):
+    """Show information about Information Supply Chainss"""
+
 
 @show_elements.command("guid-info")
 @click.argument("guid", nargs=1)
@@ -721,6 +732,74 @@ def list_all_om_type_elements(ctx, om_type, extended):
             c.width
         )
 
+
+@show_supply_chains.command("supply-chains")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_supply_chains(ctx, search_string):
+    """Display supply chains"""
+    c = ctx.obj
+    supply_chain_viewer(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@show_supply_chains.command("blueprints")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_blueprints(ctx, search_string):
+    """Display solution blueprints"""
+    c = ctx.obj
+    blueprint_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+@show_supply_chains.command("solution-roles")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_solution_roles(ctx, search_string):
+    """Display solution roles"""
+    c = ctx.obj
+    solution_component_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+@show_supply_chains.command("solution-components")
+@click.option("--search-string", default="*", help="Search string")
+@click.pass_context
+def list_solution_components(ctx, search_string):
+    """Display solution componentss"""
+    c = ctx.obj
+    solution_component_list(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+
 #
 #  Tell
 #

{pyegeria-5.3.3.14.dev3 → pyegeria-5.3.3.15}/pyegeria/commands/tech/list_information_supply_chains.py

@@ -100,11 +100,11 @@ def supply_chain_viewer(
             sc_unique_name = f"{sc_qname}\n\n\t\t/\n\n{sc_guid}"
             sc_mermaid = sc.get("mermaidGraph",'---')
             if sc_mermaid != '---':
-                link = save_mermaid_html(sc_name, sc_mermaid, EGERIA_MERMAID_FOLDER )
+                link = save_mermaid_html(sc_name, sc_mermaid, f"{EGERIA_MERMAID_FOLDER}/supply-chains" )
                 sc_mermaid_link = f"file://:{link}"
                 # print("Visit my [link=https://www.willmcgugan.com]blog[/link]!")
                 # sc_scope = Text(f"{sc_scope}\n\t\t/\n{sc_mermaid_link}")
-                sc_scope = Text(f"{sc_scope}\n\t\t/\n[link={sc_mermaid_link}]{sc_mermaid_link}[/link]!", style="underline")
+                sc_scope = f"{sc_scope}\n\t\t/\n![{sc_mermaid_link}]({sc_mermaid_link})"
                 # sc_scope.stylize("link =" + sc_mermaid_link)
 
             table.add_row(sc_name, sc_unique_name, sc_purpose_str, sc_scope, sc_desc)

pyegeria-5.3.3.14.dev3/pyegeria/commands/tech/list_solution_blueprints2.py → pyegeria-5.3.3.15/pyegeria/commands/tech/list_solution_blueprints.py

@@ -3,7 +3,7 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-A simple viewer for Information Supply Chains
+A simple viewer for Information Solution Blueprints
 
 """
 
@@ -19,12 +19,14 @@ from rich.prompt import Prompt
 from rich.table import Table
 from rich.text import Text
 from rich.tree import Tree
+
+from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
 from pyegeria.solution_architect_omvs import SolutionArchitect
 from pyegeria import (
     ProjectManager,
     UserNotAuthorizedException,
     PropertyServerException,
-    InvalidParameterException,
+    InvalidParameterException, save_mermaid_html,
     )
 
 from pyegeria._exceptions import (
@@ -46,7 +48,7 @@ EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
 EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "150"))
-
+EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
 
 def blueprint_list(
     search_string: str,
@@ -74,10 +76,10 @@ def blueprint_list(
             caption=f"View Server '{server_name}' @ Platform - {platform_url}",
             expand=True,
             )
-        table.add_column("Blueprint Name")
-        table.add_column("Qualified Name \n/\n GUID\n/\nVersion", width=38, no_wrap=False)
-        table.add_column("Description")
-        table.add_column("Solution Components")
+        table.add_column("Blueprint Name  /  Diagram Link", justify="center")
+        table.add_column("Qualified Name   /  GUID  /  Version", justify="center", width=38, no_wrap=False)
+        table.add_column("Description", justify="center")
+        table.add_column("Solution Components", justify="center")
 
         blueprints = client.find_solution_blueprints(search_string)
         if isinstance(blueprints, list) is False:
@@ -88,8 +90,14 @@ def blueprint_list(
             bp_qname = bp["properties"].get("qualifiedName", '---')
             bp_guid = bp["elementHeader"]["guid"]
             bp_desc = bp["properties"].get("description",'---')
-            bp_unique_name = f"{bp_qname}\n\n\t\t/\n\n{bp_guid}"
-            bp_mermaid = bp.get("mermaid",'---')
+            bp_unique_name = f"{bp_qname}\n\n--\n\n{bp_guid}"
+            bp_mermaid = bp.get("mermaidGraph",'---')
+            if bp_mermaid != '---':
+                link = save_mermaid_html(bp_name, bp_mermaid, f"{EGERIA_MERMAID_FOLDER}/blueprints")
+                link = f"file://:{link}"
+                bp_mermaid = Text(link, style="blue link " +  link)
+
+            bp_mermaid_label = Text(f"{bp_name}\n\n--\n\n{bp_mermaid}")
 
             bp_components = bp.get("solutionComponents",[])
             comp_md=""
@@ -103,6 +111,7 @@ def blueprint_list(
                 comp_description = comp_props.get("description",'---')
                 comp_planned = comp_props['extendedProperties'].get("plannedDeployedImplementationType",'---')
                 comp_type = comp_props.get('solutionComponentType','---')
+
                 comp_actors = comp_props.get('actors', [])
                 comp_actors_list = ""
                 for actor in comp_actors:
@@ -121,7 +130,7 @@ def blueprint_list(
                 comp_md += f"* Planned Deployment: {comp_planned}\n"
                 comp_md += f"* Actors: {comp_actors_list}\n"
             comp_out = Markdown(comp_md)
-            table.add_row(bp_name, bp_unique_name, bp_desc, comp_out)
+            table.add_row(bp_mermaid_label, bp_unique_name, bp_desc, comp_out)
 
         return table
 

pyegeria-5.3.3.15/pyegeria/commands/tech/list_solution_components.py

@@ -0,0 +1,172 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+A simple viewer for Information Solution Components
+
+"""
+
+import argparse
+import os
+import time
+
+from rich import print, box
+from rich.console import Console
+from rich.markdown import Markdown
+from rich.panel import Panel
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.text import Text
+from rich.tree import Tree
+
+from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
+from pyegeria.solution_architect_omvs import SolutionArchitect
+from pyegeria import (
+    ProjectManager,
+    UserNotAuthorizedException,
+    PropertyServerException,
+    InvalidParameterException, save_mermaid_html,
+    )
+
+from pyegeria._exceptions import (
+    print_exception_response,
+)
+
+disable_ssl_warnings = True
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "150"))
+EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
+
+def solution_component_list(
+    search_string: str,
+    server_name: str,
+    platform_url: str,
+    user: str,
+    user_password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+    timeout: int = 30,
+):
+    """A Solution Component viewer"""
+    client = SolutionArchitect(server_name, platform_url, user, user_password)
+    token = client.create_egeria_bearer_token()
+
+    def generate_table() -> Table | str:
+        table = Table(
+            title=f"Solution Components matching  {search_string} @ {time.asctime()}",
+            style="bright_white on black",
+            header_style="bright_white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            caption=f"View Server '{server_name}' @ Platform - {platform_url}",
+            expand=True,
+            )
+        table.add_column("Component Name  /  Diagram Link", justify="center", no_wrap=False)
+        table.add_column("Component Type / Planned Deployment Type", justify="center")
+        table.add_column("Qualified Name   /  GUID", justify="center", width=38, no_wrap=False)
+        table.add_column("Description / HeadCount", justify="center")
+        table.add_column("Sub-Components", justify="center")
+
+        components = client.find_solution_components(search_string)
+        if isinstance(components, list) is False:
+            return "No components found"
+
+        for component in components:
+            component_name = component["properties"].get("displayName", '---')
+            component_type = component["properties"].get("solutionComponentType", '---')
+            planned_deployment_type = component["properties"].get('extendedProperties',{}).get("plannedDeployedImplementationType", '---')
+            component_info = (f"Type: {component_type}\n\n--\n\nPlanned Deployment Type: {planned_deployment_type}")
+
+            component_qname = component["properties"].get("qualifiedName", '---')
+            component_guid = component["elementHeader"]["guid"]
+            component_unique_name = f"{component_qname}\n\n--\n\n{component_guid}"
+
+            component_desc = component["properties"].get("description",'---')
+
+
+            component_mermaid = component.get("mermaidGraph",'---')
+            if component_mermaid != '---':
+                link = save_mermaid_html(component_name, component_mermaid, f"{EGERIA_MERMAID_FOLDER}/components" )
+                link = f"file://:{link}"
+                component_mermaid = Text(link, style="blue link " +  link)
+
+            component_mermaid_label = Text(f"{component_name}\n\n--\n\n{component_mermaid}")
+
+            component_components = component.get("solutionComponents",[])
+            comp_props_md=""
+            first_comp = True
+            for component in component_components:
+                comp = component.get("relatedElement","")
+                if isinstance(comp,dict) is False:
+                    continue
+                comp_props = comp.get("properties",{})
+                comp_props_md = ""
+                for prop in comp_props.keys():
+                    comp_props_md += f"* **{prop}**: {comp_props[prop]}\n"
+
+                if first_comp:
+                    first_comp = False
+                else:
+                    comp_props_md += "\n\n---\n\n"
+
+            comp_props_out = Markdown(comp_props_md)
+            table.add_row(component_mermaid_label, component_info, component_unique_name, component_desc, comp_props_out)
+
+        return table
+
+
+
+
+    try:
+        console = Console(width=width, force_terminal=not jupyter)
+        with console.pager():
+            console.print(generate_table())
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+
+
+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="User 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
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    try:
+        search_string = Prompt.ask(
+            "Enter a search string:", default="*"
+        )
+        solution_component_list(search_string, server, url, userid, user_pass)
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

pyegeria-5.3.3.14.dev3/pyegeria/commands/tech/list_solution_blueprints.py → pyegeria-5.3.3.15/pyegeria/commands/tech/list_solution_roles.py

@@ -3,7 +3,7 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-A simple viewer for Information Supply Chains
+A simple viewer for Information Solution Roles
 
 """
 
@@ -19,12 +19,14 @@ from rich.prompt import Prompt
 from rich.table import Table
 from rich.text import Text
 from rich.tree import Tree
+
+from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
 from pyegeria.solution_architect_omvs import SolutionArchitect
 from pyegeria import (
     ProjectManager,
     UserNotAuthorizedException,
     PropertyServerException,
-    InvalidParameterException,
+    InvalidParameterException, save_mermaid_html,
     )
 
 from pyegeria._exceptions import (
@@ -46,9 +48,9 @@ EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
 EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "150"))
+EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
 
-
-def blueprint_list(
+def solution_role_list(
     search_string: str,
     server_name: str,
     platform_url: str,
@@ -64,7 +66,7 @@ def blueprint_list(
 
     def generate_table() -> Table | str:
         table = Table(
-            title=f"Blueprints matching  {search_string} @ {time.asctime()}",
+            title=f"Solution Roles matching  {search_string} @ {time.asctime()}",
             style="bright_white on black",
             header_style="bright_white on dark_blue",
             title_style="bold white on black",
@@ -74,52 +76,60 @@ def blueprint_list(
             caption=f"View Server '{server_name}' @ Platform - {platform_url}",
             expand=True,
             )
-        table.add_column("Blueprint Name")
-        table.add_column("Qualified Name \n/\n GUID\n/\nVersion", width=38, no_wrap=False)
-        table.add_column("Description")
-        table.add_column("Solution Components")
-
-        blueprints = client.find_solution_blueprints(search_string)
-        if isinstance(blueprints, list) is False:
-            return "No Blueprints found"
-
-        for bp in blueprints:
-            bp_name = bp["properties"].get("displayName", '---')
-            bp_qname = bp["properties"].get("qualifiedName", '---')
-            bp_guid = bp["elementHeader"]["guid"]
-            bp_desc = bp["properties"].get("description",'---')
-            bp_unique_name = f"{bp_qname}\n\n\t\t/\n\n{bp_guid}"
-            bp_mermaid = bp.get("mermaid",'---')
-
-            bp_components = bp.get("solutionComponents",[])
-            comp_table = Table(title="No Solution Components")
-            for component in bp_components:
-                comp = component.get("solutionComponent","")
+        table.add_column("Role Id  /  Diagram Link", justify="center", no_wrap=False)
+        table.add_column("Title / Type / Scope / HeadCount", justify="center")
+        table.add_column("Qualified Name   /  GUID", justify="center", width=38, no_wrap=False)
+        table.add_column("Description / HeadCount", justify="center")
+        table.add_column("Solution Components", justify="center")
+
+        roles = client.find_solution_roles(search_string)
+        if isinstance(roles, list) is False:
+            return "No Roles found"
+
+        for role in roles:
+            role_name = role["properties"].get("roleId", '---')
+
+            role_title = role["properties"].get("title", '---')
+            role_scope = role["properties"].get("scope", '---')
+            role_type = role["properties"].get("typeName", '---')
+            role_headcount = role["properties"].get("extendedProperties", {}).get("headCount", '---')
+            role_info = (f"Title: {role_title}\n\n--\n\nType: {role_type}\n\n--\n\n"
+                        f"Scope: {role_scope}\n\n--\n\nHeadCount: {role_headcount}")
+
+            role_qname = role["properties"].get("qualifiedName", '---')
+            role_guid = role["elementHeader"]["guid"]
+            role_unique_name = f"{role_qname}\n\n--\n\n{role_guid}"
+
+            role_desc = role["properties"].get("description",'---')
+
+
+            role_mermaid = role.get("mermaidGraph",'---')
+            if role_mermaid != '---':
+                link = save_mermaid_html(role_name, role_mermaid, f"{EGERIA_MERMAID_FOLDER}/roles" )
+                link = f"file://:{link}"
+                role_mermaid = Text(link, style="blue link " +  link)
+
+            role_mermaid_label = Text(f"{role_name}\n\n--\n\n{role_mermaid}")
+
+            role_components = role.get("solutionComponents",[])
+            comp_props_md=""
+            first_comp = True
+            for component in role_components:
+                comp = component.get("relatedElement","")
                 if isinstance(comp,dict) is False:
                     continue
                 comp_props = comp.get("properties",{})
-                comp_name = comp_props.get("displayName",'---')
-                comp_description = comp_props.get("description",'---')
-                comp_planned = comp_props['extendedProperties'].get("plannedDeployedImplementationType",'---')
-                comp_type = comp_props.get('solutionComponentType','---')
-                comp_actors = comp_props.get('actors', [])
-                comp_actors_list = ""
-                for actor in comp_actors:
-                    comp_actor_role = actor['relationshipProperties'].get('role','---')
-                    comp_actor_props = actor['relatedElement'].get('properties',{})
-                    comp_actor_props_md = f"* Role: {comp_actor_role}\n"
-                    for prop in comp_actor_props.keys():
-                        comp_actor_props_md += f"* {prop}: {comp_actor_props[prop]}\n"
-                    comp_actors_list += comp_actor_props_md
-
-                comp_table = Table(title=f"Solution Component {comp_name}")
-                comp_table.add_column("Comp Type")
-                comp_table.add_column("Description")
-                comp_table.add_column("Planned Deployment")
-                comp_table.add_column("Actors")
-                comp_table.add_row(comp_type, comp_description, comp_planned, comp_actors_list)
-
-            table.add_row(bp_name, bp_unique_name, bp_desc, comp_table)
+                comp_props_md = ""
+                for prop in comp_props.keys():
+                    comp_props_md += f"* **{prop}**: {comp_props[prop]}\n"
+
+                if first_comp:
+                    first_comp = False
+                else:
+                    comp_props_md += "\n\n---\n\n"
+
+            comp_props_out = Markdown(comp_props_md)
+            table.add_row(role_mermaid_label, role_info, role_unique_name, role_desc, comp_props_out)
 
         return table
 
@@ -157,7 +167,7 @@ def main():
         search_string = Prompt.ask(
             "Enter a search string:", default="*"
         )
-        blueprint_list(search_string, server, url, userid, user_pass)
+        solution_role_list(search_string, server, url, userid, user_pass)
     except KeyboardInterrupt:
         pass