pyegeria 5.4.4.8__py3-none-any.whl → 5.4.6__py3-none-any.whl

md_processing/__init__.py

@@ -16,6 +16,7 @@ from md_processing.md_commands.product_manager_commands import (process_digital_
                                                                 process_product_dependency_command,
                                                                 process_attach_collection_command,
                                                                 process_attach_subscriber_command,
+                                                                process_csv_element_upsert_command,
                                                                )
 
 from md_processing.md_commands.solution_architect_commands import (process_blueprint_upsert_command,
@@ -41,6 +42,7 @@ from md_processing.md_commands.ext_ref_commands import (process_external_referen
                                                         process_link_to_media_reference_command,
                                                         process_link_to_external_reference_command,
                                                         process_link_to_cited_document_command,
+
                                                         )
 
 # Re-export all functions from the original md_processing_utils.py to maintain backward compatibility

md_processing/dr_egeria.py

@@ -12,8 +12,8 @@ from .md_commands.project_commands import process_link_project_dependency_comman
 
 log_format = "{time} | {level} | {function} | {line} | {message} | {extra}"
 logger.remove()
-logger.add(sys.stderr, level="INFO", format=log_format, colorize=True)
-logger.add("debug_log.log", rotation="1 day", retention="1 week", compression="zip", level="TRACE", format=log_format,
+logger.add(sys.stderr, level="ERROR", format=log_format, colorize=True)
+logger.add("debug_log.log", rotation="1 day", retention="1 week", compression="zip", level="INFO", format=log_format,
            colorize=True)
 
 from rich import print
@@ -23,7 +23,7 @@ from md_processing import (extract_command, process_glossary_upsert_command, pro
                            process_provenance_command, get_current_datetime_string,
                            process_project_upsert_command, command_list, process_blueprint_upsert_command,
                            process_solution_component_upsert_command, process_component_link_unlink_command,
-
+                           process_csv_element_upsert_command,
                            process_link_term_term_relationship_command,
                            process_information_supply_chain_upsert_command,
                            process_information_supply_chain_link_unlink_command, process_sol_arch_list_command,
@@ -202,6 +202,9 @@ def process_md_file(input_file: str, output_folder:str, directive: str, server:
                                        "Create Product Subscription", "Update Agreement", "Update Data Sharing Agreement",
                                        "Update Digital Subscription", "Update Product Subscription"]:
                 result = process_agreement_upsert_command(client, current_block, directive)
+            elif potential_command in ["Create CSV File"]:
+                result = process_csv_element_upsert_command(client, current_block, directive)
+
             elif potential_command in SIMPLE_COLLECTIONS:
                 result = process_collection_upsert_command(client, current_block, directive)
             elif potential_command in GOV_COM_LIST:
@@ -296,7 +299,7 @@ def process_md_file(input_file: str, output_folder:str, directive: str, server:
         process_current_block(current_block)
 
     # Join the final output list into a single string
-    final_output = "\n".join(final_output)
+    final_output = "\n".join(final_output) if isinstance(final_output, list) else final_output
 
     try:
         if updated:

md_processing/md_commands/data_designer_commands.py

@@ -1,6 +1,11 @@
-"""
+"""PDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
 This file contains term-related object_action functions for processing Egeria Markdown
+
+
 """
+
 import json
 import os
 import sys
@@ -453,7 +458,7 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
     in_data_spec_valid = attributes.get('In Data Specification', {}).get('valid', None)
     in_data_spec_exists = attributes.get('In Data Specification', {}).get('exists', None)
     output_set = make_format_set_name_from_type(object_type)
-
+    object_type = "DataSpec"
     print(Markdown(parsed_output['display']))
 
     if directive == "display":
@@ -482,7 +487,7 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                         f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
 
                 body = set_update_body(object_type, attributes)
-                body['properties'] = set_element_prop_body("Data Spec", qualified_name, attributes)
+                body['properties'] = set_element_prop_body(object_type, qualified_name, attributes)
 
                 egeria_client.update_collection(guid, body)
                 if status:

md_processing/md_commands/product_manager_commands.py

@@ -174,16 +174,29 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
 
     guid = parsed_output.get('guid', None)
 
-    print(Markdown(parsed_output['display']))
+
 
     logger.debug(json.dumps(parsed_output, indent=4))
 
     attributes = parsed_output['attributes']
 
     display_name = attributes['Display Name'].get('value', None)
+    version = attributes['Version Identifier'].get('value', None)
     status = attributes.get('Status', {}).get('value', None)
     output_set = make_format_set_name_from_type(object_type)
+    if object_type in ["Root Collection", "Folder"]:
+        obj = "Collection"
+        if object_type == "Folder":
+            qn_prefix = "Folder"
+        elif object_type == "Root Collection":
+            qn_prefix = "Root"
+
+        qualified_name = egeria_client.__create_qualified_name__(qn_prefix, display_name, LOCAL_QUALIFIER,
+                                                                 version_identifier=version)
 
+    else:
+        obj = object_type
+    print(Markdown(parsed_output['display']))
 
     if directive == "display":
 
@@ -197,17 +210,7 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
 
     elif directive == "process":
         try:
-            if object_type in ["Root Collection", "Folder"]:
-                obj = "Collection"
-                if object_type == "Folder":
-                    qn_prefix = "Folder"
-                elif object_type == "Root Collection":
-                    qn_prefix = "Root"
 
-                qualified_name = egeria_client.__create_qualified_name__(qn_prefix, element_name, LOCAL_QUALIFIER, version_identifier=version)
-
-            else:
-                obj = object_type
 
             if object_action == "Update":
                 if not exists:
@@ -262,7 +265,7 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
                             })
                         msg = f"\nCreated Element `{display_name}` with GUID {guid}\n\n___"
                        # todo - add the source member asset to the product manager
-                       # create_element_from_template
+                       # create_elem_from_template
                        # add this guid to the product collection
                         logger.success(msg)
                         return egeria_client.get_collection_by_guid(guid, obj, output_format='MD', output_format_set=output_set)
@@ -628,6 +631,106 @@ def process_agreement_upsert_command(egeria_client: EgeriaTech, txt: str, direct
 
 
 
+@logger.catch
+def process_csv_element_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+    """
+    Processes a create CSV element command by extracting key attributes and calling the pyegeria
+    api that creates a csv element from template.
+
+    :param txt: A string representing the input cell to be processed for
+        extracting glossary-related attributes.
+    :param directive: an optional string indicating the directive to be used - display, validate or execute
+    :return: A string summarizing the outcome of the processing.
+    """
+    command, object_type, object_action = extract_command_plus(txt)
+    print(Markdown(f"# {command}\n"))
+
+    parsed_output = parse_upsert_command(egeria_client, object_type, object_action, txt, directive)
+    if not parsed_output:
+        logger.error(f"No output for `{object_action}`")
+        return None
+
+    valid = parsed_output['valid']
+    exists = parsed_output['exists']
+
+    qualified_name = parsed_output.get('qualified_name', None)
+    guid = parsed_output.get('guid', None)
+
+    print(Markdown(parsed_output['display']))
+
+    logger.debug(json.dumps(parsed_output, indent=4))
+
+    attributes = parsed_output['attributes']
+
+    display_name = attributes['Display Name'].get('value', None)
+    status = attributes.get('Status', {}).get('value', None)
+    output_set = make_format_set_name_from_type(object_type)
+
+    file_name = attributes.get('File Name', {}).get('value', None)
+    file_type = attributes.get('File Type', {}).get('value', None)
+    file_path = attributes.get('File Path', {}).get('value', None)
+    file_encoding = attributes.get('File Encoding', {}).get('value', 'UTF-8')
+    file_extension = attributes.get('File Extension', {}).get('value', 'csv')
+    file_system_name = attributes.get('File System Name', {}).get('value', None)
+    version_identifier = attributes.get('Version Identifier', {}).get('value', None)
+    description = attributes.get('Description', {}).get('value', None)
+
+    if directive == "display":
+
+        return None
+    elif directive == "validate":
+        if valid:
+            print(Markdown(f"==> Validation of {command} completed successfully!\n"))
+        else:
+            msg = f"Validation failed for object_action `{command}`\n"
+        return valid
+
+    elif directive == "process":
+        try:
+
+            if object_action == "Create":
+                if valid is False and exists:
+                    msg = (f"  Element `{display_name}` already exists and result document updated changing "
+                           f"`Create` to `Update` in processed output\n\n___")
+                    logger.error(msg)
+                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
+
+                else:
+                    guid = egeria_client.get_create_csv_data_file_element_from_template(
+                       file_name, file_type, file_path, version_identifier, file_encoding, file_extension, file_system_name, description)
+
+                    if guid:
+                        update_element_dictionary(qualified_name, {
+                            'guid': guid, 'display_name': display_name
+                            })
+                        msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
+                        logger.success(msg)
+                        output_md = (f"# Create CSV File\n\n## Display Name:\n\n {display_name}\n\n"
+                                    f"## File Type:\n\n {file_type}\n\n## File Path:\n\n {file_path}\n\n"
+                                    f"## File Encoding:\n\n {file_encoding}\n\n## File Extension:\n\n {file_extension}\n\n"
+                                    f"## File System Name:\n\n {file_system_name}\n\n## Version Identifier:\n\n {version_identifier}\n\n"
+                                    f"## Description:\n\n {description}\n\n"
+                                    f"## Qualified Name\n\n {qualified_name}\n\n"
+                                    f"## GUID:\n\n {guid}\n\n"
+                                     )
+                        return output_md
+                    else:
+                        msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
+                        logger.error(msg)
+                        return None
+            else:
+                logger.error(f"Currently only the Create action is supported for this command: {command}")
+
+        except PyegeriaException as e:
+            logger.error(f"Pyegeria error performing {command}: {e}")
+            print_exception_table(e)
+            return None
+        except Exception as e:
+            logger.error(f"Error performing {command}: {e}")
+    else:
+        logger.error(f"Invalid directive `{directive}`")
+        return None
+
 
 
 def process_link_agreement_item_command(egeria_client: EgeriaTech, txt: str,

md_processing/md_commands/view_commands.py

@@ -230,6 +230,9 @@ def process_output_command(egeria_client: EgeriaTech, txt: str, directive: str =
     print(Markdown(f"# {command}\n"))
 
     parsed_output = parse_view_command(egeria_client, object_type, object_action, txt, directive)
+    if parsed_output is None:
+        logger.error(f"No valid output found for command '{command}'.")
+        return None
 
     attributes = parsed_output['attributes']
 

md_processing/md_processing_utils/md_processing_constants.py

@@ -242,7 +242,8 @@ command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term
                 "Link Governance Drivers", "Detach Governance Drivers",
                 "Link Governance Policies", "Detach Governance Policies",
                 "Link Governance Controls", "Detach Governance Controls",
-                "Link Governed By", "Attach Governed By", "Detach Governed By"
+                "Link Governed By", "Attach Governed By", "Detach Governed By",
+                "Create CSV File"
 
                 ]
 command_list.extend(LIST_COMMANDS)

pyegeria/__init__.py

@@ -68,6 +68,7 @@ from .x_action_author_omvs import ActionAuthor
 from .template_manager_omvs import TemplateManager
 from .data_designer import DataDesigner
 from ._output_formats import select_output_format_set
+from .mcp_adapter import list_reports, describe_report, run_report
 #
 global template_guids, integration_guids
 

pyegeria/_client_new.py

@@ -1081,7 +1081,7 @@ class Client2:
         logger.info(response.json())
         return response.json().get("guid", "NO_GUID_RETURNED")
 
-    async def _async_create_elem_from_template(self, url: str, body: dict | TemplateRequestBody = None) -> str:
+    async def _async_create_element_from_template(self, url: str, body: dict | TemplateRequestBody = None) -> str:
         validated_body = self.validate_new_element_from_template_request(body)
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
         logger.info(json_body)

pyegeria/_output_formats.py

@@ -581,6 +581,9 @@ base_output_format_sets = FormatSetDict({
                     Column(name='Members', key='members', format=True),
                     Column(name='Uses Products', key='uses_digital_products'),
                     Column(name='Used by Products', key='used_by_digital_products'),
+                    Column(name='Product Manager', key='assigned_actors'),
+                    Column(name='License', key='governed_by'),
+                    Column(name='Solution Blueprint', key='solution_designs'),
                 ]),
             Format(
                 types=[ "REPORT", "HTML"],
@@ -595,6 +598,9 @@ base_output_format_sets = FormatSetDict({
                     Column(name='Members', key='members', format=True),
                     Column(name='Uses Products', key='uses_digital_products'),
                     Column(name='Used by Products', key='used_by_digital_products'),
+                    Column(name='Product Manager', key='assigned_actors'),
+                    Column(name='License', key='governed_by'),
+                    Column(name='Solution Blueprint', key='solution_designs'),
                     Column(name="Mermaid",key = "mermaid")
                 ],
             )
@@ -1163,7 +1169,7 @@ generated_format_sets = FormatSetDict({
                                              'metadata_element_types': ['DataDictionary']})),
     'Data-Field-DrE': FormatSet(target_type='Data-Field-DrE', heading='Data-Field-DrE Attributes',
                                 description='Auto-generated format for Data Field (Create).', formats=[
-            Format(types=['ALL'], columns=[Column(name='Display Name', key='display_name'),
+            Format(types=['ALL', 'MD'], columns=[Column(name='Display Name', key='display_name'),
                                            Column(name='Description', key='description'),
                                            Column(name='Category', key='category'),
                                            Column(name='Status', key='element_status'),
@@ -2173,15 +2179,16 @@ output_format_sets = combine_format_set_dicts(base_output_format_sets, generated
 
 def select_output_format_set(kind: str, output_type: str) -> dict | None:
     """
-    This function retrieves the appropriate output set configuration dictionary based on the `kind` and `output_type`.
-    If output_type = `ANY` that indicates this is just a test to see of the output format set exists.
+    Retrieve the appropriate output set configuration dictionary based on `kind` and `output_type`.
 
-    :param kind: The kind of output set (e.g., "Referenceable", "Collections").
-    :param output_type: The desired output format type (e.g., "DICT", "LIST", "REPORT").
-    :return: The matched output set dictionary or None if no match is found.
+    Intent of special output_type values:
+    - "ANY": Discovery-only. Resolve the FormatSet (including aliases), action, and metadata, but DO NOT
+      resolve a concrete format. Callers typically use this to check existence or to later pick a specific type
+      via get_output_format_type_match(...).
 
-    Returns:
-        dict | None: 
+    :param kind: The kind of output set (e.g., "Referenceable", "Collections"). Aliases are supported.
+    :param output_type: The desired output format type (e.g., "DICT", "LIST", "REPORT"), or "ANY".
+    :return: The matched output set dictionary or None if no match is found.
     """
     # Normalize the output type to uppercase for consistency
     output_type = output_type.upper()
@@ -2250,6 +2257,41 @@ def output_format_set_list() -> list[str]:
     return list(output_format_sets.keys())
 
 
+def list_mcp_format_sets() -> dict:
+    """
+    Returns only those format set names that can be safely exposed as MCP tools.
+    A format set is eligible if it has a DICT format or an ALL catch-all format.
+    
+    This allows MCP to prefer machine-consumable outputs and avoid side effects.
+    """
+    # eligible: list[str] = []
+    # for name, fs in output_format_sets.items():
+    #     try:
+    #         # fs is a FormatSet
+    #         has_dict = any("DICT" in f.types for f in fs.formats)
+    #         has_all = any("ALL" in f.types for f in fs.formats)
+    #         if has_dict or has_all:
+    #             eligible.append(name)
+    #     except Exception:
+    #         # Defensive: skip malformed entries
+    #         continue
+    # return sorted(eligible)
+    return {
+        name: {
+            "description": fs.description,
+            "target_type": fs.target_type,
+            "required_params": ", ".join(fs.action.required_params) or "",
+            "optional_params": ", ".join(fs.action.optional_params) or "",
+        }
+        for name, fs in sorted(output_format_sets.items())
+        if fs and fs.action and any(
+            format_type in ["DICT", "ALL"]
+            for format_obj in fs.formats
+            for format_type in format_obj.types
+        )
+    }
+
+
 def get_output_format_set_heading(format_set: str) -> str:
     """
     Gets the heading of a format set.