pyegeria 5.4.0.14__py3-none-any.whl → 5.4.0.16__py3-none-any.whl

commands/cat/list_format_set.py

@@ -38,7 +38,7 @@ import argparse
 import json
 import os
 import time
-from typing import Any, Dict, List
+
 from loguru import logger
 from rich import box
 from rich.console import Console
@@ -204,6 +204,8 @@ def execute_format_set_action(
                 file_name = f"{format_set_name}-{time.strftime('%Y-%m-%d-%H-%M-%S')}.json"
             elif output_format == "DICT":
                 file_name = f"{format_set_name}-{time.strftime('%Y-%m-%d-%H-%M-%S')}.py"
+            elif output_format == "MERMAID":
+                file_name = f"{format_set_name}-{time.strftime('%Y-%m-%d-%H-%M-%S')}.md"
             else:
                 file_name = f"{format_set_name}-{time.strftime('%Y-%m-%d-%H-%M-%S')}.md"
             full_file_path = os.path.join(file_path, file_name)
@@ -231,12 +233,16 @@ def execute_format_set_action(
                 return
             elif isinstance(output, (str, list)) and output_format == "DICT":
                 output = json.dumps(output, indent=4)
-            elif isinstance(output, (str, list)) and output_format == "REPORT":
+            elif isinstance(output, (str, list)) and output_format in[ "REPORT" ]:
                 output = preamble + output
+            elif isinstance(output, (str, list)) and output_format == "HTML":
+                pass
 
             with open(full_file_path, 'w') as f:
                 f.write(output)
-            print(f"\n==> Output written to [{format_set_name}]({full_file_path})")
+            print(f"\n==> Output written to {full_file_path}")
+            if output_format == "HTML":
+                print(f"\n==> Web link: [{file_name}]({app_config.pyegeria_publishing_root}/{file_name}")
             return
 
         # For TABLE output, add output_format to params
@@ -355,7 +361,7 @@ def main():
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
     parser.add_argument("--output-format", help="Output format (TABLE, DICT, FORM, REPORT, HTML, LIST)", 
-                        choices=["TABLE", "DICT", "FORM", "REPORT", "HTML", "LIST"], default="TABLE")
+                        choices=["TABLE", "DICT", "FORM", "REPORT", "HTML", "LIST", "MERMAID"], default="TABLE")
 
 
 

commands/ops/load_archive.py

@@ -11,29 +11,33 @@ This script refreshed an integration daemon.
 import os
 
 import click
-
-from pyegeria import AutomatedCuration, EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+from loguru import logger
+from pyegeria import AutomatedCuration, EgeriaTech,  config_logging, get_app_config
+from pyegeria._exceptions_new import (
+PyegeriaException, print_exception_response, print_basic_exception
 )
 
-EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
-EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
-EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
-EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
-EGERIA_VIEW_SERVER_URL = os.environ.get(
-    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
-)
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
-EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
-    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
-)
+# EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+# EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+# EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+# EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
+# EGERIA_VIEW_SERVER_URL = os.environ.get(
+#     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+# )
+# EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
+# EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
+#     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+# )
+
+
+
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+app_settings = get_app_config()
+app_config = app_settings.Environment
+config_logging()
 
+print(f"Console width is {app_config.console_width}")
 
 @click.command("load-archive")
 @click.option(
@@ -42,13 +46,13 @@ EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
     help="Full path on the Metadata Server to the archive file to load",
 )
 @click.option(
-    "--server_name", default=EGERIA_METADATA_STORE, help="Egeria metadata store to load"
+    "--server_name", default=app_config.egeria_metadata_store, help="Egeria metadata store to load"
 )
 @click.option(
-    "--view-server", default=EGERIA_VIEW_SERVER, help="Egeria view server to connect to"
+    "--view-server", default=app_config.egeria_view_server, help="Egeria view server to connect to"
 )
 @click.option(
-    "--url", default=EGERIA_PLATFORM_URL, help="URL of Egeria platform to connect to"
+    "--url", default=app_config.egeria_platform_url, help="URL of Egeria platform to connect to"
 )
 @click.option("--userid", default=EGERIA_USER, help="Egeria admin user")
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria admin password")
@@ -65,7 +69,7 @@ def load_archive(file_name, server_name, view_server, url, userid, password, tim
 
         click.echo(f"Loaded archive: {file_name}")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaException) as e:
         print(
             f"Perhaps there was a timeout? If so, the command will complete despite the exception\n"
             f"===> You can check by rerunning the command in a few minutes"

md_processing/dr_egeria_inbox/Derive-Dr-Gov-Defs.md

@@ -0,0 +1,8 @@
+___
+# View Governance Definition Context
+## Display Name
+New Sustainability Governance Domain
+## Qualified Name
+GovernanceApproach::New Sustainability Governance Domain
+## Output Format
+HTML