pyegeria 5.4.7.6__tar.gz → 5.4.7.8__tar.gz

{pyegeria-5.4.7.6/pyegeria.egg-info → pyegeria-5.4.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyegeria
-Version: 5.4.7.6
+Version: 5.4.7.8
 Summary: A python client for Egeria
 Author-email: Dan Wolfson <dan.wolfson@pdr-associates.com>
 License-Expression: Apache-2.0

pyegeria-5.4.7.6/commands/cat/list_format_set.py → pyegeria-5.4.7.8/commands/cat/run_report.py

@@ -361,11 +361,11 @@ def main():
     # First, parse just the format-set argument to determine which other arguments to add
     logger.enable("pyegeria")
     initial_parser = argparse.ArgumentParser(add_help=False)
-    initial_parser.add_argument("--format-set", help="Name of the output format set", required=True)
+    initial_parser.add_argument("--report", help="Name of the output format set", required=True)
     initial_args, _ = initial_parser.parse_known_args()
 
     # Get the format set to determine parameters
-    format_set_name = initial_args.format_set
+    format_set_name = initial_args.report
     format_set = select_output_format_set(format_set_name, "ANY")
 
     # Check if the format set exists
@@ -379,7 +379,7 @@ def main():
     
     # Create the full parser with all arguments
     parser = argparse.ArgumentParser(description="Execute an action from an output format set")
-    parser.add_argument("--format-set", help="Name of the output format set", required=True)
+    parser.add_argument("--report", help="Name of the output format set", required=True)
     parser.add_argument("--server", help="Name of the server to connect to")
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
@@ -412,7 +412,7 @@ def main():
     print(f"root path: {app_config.pyegeria_root}, config_file: {app_config.pyegeria_config_file}")
     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
-    format_set_name = args.format_set
+    format_set_name = args.report
     output_format = args.output_format
 
     logger.info(f"view server @ {url}")

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/commands/cli/egeria.py

@@ -18,7 +18,7 @@ from loguru import logger
 
 from pyegeria import config_logging,  settings
 
-from commands.cat.list_format_set import execute_format_set_action
+from commands.cat.run_report import execute_format_set_action
 from commands.cat.get_asset_graph import asset_viewer
 from commands.cat.get_collection import collection_viewer
 from commands.cat.get_project_dependencies import project_dependency_viewer
@@ -1041,17 +1041,17 @@ def show_cat_info(ctx):
     """Group of md_commands to show information about various Egeria objects"""
     pass
 
-@show_cat_info.command("list-output-set")
-@click.option("--format-set", help="Format set to output")
+@show_cat_info.command("Run Report")
+@click.option("--report", help="Report to output", default="Digital-Products")
 @click.option("--output-format", default = "TABLE", help="Output format type")
 @click.option('--search-string', default="*", help="Search string")
 @click.pass_context
-def show_format_set(ctx, format_set, output_format, search_string):
+def show_format_set(ctx, report, output_format, search_string):
     """Dynamically generate output based on a format set"""
     c = ctx.obj
     logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
     execute_format_set_action(
-        format_set, c.view_server, c.view_server_url,
+        report, c.view_server, c.view_server_url,
         c.userid, c.password, output_format, search_string = search_string
     )
 

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/commands/cli/egeria_cat.py

@@ -14,8 +14,9 @@ import os
 import click
 from trogon import tui
 from pyegeria import settings
+from loguru import logger
 
-from commands.cat.list_format_set import execute_format_set_action
+from commands.cat.run_report import execute_format_set_action
 from commands.cat.dr_egeria_md import process_markdown_file
 from commands.cat.get_asset_graph import asset_viewer
 from commands.cat.get_collection import collection_viewer
@@ -64,7 +65,7 @@ EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 app_settings = settings
 
-app_config = app_settings["Environment"]
+app_config = app_settings.Environment
 # config_logging()
 
 
@@ -76,7 +77,7 @@ app_config = app_settings["Environment"]
 @click.group()
 @click.option(
     "--server",
-    default=app_config['Egeria Metadata Store'],
+    default=app_config.egeria_metadata_store,
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -123,9 +124,11 @@ app_config = app_settings["Environment"]
 @click.option(
     "--password",
     default=EGERIA_USER_PASSWORD,
-    help="Egeria user password",
+    help="Egeria user password"
 )
+
 @click.option("--timeout", default=60, help="Number of seconds to wait")
+
 @click.option(
     "--jupyter",
     is_flag=True,
@@ -135,18 +138,18 @@ app_config = app_settings["Environment"]
 )
 @click.option(
     "--width",
-    default=app_config.console__width,
+    default=app_config.console_width,
     type=int,
     help="Screen width, in characters, to use",
 )
 @click.option(
-    "--home_glossary_guid",
-    default=app_settings.User_Profile.home_glossary_guid,
+    "--home_glossary_name",
+    default=app_settings.User_Profile.egeria_home_glossary_name,
     help="Glossary name to use as the home glossary",
 )
 @click.option(
     "--glossary_path",
-    default=app_config.egeria_platform_glossary_path,
+    default=app_config.egeria_glossary_path,
     help="Path to glossary import/export files",
 )
 
@@ -183,7 +186,7 @@ def cli(
     timeout,
     jupyter,
     width,
-    home_glossary_guid,
+    home_glossary_name,
     glossary_path,
     root_path,
     inbox_path,
@@ -204,7 +207,7 @@ def cli(
         timeout,
         jupyter,
         width,
-        home_glossary_guid,
+        home_glossary_name,
         glossary_path,
         root_path,
         inbox_path,
@@ -227,17 +230,17 @@ def info(ctx):
     pass
 
 
-@info.command("list-output-set")
-@click.option("--format-set", help="Format set to output")
+@info.command("Run Report")
+@click.option("--report", help="Report to output", default="Digital-Products")
 @click.option("--output-format", default = "TABLE", help="Output format type")
 @click.option('--search-string', default="*", help="Search string")
 @click.pass_context
-def show_format_set(ctx, format_set, output_format, search_string):
+def show_format_set(ctx, report, output_format, search_string):
     """Dynamically generate output based on a format set"""
     c = ctx.obj
-
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
     execute_format_set_action(
-        format_set, c.view_server, c.view_server_url,
+        report, c.view_server, c.view_server_url,
         c.userid, c.password, output_format, search_string = search_string
     )
 

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/commands/ops/gov_server_actions.py

@@ -14,7 +14,7 @@ import click
 from rich import print, print_json
 from rich.console import Console
 
-from pyegeria import INTEGRATION_GUIDS, AutomatedCuration, EgeriaTech
+from pyegeria import AutomatedCuration, EgeriaTech
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
@@ -36,17 +36,18 @@ def add_catalog_target(
 ) -> str:
     """Add catalog targets to the specified integration connector"""
     try:
-        if integration_connector not in INTEGRATION_GUIDS.keys():
-            click.echo("Integration connector is not known")
-
         c = ctx.obj
         a_client = AutomatedCuration(
             c.view_server, c.view_server_url, c.userid, c.password
         )
         token = a_client.create_egeria_bearer_token()
 
+        integ_connector_guid = a_client.get_connector_guid(integration_connector)
+        if not integ_connector_guid or c.catalog_targets == 'No connector found':
+            raise InvalidParameterException('No Connector found')
+
         guid = a_client.add_catalog_target(
-            INTEGRATION_GUIDS[integration_connector],
+            integ_connector_guid,
             metadata_element_guid,
             catalog_target_name,
         )

{pyegeria-5.4.7.6/commands/my → pyegeria-5.4.7.8/commands/tech}/__init__.py

@@ -4,8 +4,6 @@ Copyright Contributors to the ODPi Egeria project.
 
 """
 from pyegeria import (
-    INTEGRATION_GUIDS,
-    TEMPLATE_GUIDS,
     default_time_out,
     disable_ssl_warnings,
     enable_ssl_check,

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/md_processing/dr_egeria.py

@@ -258,7 +258,7 @@ def process_md_file(input_file: str, output_folder:str, directive: str, server:
                 print(f"\n==>\tErrors found while processing command: \'{potential_command}\'\n"
                       f"\tPlease correct and try again. \n")
                 final_output.append(current_block)
-                final_output.append('\n___\n')
+                final_output.append('\n____\n')
         else:
             # If there is no object_action, append the block as-is
             final_output.append(current_block)
@@ -278,7 +278,7 @@ def process_md_file(input_file: str, output_folder:str, directive: str, server:
             in_h1_block = True
 
         # Handle the end of a block (line starts with `---`)
-        elif line.startswith("___"):
+        elif line.startswith("___") or line.startswith("---"):
             if in_h1_block:
                 # Process the current block when it ends with `---`
                 current_block += f"\n{line}"

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/md_processing/md_commands/ext_ref_commands.py

@@ -100,13 +100,15 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
             prop_body["copyright"] = attributes.get('Copyright', {}).get('value', None)
             prop_body["attribution"] = attributes.get('Attribution', {}).get('value', None)
 
-            if object_type == "RelatedMedia":
+            if object_type in ["RelatedMedia", "Related Media"]:
+                object_type = "RelatedMedia"
                 prop_body["class"]  = "RelatedProperties"
                 prop_body["mediaType"]  = attributes.get('Media Type', {}).get('value', None)
                 prop_body["mediaTypeOtherId"] = attributes.get('Media Type Other ID', {}).get('value', None)
                 prop_body["defaultMediaUsage"]= attributes.get('Default Media Usage', {}).get('value', None)
                 prop_body["defaultMediaUsageOtherId"] = attributes.get('Default Media Usage Other ID', {}).get('value', None)
-            elif object_type == "CitedDocument":
+            elif object_type in ["CitedDocument", "Cited Document"]:
+                object_type = "CitedDocument"
                 prop_body["class"]  = "CitedDocumentProperties"
                 prop_body["numberOfPages"]  = attributes.get('Number of Pages', {}).get('value', None)
                 prop_body["pageRange"] = attributes.get('Page Range', {}).get('value', None)
@@ -119,7 +121,8 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
                 prop_body["publicationCity"] = attributes.get('Publication City', {}).get('value', None)
                 prop_body["publicationYear"] = attributes.get('Publication Year', {}).get('value', None)
                 prop_body["publicationNumbers"]= attributes.get('Publication Numbers', {}).get('value', None)
-
+            elif object_type in ["ExternalReference", "External Reference"]:
+                object_type = "ExternalReference"
 
 
             if object_action == "Update":
@@ -147,6 +150,7 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
                 #     egeria_client.update_external_reference_status(guid, status)
 
                 logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___")
+                print(Markdown(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___"))
                 update_element_dictionary(qualified_name, {
                     'guid': guid, 'display_name': display_name
                     })
@@ -182,11 +186,13 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
                             })
                         msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
+                        print(Markdown(msg))
                         return egeria_client.get_external_reference_by_guid(guid, element_type=object_type,
                                                                             output_format='MD',
                                                                             output_format_set=output_set)
                     else:
                         msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
+                        print(Markdown(msg))
                         logger.error(msg)
                         return None
 

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/md_processing/md_commands/solution_architect_commands.py

@@ -155,7 +155,7 @@ def sync_component_related_elements(egeria_client: EgeriaTech, object_type: str,
         logger.trace(f"supply_chains_to_add: {list(supply_chains_to_add)}")
         if len(supply_chains_to_add) > 0:
             body = {
-                "class": "RelationshipRequestBody",
+                "class": "NewRelationshipRequestBody",
                 "properties": {
                     "class": "ImplementedByProperties",
                     "description": "a blank description to satisfy the Egeria gods"
@@ -188,7 +188,7 @@ def sync_component_related_elements(egeria_client: EgeriaTech, object_type: str,
 
         if supply_chain_guids:
             body = {
-                "class": "RelationshipRequestBody",
+                "class": "NewRelationshipRequestBody",
                 "properties": {
                     "class": "ImplementedByProperties",
                     "description": "a blank description to satisfy the Egeria gods"
@@ -307,6 +307,7 @@ def process_blueprint_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                     msg = (f" Element `{display_name}` does not exist! Updating result document with Create "
                            f"object_action\n")
                     logger.error(msg)
+                    print(Markdown(msg))
                     return update_a_command(txt, object_action, object_type, qualified_name, guid)
                 elif not valid:
                     return None
@@ -324,19 +325,11 @@ def process_blueprint_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                     update_element_dictionary(qualified_name, {
                         'guid': guid, 'display_name': display_name
                     })
-                    logger.info(msg)
                     logger.success(msg)
-                    return egeria_client.find_solution_blueprints(qualified_name, output_format='MD')
-
-                egeria_client.update_solution_blueprint(guid, body, replace_all_props)
-                logger.success(f"==> Updated  {object_type} `{display_name}` with GUID {guid}\n\n")
-                update_element_dictionary(qualified_name, {
-                    'guid': guid, 'display_name': display_name
-                    })
-                sync_blueprint_related_elements(egeria_client, object_type, component_guids, guid, qualified_name,
-                                                display_name, replace_all_props)
-                logger.success(f"===> Updated {object_type} `{display_name}` related elements\n\n")
-                return egeria_client.find_solution_blueprints(qualified_name, output_format='MD')
+                    sync_blueprint_related_elements(egeria_client, object_type, component_guids, guid, qualified_name,
+                                                    display_name, replace_all_props)
+                    logger.success(f"===> Updated {object_type} `{display_name}` related elements\n\n")
+                    return egeria_client.get_solution_blueprints_by_name(qualified_name, output_format='MD', output_format_set = "Solution-Blueprint-DrE")
 
 
             elif object_action == "Create":
@@ -346,10 +339,12 @@ def process_blueprint_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                         msg = (f"  Data Specification `{display_name}` already exists and result document updated changing "
                                f"`Create` to `Update` in processed output\n\n___")
                         logger.error(msg)
+                        print(Markdown(msg))
                         return update_a_command(txt, object_action, object_type, qualified_name, guid)
 
                     elif not valid:
                         msg = (f"==>{object_type} `{display_name}` is not valid and can't be created")
+                        print(Markdown(msg))
                         logger.error(msg)
                         return
 
@@ -366,10 +361,12 @@ def process_blueprint_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                         'guid': guid, 'display_name': display_name
                         })
                     msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
+                    print(Markdown(msg))
                     logger.success(msg)
-                    return egeria_client.find_solution_blueprints(qualified_name, output_format='MD')
+                    return egeria_client.get_solution_blueprint_by_guid(guid, output_format='MD', output_format_set = "Solution-Blueprint-DrE")
                 else:
                     msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
+                    print(Markdown(msg))
                     logger.error(msg)
                     return None
 
@@ -488,9 +485,10 @@ def process_solution_component_upsert_command(egeria_client: EgeriaTech, txt: st
                     "class": "UpdateElementRequestBody",
                     "externalSourceGUID": external_source_guid,
                     "externalSourceName": external_source_name,
-                    "effectiveTime": effective_time, "forLineage": False,
+                    "effectiveTime": effective_time,
+                    "mergeUpdate": merge_update,
+                    "forLineage": False,
                     "forDuplicateProcessing": False,
-                    "parentAtEnd1": parent_at_end1,
                     "properties": {
                         "class": "SolutionComponentProperties",
                         "qualifiedName": qualified_name,
@@ -505,7 +503,7 @@ def process_solution_component_upsert_command(egeria_client: EgeriaTech, txt: st
                         }
                     })
 
-                egeria_client.update_solution_component(guid, body, not merge_update)
+                egeria_client.update_solution_component(guid, body)
                 logger.success(f"==>Updated  {object_type} `{display_name}` with GUID {guid}\n")
                 update_element_dictionary(qualified_name, {
                     'guid': guid, 'display_name': display_name
@@ -517,7 +515,7 @@ def process_solution_component_upsert_command(egeria_client: EgeriaTech, txt: st
                                                 display_name,
                                                 merge_update)
                 logger.success(f"==>Updated  {object_type} `{display_name}` with related elements")
-                return egeria_client.get_solution_component_by_guid(guid, output_format='MD')
+                return egeria_client.get_solution_component_by_guid(guid, output_format='MD', output_format_set = "Solution-Component-DrE")
 
 
             elif object_action == "Create":
@@ -704,7 +702,7 @@ def process_component_link_unlink_command(egeria_client: EgeriaTech, txt: str,
                     return
                 else:
                     body = {
-                        "class": "RelationshipRequestBody",
+                        "class": "NewRelationshipRequestBody",
                         "effectiveTime": effective_time,
                         "forLineage": False,
                         "forDuplicateProcessing": False,
@@ -717,13 +715,13 @@ def process_component_link_unlink_command(egeria_client: EgeriaTech, txt: str,
                             }
                         }
 
-                    egeria_client.link_solution_linking_wire(component1, component2, None)
+                    egeria_client.link_solution_linking_wire(component1, component2, body)
                     msg = f"==>Created {object_type} link named `{label}`\n"
                     logger.success(msg)
+                    print(Markdown(msg))
                     out = parsed_output['display'].replace('Link', 'Detach', 1)
                     return out
 
-
         except Exception as e:
             logger.error(f"Error performing {command}: {e}")
             return None
@@ -1006,7 +1004,7 @@ def process_information_supply_chain_link_unlink_command(egeria_client: EgeriaTe
                     return
                 else:
                     body = {
-                        "class": "RelationshipRequestBody",
+                        "class": "NewRelationshipRequestBody",
                         "effectiveTime": effective_time,
                         "forLineage": False,
                         "forDuplicateProcessing": False,

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/md_processing/md_processing_utils/common_md_proc_utils.py

@@ -186,6 +186,9 @@ def parse_upsert_command(egeria_client: EgeriaTech, object_type: str, object_act
 
                 elif style == 'GUID':
                     parsed_attributes[key] = proc_simple_attribute(txt, object_action, labels, if_missing)
+                    g = parsed_attributes[key].get('value', None)
+                    if g and ("___" not in g and "---" not in g):
+                        parsed_output['guid'] = parsed_attributes[key]['value']
                 elif style == 'Ordered Int':
                     parsed_attributes[key] = proc_simple_attribute(txt, object_action, labels, if_missing)
                 elif style == 'Simple Int':
@@ -536,6 +539,10 @@ def proc_simple_attribute(txt: str, action: str, labels: set, if_missing: str =
 
     # attribute = default_value if attribute is None else attribute.replace('\n', '')
     attribute = default_value if attribute is None else attribute
+    if isinstance(attribute, str):
+        attribute = re.sub(r'\n+', '\n', attribute)
+        attribute = None if attribute.startswith('___') or attribute.startswith('---') else attribute
+
 
     if attribute is None:
         if if_missing == INFO or if_missing == WARNING:

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/md_processing/md_processing_utils/common_md_utils.py

@@ -51,7 +51,7 @@ GOVERNANCE_CONTROLS = ["Governance Control", "Governance Rule", "Service Level O
 ALL_GOVERNANCE_DEFINITIONS = GENERAL_GOVERNANCE_DEFINITIONS + GOVERNANCE_CONTROLS + ["Governance Strategy", "Regulation",
                                                 "Security Group", "GovernanceMetric",
                                                 "Naming Standard Rule", "TermsAndConditions", "Certification Type", "License Type"]
-
+console = Console(width=EGERIA_WIDTH)
 debug_level = DEBUG_LEVEL
 global COMMAND_DEFINITIONS
 
@@ -521,7 +521,7 @@ def set_classifications(object_type: str, attributes: dict)->dict:
     classifications = attributes.get('Classifications', {}).get('name_list', None)
     body = None
     if classifications:
-        body = {classification: {} for classification in classifications} if cclassifications else {}
+        body = {classification: {} for classification in classifications} if classifications else {}
     return body
 
 def set_object_classifications(object_type: str, attributes: dict, obj_types: list[str])->dict:

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/pyegeria/__init__.py

@@ -72,8 +72,6 @@ from ._output_formats import select_output_format_set
 from .mcp_adapter import list_reports, describe_report, run_report, _async_run_report, _execute_egeria_call_blocking
 
 #
-global template_guids, integration_guids
-
 # 2/12/25
 
 def __getattr__(name):

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/pyegeria/_client_new.py

@@ -166,7 +166,7 @@ class Client2:
 
         try:
             result = self.check_connection()
-            logger.info(f"client initialized, platform origin is: {result}")
+            logger.debug(f"client initialized, platform origin is: {result}")
         except PyegeriaConnectionException as e:
             raise
 
@@ -399,10 +399,10 @@ class Client2:
         response = await self._async_make_request("GET", origin_url, is_json=False)
         if response.status_code == 200:
             text = response.text.strip()
-            logger.success(f"Got response from {origin_url}\n Response: {text}")
+            logger.debug(f"Got response from {origin_url}\n Response: {text}")
             return text
         else:
-            logger.info(f"Got response from {origin_url}\n status_code: {response.status_code}")
+            logger.debug(f"Got response from {origin_url}\n status_code: {response.status_code}")
             return ""
 
 
@@ -1565,7 +1565,7 @@ class Client2:
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
 
         response = await self._async_make_request("POST", url, json_body)
-        elements = response.json().get("element", NO_ELEMENTS_FOUND)
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is str:
             logger.info(NO_ELEMENTS_FOUND)
             return NO_ELEMENTS_FOUND

{pyegeria-5.4.7.6 → pyegeria-5.4.7.8}/pyegeria/_output_formats.py

@@ -191,7 +191,6 @@ GLOSSARY_COLUMNS = COMMON_COLUMNS + [
 ]
 
 COLLECTIONS_COLUMNS = COMMON_COLUMNS + [
-    Column(name='Type Name', key='type_name'),
     Column(name='Classifications', key='classifications'),
     Column(name="Created By", key='created_by'),
     Column(name="Create Time", key='create_time'),
@@ -298,6 +297,26 @@ base_output_format_sets = FormatSetDict({
             )
         ],
     ),
+    "TechTypeDetail": FormatSet(
+        target_type="TechTypeDetail",
+        heading="Technology Type Details",
+        description="Details of a Technology Type Valid Value.",
+        annotations={},  # No specific annotations
+        formats=[
+            Format(
+                types=["ALL"],
+                columns= [
+                    Column(name='Display Name', key='display_name'),
+                    Column(name="Qualified Name", key='qualified_name'),
+                    Column(name="GUID", key='guid'),
+                    Column(name="Description", key='description'),
+                    Column(name="Catalog Template Placeholders", key='catalog_template_specs'),
+                    Column(name="Reference URL", key='ref_url'),
+                ],
+            )
+        ],
+    ),
+
     "ExternalReference": FormatSet(
         target_type="External Reference",
         heading="External Reference Attributes",
@@ -531,6 +550,38 @@ base_output_format_sets = FormatSetDict({
             spec_params={"output_format": "DICT"},
         )
     ),
+"Solution-Blueprint": FormatSet(
+        target_type="SolutionBlueprint",
+        heading="Solution Blueprint Report",
+        description="Details of a Solution Blueprint.",
+        aliases=[],
+        annotations={"Wikilinks": ["[[Solution-Blueprint]]"]},
+        formats=[
+            Format(
+                types=["DICT", "TABLE", "LIST", "MD", "FORM"],
+                columns=COLLECTIONS_MEMBERS_COLUMNS
+            ),
+            Format(
+                types=["REPORT", "HTML"],
+                columns=COLLECTIONS_MEMBERS_COLUMNS + [
+                    Column(name="GUID", key='GUID'),
+                    Column(name="Mermaid", key='mermaid'),
+                    Column(name="Solution Blueprint Mermaid Graph", key='solutionBlueprintMermaidGraph'),
+                ]),
+            Format(
+                types=["MERMAID"],
+                columns= [
+                    Column(name="Mermaid", key='mermaid'),
+                    Column(name="Solution Blueprint Mermaid Graph", key='solutionBlueprintMermaidGraph'),
+                ])
+        ],
+        action=ActionParameter(
+            function="SolutionArchitect.find_solution_blueprints",
+            required_params=["search_string"],
+            optional_params=OPTIONAL_PARAMS,
+            spec_params={},
+        ),
+    ),
     "Digital-Product-Catalog": FormatSet(
         target_type="DigitalProductCatalog",
         heading="Catalogs for Digital Products",
@@ -2122,9 +2173,9 @@ generated_format_sets = FormatSetDict({
                                            Column(name='Category', key='category'),
                                            Column(name='Description', key='description'),
                                            Column(name='Status', key='element_status'),
-                                           Column(name='Solution Component Type', key='soln_comp_type'),
+                                           Column(name='Solution Component Type', key='solution_component_type'),
                                            Column(name='Planned Deployed Implementation Type',
-                                                  key='planned_deployed_impl_type'),
+                                                  key='planned_deployed_implementation_type'),
                                            Column(name='Initial Status', key='initial_status'),
                                            Column(name='In Solution Components', key='in_components'),
                                            Column(name='In Solution Blueprints', key='solution_blueprints'),