pyegeria 1.5.1.0.23__tar.gz → 1.5.1.0.120__tar.gz

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/PKG-INFO

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

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/commands/cat/glossary_actions.py

@@ -7,7 +7,6 @@ Copyright Contributors to the ODPi Egeria project.
 Execute Glossary actions.
 
 """
-import csv
 import os
 import sys
 import time
@@ -112,7 +111,7 @@ def delete_glossary(server, url, userid, password, timeout, glossary_guid):
     try:
         m_client.delete_to_do(glossary_guid)
 
-        click.echo(f"Deleted glossary: {glossary_guid}")
+        click.echo(f"Deleted Todo item {glossary_guid}")
 
     except (InvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
@@ -157,6 +156,7 @@ def create_term(
     url,
     userid,
     password,
+    timeout,
     glossary_name,
     term_name,
     summary,
@@ -166,8 +166,7 @@ def create_term(
     usage,
     version,
     status,
-    timeout: int = 120,
-) -> str:
+):
     """Create a new term"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
@@ -176,7 +175,7 @@ def create_term(
             "class": "ReferenceableRequestBody",
             "elementProperties": {
                 "class": "GlossaryTermProperties",
-                "qualifiedName": f"GlossaryTerm: {term_name} - {datetime.now().isoformat()}",
+                "qualifiedName": f"GlossaryTerm: {term_name} : {datetime.now().isoformat()}",
                 "displayName": term_name,
                 "summary": summary,
                 "description": description,
@@ -206,36 +205,6 @@ def create_term(
         click.echo(
             f"Successfully created term {term_name} with GUID {term_guid}, in glossary {glossary_name}.\n"
         )
-        return term_guid
-    except (InvalidParameterException, PropertyServerException) as e:
-        print_exception_response(e)
-    finally:
-        m_client.close_session()
-
-
-@click.command("load-terms-from-file")
-@click.option("--glossary-name", help="Name of Glossary", required=True)
-@click.option("--file-name", help="Path of CSV file", required=True)
-@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.argument("glossary-guid")
-def load_terms(
-    glossary_name, file_name, server, url, userid, password, timeout, glossary_guid
-):
-    """Delete the glossary specified"""
-    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
-    token = m_client.create_egeria_bearer_token()
-    try:
-        result = m_client.load_terms_from_file(glossary_name, file_name)
-
-        click.echo(
-            f"Loaded terms from  into glossary: {glossary_name} from {file_name}"
-        )
 
     except (InvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/commands/cli/egeria.py

@@ -37,12 +37,7 @@ from commands.cat.list_deployed_database_schemas import (
 )
 from commands.cat.list_deployed_catalogs import list_deployed_catalogs
 from commands.cat.list_deployed_databases import list_deployed_databases
-from commands.cat.glossary_actions import (
-    create_glossary,
-    delete_glossary,
-    create_term,
-    load_terms,
-)
+from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
 from commands.my.todo_actions import (
     mark_todo_complete,
     reassign_todo,
@@ -989,7 +984,6 @@ tell.add_command(mark_todo_complete)
 tell.add_command(reassign_todo)
 tell.add_command(delete_todo)
 tell.add_command(create_todo)
-tell.add_command(load_terms)
 
 
 @tell.group("survey")

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/commands/cli/egeria_cat.py

@@ -18,12 +18,7 @@ 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.get_tech_type_template import template_viewer
-from commands.cat.glossary_actions import (
-    create_glossary,
-    delete_glossary,
-    create_term,
-    load_terms,
-)
+from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
 from commands.cat.list_archives import display_archive_list
 from commands.cat.list_assets import display_assets
 from commands.cat.list_cert_types import display_certifications
@@ -571,7 +566,6 @@ tell.add_command(mark_todo_complete)
 tell.add_command(reassign_todo)
 tell.add_command(delete_todo)
 tell.add_command(create_todo)
-tell.add_command(load_terms)
 
 
 @tell.group("survey")

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/commands/tech/list_tech_templates.py

@@ -1,6 +1,4 @@
 """This creates a templates guid file from the core metadata archive"""
-import json
-
 from rich.markdown import Markdown
 from rich.prompt import Prompt
 import os
@@ -18,66 +16,30 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    RegisteredInfo,
+    RegisteredInfo
 )
 
 
 console = Console()
 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 list_templates(
-    search_string: str, server: str, url: str, username: str, password: str
-) -> []:
-    """Return a list of templates for one or more technology type"""
-    a_client = AutomatedCuration(server, url, username)
-    token = a_client.create_egeria_bearer_token(username, password)
-    tech_list = a_client.find_technology_types(search_string, page_size=0)
-    tech_info_list: dict = []
-
-    if type(tech_list) is list:
-        for item in tech_list:
-            if "deployedImplementationType" not in item["qualifiedName"]:
-                continue
-
-            details = a_client.get_technology_type_detail(item["name"])
-            entry = {details["name"]: {}}
-            if type(details) is str:
-                tech_info_list.append(entry)
-                continue
-            templates = details.get("catalogTemplates", "Not Found")
-            if type(templates) is list:
-                t_list = []
-                entry = {details["name"]: {}}
-                for template in templates:
-                    t_list.append({"template": template["name"]})
-                entry[details["name"]] = t_list
-                tech_info_list.append(entry)
-    return tech_info_list
-
-
-def display_templates_spec(
-    search_string: str,
-    server: str,
-    url: str,
-    username: str,
-    password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+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_templates_spec(search_string:str, server: str,
+                       url: str, username: str, password: str, jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH
 ):
+
     a_client = AutomatedCuration(server, url, username)
     token = a_client.create_egeria_bearer_token(username, password)
     tech_list = a_client.find_technology_types(search_string, page_size=0)
@@ -100,19 +62,21 @@ def display_templates_spec(
 
         table.add_column("Name", width=20)
         table.add_column("Template Name", width=20)
-        table.add_column("Template GUID", width=38, no_wrap=True)
+        table.add_column("Template GUID", width = 38,no_wrap=True)
         table.add_column("Placeholders")
 
+
         if type(tech_list) is list:
             for item in tech_list:
-                if "deployedImplementationType" not in item["qualifiedName"]:
+                if 'deployedImplementationType' not in item['qualifiedName']:
                     continue
                 placeholder_table = Table(expand=False, show_lines=True)
-                placeholder_table.add_column("Name", width=20, no_wrap=True)
-                placeholder_table.add_column("Type", width=10)
-                placeholder_table.add_column("Required", width=10)
-                placeholder_table.add_column("Example", width=20)
-                placeholder_table.add_column("Description", width=40)
+                placeholder_table.add_column("Name", width = 20,no_wrap=True)
+                placeholder_table.add_column("Type", width = 10)
+                placeholder_table.add_column("Required", width = 10)
+                placeholder_table.add_column("Example", width = 20)
+                placeholder_table.add_column("Description", width = 40)
+
 
                 name = item.get("name", "none")
 
@@ -126,11 +90,7 @@ def display_templates_spec(
                     for template in templates:
                         template_name = template.get("name", None)
 
-                        template_name = (
-                            f"{name}_Template"
-                            if template_name is None
-                            else template_name
-                        )
+                        template_name = f"{name}_Template" if template_name is None else template_name
 
                         specification = template["specification"]["placeholderProperty"]
                         template_guid = template["relatedElement"]["guid"]
@@ -141,17 +101,10 @@ def display_templates_spec(
                             placeholder_name = placeholder["placeholderPropertyName"]
                             placeholder_required = placeholder["required"]
                             placeholder_example = placeholder.get("example", None)
-                            placeholder_table.add_row(
-                                placeholder_name,
-                                placeholder_data_type,
-                                placeholder_required,
-                                placeholder_example,
-                                placeholder_description,
-                            )
-
-                        table.add_row(
-                            name, template_name, template_guid, placeholder_table
-                        )
+                            placeholder_table.add_row(placeholder_name, placeholder_data_type,  placeholder_required,
+                                                      placeholder_example, placeholder_description,)
+
+                        table.add_row(name, template_name, template_guid, placeholder_table)
 
             return table
         else:
@@ -164,11 +117,7 @@ def display_templates_spec(
         with console.pager(styles=True):
             console.print(generate_table())
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
+    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
         assert e.related_http_code != "200", "Invalid parameters"
     finally:
@@ -191,14 +140,14 @@ def main():
     guid = None
 
     try:
-        search_string = Prompt.ask(
-            "Enter the technology you are searching for:", default="*"
-        )
-        # display_templates_spec(search_string, server, url, userid, password)
-        list_templates(search_string, server, url, userid, password)
-    except KeyboardInterrupt:
+        search_string = Prompt.ask("Enter the technology you are searching for:", default="*")
+        display_templates_spec(search_string, server, url, userid, password)
+    except(KeyboardInterrupt):
         pass
 
 
 if __name__ == "__main__":
     main()
+
+
+

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/pyegeria/glossary_manager_omvs.py

@@ -8,11 +8,8 @@ added in subsequent versions of the glossary_omvs module.
 """
 import asyncio
 import time
-import csv
 from datetime import datetime
 
-from pyegeria import InvalidParameterException
-
 # import json
 from pyegeria._client import Client
 from pyegeria._validators import (
@@ -1410,92 +1407,28 @@ class GlossaryManager(GlossaryBrowser):
 
     def load_terms_from_file(
         self, glossary_name: str, filename: str, upsert: bool = False
-    ) -> [dict]:
+    ) -> str:
         """This method loads glossary terms into the specified glossary from the indicated file."""
         # Check that glossary exists and get guid
         glossaries = self.get_glossaries_by_name(glossary_name)
         if type(glossaries) is not list:
             return "Unknown glossary"
         if len(glossaries) > 1:
-            glossary_error = (
-                "Multiple glossaries found - please use a qualified name from below\n"
-            )
             for g in glossaries:
+                glossary_error = (
+                    "Multiple glossaries found - please use the qualified name\n"
+                )
                 glossary_error += (
                     f"Display Name: {g['glossaryProperties']['displayName']}\tQualified Name:"
                     f" {g['glossaryProperties']['qualifiedName']}\n"
                 )
-            raise InvalidParameterException(glossary_error)
-            sys.exit(1)
-
-        # Now we know we have a single glossary so we can get the guid
+                return glossary_error
         glossary_guid = glossaries[0]["elementHeader"]["guid"]
-        term_info = []
-
-        term_properties = {
-            "Term Name",
-            "Qualified Name",
-            "Abbreviation",
-            "Summary",
-            "Description",
-            "Examples",
-            "Usage",
-            "Version Identifier",
-            "Status",
-        }
-        # process file
-        with open(filename, mode="r") as file:
-            # Create a CSV reader object
-            csv_reader = csv.DictReader(file)
-            headers = csv_reader.fieldnames
-            # check that the column headers are known
-            if all(header in term_properties for header in headers) is False:
-                raise InvalidParameterException("Invalid headers in CSV File")
-                sys.exit(1)
-
-            # process each row
-            for row in csv_reader:
-                term_name = row.get("Term Name", None)
-                qualified_name = row.get("Qualified Name", None)
-                abbrev = row.get("Abbreviation", None)
-                summary = row.get("Summary", None)
-                description = row.get("Description", None)
-                examples = row.get("Examples", None)
-                usage = row.get("Usage", None)
-                version = row.get("Version Identifier", "1.0")
-                status = row.get("Status", "DRAFT").upper()
-
-                # process the row
-                if term_name is None:
-                    continue
-                body = {
-                    "class": "ReferenceableRequestBody",
-                    "elementProperties": {
-                        "class": "GlossaryTermProperties",
-                        "qualifiedName": f"GlossaryTerm: {term_name} - {datetime.now().isoformat()}",
-                        "displayName": term_name,
-                        "summary": summary,
-                        "description": description,
-                        "abbreviation": abbrev,
-                        "examples": examples,
-                        "usage": usage,
-                        "publishVersionIdentifier": version,
-                    },
-                    "initialStatus": status,
-                }
 
-                # Add the term
-                term_guid = self.create_controlled_glossary_term(
-                    glossary_guid, body_slimmer(body)
-                )
-                term_info.append(
-                    {
-                        "term_name": term_name,
-                        "qualified_name": qualified_name,
-                        "term_guid": term_guid,
-                    }
-                )
-        return term_info
+        # Open file
+
+        # Insert terms into glossary
+        pass
 
     async def _async_create_term_copy(
         self,

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/pyegeria/runtime_manager_omvs.py

@@ -59,7 +59,7 @@ class RuntimeManager(Client):
         )
 
     async def __async__get_guid__(
-        self, guid: str = None, name: str = None, property_name: str = "qualifiedName"
+        self, guid: str = None, name: str = None, property_name: str = "name"
     ) -> str:
         """Helper function to return a server_guid - one of server_guid or server_name should
         contain information. If both are None, an exception will be thrown. If both contain
@@ -92,7 +92,7 @@ class RuntimeManager(Client):
             )
 
     def __get_guid__(
-        self, guid: str = None, name: str = None, property_name: str = "qualifiedName"
+        self, guid: str = None, name: str = None, property_name: str = "name"
     ) -> str:
         """Helper function to return a server_guid - one of server_guid or server_name should
         contain information. If both are None, an exception will be thrown. If both contain
@@ -1128,7 +1128,6 @@ class RuntimeManager(Client):
         UserNotAuthorizedException
 
         """
-        server_name = f"Metadata Access Server:{server_name}"
         server_guid = self.__get_guid__(server_guid, server_name)
         url = f"{self.runtime_command_root}/metadata-access-stores/{server_guid}/instance/load/open-metadata-archives/file"
 

{pyegeria-1.5.1.0.23 → pyegeria-1.5.1.0.120}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "1.5.1.0.23"
+version = "1.5.1.0.120"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -56,7 +56,7 @@ pytest = "^8.2.2"
     list_tech_types = "commands.cat.list_tech_types:main"
     get_asset_graph = "commands.cat.get_asset_graph:main"
     get_collection = "commands.cat.get_collection:main"
-    list_terms = "commands.cat.list_glossary:main"
+    list_glossary = "commands.cat.list_glossary:main"
     get_tech_type_elements = "commands.cat.get_tech_type_elements:main"
     get_tech_type_template = "commands.cat.get_tech_type_template:main"
     list_projects = "commands.cat.list_projects:main"
@@ -68,12 +68,10 @@ pytest = "^8.2.2"
     list_user_ids = "commands.cat.list_user_ids:main"
     list_archives = "commands.cat.list_archives:main"
     list_deployed_catalogs = "commands.cat.list_deployed_catalogs:main"
-    list_deployed_databases = "commands.cat.list_deployed_databases:main"
     list_deployed_schemas = "commands.cat.list_deployed_database_schemas:main"
     create_glossary = "commands.cat.glossary_actions:create_glossary"
     delete_glossary = "commands.cat.glossary_actions:delete_glossary"
     create_term = "commands.cat.glossary_actions:create_term"
-    load_terms_from_file = "commands.cat.glossary_actions:load_terms"
 
     monitor_asset_events = "commands.ops.monitor_asset_events:main"
     monitor_coco_status = "commands.ops.monitor_coco_status:main"