pyegeria 5.2.0.12__tar.gz → 5.2.0.20__tar.gz

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/PKG-INFO

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

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/collection_manager_omvs.py

@@ -2646,8 +2646,8 @@ class CollectionManager(Client):
 
         Returns
         -------
-        list | bool
-            The list of member information if successful, otherwise False.
+        list | str
+            The list of member information if successful, otherwise the string "No members found"
 
         Raises
         ------
@@ -2663,14 +2663,17 @@ class CollectionManager(Client):
         members = await self._async_get_collection_members(
             collection_guid, collection_name, collection_qname
         )
-        if type(members) is str:
-            return False
+        if (type(members) is str) or (len(members) == 0):
+            return "No members found"
         # finally, construct a list of  member information
         for member_rel in members:
             member_guid = member_rel["elementHeader"]["guid"]
             member_resp = await self._async_get_collection(member_guid)
-            member = member_resp["element"]
+            member = member_resp.get("element", None)
+            if member is None:
+                continue
             # print(json.dumps(member, indent = 4))
+
             member_instance = {
                 "name": member["properties"]["name"],
                 "qualifiedName": member["properties"]["qualifiedName"],
@@ -2680,7 +2683,7 @@ class CollectionManager(Client):
             }
             member_list.append(member_instance)
 
-        return member_list
+        return member_list if len(member_list) > 0 else "No members found"
 
     def get_member_list(
         self,

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/commands/cat/get_collection.py

@@ -96,7 +96,7 @@ def collection_viewer(
                     walk_collection_hierarchy(branch, collection_client, member["guid"])
         else:
             tt = tree.add(
-                f"[bold magenta on black]No collections match {root_collection_name}"
+                f"[bold magenta on black]No collections found in {root_collection_name}"
             )
 
     try:

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/commands/cat/list_assets.py

@@ -3,10 +3,8 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-Unit tests for the Utils helper functions using the Pytest framework.
+List assets
 
-
-A simple display for glossary terms
 """
 import argparse
 import os
@@ -18,6 +16,7 @@ from rich.console import Console
 from rich.prompt import Prompt
 from rich.markdown import Markdown
 from rich.table import Table
+from rich.text import Text
 
 from pyegeria import (
     InvalidParameterException,
@@ -78,9 +77,8 @@ def display_assets(
             caption=f"View Server '{server}' @ Platform - {url}",
             expand=True,
         )
-        table.add_column("Display Name", max_width=15)
+        table.add_column("Display Name / Qualified Name / GUID", width=36)
         table.add_column("Type Name")
-        table.add_column("GUID", no_wrap=True)
         table.add_column("Technology Type")
         # table.add_column("Qualified Name",max_width=15)
         table.add_column("Matching Elements")
@@ -100,23 +98,16 @@ def display_assets(
             properties = element["properties"]
             header = element["elementHeader"]
             nested = element.get("matchingElements", "---")
+            qualified_name = properties["qualifiedName"]
+            display_name = Text(f"{properties.get("displayName", "---")}\n\n{qualified_name}\n\n"
+                                f"{header['guid']}", justify="center")
 
-            display_name = properties.get("displayName", "---")
-            # qualified_name = properties["qualifiedName"] # we decided that qualified name wasn't useful
             type_name = header["type"]["typeName"]
             tech_type = properties.get("deployedImplementationType", "---")
-            guid = header["guid"]
-            #### We decided that path wasn't useful
-            # path_name = element.get("extendedProperties", None)
-            # if path_name:
-            #     path = path_name.get("pathName"," ")
-            # else:
-            #     path = " "
-            match_md = ""
 
             match_tab = Table(expand=True)
             match_tab.add_column("Type Name")
-            match_tab.add_column("GUID", no_wrap=True, width=36)
+            match_tab.add_column("GUID", width=36)
             match_tab.add_column("Properties")
 
             for match_t in nested:
@@ -130,7 +121,7 @@ def display_assets(
                 match_details_out = Markdown(match_details_md)
                 match_tab.add_row(match_type_name, matching_guid, match_details_out)
 
-            table.add_row(display_name, type_name, guid, tech_type, match_tab)
+            table.add_row(display_name, type_name, tech_type, match_tab)
 
         g_client.close_session()
         return table

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/commands/cli/egeria.py

@@ -235,10 +235,16 @@ def cli(
     ctx.ensure_object(Config)
 
 
-@cli.command("alogin")
+# cli.add_command(login)
+@cli.command("login")
 @click.pass_context
-def login(ctx):
-    login()
+def egeria_login(ctx):
+    """Login to Egeria platform"""
+    user = login(
+        ctx.obj.userid, ctx.obj.password, ctx.obj.view_server, ctx.obj.view_server_url
+    )
+    ctx.obj.userid = user
+    click.echo(f" user is {ctx.obj.userid}")
 
 
 #
@@ -1319,27 +1325,6 @@ def show_tech_type_elements(ctx, tech_type):
     tech_viewer(tech_type, c.view_server, c.view_server_url, c.userid, c.password)
 
 
-@show_cat_info.command("collection")
-@click.option(
-    "--root-collection",
-    default="Coco Pharmaceuticals Governance Domains",
-    help="View of tree of collections from a given root",
-)
-@click.pass_context
-def show_collection(ctx, root_collection):
-    """Display information about a collection"""
-    c = ctx.obj
-    collection_viewer(
-        root_collection,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
-
-
 @show_project_group.command("projects")
 @click.option("--search-string", default="*", help="List Projects by Search String")
 @click.pass_context
@@ -1837,4 +1822,8 @@ def repository(ctx):
 repository.add_command(load_archive)
 
 if __name__ == "__main__":
-    cli()
+    while True:
+        try:
+            cli()
+        except Exception as e:
+            click.echo(f"Error: {e}")

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/commands/cli/egeria_login_tui.py

@@ -9,7 +9,7 @@ Peter Coldicott
 
 import os
 from os import system
-
+import click
 from textual.reactive import Reactive
 
 from textual.app import App, ComposeResult
@@ -36,6 +36,7 @@ from textual.widgets import (
 
 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")
@@ -294,10 +295,17 @@ class Egeria_login(App):
         )
 
 
-def login() -> None:
+# @click.command("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"
+# )
+# @click.option("--userid", default=EGERIA_USER, help="Egeria user")
+# @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+def login(userid: str, password: str, server: str, url: str) -> None:
     app = Egeria_login()
     app.run()
-    return
+    return "peterprofile"
 
 
 if __name__ == "__main__":

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/commands/ops/monitor_integ_daemon_status.py

@@ -197,7 +197,7 @@ def display_integration_daemon_status(
 
     try:
         if paging is True:
-            console = Console(width=width, force_terminal=not jupyter)
+            console = Console(width=width)  # main_pagig, force_terminal=not jupyter)
             with console.pager():
                 console.print(generate_table(search_list))
         else:

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyegeria/metadata_explorer_omvs.py

@@ -1742,7 +1742,7 @@ class MetadataExplorer(Client):
         )
 
         url = (
-            f"{base_path(self, self.view_server)}/metadata-elements/by-search-specification"
+            f"{base_path(self, self.view_server)}/metadata-elements/by-search-conditions"
             f"{possible_query_params}"
         )
 
@@ -1951,7 +1951,7 @@ class MetadataExplorer(Client):
         )
 
         url = (
-            f"{base_path(self, self.view_server)}/relationships/by-search-specification"
+            f"{base_path(self, self.view_server)}/relationships/by-search-conditions"
             f"{possible_query_params}"
         )
 
@@ -1959,7 +1959,7 @@ class MetadataExplorer(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        elements = response.json().get("elementList", "No elements found")
+        elements = response.json().get("relationshipList", "No elements found")
         if type(elements) is list:
             if len(elements) == 0:
                 return "No elements found"

{pyegeria-5.2.0.12 → pyegeria-5.2.0.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.2.0.12"
+version = "5.2.0.20"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -120,6 +120,7 @@ pytest = "^8.2.2"
     hey_egeria_tech = "pyegeria.commands.cli.egeria_tech:cli"
     hey_egeria_my = "pyegeria.commands.cli.egeria_my:cli"
     hey_egeria = "pyegeria.commands.cli.egeria:cli"
+    egeria_login = "pyegeria.commands.cli.egeria_login_tui:login"
 
     get_guid_info = "pyegeria.commands.tech.get_guid_info:main"
     get_tech_details = "pyegeria.commands.tech.get_tech_details:main"