pyegeria 1.5.1.1.28__tar.gz → 1.5.1.1.31__tar.gz

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/PKG-INFO

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

pyegeria-1.5.1.1.31/pyegeria/commands/__init__.py

@@ -0,0 +1,21 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+
+pyegeria commands available also from python.
+"""
+
+from .ops.monitor_gov_eng_status import display_gov_eng_status
+from .ops.monitor_integ_daemon_status import display_integration_daemon_status
+from .ops.table_integ_daemon_status import (
+    display_integration_daemon_status as table_integ_daemon_status,
+)
+from .ops.monitor_engine_activity_c import display_engine_activity_c
+
+from .cat.list_glossaries import display_glossaries
+from .cat.list_terms import display_glossary_terms
+from .cat.list_deployed_catalogs import list_deployed_catalogs
+from .cat.list_deployed_database_schemas import list_deployed_database_schemas
+from .cat.list_deployed_databases import list_deployed_databases

pyegeria-1.5.1.1.31/pyegeria/commands/cat/__init__.py

@@ -0,0 +1,5 @@
+from .list_glossaries import display_glossaries
+from .list_terms import display_glossary_terms
+from .list_deployed_catalogs import list_deployed_catalogs
+from .list_deployed_database_schemas import list_deployed_database_schemas
+from .list_deployed_databases import list_deployed_databases

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cat/glossary_actions.py

@@ -117,94 +117,6 @@ def create_glossary(
         m_client.close_session()
 
 
-def display_glossaries(
-    search_string: str,
-    server: str,
-    url: str,
-    userid: str,
-    password: str,
-    timeout: int,
-    jupyter: bool,
-    width: int,
-):
-    list_glossaries(
-        search_string, server, url, userid, password, timeout, jupyter, width
-    )
-
-
-@click.command("glossaries")
-@click.option("--search-string", default="*", help="Glossaries to search for")
-@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("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
-@click.option("--timeout", default=60, help="Number of seconds to wait")
-@click.option(
-    "--jupyter",
-    is_flag=True,
-    default=False,
-    envvar="EGERIA_JUPYTER",
-    help="Enable for rendering in a Jupyter terminal",
-)
-@click.option(
-    "--width",
-    default=200,
-    envvar="EGERIA_WIDTH",
-    help="Screen width, in characters, to use",
-)
-def list_glossaries(
-    search_string, server, url, userid, password, timeout, jupyter, width
-):
-    """List all glossaries"""
-    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
-    token = m_client.create_egeria_bearer_token()
-    try:
-        table = Table(
-            title=f"Glossary List @ {time.asctime()}",
-            style="bright_white on black",
-            header_style="bright_white on dark_blue",
-            title_style="bold white on black",
-            caption_style="white on black",
-            show_lines=True,
-            box=box.ROUNDED,
-            caption=f"View Server '{server}' @ Platform - {url}",
-            expand=True,
-        )
-        table.add_column("Glossary Name")
-        table.add_column("Qualified Name / GUID", width=38, no_wrap=True)
-        table.add_column("Language")
-        table.add_column("Description")
-        table.add_column("Usage")
-
-        glossaries = m_client.find_glossaries(search_string)
-        if type(glossaries) is list:
-            sorted_glossary_list = sorted(
-                glossaries, key=lambda k: k["glossaryProperties"]["displayName"]
-            )
-            for glossary in sorted_glossary_list:
-                display_name = glossary["glossaryProperties"]["displayName"]
-                qualified_name = glossary["glossaryProperties"]["qualifiedName"]
-                guid = glossary["elementHeader"]["guid"]
-                q_name = f"{qualified_name}\n\n{guid}"
-                language = glossary["glossaryProperties"]["language"]
-                description = glossary["glossaryProperties"]["description"]
-                usage = glossary["glossaryProperties"]["usage"]
-                table.add_row(display_name, q_name, language, description, usage)
-            console = Console(
-                style="bold bright_white on black",
-                width=width,
-                force_terminal=not jupyter,
-            )
-            console.print(table)
-
-    except (InvalidParameterException, PropertyServerException) as e:
-        print_exception_response(e)
-    finally:
-        m_client.close_session()
-
-
 @click.command("delete-glossary")
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
 @click.option(

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cat/list_deployed_catalogs.py

@@ -47,21 +47,41 @@ def check_if_template(header: dict) -> bool:
 
 
 def list_deployed_catalogs(
-    catalog_server: str,
-    server: str,
-    url: str,
-    username: str,
-    password: str,
+    catalog_server: str = "*",
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
+    """
+    Display the list of deployed catalogs. These could be metadata catalogs or other catalogs such as database catalogs..
+
+    Parameters
+    ----------
+    catalog_server : str, optional
+        The name of the catalog server to query. Default is "*" for all catalog servers.
+    view_server : str, optional
+        The server providing the view. Default is EGERIA_VIEW_SERVER.
+    view_url : str, optional
+        The URL of the view server. Default is EGERIA_VIEW_SERVER_URL.
+    user : str, optional
+        The user ID for authentication. Default is EGERIA_USER.
+    user_pass : str, optional
+        The password for the user. Default is EGERIA_USER_PASSWORD.
+    jupyter : bool, optional
+        Enable Jupyter notebook output. Default is EGERIA_JUPYTER.
+    width : int, optional
+        The width of the console output. Default is EGERIA_WIDTH.
+    """
+    c_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
     token = c_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
-            caption=f"Databases found: {url} - {server} @ {time.asctime()}",
+            caption=f"Databases found: {view_url} - {view_server} @ {time.asctime()}",
             style="bold bright_white on black",
             row_styles=["bold bright_white on black"],
             header_style="white on dark_blue",

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cat/list_deployed_database_schemas.py

@@ -55,21 +55,39 @@ def make_prop_md(props: dict) -> str:
 
 
 def list_deployed_database_schemas(
-    db_name: str,
-    server: str,
-    url: str,
-    username: str,
-    password: str,
+    db_name: str = "*",
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
+    """List schemas that have been deployed in database catalogs or databases.
+    Parameters
+    ----------
+    db_name : str
+        Name of the database or catalog to get schemas for, or '*' for all databases.
+    view_server : str
+        The view server to connect to.
+    view_url : str
+        URL of the view server.
+    user : str
+        Username for authentication.
+    user_pass : str
+        Password for authentication.
+    jupyter : bool
+        Whether to force the terminal output to behave as if in a Jupyter notebook.
+    width : int
+        Width of the console output.
+    """
+    c_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
     token = c_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
-            caption=f"Databases found: {url} - {server} @ {time.asctime()}",
+            caption=f"Databases found: {view_url} - {view_server} @ {time.asctime()}",
             style="bold bright_white on black",
             row_styles=["bold bright_white on black"],
             header_style="white on dark_blue",

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cat/list_deployed_databases.py

@@ -47,20 +47,36 @@ def check_if_template(header: dict) -> bool:
 
 
 def list_deployed_databases(
-    server: str,
-    url: str,
-    username: str,
-    password: str,
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
+    """
+    Parameters
+    ----------
+    view_server : str
+        The view server name to which the Egeria client will connect. By default, this is set to EGERIA_VIEW_SERVER.
+    view_url : str
+        The URL of the Egeria view server. By default, this is set to EGERIA_VIEW_SERVER_URL.
+    user : str
+        The username used for authentication with the Egeria server. By default, it is set to EGERIA_USER.
+    user_pass : str
+        The password used for authentication with the Egeria server. By default, it is set to EGERIA_USER_PASSWORD.
+    jupyter : bool
+        A flag indicating whether the output is displayed within a Jupyter notebook. Default is set to EGERIA_JUPYTER.
+    width : int
+        The width of the output console. By default, it is set to EGERIA_WIDTH.
+    """
+    c_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
     token = c_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
-            caption=f"Databases found: {url} - {server} @ {time.asctime()}",
+            caption=f"Databases found: {view_url} - {view_server} @ {time.asctime()}",
             style="bold bright_white on black",
             row_styles=["bold bright_white on black"],
             header_style="white on dark_blue",

pyegeria-1.5.1.1.31/pyegeria/commands/cat/list_glossaries.py

@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Unit tests for the Utils helper functions using the Pytest framework.
+
+
+A simple display for glossary terms
+"""
+import argparse
+import os
+import sys
+import time
+
+from rich import box
+from rich.console import Console
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.text import Text
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    EgeriaTech,
+    print_exception_response,
+)
+
+disable_ssl_warnings = True
+
+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_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+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"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+
+def display_glossaries(
+    search_string: str = "*",
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    """Display either a specified glossary or all glossaries if the search_string is '*'.
+    Parameters
+    ----------
+    search_string : str, default is '*'
+        The string used to search for glossaries.
+    view_server : str
+        The view server name or address where the Egeria services are hosted.
+    view_url : str
+        The URL of the platform the view server is on.
+    user : str
+        The user ID for authentication with the Egeria server.
+    user_pass : str
+        The password for authentication with the Egeria server.
+    jupyter : bool, optional
+        A boolean indicating whether the output is intended for a Jupyter notebook (default is EGERIA_JUPYTER).
+    width : int, optional
+        The width of the console output (default is EGERIA_WIDTH).
+    """
+    m_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
+    token = m_client.create_egeria_bearer_token()
+    try:
+        table = Table(
+            title=f"Glossary List @ {time.asctime()}",
+            style="bright_white on black",
+            header_style="bright_white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            caption=f"View Server '{view_server}' @ Platform - {view_url}",
+            expand=True,
+        )
+        table.add_column("Glossary Name")
+        table.add_column("Qualified Name / GUID", width=38, no_wrap=True)
+        table.add_column("Language")
+        table.add_column("Description")
+        table.add_column("Usage")
+
+        glossaries = m_client.find_glossaries(search_string)
+        if type(glossaries) is list:
+            sorted_glossary_list = sorted(
+                glossaries, key=lambda k: k["glossaryProperties"]["displayName"]
+            )
+            for glossary in sorted_glossary_list:
+                display_name = glossary["glossaryProperties"]["displayName"]
+                qualified_name = glossary["glossaryProperties"]["qualifiedName"]
+                guid = glossary["elementHeader"]["guid"]
+                q_name = f"{qualified_name}\n\n{guid}"
+                language = glossary["glossaryProperties"]["language"]
+                description = glossary["glossaryProperties"]["description"]
+                usage = glossary["glossaryProperties"]["usage"]
+                table.add_row(display_name, q_name, language, description, usage)
+            console = Console(
+                style="bold bright_white on black",
+                width=width,
+                force_terminal=not jupyter,
+            )
+            console.print(table)
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
+
+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")
+
+    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
+
+    try:
+        search_string = Prompt.ask(
+            "Enter the glossary you are searching for or '*' for all:", default="*"
+        )
+
+        display_glossaries(search_string, server, url, userid, user_pass)
+
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cat/list_terms.py

@@ -46,18 +46,45 @@ EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
 
 
 def display_glossary_terms(
-    search_string: str,
-    glossary_guid: str,
-    glossary_name: str,
-    server: str,
-    url: str,
-    username: str,
-    user_password: str,
+    search_string: str = "*",
+    glossary_guid: str = None,
+    glossary_name: str = None,
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user_id: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    """Display glossary terms in a table"""
-    g_client = EgeriaTech(server, url, username, user_password)
+    """Display a table of glossary terms filtered by search_string and glossary, if specified. If no
+        filters then all terms are displayed. If glossary_guid or name is specified, then only terms from that
+        glossary are displayed.
+    Parameters
+    ----------
+    search_string : str, optional
+        The string to search for terms. Defaults to "*".
+    glossary_guid : str, optional
+        The unique identifier of the glossary. Defaults to None. If specified, then only terms from that glossary
+        are displayed. If both glossary_guid and glossary_name are provided then glossary_guid will take precedence.
+    glossary_name : str, optional
+        The display name of the glossary. Defaults to None. If specified, then only terms from that glossary
+        are displayed. If both glossary_guid and glossary_name are provided then glossary_guid will take precedence.
+        Note that the use of glossary display name relies on the qualified name conforming to convention. GUID is more
+        reliable.
+    view_server : str
+        The server where the glossary is hosted. Defaults to EGERIA_VIEW_SERVER.
+    view_url : str
+        The URL of the server where the glossary is hosted. Defaults to EGERIA_VIEW_SERVER_URL.
+    user_id : str
+        The user ID for authentication. Defaults to EGERIA_USER.
+    user_pass : str
+        The user password for authentication. Defaults to EGERIA_USER_PASSWORD.
+    jupyter : bool
+        Flag to indicate if the output should be formatted for Jupyter notebook. Defaults to EGERIA_JUPYTER.
+    width : int
+        The width of the console output. Defaults to EGERIA_WIDTH.
+    """
+    g_client = EgeriaTech(view_server, view_url, user_id, user_pass)
     token = g_client.create_egeria_bearer_token()
     if (glossary_name is not None) and (glossary_name != "*"):
         glossary_guid = g_client.__get_guid__(
@@ -78,7 +105,7 @@ def display_glossary_terms(
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"View Server '{server}' @ Platform - {url}",
+            caption=f"View Server '{view_server}' @ Platform - {view_url}",
             expand=True,
         )
         table.add_column("Term Name")

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cli/egeria.py

@@ -40,11 +40,12 @@ from pyegeria.commands.cat.list_deployed_databases import list_deployed_database
 from pyegeria.commands.cat.glossary_actions import (
     create_glossary,
     delete_glossary,
-    list_glossaries,
     create_term,
     load_terms,
     export_terms,
 )
+from pyegeria.commands.cat.list_glossaries import display_glossaries
+
 from pyegeria.commands.my.todo_actions import (
     mark_todo_complete,
     reassign_todo,
@@ -978,7 +979,22 @@ def list_databases(ctx):
     )
 
 
-show.add_command(list_glossaries)
+@show.command("list-glossaries")
+@click.option("--search_string", default="*", help="Name to search for glossaries")
+@click.pass_context
+def list_glossaries(ctx, search_string):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    display_glossaries(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
 
 #
 #  Catalog User: Tell

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/cli/egeria_cat.py

@@ -23,9 +23,9 @@ from pyegeria.commands.cat.glossary_actions import (
     delete_glossary,
     create_term,
     load_terms,
-    list_glossaries,
     export_terms,
 )
+from pyegeria.commands.cat.list_glossaries import display_glossaries
 from pyegeria.commands.cat.list_archives import display_archive_list
 from pyegeria.commands.cat.list_assets import display_assets
 from pyegeria.commands.cat.list_cert_types import display_certifications
@@ -550,6 +550,23 @@ def list_catalogs(ctx, search_server):
     )
 
 
+@show.command("list-glossaries")
+@click.option("--search_string", default="*", help="Name to search for glossaries")
+@click.pass_context
+def list_glossaries(ctx, search_string):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    display_glossaries(
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show.command("list-databases")
 @click.pass_context
 def list_databases(ctx):
@@ -560,8 +577,6 @@ def list_databases(ctx):
     )
 
 
-show.add_command(list_glossaries)
-
 #
 #  Tell
 #

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/ops/__init__.py

@@ -4,12 +4,12 @@ Copyright Contributors to the ODPi Egeria project.
 
 
 """
-
-from monitor_integ_daemon_status import display_integration_daemon_status
-from monitor_gov_eng_status import display_gov_eng_status
-from monitor_platform_status import display_status as display_platform_status
-from monitor_server_status import display_status as display_server_status
-from monitor_engine_activity_c import display_engine_activity_c
+#
+# from .monitor_integ_daemon_status import display_integration_daemon_status
+# from .monitor_gov_eng_status import display_gov_eng_status
+# from .monitor_platform_status import display_status as display_platform_status
+# from .monitor_server_status import display_status as display_server_status
+# from .monitor_engine_activity_c import display_engine_activity_c
 
 # import monitor_server_status
 # import monitor_server_list

{pyegeria-1.5.1.1.28 → pyegeria-1.5.1.1.31}/pyegeria/commands/ops/monitor_engine_activity_c.py

@@ -54,20 +54,39 @@ disable_ssl_warnings = True
 
 
 def display_engine_activity_c(
-    server: str,
-    url: str,
-    user: str,
-    user_pass: str,
-    paging: bool,
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    paging: bool = True,
     jupyter: bool = EGERIA_JUPYTER,
-    width=EGERIA_WIDTH,
+    width: int = EGERIA_WIDTH,
 ):
-    g_client = AutomatedCuration(server, url, user, user_pwd=user_pass)
+    """Display governance engine activity as a table.
+
+    Parameters
+    ----------
+    view_server : str
+        The Egeria view server name.
+    view_url : str
+        The URL for the Egeria view server.
+    user : str
+        The user name for authenticating with the Egeria server.
+    user_pass : str
+        The user password for authenticating with the Egeria server.
+    paging : bool, default is True
+        Whether to enable paging mode when displaying the table.
+    jupyter : bool
+        Indicates if the environment is a Jupyter notebook.
+    width : int
+        The width of the console for table printing.
+    """
+    g_client = AutomatedCuration(view_server, view_url, user, user_pwd=user_pass)
 
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Engine Action Status for Platform {url} @ {time.asctime()}",
+            title=f"Engine Action Status for Platform {view_url} @ {time.asctime()}",
             style="bold white on black",
             row_styles=["bold white on black"],
             header_style="white on dark_blue",
@@ -75,7 +94,7 @@ def display_engine_activity_c(
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Engine Status for Server '{server}' @ Platform - {url}",
+            caption=f"Engine Status for Server '{view_server}' @ Platform - {view_url}",
             expand=True,
         )
         table.add_column("Requested Time")