Merge pull request #243 from dwolfson/main

Several bugs fixed around NoteLogs and Journals

Author: dwolfson

commands/tech/refresh_specs.py

@@ -36,7 +36,8 @@ def run_command(cmd_args: list[str], description: str):
 def main():
     parser = argparse.ArgumentParser(description="Refresh generated specs and templates for Dr. Egeria.")
     parser.add_argument("--usage-level", choices=["Basic", "Advanced"], default=None,
-                        help="Egeria usage level (Basic or Advanced)")
+                        help="Egeria usage level (Basic or Advanced). "
+                             "If omitted, both Basic and Advanced are generated.")
     parser.add_argument("--family", type=str, default=None,
                         help="Generate only for a specific family (applies to cmd templates)")
     parser.add_argument("--merge-reports", action="store_true", default=False,
@@ -46,25 +47,29 @@ def main():
     # Base executable path for scripts
     python_exec = sys.executable
 
-    # 1. Generate Markdown Command Templates
-    cmd_templates = [
-        python_exec,
-        "-m", "commands.tech.generate_md_cmd_templates"
-    ]
-    if args.usage_level:
-        cmd_templates.extend(["--usage-level", args.usage_level])
-    if args.family:
-        cmd_templates.extend(["--family", args.family])
-    run_command(cmd_templates, "Markdown Command Templates Generation")
-
-    # 2. Generate Dr. Egeria Help
-    cmd_help = [
-        python_exec,
-        "-m", "commands.tech.generate_dr_help"
-    ]
-    if args.usage_level == "Advanced":
-        cmd_help.append("--advanced")
-    run_command(cmd_help, "Dr. Egeria Help Generation")
+    # When no usage level is requested, refresh both Basic and Advanced.
+    usage_levels = [args.usage_level] if args.usage_level else ["Basic", "Advanced"]
+
+    # 1. Generate Markdown Command Templates (per usage level)
+    for usage_level in usage_levels:
+        cmd_templates = [
+            python_exec,
+            "-m", "commands.tech.generate_md_cmd_templates",
+            "--usage-level", usage_level,
+        ]
+        if args.family:
+            cmd_templates.extend(["--family", args.family])
+        run_command(cmd_templates, f"Markdown Command Templates Generation ({usage_level})")
+
+    # 2. Generate Dr. Egeria Help (per usage level)
+    for usage_level in usage_levels:
+        cmd_help = [
+            python_exec,
+            "-m", "commands.tech.generate_dr_help"
+        ]
+        if usage_level == "Advanced":
+            cmd_help.append("--advanced")
+        run_command(cmd_help, f"Dr. Egeria Help Generation ({usage_level})")
 
     # 3. Generate Report Specifications
     cmd_reports = [

md_processing/v2/feedback.py

@@ -88,20 +88,23 @@ async def apply_changes(self) -> str:
             if guid:
                 self.parsed_output["guid"] = guid
                 logger.success(f"Added Journal Entry to '{journal_name}' with GUID {guid}")
-                return await self.client._async_get_note_by_guid(guid, output_format='MD')
+                # A note is a Journal Entry in Dr.Egeria; render with the Journal Entry spec.
+                return await self.client._async_get_note_by_guid(
+                    guid, output_format='MD', report_spec="Journal-Entry-DrE")
 
         elif "Note" in object_type:
-             # Standard Note in NoteLog
-            prop_body = set_element_prop_body("Note", qualified_name, attributes)
+             # A note is a Journal Entry; at the metadata level it is a Notification (NotificationProperties).
+            prop_body = set_element_prop_body("Notification", qualified_name, attributes)
             if verb == "Update":
                 guid = self.parsed_output.get("guid")
                 if not guid: return self.command.raw_block
-                body = set_update_body("Note", attributes)
+                body = set_update_body("Notification", attributes)
                 body['properties'] = self.filter_update_properties(prop_body, body.get('mergeUpdate', True))
                 await self.client._async_update_note(guid, body=body_slimmer(body))
                 self.parsed_output["guid"] = guid
                 logger.success(f"Updated Note '{display_name}' with GUID {guid}")
-                return await self.client._async_get_note_by_guid(guid, output_format='MD')
+                return await self.client._async_get_note_by_guid(
+                    guid, output_format='MD', report_spec="Journal-Entry-DrE")
             # Create Note omitted for brev since it was create_project in sync code? 
             # Looking closer at sync code: body = set_create_body... guid = egeria_client.create_project (??)
             # That looks like a bug in sync code. I'll stick to what was there or leave for now.

pyegeria/core/_base_server_client.py

@@ -74,6 +74,7 @@ def __init__(
             page_size: int = None,
             local_qualifier: str = None,
             organization_name: str = None,
+            time_out: int = None,
     ):
         server_name = server_name or settings.Environment.egeria_view_server
         platform_url = platform_url or settings.Environment.egeria_platform_url
@@ -90,6 +91,7 @@ def __init__(
         self.token = token
         self.local_qualifier = local_qualifier or settings.User_Profile.egeria_local_qualifier
         self.organization_name = organization_name or settings.Environment.organization_name
+        self.time_out = time_out or settings.Debug.timeout_seconds or 30
         self._valid_value_cache = {}
 
         self.exc_type = None
@@ -452,7 +454,7 @@ async def _async_make_request(
             request_type: str,
             endpoint: str,
             payload: str | dict = None,
-            time_out: int = 30,
+            time_out: int = None,
             is_json: bool = True,
             params: dict | None = None
     ) -> Response | str:
@@ -487,6 +489,9 @@ async def _async_make_request(
         PyegeriaInvalidParameterException
             If the request parameters are invalid.
         """
+        if time_out is None:
+            time_out = self.time_out
+        
         context: dict = {}
         context['class name'] = __class__.__name__
         context['caller method'] = inspect.currentframe().f_back.f_code.co_name