pyegeria 5.3.6.5__py3-none-any.whl → 5.3.6.6__py3-none-any.whl

pyegeria/commands/cat/dr_egeria_md.py

@@ -1,15 +1,17 @@
 """
 This is an ongoing experiment in parsing and playing with Freddie docs
 """
+import argparse
 import json
 import os
 from rich import print
 from rich.console import Console
 from rich.markdown import Markdown
+from rich.prompt import Prompt
 
-from pyegeria.md_processing_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
-                                          get_current_datetime_string, process_per_proj_upsert_command, commands,
-                                          process_provenance_command)
+from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                     get_current_datetime_string, process_per_proj_upsert_command, commands,
+                     process_provenance_command)
 
 import click
 from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
@@ -41,20 +43,20 @@ EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "/Users/dwolfson/localGit/
 EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/dr_egeria_inbox")
 EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/dr_egeria_outbox")
 
-console = Console(width=int(EGERIA_WIDTH))
 
 
 
-@click.command("process-markdown-file", help="Process a markdown file and return the output as a string.")
-@click.option("--file-path", help="File path to markdown file",
-              default="glossary_exp.md")
-@click.option("--directive", default="display-only", help="How to process the file")
-@click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use.")
-@click.option(
-    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
-)
-@click.option("--userid", default=EGERIA_USER, help="Egeria user")
-@click.option("--user_pass", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+
+# @click.command("process_markdown_file", help="Process a markdown file and return the output as a string.")
+# @click.option("--file-path", help="File path to markdown file",
+#               default="glossary_exp.md")
+# @click.option("--directive", default="display-only", help="How to process the file")
+# @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use.")
+# @click.option(
+#     "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+# )
+# @click.option("--userid", default=EGERIA_USER, help="Egeria user")
+# @click.option("--user_pass", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 def process_markdown_file(
         file_path: str,
         directive: str,
@@ -62,8 +64,11 @@ def process_markdown_file(
         url: str,
         userid: str,
         user_pass: str,
-        ):
-
+        )-> None:
+    """
+    Process a markdown file by parsing and executing Dr. Egeria commands. Write output to a new file.
+    """
+    console = Console(width=int(EGERIA_WIDTH))
     client = EgeriaTech(server, url, user_id=userid)
     token = client.create_egeria_bearer_token(userid, user_pass)
 
@@ -160,5 +165,29 @@ def process_markdown_file(
         console.print_exception(show_locals=True)
 
 
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+    parser.add_argument("--time_out", help="Time Out")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_USER
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    time_out = args.time_out if args.time_out is not None else 60
+    try:
+        file_path = Prompt.ask("Markdown File name to process:", default="")
+        directive = Prompt.ask("Processing Directive:", choices=[ "display", "validate", "process"], default="validate")
+
+        process_markdown_file(file_path, directive, server, url, userid, user_pass)
+    except KeyboardInterrupt:
+        pass
+
+
 if __name__ == "__main__":
-    process_markdown_file()
+    main()

pyegeria/commands/cli/egeria.py

@@ -54,6 +54,8 @@ from pyegeria.commands.cat.list_terms import display_glossary_terms
 from pyegeria.commands.cat.list_todos import display_to_dos as list_todos
 from pyegeria.commands.cat.list_user_ids import list_user_ids
 
+from pyegeria.commands.cat.dr_egeria_md import process_markdown_file
+
 from pyegeria.commands.cli.egeria_login_tui import login
 from pyegeria.commands.cli.egeria_ops import show_server
 from pyegeria.commands.cli.ops_config import Config
@@ -374,6 +376,7 @@ my_tell.add_command(mark_todo_complete)
 my_tell.add_command(reassign_todo)
 
 
+
 #
 #  tech User: Show
 #
@@ -1457,6 +1460,18 @@ def tell_cat(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
+#
+# dr.egeria
+#
+@tell_cat.group("dr_egeria")
+@click.pass_context
+def dr_egeria(ctx):
+    """Execute Dr.Egeria actions"""
+    pass
+
+dr_egeria.add_command(process_markdown_file)
+
+
 
 @tell_cat.group("glossary")
 @click.pass_context

pyegeria/commands/cli/egeria_cat.py

@@ -14,6 +14,7 @@ import os
 import click
 from trogon import tui
 
+from pyegeria.commands.cat.dr_egeria_md import process_markdown_file
 from pyegeria.commands.cat.get_asset_graph import asset_viewer
 from pyegeria.commands.cat.get_collection import collection_viewer
 from pyegeria.commands.cat.get_project_dependencies import project_dependency_viewer
@@ -31,22 +32,18 @@ from pyegeria.commands.cat.glossary_actions import (
     delete_category,
     add_term_to_category,
     remove_term_from_category)
-
-from pyegeria.commands.cat.dr_egeria_jupyter import process_jupyter_notebook
-from pyegeria.commands.cat.dr_egeria_md_file import process_markdown_file
-
-from pyegeria.commands.cat.list_categories import display_categories
 from pyegeria.commands.cat.list_assets import display_assets
+from pyegeria.commands.cat.list_categories import display_categories
 from pyegeria.commands.cat.list_cert_types import display_certifications
 from pyegeria.commands.cat.list_collections import display_collections
 from pyegeria.commands.cat.list_deployed_catalogs import list_deployed_catalogs
 from pyegeria.commands.cat.list_deployed_database_schemas import (
     list_deployed_database_schemas,
-)
+    )
 from pyegeria.commands.cat.list_deployed_databases import list_deployed_databases
+from pyegeria.commands.cat.list_deployed_servers import display_servers_by_dep_imp
 from pyegeria.commands.cat.list_glossaries import display_glossaries
 from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.cat.list_deployed_servers import display_servers_by_dep_imp
 from pyegeria.commands.cat.list_tech_type_elements import list_tech_elements
 from pyegeria.commands.cat.list_tech_types import display_tech_types
 from pyegeria.commands.cat.list_terms import display_glossary_terms
@@ -58,7 +55,7 @@ from pyegeria.commands.my.todo_actions import (
     delete_todo,
     mark_todo_complete,
     reassign_todo,
-)
+    )
 from pyegeria.commands.tech.list_asset_types import display_asset_types
 
 
@@ -668,6 +665,26 @@ def tell(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
+#
+# dr.egeria
+#
+@tell.group("dr_egeria")
+@click.pass_context
+def tell_dr_egeria(ctx):
+    """Execute Dr.Egeria actions"""
+    pass
+
+@tell_dr_egeria.command("process_markdown_file")
+@click.option("--file-path", help="File path to markdown file",
+              default="glossary_exp.md")
+@click.option("--directive", type=click.Choice(['Display','Validate','Process'], case_sensitive=False),
+              default="validate", help="How to process the file")
+@click.pass_context
+def process_markdown_file(ctx, file_path, directive):
+    """Process a markdown file"""
+    c = ctx.obj
+    process_markdown_file(file_path, directive, c.view_server, c.view_server_url, c.userid, c.password)
+
 
 @tell.group("glossary")
 @click.pass_context
@@ -676,6 +693,8 @@ def tell_glossary(ctx):
     pass
 
 
+
+
 tell_glossary.add_command(create_glossary)
 tell_glossary.add_command(delete_glossary)
 tell_glossary.add_command(create_term)

pyegeria/egeria_client.py

@@ -27,7 +27,8 @@ from pyegeria.solution_architect_omvs import SolutionArchitect
 from pyegeria.server_operations import ServerOps
 from pyegeria.registered_info import RegisteredInfo
 from pyegeria.valid_metadata_omvs import ValidMetadataManager
-
+from pyegeria.egeria_config_client import EgeriaConfig
+from pyegeria.md_processing_utils import render_markdown
 
 
 class Egeria(
@@ -49,6 +50,8 @@ class Egeria(
     ValidMetadataManager,
     MetadataExplorer,
     SolutionArchitect,
+    EgeriaMy,
+    EgeriaConfig,
 ):
     """
     Client to issue Runtime status requests.

{pyegeria-5.3.6.5.dist-info → pyegeria-5.3.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.3.6.5
+Version: 5.3.6.6
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance

{pyegeria-5.3.6.5.dist-info → pyegeria-5.3.6.6.dist-info}/RECORD

@@ -17,7 +17,7 @@ pyegeria/commands/cat/__init__.py,sha256=5OCy4m_yZsnSxdy_gvkCyP_OkjvuWKimqUGHYCJ
 pyegeria/commands/cat/dr_egeria_inbox/glossary_creation_experiment.ipynb,sha256=dbzNu90fCKNohOWVSRBOB1GLyd95x8Qw51I5AkaPtso,11552
 pyegeria/commands/cat/dr_egeria_inbox/glossary_exp.md,sha256=KsUeTzDe5QkrTmIfIAXR74qZ29oSfRW-NAEn0RYIRqM,2534
 pyegeria/commands/cat/dr_egeria_jupyter.py,sha256=4LcmD5CrtazLgUK_LCjgOnwtxZqTBB6lrMR8tsugl94,6036
-pyegeria/commands/cat/dr_egeria_md.py,sha256=Upro9-273V4LNmQkSWnx7njVNUsuXaWIPfn1HrU6-NI,7830
+pyegeria/commands/cat/dr_egeria_md.py,sha256=HlCgBRrECsi5UL1L_f_d5RMcuHMzK0W26nLWK5nqitc,9052
 pyegeria/commands/cat/exp_list_glossaries.py,sha256=dC6Bnfm3YSMTKPP146qeslIFRiZnGu5b7iDYE07p4iU,5817
 pyegeria/commands/cat/get_asset_graph.py,sha256=xnXJfpDTVH1TJ2TwE3dtjaXU36Di6-N6JAyhothzz2o,12461
 pyegeria/commands/cat/get_collection.py,sha256=kXPcP8u-SMWfrVyyBhNoxG8mcgB7EV_5i9N9w_IBU7o,5379
@@ -41,8 +41,8 @@ pyegeria/commands/cat/list_terms.py,sha256=D0tCD2f8j-UgnV4Bgisj9a11CCEOneNsRT7_3
 pyegeria/commands/cat/list_todos.py,sha256=NitCw0uyVVjmN1hxb1W-I4FbOsa8wQxW2ICyOElHyc8,6556
 pyegeria/commands/cat/list_user_ids.py,sha256=X5Q-YNEp38saPYDuy9VwdQC5Qpa4HyC3WvAdbyp_P6M,5108
 pyegeria/commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-pyegeria/commands/cli/egeria.py,sha256=Rtqru3Dp61SspzMVQ_UMHhtPc4_kq7S3Ocf-SqdfTN0,52635
-pyegeria/commands/cli/egeria_cat.py,sha256=_1qA7PS3fMH22j9BTGqFLnqVOTMRewP8-6jIPBvjuCI,18237
+pyegeria/commands/cli/egeria.py,sha256=_Z__gugx11bpwyWU6Uiacw_0r0q5o4mbAZ-ipDozFwc,52884
+pyegeria/commands/cli/egeria_cat.py,sha256=uYI_KD_9iAOgx5zsSWPpvK8MK3ymJcMmsTRONfbQDkM,18848
 pyegeria/commands/cli/egeria_login_tui.py,sha256=W5ouG3nlN7z2Waa-wzYFS7yyoGfOrK-lNB0FMt2JdOk,9492
 pyegeria/commands/cli/egeria_my.py,sha256=0KTH7OIeKyp16ZeN7zK5uhadbPfAQsq38GMzJNWYG8g,6386
 pyegeria/commands/cli/egeria_ops.py,sha256=8W4t2jFGn22OOOtyUAapQH8yyOl1wo09CVNTojRQKvo,12817
@@ -219,7 +219,7 @@ pyegeria/commands/tech/x_list_related_elements.py,sha256=ynaw792VnbMZ9IXBi5mmG7x
 pyegeria/core_omag_server_config.py,sha256=pNQpocICkZx8sRsTw5DPUe-TFyxlIo1U88qqgci_f7I,97764
 pyegeria/create_tech_guid_lists.py,sha256=hf5q8Xrdsz-bqeIW3yTORZ1XB6_BrKzLDWWwC_bNG2g,4811
 pyegeria/egeria_cat_client.py,sha256=d8dQNPLzL4efi99OJfH1T-Rt1N0k9Rf9LX8LpuhiFls,2179
-pyegeria/egeria_client.py,sha256=RxD-iU2SiUcWG-c3I2M4dSDGBgE9oCK40edJ4kKfm3w,4135
+pyegeria/egeria_client.py,sha256=HAM7pwH2ooegnpeaBr6Q0Km3zrzH1Mpgm0wgC82Y-DQ,4278
 pyegeria/egeria_config_client.py,sha256=3TZUeXSl1f7SQ2WWYTbgOu1Cu1YqApilErAgjZLzbWY,1391
 pyegeria/egeria_my_client.py,sha256=eOKLk2zdI6FHZnhAimfR_0yNdBjpUgD41dJZcJODcqE,1607
 pyegeria/egeria_tech_client.py,sha256=uycgYfCpb4jzFfaQ7I5JxbZ5PKsWdaWxLOJjbw6C2Zk,3817
@@ -242,8 +242,8 @@ pyegeria/template_manager_omvs.py,sha256=PfJ9dOfmBvf59DgRdZ9Dl1Kl_UYqjF-JncXVnbC
 pyegeria/utils.py,sha256=GCt1C0bp0Xng1ahzbZhzV9qQwH7Dj93IaCt2dvWb-sg,5417
 pyegeria/valid_metadata_omvs.py,sha256=Xq9DqBQvBFFJzaFIRKcVZ2k4gJvSh9yeXs_j-O3vn1w,65050
 pyegeria/x_action_author_omvs.py,sha256=RcqSzahUKCtvb_3u_wyintAlc9WFkC_2v0E12TZs8lQ,6433
-pyegeria-5.3.6.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.3.6.5.dist-info/METADATA,sha256=GrlrzX8hGY3vjq6vYSrSbGYgAxRqsLe1L2BQCLnC9O8,2743
-pyegeria-5.3.6.5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pyegeria-5.3.6.5.dist-info/entry_points.txt,sha256=eAvQ_vkejlF3JzMzEc5VD93ymLA_hSFV0HM8fntG-d8,6791
-pyegeria-5.3.6.5.dist-info/RECORD,,
+pyegeria-5.3.6.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.3.6.6.dist-info/METADATA,sha256=ialvs-DxLCrQU-TTXD9UZDS6mv917IEsjChoV6urAYw,2743
+pyegeria-5.3.6.6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pyegeria-5.3.6.6.dist-info/entry_points.txt,sha256=-25SObCenvad7XXzMewoEnHVqXNwHOwEVfXHE12vBmI,6774
+pyegeria-5.3.6.6.dist-info/RECORD,,

{pyegeria-5.3.6.5.dist-info → pyegeria-5.3.6.6.dist-info}/entry_points.txt

@@ -10,7 +10,7 @@ delete_glossary=pyegeria.commands.cat.glossary_actions:delete_glossary
 delete_term=pyegeria.commands.cat.glossary_actions:delete_term
 delete_todo=pyegeria.commands.my.todo_actions:delete_todo
 dr_egeria_jupyter=pyegeria.commands.cat.dr_egeria_jupyter:process_jupyter_notebook
-dr_egeria_md=pyegeria.commands.cat.dr_egeria_md:process_markdown_file
+dr_egeria_md=pyegeria.commands.cat.dr_egeria_md:main
 egeria_login=pyegeria.commands.cli.egeria_login_tui:login
 export_terms_to_csv_file=pyegeria.commands.cat.glossary_actions:export_terms_csv
 get_asset_graph=pyegeria.commands.cat.get_asset_graph:main