pyegeria 5.4.8.7__tar.gz → 5.4.8.9__tar.gz

{pyegeria-5.4.8.7/pyegeria.egg-info → pyegeria-5.4.8.9}/PKG-INFO

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

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/examples/GeoSpatial Products Example.py

@@ -44,8 +44,8 @@ logger.info(f"Console width is {app_config.console_width}")
 
 view_server = app_config.egeria_view_server
 view_url = app_config.egeria_view_server_url
-user = app_settings.User_Profile.user_name
-user_pass = app_settings.User_Profile.user_pwd
+user = EGERIA_USER
+user_pass = EGERIA_USER_PASSWORD
 
 
 console = Console(
@@ -89,7 +89,7 @@ try:
     display_name = "Digital Products MarketPlace"
     description = "This is the digital products marketplace"
     category = "GeoSpatial"
-    qualified_name = client.__create_qualified_name__("Folder", display_name)
+    qualified_name = client.__create_qualified_name__("Marketplace", display_name)
 
     props_body = {
         "class": "DigitalProductCatalogProperties",

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/__init__.py

@@ -32,7 +32,7 @@ from md_processing.md_commands.data_designer_commands import (process_data_field
                                                               process_data_dict_upsert_command,
                                                               process_data_structure_upsert_command)
 
-from md_processing.md_commands.feedback_commands import (process_add_comment_command, process_upsert_note_log_command,
+from md_processing.md_commands.feedback_commands import (process_add_comment_command, process_journal_entry_command,
                                                          process_upsert_note_command, process_attach_note_log_command,
                                                          process_upsert_informal_tag_command, process_tag_element_command)
 

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/data/commands.json

@@ -1,6 +1,6 @@
 {
   "Command Specifications": {
-    "exported": "Oct 29, 2025 at 10:57:59 AM",
+    "exported": "Oct 30, 2025 at 11:35:20 AM",
     "Create Comment": {
       "display_name": "Comment",
       "qn_prefix": "Comment",
@@ -54,7 +54,7 @@
             "default_value": "",
             "valid_values": "",
             "existing_element": "",
-            "description": "The element the comment is attached to.",
+            "description": "The element the comment is attached to. To reply to a previous comment, you would use the ID of the previous comment as the associated element.",
             "qualified_name_pattern": "",
             "generated": false,
             "style": "Reference Name",
@@ -69,30 +69,6 @@
             "Journal Entry": ""
           }
         },
-        {
-          "Parent Comment": {
-            "variable_name": "parent_comment",
-            "inUpdate": true,
-            "attr_labels": "Element",
-            "examples": "",
-            "default_value": "",
-            "valid_values": "",
-            "existing_element": "",
-            "description": "The comment being replied to. If provided, the Associated Element will be ignored (this becomes the associated element).",
-            "qualified_name_pattern": "",
-            "generated": false,
-            "style": "ID",
-            "user_specified": true,
-            "unique": false,
-            "input_required": false,
-            "isParent": false,
-            "isAnchor": false,
-            "min_cardinality": 1,
-            "max_cardinality": 1,
-            "level": "Basic",
-            "Journal Entry": ""
-          }
-        },
         {
           "Comment Text": {
             "variable_name": "comment_text",
@@ -455,10 +431,10 @@
         }
       ]
     },
-    "Create NoteLog": {
+    "Create Journal Entry": {
       "display_name": "NoteLog",
       "qn_prefix": "NoteLog",
-      "alternate_names": "",
+      "alternate_names": "Note Log; Journal",
       "family": "Feedback Manager",
       "description": "Allows a sequence of notes to be attached to an associated element.",
       "verb": "Create",
@@ -476,21 +452,21 @@
       "Journal Entry": "",
       "Attributes": [
         {
-          "Display Name": {
+          "Journal Name": {
             "variable_name": "display_name",
             "inUpdate": true,
-            "attr_labels": "Name",
+            "attr_labels": "Name; Title",
             "examples": "",
             "default_value": "",
             "valid_values": "",
             "existing_element": "",
-            "description": "Name of the  NoteLog.",
+            "description": "Name of the  NoteLog or Journal.",
             "qualified_name_pattern": "",
             "generated": false,
-            "style": "Simple",
+            "style": "ID",
             "user_specified": true,
             "unique": false,
-            "input_required": false,
+            "input_required": true,
             "isParent": false,
             "isAnchor": false,
             "min_cardinality": 0,
@@ -524,8 +500,8 @@
           }
         },
         {
-          "Description": {
-            "variable_name": "description",
+          "Journal Description": {
+            "variable_name": "journal_description",
             "inUpdate": true,
             "attr_labels": "",
             "examples": "",
@@ -547,6 +523,30 @@
             "Journal Entry": ""
           }
         },
+        {
+          "Note Entry": {
+            "variable_name": "note_entry",
+            "inUpdate": true,
+            "attr_labels": "Note; Journal Entry",
+            "examples": "",
+            "default_value": "",
+            "valid_values": "",
+            "existing_element": "",
+            "description": "The text of the journal entry.",
+            "qualified_name_pattern": "",
+            "generated": false,
+            "style": "Simple",
+            "user_specified": true,
+            "unique": false,
+            "input_required": true,
+            "isParent": false,
+            "isAnchor": false,
+            "min_cardinality": 1,
+            "max_cardinality": 1,
+            "level": "Basic",
+            "Journal Entry": ""
+          }
+        },
         {
           "URL": {
             "variable_name": "url",
@@ -885,7 +885,7 @@
           "Display Name": {
             "variable_name": "display_name",
             "inUpdate": true,
-            "attr_labels": "Name",
+            "attr_labels": "Name; Title",
             "examples": "",
             "default_value": "",
             "valid_values": "",
@@ -909,7 +909,7 @@
           "NoteLog": {
             "variable_name": "note_log",
             "inUpdate": true,
-            "attr_labels": "",
+            "attr_labels": "Journal",
             "examples": "",
             "default_value": "",
             "valid_values": "",
@@ -933,12 +933,12 @@
           "Description": {
             "variable_name": "description",
             "inUpdate": true,
-            "attr_labels": "",
+            "attr_labels": "Text",
             "examples": "",
             "default_value": "",
             "valid_values": "",
             "existing_element": "",
-            "description": "Description of the NoteLog.",
+            "description": "The text of the note..",
             "qualified_name_pattern": "",
             "generated": false,
             "style": "Simple",

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/dr_egeria.py

@@ -45,7 +45,7 @@ from md_processing.md_commands.data_designer_commands import (process_data_spec_
                                                               process_data_structure_upsert_command,
                                                               process_data_class_upsert_command)
 
-from md_processing.md_commands.feedback_commands import (process_add_comment_command, process_upsert_note_log_command,
+from md_processing.md_commands.feedback_commands import (process_add_comment_command, process_journal_entry_command,
                                                          process_upsert_note_command, process_attach_note_log_command,
                                                          process_upsert_informal_tag_command, process_tag_element_command)
 
@@ -124,8 +124,8 @@ def process_md_file(input_file: str, output_folder:str, directive: str, server:
 
             elif potential_command in ["Create Comment", "Update Comment"]:
                 result = process_add_comment_command(client, current_block, directive)
-            elif potential_command in ["Create NoteLog", "Update NoteLog"]:
-                result = process_upsert_note_log_command(client, current_block, directive)
+            elif potential_command in ["Create Journal Entry"]:
+                result = process_journal_entry_command(client, current_block, directive)
             elif potential_command in ["Create Note", "Update Note"]:
                 result = process_upsert_note_command(client, current_block, directive)
             elif potential_command in ["Link NoteLog", "Detach NoteLog"]:

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/md_commands/feedback_commands.py

@@ -64,7 +64,8 @@ def process_add_comment_command(egeria_client: EgeriaTech, txt: str, directive:
 
     attributes = parsed_output['attributes']
 
-
+    valid = parsed_output['valid']
+    exists = parsed_output['exists']
 
     qualified_name = parsed_output.get('qualified_name', None)
     guid = parsed_output.get('guid', None)
@@ -79,19 +80,18 @@ def process_add_comment_command(egeria_client: EgeriaTech, txt: str, directive:
     associated_element = attributes.get('Associated Element', {}).get('value', None)
     associated_element_guid = attributes.get('Associated Element', {}).get('guid', None)
     description = attributes.get('Comment Text', {}).get('value', None)
-    comment_type = attributes.get('Comment Type', {}).get('value', None)
-    parent_comment = attributes.get('Parent Comment', {}).get('value', None)
-    parent_comment_guid = attributes.get('Parent Comment', {}).get('guid', None)
-
-    if associated_element_guid is None and parent_comment_guid is None:
-        valid = False
-        msg = f"Validation failed for {command} - One of `Associated Element` or `Parent Comment` must be specified\n"
-        logger.error(msg)
-        print(msg)
-    else:
-        if description:
-            valid = True
-            exists = True
+    comment_type = attributes.get('Comment Type', {}).get('value', None).strip()
+
+
+    # if associated_element_guid is None and parent_comment_guid is None:
+    #     valid = False
+    #     msg = f"Validation failed for {command} - One of `Associated Element` or `Parent Comment` must be specified\n"
+    #     logger.error(msg)
+    #     print(msg)
+    # else:
+    #     if description:
+    #         valid = True
+    #         exists = True
     #
 
     if directive == "display":
@@ -109,13 +109,14 @@ def process_add_comment_command(egeria_client: EgeriaTech, txt: str, directive:
             obj = "Comment"
             if comment_type not in COMMENT_TYPES:
                 raise ValueError(f"Invalid comment type: {comment_type}")
-            target_guid = parent_comment_guid if parent_comment_guid else associated_element_guid
+            # target_guid = parent_comment_guid if parent_comment_guid else associated_element_guid
             if qualified_name is None:
-                qualified_name = egeria_client.make_feedback_qn("Comment",target_guid,display_name)
+                qualified_name = egeria_client.make_feedback_qn("Comment",associated_element_guid,display_name)
             #   Set the property body for a glossary collection
             #
             prop_body = {
                     "class": "CommentProperties",
+                    "displayName": display_name,
                     "qualifiedName": qualified_name,
                     "description": description,
                     "commentType": comment_type
@@ -165,20 +166,21 @@ def process_add_comment_command(egeria_client: EgeriaTech, txt: str, directive:
                     return None
 
                 else:
+
                     body = set_create_body(object_type,attributes)
                     body['class'] = "NewAttachmentRequestBody"
                     body["properties"] = prop_body
                     slim_body = body_slimmer(body)
-                    if parent_comment_guid:
-                        guid = egeria_client.add_comment_reply(element_guid = parent_comment_guid, body = slim_body)
-                    else:
-                        guid = egeria_client.add_comment_to_element(element_guid = associated_element_guid, body =slim_body)
+                    # if parent_comment_guid:
+                    #     guid = egeria_client.add_comment_reply(element_guid = parent_comment_guid, body = slim_body)
+                    # else:
+                    guid = egeria_client.add_comment_to_element(element_guid = associated_element_guid, body =slim_body)
 
                     if guid:
                         update_element_dictionary(qualified_name, {
                             'guid': guid, 'display_name': display_name
                             })
-                        msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
+                        msg = f"## ==> Created Element `{display_name}` with GUID {guid}\n\n___"
                         logger.success(msg)
                         print(Markdown(msg))
                         return egeria_client.get_comment_by_guid(guid, output_format='MD', report_spec = "Comments-DrE")
@@ -196,10 +198,11 @@ def process_add_comment_command(egeria_client: EgeriaTech, txt: str, directive:
     else:
         return None
 
-def process_upsert_note_log_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+def process_journal_entry_command(egeria_client: EgeriaTech, txt: str,
+                                         directive: str = "display") -> Optional[str]:
     """
-    Processes a noteLog create or update  object_action by extracting key attributes from the given text and applying
-    this using the pyegeria function.
+    Creates or updates a journal entry. If the journal (NoteLog) doesn't exist, then it will be created. Each journal
+    entry is a note in a NoteLog.
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -227,10 +230,24 @@ def process_upsert_note_log_command(egeria_client: EgeriaTech, txt: str, directi
 
     attributes = parsed_output['attributes']
 
-    display_name = attributes['Display Name'].get('value', None)
-    description = attributes['Description'].get('value', None)
+    journal_name = attributes['Journal Name'].get('value', None)
+    journal_qn = attributes['Journal Name'].get('qualified_name', None)
+    journal_exists = attributes['Journal Name'].get('Exists', False)
+    note_entry = attributes['Note Entry'].get('value', None)
+    journal_description = attributes['Journal Description'].get('value', None)
+
     associated_element = attributes.get('Associated Element', {}).get('value', None)
-    associated_element_guid = attributes.get('Associated Element', {}).get('guid', None)
+    associated_element_qn = attributes.get('Associated Element', {}).get('qualified_name', None)
+
+    if journal_exists is False:
+        qualified_name = None
+        journal_qn = None
+
+
+    if journal_name and note_entry:
+        valid = True
+    else:
+        valid = False
     #
 
     if directive == "display":
@@ -244,71 +261,29 @@ def process_upsert_note_log_command(egeria_client: EgeriaTech, txt: str, directi
 
     elif directive == "process":
         try:
-            obj = "NoteLog"
-
-            #   Set the property body for a glossary collection
-            #
-            prop_body = set_element_prop_body(obj, qualified_name, attributes)
 
-            if object_action == "Update":
-                if not exists:
-                    msg = (f" Element `{display_name}` does not exist! Updating result document with Create "
-                           f"{object_action}\n")
-                    logger.error(msg)
-                    return update_a_command(txt, object_action, object_type, qualified_name, guid)
-                elif not valid:
-                    msg = ("  The input data is invalid and cannot be processed. \nPlease review")
+            if object_action == "Create":
+                if valid is False:
+                    msg = "Journal name or Journal entry are missing."
                     logger.error(msg)
+                    print(msg)
                     print(Markdown(f"==> Validation of {command} failed!!\n"))
-                    print(Markdown(msg))
-                    return None
-                else:
-                    print(Markdown(
-                        f"==> Validation of {command} completed successfully! Proceeding to apply the changes.\n"))
-
-
-                body = set_update_body(obj, attributes)
-                body['properties'] = prop_body
-
-                egeria_client.update_note_log(associated_element_guid, body)
-
-                logger.success(f"Updated  {object_type} `{display_name}` with GUID {guid}\n\n___")
-                update_element_dictionary(qualified_name, {
-                    'guid': guid, 'display_name': display_name
-                    })
-                return egeria_client.get_note_logs_by_name(filter = qualified_name, element_type="NoteLog",
-                                                                   output_format='MD', report_spec = "NoteLog-DrE")
-
-
-            elif object_action == "Create":
-                if valid is False and exists:
-                    msg = (f"NoteLog `{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)
-                elif not valid:
-                    msg = ("The input data is invalid and cannot be processed. \nPlease review")
-                    logger.error(msg)
-                    print(Markdown(f"==> Validation of {command} failed!!\n"))
-                    print(Markdown(msg))
                     return None
 
                 else:
-                    body = set_create_body(object_type,attributes)
 
-                    body["properties"] = prop_body
-                    slim_body = body_slimmer(body)
-                    guid = egeria_client.create_note_log(associated_element_guid, slim_body)
-                    if guid:
-                        update_element_dictionary(qualified_name, {
-                            'guid': guid, 'display_name': display_name
-                            })
-                        msg = f"Created Element `{display_name}` with GUID {guid}\n\n___"
+                    note_guid = egeria_client.add_journal_entry(note_log_qn = journal_qn,
+                                                                   element_qn = associated_element_qn,
+                                                                   note_log_display_name = journal_name,
+                                                                   note_entry = note_entry )
+                    if note_guid:
+                        msg = f"Created entry in `{journal_name}` with GUID {note_guid}\n\n___"
                         logger.success(msg)
-                        return egeria_client.get_note_logs_by_name(filter = qualified_name, element_type="NoteLog",
-                                                                   output_format='MD', report_spec = "NoteLog-DrE")
+                        print(Markdown(msg))
+                        return egeria_client.get_note_by_guid(note_guid,
+                                                                   output_format='MD', report_spec = "Journal-Entry-DrE")
                     else:
-                        msg = f"Failed to create element `{display_name}` with GUID {guid}\n\n___"
+                        msg = f"Failed to create entry for  `{journal_name}`\n\n___"
                         logger.error(msg)
                         return None
 

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/md_processing_utils/common_md_utils.py

@@ -572,8 +572,8 @@ def add_note_in_dr_e(client: Client2, qualified_name: str, display_name: str, jo
         note_log_qn = f"{qualified_name}-NoteLog"
         note_log_display_name = f"{display_name}-NoteLog"
         note_display_name = f"{qualified_name}-Journal-Entry-{datetime.now().strftime('%Y-%m-%d %H:%M')}"
-        journal_entry_guid = client.add_journal_entry(note_log_qn, qualified_name, note_log_display_name, note_display_name,
-                                                             journal_entry)
+        journal_entry_guid = client.add_journal_entry(note_log_qn, qualified_name, note_log_display_name,
+                                                      note_display_name, journal_entry)
         logger.info(f"Added journal entry `{journal_entry_guid}` to `{qualified_name}`")
         return journal_entry_guid
     else:

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/md_processing_utils/extraction_utils.py

@@ -142,17 +142,21 @@ def extract_attribute(text: str, labels: List[str]) -> Optional[str]:
     Returns:
         The cleaned value of the attribute, or None if not found.
     """
+
+
     for label in labels:
-        # Construct pattern for the current label
-        pattern = rf"## {re.escape(label)}\n(.*?)(?=^##|\Z)"  # Captures content until the next '##' or end of text
+        # Construct pattern for the current label - stops at next ##, ___ separator, or end of text
+        pattern = rf"## {re.escape(label)}\n(.*?)(?=^##|^_{3,}|\Z)"
         match = re.search(pattern, text, re.DOTALL | re.MULTILINE)
         if match:
             # Extract matched text
             extracted_text = match.group(1)
 
-            # Remove lines starting with '>'
-            filtered_lines = [line for line in extracted_text.splitlines() if not line.lstrip().startswith(">")]
-
+            # Remove lines starting with '>' and lines that are only underscores/whitespace
+            filtered_lines = [
+                line for line in extracted_text.splitlines()
+                if not line.lstrip().startswith(">") and not re.match(r'^\s*_+\s*$', line)
+            ]
             # Join the lines back, preserving single newlines
             cleaned_text = "\n".join(filtered_lines).strip()
 

{pyegeria-5.4.8.7 → pyegeria-5.4.8.9}/md_processing/md_processing_utils/md_processing_constants.py

@@ -6,10 +6,12 @@ import json
 import os
 
 import inflect
+from loguru import logger
 from rich.markdown import Markdown
 
 from md_processing.md_processing_utils.message_constants import ERROR
 from pyegeria._globals import DEBUG_LEVEL
+from pyegeria.logging_configuration import config_logging
 
 inflect_engine = inflect.engine()
 
@@ -167,7 +169,7 @@ COLLECTION_CREATE = ["Create Collection", "Update Collection", "Create Digital P
                 "Update Digital Product Catalog",
                 "Create Root Collection", "Update Root Collection", "Create Folder", "Update Folder",
             ]
-FEEDBACK_COMMANDS = ["Create Comment", "Update Comment", "Create NoteLog", "Update NoteLog", "Create Note", "Update Note",
+FEEDBACK_COMMANDS = ["Create Comment", "Update Comment", "Create Journal Entry",
                      "Create Informal Tag", "Update Informal Tag", "Tag Element"]
 
 command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term", "Update Term", "List Terms",
@@ -263,9 +265,10 @@ command_seperator = Markdown("\n---\n")
 EXISTS_REQUIRED = "Exists Required"
 COMMAND_DEFINITIONS = {}
 
+config_logging()
+logger.enable("pyegeria")
 debug_level = DEBUG_LEVEL
 
-
 # def load_commands(filename: str) -> None:
 #     global COMMAND_DEFINITIONS
 #
@@ -288,7 +291,8 @@ def load_commands(filename: str) -> None:
         # Validate JSON before attempting to load
         try:
             COMMAND_DEFINITIONS = json.loads(config_str)
-            print(f"Successfully loaded {filename}")
+            msg = f"Successfully loaded {filename}"
+            logger.info(msg)
         except json.JSONDecodeError as json_err:
             # Provide detailed error information
             error_line = json_err.lineno