pyegeria 5.2.1.1__py3-none-any.whl → 5.3__py3-none-any.whl

{pyegeria/commands → commands}/cli/egeria_cat.py

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
 
-A command line interface for Egeria Catalog User functions
+A object_action line interface for Egeria Catalog User functions
 
 This is an emerging capability based on the **click** package. Feedback welcome!
 
@@ -14,55 +14,59 @@ import os
 import click
 from trogon import tui
 
-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
-from pyegeria.commands.cat.get_project_structure import project_structure_viewer
-from pyegeria.commands.cat.get_tech_type_elements import tech_viewer
-from pyegeria.commands.cat.list_tech_type_elements import list_tech_elements
-from pyegeria.commands.cat.glossary_actions import (
+from commands.cat.dr_egeria_md import process_markdown_file
+from commands.cat.get_asset_graph import asset_viewer
+from commands.cat.get_collection import collection_viewer
+from commands.cat.get_project_dependencies import project_dependency_viewer
+from commands.cat.get_project_structure import project_structure_viewer
+from commands.cat.get_tech_type_elements import tech_viewer
+from commands.cat.glossary_actions import (
     create_glossary,
-    delete_glossary,
     create_term,
+    delete_glossary,
     delete_term,
-    import_terms,
-    export_terms,
-)
-from pyegeria.commands.cat.list_servers_deployed_imp import display_servers_by_dep_imp
-from pyegeria.commands.cat.list_glossaries import display_glossaries
-from pyegeria.commands.cat.list_assets import display_assets
-from pyegeria.commands.cat.list_cert_types import display_certifications
-from pyegeria.commands.cat.list_deployed_catalogs import list_deployed_catalogs
-from pyegeria.commands.cat.list_deployed_database_schemas import (
+    export_terms_csv,
+    import_terms_csv,
+    create_category,
+    update_category,
+    delete_category,
+    add_term_to_category,
+    remove_term_from_category)
+from commands.cat.list_assets import display_assets
+from commands.cat.list_categories import display_categories
+from commands.cat.list_cert_types import display_certifications
+from commands.cat.list_collections import display_collections
+from commands.cat.list_deployed_catalogs import list_deployed_catalogs
+from 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_terms import display_glossary_terms
-from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.cat.list_tech_types import display_tech_types
-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.list_collections import display_collections
-
-
-from pyegeria.commands.cli.ops_config import Config
-from pyegeria.commands.my.todo_actions import (
+    )
+from commands.cat.list_deployed_databases import list_deployed_databases
+from commands.cat.list_deployed_servers import display_servers_by_dep_imp
+from commands.cat.list_glossaries import display_glossaries
+from commands.cat.list_projects import display_project_list
+from commands.cat.list_tech_type_elements import list_tech_elements
+from commands.cat.list_tech_types import display_tech_types
+from commands.cat.list_terms import display_glossary_terms
+from commands.cat.list_todos import display_to_dos as list_todos
+from commands.cat.list_user_ids import list_user_ids
+from commands.cli.ops_config import Config
+from commands.my.todo_actions import (
+    create_todo,
+    delete_todo,
     mark_todo_complete,
     reassign_todo,
-    delete_todo,
-    create_todo,
-)
-from pyegeria.commands.tech.list_asset_types import display_asset_types
+    )
+from commands.tech.list_asset_types import display_asset_types
 
 
 # @tui
-# @tui('menu','menu','A textual command line interface')
+# @tui('menu','menu','A textual object_action line interface')
 @tui()
 @click.version_option("0.0.1", prog_name="egeria_ops")
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -72,7 +76,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -82,7 +86,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -92,7 +96,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(
@@ -144,6 +148,23 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
     help="Path to glossary import/export files",
 )
 
+@click.option(
+    "--root_path",
+    default=os.environ.get("EGERIA_ROOT_PATH", "/home/jovyan"),
+    help="Root path to use for file operations",
+)
+
+@click.option(
+    "--inbox_path",
+    default=os.environ.get("EGERIA_INBOX_PATH", "loading-bay/dr_egeria_inbox"),
+    help="Path to inbox files",
+)
+@click.option(
+    "--outbox_path",
+    default=os.environ.get("EGERIA_OUTBOX_PATH", "distribution-hub/dr_egeria_outbox"),
+    help="Path to outbox files",
+)
+
 @click.pass_context
 def cli(
     ctx,
@@ -164,6 +185,9 @@ def cli(
     width,
     home_glossary_guid,
     glossary_path,
+    root_path,
+    inbox_path,
+    outbox_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -184,6 +208,9 @@ def cli(
         width,
         home_glossary_guid,
         glossary_path,
+        root_path,
+        inbox_path,
+        outbox_path
     )
     ctx.max_content_width = 250
     ctx.ensure_object(Config)
@@ -198,7 +225,7 @@ def show():
 @show.group("info")
 @click.pass_context
 def info(ctx):
-    """Group of commands to show information about various Egeria objects"""
+    """Group of md_commands to show information about various Egeria objects"""
     pass
 
 
@@ -290,7 +317,7 @@ def show_asset_graph(ctx, asset_guid):
 
     Usage: show asset-graph <asset-guid>
 
-           asset-guid must be a valid asset guid. These can be found through other commands such as 'show tech-type-elements'
+           asset-guid must be a valid asset guid. These can be found through other md_commands such as 'show tech-type-elements'
 
     """
     c = ctx.obj
@@ -328,8 +355,14 @@ def glossary_group(ctx):
     default="*",
     help="Optionally restrict search to a specific named glossary",
 )
+@click.option(
+    "--output-format",
+    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    default="TABLE",
+    help="Display on screen as table, or as FORM or REPORT file",
+    )
 @click.pass_context
-def show_terms(ctx, search_string, glossary_guid, glossary_name):
+def show_terms(ctx, search_string, glossary_guid, glossary_name, output_format):
     """Find and display glossary terms"""
     c = ctx.obj
     display_glossary_terms(
@@ -342,13 +375,19 @@ def show_terms(ctx, search_string, glossary_guid, glossary_name):
         c.password,
         c.jupyter,
         c.width,
+        output_format,
     )
 
-
 @glossary_group.command("glossaries")
 @click.option("--search_string", default="*", help="Name to search for glossaries")
+@click.option(
+    "--output-format",
+    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    default="TABLE",
+    help="Display on screen as table, or as FORM or REPORT file",
+    )
 @click.pass_context
-def glossaries(ctx, search_string):
+def glossaries(ctx, search_string, output_format):
     """Display a list of glossaries"""
     c = ctx.obj
     display_glossaries(
@@ -359,7 +398,32 @@ def glossaries(ctx, search_string):
         c.password,
         c.jupyter,
         c.width,
+        output_format,
     )
+@glossary_group.command("glossary-categories")
+@click.option("--search_string", default="*", help="Name to search for categories")
+@click.option(
+    "--output-format",
+    type=click.Choice(["FORM", "REPORT", "TABLE"]),
+    default="TABLE",
+    help="Display on screen as table, or as FORM or REPORT file",
+    )
+@click.pass_context
+def categories(ctx, search_string, output_format):
+    """Display a list of categories"""
+    c = ctx.obj
+    display_categories(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+        output_format,
+    )
+
+
 
 
 @info.command("collection")
@@ -601,6 +665,16 @@ 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.add_command(process_markdown_file)
 
 @tell.group("glossary")
 @click.pass_context
@@ -609,13 +683,19 @@ def tell_glossary(ctx):
     pass
 
 
+
+
 tell_glossary.add_command(create_glossary)
 tell_glossary.add_command(delete_glossary)
 tell_glossary.add_command(create_term)
-tell_glossary.add_command(import_terms)
-tell_glossary.add_command(export_terms)
+tell_glossary.add_command(import_terms_csv)
+tell_glossary.add_command(export_terms_csv)
 tell_glossary.add_command(delete_term)
-
+tell_glossary.add_command(create_category)
+tell_glossary.add_command(delete_category)
+tell_glossary.add_command(update_category)
+tell_glossary.add_command(add_term_to_category)
+tell_glossary.add_command(remove_term_from_category)
 
 @tell.group("todo")
 @click.pass_context
@@ -630,8 +710,5 @@ tell_todo.add_command(delete_todo)
 tell_todo.add_command(create_todo)
 
 
-
-
-
 if __name__ == "__main__":
     cli()

{pyegeria/commands → commands}/cli/egeria_login_tui.py

@@ -9,42 +9,40 @@ Peter Coldicott
 
 import os
 from os import system
-import click
-from textual.reactive import Reactive
+from typing import Any
 
+import click
+from textual import on, work
 from textual.app import App, ComposeResult
 from textual.containers import (
     Container,
-    Vertical,
     HorizontalScroll,
-    VerticalScroll,
     ScrollableContainer,
+    Vertical,
+    VerticalScroll,
 )
-from textual import on, work
+from textual.reactive import Reactive
 from textual.screen import ModalScreen, Screen
 from textual.widgets import (
-    Input,
-    Static,
     Button,
-    RichLog,
-    Label,
-    Tree,
-    Footer,
     DataTable,
+    Footer,
     Header,
+    Input,
+    Label,
+    RichLog,
+    Static,
+    Tree,
 )
 
-from typing import Any
-
-
 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("VIEW_SERVER", "view-server")
+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("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
@@ -295,7 +293,7 @@ class Egeria_login(App):
         )
 
 
-# @click.command("egeria-login")
+# @click.object_action("egeria-login")
 # @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"

{pyegeria/commands → commands}/cli/egeria_my.py

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
 
-A command line interface for Egeria Users - of individual relevance
+A object_action line interface for Egeria Users - of individual relevance
 
 This is an emerging capability based on the **click** package. Feedback welcome!
 
@@ -14,21 +14,19 @@ import os
 import click
 from trogon import tui
 
-from pyegeria.commands.cli.ops_config import Config
-
-from pyegeria.commands.my.monitor_open_todos import display_todos
-from pyegeria.commands.my.monitor_my_todos import display_my_todos
-from pyegeria.commands.my.list_my_profile import display_my_profile
-from pyegeria.commands.my.list_my_roles import display_my_roles
-from pyegeria.commands.my.todo_actions import (
+from commands.cli.ops_config import Config
+from commands.my.list_my_profile import display_my_profile
+from commands.my.list_my_roles import display_my_roles
+from commands.my.monitor_my_todos import display_my_todos
+from commands.my.monitor_open_todos import display_todos
+from commands.my.todo_actions import (
+    change_todo_status,
     create_todo,
     delete_todo,
-    change_todo_status,
     mark_todo_complete,
     reassign_todo,
 )
 
-
 # class Config(object):
 #     def __init__(self, server: str = None, url: str = None, userid:str = None, password:str = None,
 #                  timeout:int = 30, paging: bool = False):
@@ -44,12 +42,12 @@ from pyegeria.commands.my.todo_actions import (
 
 
 @tui()
-# @tui('menu', 'menu', 'A textual command line interface')
+# @tui('menu', 'menu', 'A textual object_action line interface')
 @click.version_option("0.0.1", prog_name="egeria_ops")
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -59,7 +57,7 @@ from pyegeria.commands.my.todo_actions import (
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -69,7 +67,7 @@ from pyegeria.commands.my.todo_actions import (
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -79,7 +77,7 @@ from pyegeria.commands.my.todo_actions import (
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(
@@ -124,6 +122,11 @@ from pyegeria.commands.my.todo_actions import (
     default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
     help="Glossary guid to use as the home glossary",
 )
+@click.option(
+    "--glossary_path",
+    default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
+    help="Path to glossary import/export files",
+)
 @click.pass_context
 def cli(
     ctx,
@@ -142,6 +145,8 @@ def cli(
     timeout,
     jupyter,
     width,
+    home_glossary_guid,
+    glossary_path,
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -160,6 +165,8 @@ def cli(
         timeout,
         jupyter,
         width,
+        home_glossary_guid,
+        glossary_path,
     )
     ctx.max_content_width = 200
     ctx.ensure_object(Config)