pyegeria 0.5.8.3__tar.gz → 0.5.8.6__tar.gz

{pyegeria-0.5.8.3 → pyegeria-0.5.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.5.8.3
+Version: 0.5.8.6
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

pyegeria-0.5.8.6/examples/widgets/cli/__init__.py

@@ -0,0 +1 @@
+from .ops_config import Config

{pyegeria-0.5.8.3/examples/widgets/operational → pyegeria-0.5.8.6/examples/widgets/cli}/egeria_ops.py

@@ -11,19 +11,20 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 """
 import click
 from trogon import tui
-from pyegeria import ServerOps
-from .ops_config import Config
-import monitor_gov_eng_status
-import monitor_server_status
-import monitor_server_list
-import monitor_integ_daemon_status
-import monitor_platform_status
-import monitor_engine_activity
-import refresh_integration_daemon
-import restart_integration_daemon
-import integration_daemon_actions
-import list_catalog_targets
-
+# from pyegeria import ServerOps
+from examples.widgets.cli.ops_config import Config
+from examples.widgets.operational.monitor_gov_eng_status import display_gov_eng_status
+from examples.widgets.operational.monitor_server_status import display_status as s_display_status
+from examples.widgets.operational.monitor_server_list import display_status as display_list
+from examples.widgets.operational.monitor_integ_daemon_status import display_integration_daemon_status
+from examples.widgets.operational.monitor_platform_status import display_status as p_display_status
+from examples.widgets.operational.monitor_engine_activity import display_engine_activity
+from examples.widgets.operational.refresh_integration_daemon import refresh_connector
+from examples.widgets.operational.restart_integration_daemon import restart_connector
+from examples.widgets.operational.integration_daemon_actions import (add_catalog_target,remove_catalog_target,
+                                                                     update_catalog_target, stop_server, start_server)
+
+from examples.widgets.operational.list_catalog_targets import display_catalog_targets
 # class Config(object):
 #     def __init__(self, server: str = None, url: str = None, userid:str = None, password:str = None,
 #                  timeout:int = 30, paging: bool = False):
@@ -97,7 +98,7 @@ def show_platform(ctx):
 def show_platform_status(ctx):
     """Display a live status view of known platforms"""
     c = ctx.obj
-    monitor_platform_status.display_status(c.view_server,c.view_server_url,
+    p_display_status(c.view_server,c.view_server_url,
                                            c.admin_user,c.admin_user_password)
 
 
@@ -114,9 +115,9 @@ def show_server_status(ctx, full):
     """Display a live status view of Egeria servers for the specified Egeria platform"""
     c = ctx.obj
     if full:
-        monitor_server_list.display_status(c.metadata_store, c.metadata_store_url, c.admin_user,c.admin_user_password)
+        display_list(c.metadata_store, c.metadata_store_url, c.admin_user,c.admin_user_password)
     else:
-        monitor_server_status.display_status(c.metadata_store, c.metadata_store_url, c.admin_user,c.admin_user_password)
+        s_display_status(c.metadata_store, c.metadata_store_url, c.admin_user,c.admin_user_password)
 
 @show.group("engines")
 @click.pass_context
@@ -130,7 +131,7 @@ def engine_host(ctx):
 def gov_eng_status(ctx,list):
     """Display engine-host status information"""
     c = ctx.obj
-    monitor_gov_eng_status.display_gov_eng_status(c.engine_host, c.engine_host_url,
+    display_gov_eng_status(c.engine_host, c.engine_host_url,
                                                                   c.userid, c.password,
                                                   list)
 
@@ -140,7 +141,7 @@ def gov_eng_status(ctx,list):
 def eng_activity_status(ctx,list):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
-    monitor_engine_activity.display_engine_activity(c.view_server, c.view_server_url,
+    display_engine_activity(c.view_server, c.view_server_url,
                                                       c.userid, c.password,
                                                       list)
 
@@ -157,7 +158,7 @@ def integrations(ctx):
 def integrations_status(ctx,list):
     """Display integration-daemon status information"""
     c = ctx.obj
-    monitor_integ_daemon_status.display_integration_daemon_status(c.integration_daemon, c.integration_daemon_url,
+    display_integration_daemon_status(c.integration_daemon, c.integration_daemon_url,
                                                                       c.view_server, c.view_server_url,
                                                                  c.userid, c.password, list)
 
@@ -167,7 +168,7 @@ def integrations_status(ctx,list):
 def integrations_status(ctx,connector):
     """Display Catalog Targets for a connector"""
     c = ctx.obj
-    list_catalog_targets.display_catalog_targets(connector, c.view_server, c.view_server_url,
+    display_catalog_targets(connector, c.view_server, c.view_server_url,
                                                                       c.userid, c.password)
 
 #
@@ -192,7 +193,7 @@ def integration_daemon(ctx):
 def refresh_connectors(ctx,connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
-    refresh_integration_daemon.refresh_connector(connector,c.integration_daemon, c.integration_daemon_url,
+    refresh_connector(connector,c.integration_daemon, c.integration_daemon_url,
                                    c.userid, c.passwordcatalog_target_actions.py )
 
 @integration_daemon.command('restart')
@@ -201,14 +202,14 @@ def refresh_connectors(ctx,connector):
 def restart_connectors(ctx,connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
-    restart_integration_daemon.restart_connector(connector,c.integration_daemon, c.integration_daemon_url,
+    restart_connector(connector,c.integration_daemon, c.integration_daemon_url,
                                    c.userid, c.password)
 
-integration_daemon.add_command(integration_daemon_actions.add_catalog_target)
-integration_daemon.add_command(integration_daemon_actions.remove_catalog_target)
-integration_daemon.add_command(integration_daemon_actions.update_catalog_target)
-integration_daemon.add_command(integration_daemon_actions.stop_server)
-integration_daemon.add_command(integration_daemon_actions.start_server)
+integration_daemon.add_command(add_catalog_target)
+integration_daemon.add_command(remove_catalog_target)
+integration_daemon.add_command(update_catalog_target)
+integration_daemon.add_command(stop_server)
+integration_daemon.add_command(start_server)
 
 
 if __name__ == '__main__':

pyegeria-0.5.8.6/examples/widgets/operational/__init__.py

@@ -0,0 +1,19 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+"""
+import pyegeria
+# from .ops_config import Config
+
+# import monitor_gov_eng_status
+# import monitor_server_status
+# import monitor_server_list
+# import monitor_integ_daemon_status
+# import monitor_platform_status
+# import monitor_engine_activity
+# import refresh_integration_daemon
+# import restart_integration_daemon
+# import integration_daemon_actions
+# import list_catalog_targets

{pyegeria-0.5.8.3 → pyegeria-0.5.8.6}/examples/widgets/operational/engine_actions.py

@@ -14,7 +14,7 @@ from rich.console import Console
 
 import time
 import click
-from ops_config import Config, pass_config
+# from ops_config import Config, pass_config
 from pyegeria import ServerOps, AutomatedCuration, INTEGRATION_GUIDS
 from pyegeria._exceptions import (
     InvalidParameterException,

{pyegeria-0.5.8.3 → pyegeria-0.5.8.6}/examples/widgets/operational/integration_daemon_actions.py

@@ -12,9 +12,7 @@ import os
 from rich import print, print_json
 from rich.console import Console
 
-import time
 import click
-from ops_config import Config, pass_config
 from pyegeria import ServerOps, AutomatedCuration, INTEGRATION_GUIDS, Platform
 from pyegeria._exceptions import (
     InvalidParameterException,

{pyegeria-0.5.8.3 → pyegeria-0.5.8.6}/examples/widgets/operational/monitor_gov_eng_status.py

@@ -12,8 +12,6 @@ import os
 import time
 import json
 import argparse
-import click
-from ops_config import Config, pass_config
 
 
 from pyegeria import (

{pyegeria-0.5.8.3 → pyegeria-0.5.8.6}/examples/widgets/operational/monitor_integ_daemon_status.py

@@ -12,7 +12,6 @@ import os
 import argparse
 import time
 from datetime import datetime
-from ops_config import Config
 
 from rich import box
 from rich.console import Console

{pyegeria-0.5.8.3 → pyegeria-0.5.8.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.8.3"
+version = "0.5.8.6"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -20,7 +20,8 @@ packages = [
     { include = "examples/widgets/developer" },
     { include = "examples/widgets/operational"},
     { include = "examples/widgets/personal_organizer"},
-    { include = "examples/doc_samples"}
+    { include = "examples/doc_samples"},
+    { include = "examples/widgets/cli"}
     ]
 
 [tool.poetry.dependencies]
@@ -79,8 +80,8 @@ pytest = "^8.2.2"
     monitor_open_todos = "examples.widgets.personal_organizer.monitor_open_todos:main"
     monitor_my_todos = "examples.widgets.personal_organizer.monitor_my_todos:main"
 
-    egeria_ops = "examples.widgets.operational.egeria_ops:cli"
-    egeria_ops_tui = "examples.widgets.operational.egeria_ops:tui"
+    egeria_ops = "examples.widgets.cli.egeria_ops:cli"
+    egeria_ops_tui = "examples.widgets.cli.egeria_ops:tui"
 
     get_guid_info = "examples.widgets.developer.get_guid_info:main"
     get_tech_details = "examples.widgets.developer.get_tech_details:main"

pyegeria-0.5.8.3/examples/widgets/operational/__init__.py

@@ -1,19 +0,0 @@
-"""
-SPDX-License-Identifier: Apache-2.0
-Copyright Contributors to the ODPi Egeria project.
-
-
-"""
-import pyegeria
-from .ops_config import Config
-
-import monitor_gov_eng_status
-import monitor_server_status
-import monitor_server_list
-import monitor_integ_daemon_status
-import monitor_platform_status
-import monitor_engine_activity
-import refresh_integration_daemon
-import restart_integration_daemon
-import integration_daemon_actions
-import list_catalog_targets