pyegeria 5.4.0.33__py3-none-any.whl → 5.4.0.34__py3-none-any.whl

md_processing/md_processing_utils/determine_width.py

@@ -0,0 +1,103 @@
+"""
+Determines the width of a markdown table
+"""
+
+import re
+import html
+from wcwidth import wcswidth
+
+def split_row(line: str) -> list[str]:
+    s = line.strip()
+    if s.startswith("|"):
+        s = s[1:]
+    if s.endswith("|"):
+        s = s[:-1]
+
+    parts = []
+    cur = []
+    escape = False
+    for ch in s:
+        if escape:
+            cur.append(ch)
+            escape = False
+        elif ch == "\\":
+            escape = True
+        elif ch == "|":
+            parts.append("".join(cur))
+            cur = []
+        else:
+            cur.append(ch)
+    parts.append("".join(cur))
+    return parts
+
+IMG_RE = re.compile(r'!\[([^\]]*)\]\([^)]+\)')
+LINK_RE = re.compile(r'\[([^\]]*)\]\([^)]+\)')
+CODE_TICKS_RE = re.compile(r'`([^`]*)`')
+EMPH_RE = re.compile(r'(\*\*|\*|__|_)')
+
+def visible_text(md: str) -> str:
+    s = md
+    s = IMG_RE.sub(lambda m: m.group(1), s)    # images → alt
+    s = LINK_RE.sub(lambda m: m.group(1), s)   # links → text
+    s = CODE_TICKS_RE.sub(lambda m: m.group(1), s)  # remove backticks
+    s = EMPH_RE.sub("", s)                    # remove emphasis markers
+
+    # unescape common backslash-escapes
+    s = (s
+         .replace("\\|", "|")
+         .replace("\\*", "*")
+         .replace("\\_", "_")
+         .replace("\\`", "`")
+         .replace("\\\\", "\\"))
+
+    s = html.unescape(s)  # & → &
+    return s.strip()
+
+def is_alignment_row(line: str) -> bool:
+    parts = split_row(line)
+    if not parts:
+        return False
+    def is_align_cell(c: str) -> bool:
+        c = c.strip()
+        return c != "" and all(ch in ":-" for ch in c)
+    return all(is_align_cell(p) for p in parts)
+
+def column_widths(md_table: str) -> list[int]:
+    lines = [ln for ln in md_table.splitlines() if ln.strip()]
+    if not lines:
+        return []
+
+    lines_wo_align = [ln for ln in lines if not is_alignment_row(ln)]
+
+    rows = [split_row(ln) for ln in lines_wo_align]
+    if not rows:
+        return []
+
+    max_cols = max(len(r) for r in rows)
+    for r in rows:
+        if len(r) < max_cols:
+            r.extend([""] * (max_cols - len(r)))
+
+    widths = [0] * max_cols
+    for r in rows:
+        for i, cell in enumerate(r):
+            text = visible_text(cell)
+            w = wcswidth(text)
+            if w < 0:  # non-printables fallback
+                w = len(text)
+            widths[i] = max(widths[i], w)
+    print(widths)
+    return widths
+
+# Example usage
+if __name__ == "__main__":
+    table = """
+| Attribute Name      | Input Required | Read Only | Generated | Default Value | Notes                                                                                                       | Unique Values | Valid Values                                                              |
+| ------------------- | -------------- | --------- | --------- | ------------- | ----------------------------------------------------------------------------------------------------------- | ------------- | ------------------------------------------------------------------------- |
+| Display Name        | True           | True      | False     | None          | Name of the  definition.                                                                                    | False         |                                                                           |
+| Summary             | False          | True      | False     | None          | Summary of the definition.                                                                                  | False         |                                                                           |
+| Description         | False          | True      | False     | None          | Description of the contents of the definition.                                                              | False         |                                                                           |
+| Category            | False          | True      | False     | None          | A user specified category name that can be used for example, to define product types or agreement types.    | False         |                                                                           |
+"""
+
+print(column_widths(table))  # e.g., [9, 28, 36] depending on characters

md_processing/md_processing_utils/generate_dr_help.py

@@ -23,7 +23,7 @@ from md_processing.md_processing_utils.md_processing_constants import (get_comma
 from md_processing.md_processing_utils.message_constants import (ERROR, INFO, WARNING, ALWAYS, EXISTS_REQUIRED)
 from pyegeria import EgeriaTech
 from pyegeria._globals import DEBUG_LEVEL
-from pyegeria.output_formatter import generate_entity_md_table
+from pyegeria.output_formatter import generate_entity_md_table, populate_columns_from_properties
 
 # Constants
 EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
@@ -69,18 +69,17 @@ def yes_no(input: str)->str:
 @logger.catch
 def _extract_help_fields(command: dict):
     """
-
+    Build a list of attribute dictionaries for a given command spec.
+    This prepares the data rows used to render the help table.
     """
 
     command_spec = get_command_spec(command)
     attributes = command_spec.get('Attributes', [])
-    command_display_name = command_spec.get('display_name', None)
-    command_qn_prefix = command_spec.get('qn_prefix', None)
 
     term_entry: list = []
     for attr in attributes:
         for key in attr:
-            if attr[key].get('level','Basic') != "Basic":
+            if attr[key].get('level', 'Basic') != "Basic":
                 continue
             attribute_name = key
             input_required = yes_no(attr[key].get('input_required', "No"))
@@ -93,19 +92,41 @@ def _extract_help_fields(command: dict):
             unique = yes_no(attr[key].get('unique', "No"))
             notes = attr[key].get('description', "")
             valid_values = attr[key].get('valid_values', [])
-            term_entry.append ({
-                'Attribute Name' : attribute_name,
-                'Input Required' : input_required,
-                'Read Only' : read_only,
-                'Generated' : generated,
-                'Default Value' : default,
-                'Notes' : notes,
-                'Unique Values' : unique,
-                'Valid Values' : valid_values,
-                })
+            term_entry.append({
+                'Attribute Name': attribute_name,
+                'Input Required': input_required,
+                'Read Only': read_only,
+                'Generated': generated,
+                'Default Value': default,
+                'Notes': notes,
+                'Unique Values': unique,
+                'Valid Values': valid_values,
+            })
 
     return term_entry
 
+@logger.catch
+def _extract_help_function(element: dict, columns_struct: dict) -> dict:
+    """
+    Return a populated columns data structure matching the signature and structure
+    of _extract_glossary_properties in glossary_manager.
+
+    Args:
+        element: One row (dict) describing a help attribute with keys matching columns_struct
+        columns_struct: Dict containing formats->columns definitions
+
+    Returns:
+        dict: A structure with key 'formats' and a 'columns' list whose entries have
+              their 'value' fields populated from the element dict.
+    """
+    # Normalize to a shape compatible with populate_columns_from_properties
+    normalized = {
+        'properties': element or {},
+        'elementHeader': {},
+    }
+    col_data = populate_columns_from_properties(normalized, columns_struct)
+    return col_data
+
 def create_help_terms():
     term_entry:str = ""
     glossary_name = "Egeria-Markdown"
@@ -118,6 +139,10 @@ def create_help_terms():
                {'name': 'Notes', 'key': 'Notes'},
                {'name': 'Unique Values', 'key': 'Unique Values'},
                {'name': 'Valid Values', 'key': 'Valid Values'}]
+    columns_struct = {"target_type": "Term", "formats": {
+                                          "types": "ALL",
+                                        "columns": columns}
+                      }
 
     term_entry = """# Generating glossary entries for the documented commands\n\n
             This file contains generated Dr.Egeria commands to generate glossary term entries describing
@@ -137,14 +162,15 @@ def create_help_terms():
         term_entry+= "# Create Term\n"
         term_entry+= f"## Term Name\n\n{command}\n\n"
         term_entry+= f"## Description\n\n{command_description}\n\n"
-        term_entry+= f"## Owning Glossary\n\n{glossary_name}\n\n"
-        term_entry+= f"## Categories\n\nWriting Dr.Egeria Markdown\n\n"
+        term_entry+= f"## Glossary\n\n{glossary_name}\n\n"
+        term_entry+= f"## Folders\n\nWriting Dr.Egeria Markdown\n\n"
 
 
         du = _extract_help_fields(command)
-        output = generate_entity_md_table(du, "", "", _extract_help_fields, columns, None, "help" )
+        output = generate_entity_md_table(du, "", "", _extract_help_function, columns_struct, None, "help" )
 
         term_entry+= f"## Usage\n\n{output}\n\n___\n\n"
+
     print(term_entry)
     # Generate filename with current date and time in ISO 8601 format
     current_datetime = get_iso8601_datetime()

md_processing/md_processing_utils/logs/pyegeria.log

@@ -0,0 +1,56 @@
+2025-08-27 19:58:06 | INFO | main:407 - view server @ https://localhost:9443-{}
+2025-08-27 19:58:10 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 19:58:10 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 19:58:10 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 19:58:10 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:01:57 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:02:00 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:02:00 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:02:00 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:02:00 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:02:38 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:02:41 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:02:41 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:02:41 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:02:41 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:03:21 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:03:25 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:03:25 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:03:25 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:03:25 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:04:03 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:04:06 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:04:06 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:04:06 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:04:06 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:05:01 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:05:04 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:05:04 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:05:04 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:05:04 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:05:27 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:05:30 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:05:30 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:05:30 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:05:30 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}
+2025-08-27 20:06:00 | INFO | main:408 - view server @ https://localhost:9443-{}
+2025-08-27 20:06:02 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:06:02 | INFO | __init__:133 - CollectionManager initialized, platform origin is: True-{}
+2025-08-27 20:06:02 | SUCCESS | get_platform_origin:368 - Got response from https://localhost:9443/open-metadata/platform-services/users/erinoverview/server-platform/origin
+ Response: Egeria OMAG Server Platform (version 5.4-SNAPSHOT)-{}
+2025-08-27 20:06:02 | INFO | __init__:98 - GlossaryManager initialized, platform origin is: True-{}

md_processing/md_processing_utils/md_processing_constants.py

@@ -126,11 +126,17 @@ COLLECTIONS_LIST = ["List Collections", "View Collections", "List Digital Produc
                     "List Naming Standard Rulesets", "View Naming Standard Rulesets",
                     ]
 
+PROJECT_COMMANDS = ["Create Project", "Update Project", "Create Campaign", "Update Campaign",
+                    "Create Task", "Update Task", "Create Study Project", "Update Study Project",
+                    "Create Personal Project", "Update Personal Project"]
+
 command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term", "Update Term", "List Terms",
                 "List Term Details", "List Glossary Terms", "List Term History", "List Term Revision History",
                 "List Term Update History", "List Glossary Structure", "List Glossaries", "List Categories",
-                "List Glossary Categories", "Create Personal Project", "Update Personal Project", "Create Category",
-                "Update Category", "Create Solution Blueprint", "Update Solution Blueprint", "View Solution Blueprint",
+                "List Glossary Categories", "Lnk Project Dependency", "Attach Project Dependency",
+                "Detach Project Dependency", "Link Parent Project", "Attach Parent Project", "Detach Parent Project",
+                "Detach Parent Project",
+                 "Create Solution Blueprint", "Update Solution Blueprint", "View Solution Blueprint",
                 "View Solution Blueprints", "View Blueprints",
                 "View Information Supply Chain", "View Information Supply Chains", "View Supply Chains", "View Supply Chain",
                 "View Solution Components", "View Solution Component", "View Solution Roles", "View Solution Role",
@@ -191,6 +197,7 @@ command_list.extend(GOV_COM_LIST)
 command_list.extend(GOV_LINK_LIST)
 command_list.extend(COLLECTIONS_LIST)
 command_list.extend(SIMPLE_COLLECTIONS)
+command_list.extend(PROJECT_COMMANDS)
 command_list.extend(["Link Governance Response", "Detach Governance Response",
                   "Link Governance Mechanism", "Detach Governance Mechanism"])
 
@@ -226,6 +233,27 @@ def get_command_spec(command: str) -> dict | None:
         if obj:
             return COMMAND_DEFINITIONS.get('Command Specifications', {}).get(obj, None)
 
+def does_command_match(command: str, alt_names: list[str]) -> bool:
+    # Define verb synonyms
+    verbs_synonyms = {
+        "Link": ["Link", "Attach", "Detach", "Unlink"],
+        "Create": ["Create", "Update"],
+        "View": ["List", "View"],
+    }
+
+    # Extract the verb from the command
+    command_parts = command.split(maxsplit=1)
+    if len(command_parts) < 2:
+        return False  # Invalid command structure
+    verb, terms = command_parts
+
+    # Generate all possible combinations and check for a match
+    for primary_verb, synonyms in verbs_synonyms.items():
+        for synonym in synonyms:
+            for alt_name in alt_names:
+                if f"{synonym} {alt_name}" == command:
+                    return True
+    return False
 
 def find_alternate_names(command: str) -> str | None:
     global COMMAND_DEFINITIONS
@@ -234,9 +262,14 @@ def find_alternate_names(command: str) -> str | None:
     for key, value in comm_spec.items():
         if isinstance(value, dict):
             v = value.get('alternate_names', "")
-            if command in v:
+            verb = command.split()[0] if command else ""
+            normalized_command = " ".join(command.split())
+            normalized_alternates = (" ".join(s.split()) for s in v)
+            if (command in v):
+                return key
+            elif does_command_match(normalized_command, normalized_alternates):
                 return key
-    return None
+        return None
 
 
 def get_alternate_names(command: str) -> list | None:

pyegeria/_output_formats.py

@@ -125,7 +125,7 @@ COMMON_FORMATS_ALL = Format(
     columns=COMMON_COLUMNS,
 )
 
-PROJECT_COLUMNS = COMMON_COLUMNS + [
+PROJECT_COLUMNS = COMMON_COLUMNS  +[
     Column(name="Classifications", key='classifications'),
     Column(name='Priority', key='priority'),
     Column(name='Project Status', key='project_status'),
@@ -133,6 +133,8 @@ PROJECT_COLUMNS = COMMON_COLUMNS + [
     Column(name='Start Date', key='start_date'),
     Column(name='Assigned Actors', key='assigned_actors'),
     Column(name='Resources', key='resource_list'),
+    Column(name="Project Roles", key='project_roles'),
+    Column(name="Managed Projects", key='managed_projects'),
     ]
 
 GLOSSARY_COLUMNS = COMMON_COLUMNS + [
@@ -249,14 +251,14 @@ output_format_sets = FormatSetDict({
             )
         ],
     ),
-    "Project": FormatSet(
+    "Projects": FormatSet(
         target_type="Project",
         heading="Project Attributes",
         description="Attributes that apply to all Projects.",
         annotations={},
         formats=[
             Format(
-                types=["ALL"],
+                types=["ALL", "LIST"],
                 columns=PROJECT_COLUMNS
             )
         ],
@@ -318,6 +320,32 @@ output_format_sets = FormatSetDict({
                 spec_params={},
             )
         ),
+    "Help-Terms": FormatSet(
+        target_type="Term",
+        heading="Display Help for Dr.Egeria Commands",
+        description="Designed for help output of Dr.Egeria commands.",
+        annotations={"wikilinks": ["[[Help]]", "[[Dr.Egeria]]"]},
+        formats=[
+            Format(
+
+                types=["DICT", "FORM", "LIST", "TABLE"],
+                columns= [
+                    Column(name='Term Name', key='display_name'),
+                    Column(name='Description', key='description'),
+                    Column(name="Usage", key='usage', format=True),
+                    Column(name="Update Time", key='update_time')
+
+
+                ],
+            )
+            ],
+            action = ActionParameter(
+                function="GlossaryManager.find_glossary_terms",
+                required_params=["search_string"],
+                optional_params=OPTIONAL_PARAMS,
+                spec_params={},
+            )
+        ),
 
     "Collections": FormatSet(
         target_type="Collection",
@@ -571,13 +599,13 @@ output_format_sets = FormatSetDict({
             )
     ),
     "Governance Policies": FormatSet(
-    target_type="GovernancePolicy",
-    heading="Governance-Definitions Information",
-    description="Attributes useful to Governance-Definitions.",
-    aliases=["GovernanceDefinitions"],
-    annotations={"wikilinks": ["[[Governance]]"]},
-    formats=[Format(types=["ALL"], columns=GOVERNANCE_DEFINITIONS_COLUMNS)],
-    action=ActionParameter(
+        target_type="GovernancePolicy",
+        heading="Governance-Definitions Information",
+        description="Attributes useful to Governance-Definitions.",
+        aliases=["GovernanceDefinitions"],
+        annotations={"wikilinks": ["[[Governance]]"]},
+        formats=[Format(types=["ALL"], columns=GOVERNANCE_DEFINITIONS_COLUMNS)],
+        action=ActionParameter(
         function="GovernanceOfficer.find_governance_definitions",
         required_params=["search_string"],
         optional_params=OPTIONAL_PARAMS,

pyegeria/glossary_manager.py

@@ -1249,8 +1249,6 @@ class GlossaryManager(CollectionManager):
 
 
 
-
-
     async def _async_add_is_abstract_concepts(
             self, term_guid: str, body: dict | NewClassificationRequestBody = None,
             ) -> None:

pyegeria/output_formatter.py

@@ -5,6 +5,7 @@ from pyegeria.utils import (camel_to_title_case)
 from markdown_it import MarkdownIt
 from rich.console import Console
 from loguru import logger
+from pyegeria.config import settings
 
 from pyegeria.mermaid_utilities import construct_mermaid_web
 from pyegeria._output_formats import select_output_format_set, MD_SEPARATOR
@@ -17,7 +18,7 @@ This function and related data structures have been moved back to _output_format
 Please import select_output_format_set from pyegeria._output_formats instead of from this module.
 """
 
-console = Console(width= 250)
+Console = Console(width=settings.Environment.console_width)
 
 
 def _extract_referenceable_properties(element: dict[str, Any]) -> dict[str, Any]:
@@ -526,13 +527,13 @@ def generate_entity_md_table(elements: List[Dict],
     """
     # Handle pluralization - if entity_type ends with 'y', use 'ies' instead of 's'
     target_type = columns_struct.get('target_type', entity_type)
-    if target_type.endswith('y'):
-        target_type = target_type.replace('y', 'ies')
-    else:
-        target_type = target_type.replace('s', 's')
+    # if target_type.endswith('y'):
+    #     target_type = target_type.replace('y', 'ies')
+    # else:
+    #     target_type = target_type.replace('s', 's')
 
-    # entity_type_plural = f"{entity_type[:-1]}ies" if entity_type.endswith('y') else f"{entity_type}s"
-    entity_type_plural = target_type
+    entity_type_plural = f"{target_type[:-1]}ies" if target_type.endswith('y') else f"{target_type}s"
+    # entity_type_plural = target_type
     columns = columns_struct['formats'].get('columns', [])
     heading = columns_struct.get("heading")
     if heading == "Default Base Attributes":
@@ -556,7 +557,7 @@ def generate_entity_md_table(elements: List[Dict],
 
     # Add rows
     for element in elements:
-        guid = element.get('elementHeader', {}).get('guid')
+        guid = element.get('elementHeader', {}).get('guid', None)
 
         # Extractor returns columns_struct with values when possible
         try: