pyegeria 5.2__py3-none-any.whl → 5.2.0.1__py3-none-any.whl

pyegeria/commands/tech/list_anchored_elements.py

@@ -3,6 +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.
+
 
 Retrieve elements based on a search of a specified properties.
 """
@@ -46,7 +48,7 @@ disable_ssl_warnings = True
 
 def display_anchored_elements(
     search_string: str,
-    prop_list: list[str],
+    prop_list: [str],
     server: str,
     url: str,
     username: str,
@@ -57,18 +59,16 @@ def display_anchored_elements(
 ):
     console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
     if (search_string is None) or (len(search_string) < 3):
-        print(
-            "\nError --> Invalid Search String - must be greater than four characters long"
+        raise ValueError(
+            "Invalid Search String - must be greater than four characters long"
         )
-        sys.exit(3)
     g_client = EgeriaTech(server, url, username, user_password)
     token = g_client.create_egeria_bearer_token()
-    print(f"search string is {search_string} and prop_list is {prop_list}\n")
 
     def generate_table(search_string: str, prop_list: [str]) -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Elements containing the string  {search_string} @ {time.asctime()}",
+            title=f"Assets containing the string  {search_string} @ {time.asctime()}",
             header_style="white on dark_blue",
             style="bold white on black",
             row_styles=["bold white on black"],
@@ -89,7 +89,6 @@ def display_anchored_elements(
         classification = "Anchors"
         open_type_name = None
         property_value = search_string
-
         property_names = prop_list
 
         elements = g_client.find_elements_by_classification_with_property_value(
@@ -149,6 +148,11 @@ def display_anchored_elements(
         return table
 
     try:
+        # with Live(generate_table(), refresh_per_second=4, screen=True) as live:
+        #     while True:
+        #         time.sleep(2)
+        #         live.update(generate_table())
+
         with console.pager(styles=True):
             console.print(generate_table(search_string, prop_list), soft_wrap=True)
 
@@ -160,7 +164,7 @@ def display_anchored_elements(
         console.print_exception()
         sys.exit(1)
 
-    except Exception as e:
+    except ValueError as e:
         console.print(
             f"\n\n====> Invalid Search String - must be greater than four characters long"
         )
@@ -187,16 +191,9 @@ def main():
         prop_list = Prompt.ask(
             "Enter the list of properties to search", default="anchorTypeName"
         )
-        if search_string == "":
-            print("\nError --> Search string can't be empty")
-            sys.exit(1)
-        elif len(search_string) <= 4:
-            print("\nError --> Search string must be greater than four characters long")
-            sys.exit(2)
-        else:
-            display_anchored_elements(
-                search_string, [prop_list], server, url, userid, user_pass, time_out
-            )
+        display_anchored_elements(
+            search_string, [prop_list], server, url, userid, user_pass, time_out
+        )
     except KeyboardInterrupt:
         pass
 

pyegeria/commands/tech/list_elements_x.py

@@ -102,13 +102,13 @@ def list_elements_x(
                 if type(tags) is list:
                     for tag in tags:
                         tags_md += (
-                            f"* tag: {tag.get('name','')}\n"
+                            f"* tag: {tag.get('name','---')}\n"
                             f"\t description: {tag.get('description','---')}\n"
                             f"\t assigned by: {tag.get('user','---')}\n"
                         )
 
                 else:
-                    tags_md = ""
+                    tags_md = "---"
 
                 likes = c_client.get_attached_likes(el_guid)
                 likes_md = "Likes:\b"
@@ -122,12 +122,9 @@ def list_elements_x(
                         )
 
                 else:
-                    likes_md = ""
+                    likes_md = "---"
 
-                if len(tags_md) > 0 and len(likes_md) > 0:
-                    feedback_out = f"{tags_md}\n --- \n{likes_md}"
-                else:
-                    feedback_out = ""
+                feedback_out = f"{tags_md}\n --- \n{likes_md}"
 
                 comments_out = " "
 

pyegeria/commands/tech/list_registered_services.py

@@ -71,7 +71,7 @@ def display_registered_svcs(
     def generate_table(svc_list) -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Services for: {url} @ {time.asctime()}",
+            title=f"Technology Types for: {url} @ {time.asctime()}",
             style="bold bright_white on black",
             row_styles=["bold bright_white on black"],
             header_style="white on dark_blue",

pyegeria/commands/tech/list_relationship_types.py

@@ -14,7 +14,6 @@ import time
 from rich import box
 from rich import print
 from rich.console import Console
-from rich.markdown import Markdown
 from rich.prompt import Prompt
 from rich.table import Table
 
@@ -70,11 +69,16 @@ def display_relationship_types(
             expand=True,
         )
 
-        table.add_column("Name")
         table.add_column("Status")
+        table.add_column("Name")
+        # table.add_column("GUID", no_wrap=True,)
+
         table.add_column("Description")
+        table.add_column("Attrib Name")
+        table.add_column("Attrib Status")
+        table.add_column("Attrib Type")
+        table.add_column("Attrib Description")
         table.add_column("Description Wiki", no_wrap=True)
-        table.add_column("Attributes", min_width=50)
 
         types_list = p_client.get_valid_relationship_types(type_name)
 
@@ -95,27 +99,27 @@ def display_relationship_types(
                 description = types["description"]
                 description_wiki = types.get("descriptionWiki", " ")
                 attribute_defs = types.get("attributeDefinitions")
-
-                att_table = Table(show_lines=True)
-                att_table.add_column("Name")
-                att_table.add_column("Description")
-                att_table.add_column("Status")
-                att_table.add_column("Type")
-
                 if attribute_defs:
-                    att_md = True
                     for attr in attribute_defs:
                         attr_name = attr["attributeName"]
                         attr_desc = attr["attributeDescription"]
                         attr_status = attr["attributeStatus"]
                         attr_type = attr["attributeType"]["name"]
-                        att_table.add_row(attr_name, attr_desc, attr_status, attr_type)
-
+                        table.add_row(
+                            status,
+                            name,
+                            description,
+                            attr_name,
+                            attr_status,
+                            attr_type,
+                            attr_desc,
+                            description_wiki,
+                        )
                 else:
-                    att_md = False
-            att_out = att_table if att_md else " "
+                    table.add_row(
+                        status, name, description, description_wiki, " ", " ", " ", " "
+                    )
 
-            table.add_row(name, status, description, description_wiki, att_out)
         p_client.close_session()
         return table
 
@@ -153,9 +157,7 @@ def main():
     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
     save_output = args.save_output if args.save_output is not None else False
-    type_name = Prompt.ask(
-        "Enter the OM Type Name to retrieve relationships for:", default="AssetOwner"
-    )
+    type_name = Prompt.ask("Enter the Type Name to retrieve:", default="AssetOwner")
 
     display_relationship_types(type_name, server, url, userid, user_pass, save_output)
 

pyegeria/commands/tech/list_relationships.py

@@ -16,7 +16,6 @@ import time
 from rich import box
 from rich.console import Console
 from rich.markdown import Markdown
-from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
@@ -24,7 +23,6 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     ClassificationManager,
-    max_paging_size,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -89,7 +87,7 @@ def list_relationships(
         table.add_column("Properties", min_width=40)
 
         rel_list = g_client.get_relationships(
-            search_string, page_size=max_paging_size, time_out=time_out
+            search_string, page_size=100, time_out=time_out
         )
         if type(rel_list) is str:
             return table
@@ -166,10 +164,8 @@ def main():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     time_out = args.time_out if args.time_out is not None else 60
     try:
-        search_string = Prompt.ask(
-            "Enter an asset search string:", default="Certification"
-        )
-
+        # search_string = Prompt.ask("Enter an asset search string:", default="*")
+        search_string = "Certification"
         list_relationships(search_string, server, url, userid, user_pass, time_out)
     except KeyboardInterrupt:
         pass

pyegeria/commands/tech/table_tech_templates.py

@@ -181,7 +181,6 @@ def display_templates_spec(
             sys.exit(1)
 
     try:
-        start_time = time.perf_counter()
         if data_table:
             return generate_table(data_table)
         else:
@@ -189,8 +188,7 @@ def display_templates_spec(
 
             with console.pager(styles=True):
                 console.print(generate_table(data_table))
-        duration = time.perf_counter() - start_time
-        print(f"\n\n\t Search string {search_string}\tDuration was {duration:.2f}\n")
+
     except (
         InvalidParameterException,
         PropertyServerException,

pyegeria/create_tech_guid_lists.py

@@ -82,10 +82,10 @@ def build_global_guid_lists(
                     )
             #
             #   Ok - now lets harvest integration connectors using get_integration_daemon_status from ServerOps
-            #   Assume that integration daemon called integration_daemon
+            #   Assume that integration daemon called integration-daemon
             #
             s_client = ServerOps(
-                "integration_daemon", url, user_id=user_id, user_pwd=user_pwd
+                "integration-daemon", url, user_id=user_id, user_pwd=user_pwd
             )
             integ_status = s_client.get_integration_daemon_status()
 

pyegeria/egeria_client.py

@@ -28,7 +28,6 @@ from pyegeria import (
     ValidMetadataManager,
     FullServerConfig,
     EgeriaConfig,
-    MetadataExplorer,
 )
 
 
@@ -49,7 +48,6 @@ class Egeria(
     RegisteredInfo,
     # TemplateManager,
     ValidMetadataManager,
-    MetadataExplorer,
 ):
     """
     Client to issue Runtime status requests.

pyegeria/egeria_tech_client.py

@@ -23,7 +23,6 @@ from pyegeria import (
     RuntimeManager,
     TEMPLATE_GUIDS,
     INTEGRATION_GUIDS,
-    MetadataExplorer,
 )
 
 
@@ -35,7 +34,6 @@ class EgeriaTech(
     RegisteredInfo,
     RuntimeManager,
     ValidMetadataManager,
-    MetadataExplorer,
 ):
     """
     Client for technical Egeria users.
@@ -84,9 +82,6 @@ class EgeriaTech(
         ValidMetadataManager.__init__(
             self, view_server, platform_url, user_id, user_pwd, token
         )
-        MetadataExplorer.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
 
 
 if __name__ == "__main__":

pyegeria/glossary_manager_omvs.py

@@ -1535,7 +1535,6 @@ class GlossaryManager(GlossaryBrowser):
         self,
         glossary_name: str,
         filename: str,
-        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
         upsert: bool = True,
         verbose: bool = True,
     ) -> List[dict] | None:
@@ -1545,9 +1544,6 @@ class GlossaryManager(GlossaryBrowser):
         ----------
             glossary_name : str
                 Name of the glossary to import terms into.
-            file_path: str, default is EGERIA_GLOSSARY_PATH if specified or None
-                If EGERIA_GLOSSARY_PATH environment variable is set, then it will be used in forming the
-                prepended to the filename parameter to form the full path to the file.
             filename: str
                 Path to the file to import terms from. File is assumed to be in CSV format. The path
                 is relative to where the python method is being called from.
@@ -1613,18 +1609,8 @@ class GlossaryManager(GlossaryBrowser):
             "Version Identifier",
             "Status",
         }
-
-        if file_path:
-            full_file_path = os.path.join(file_path, filename)
-        else:
-            full_file_path = filename
-
-        if not os.path.isfile(full_file_path):
-            raise FileNotFoundError(
-                f"Did not find file with path {file_path} and name {filename}"
-            )
         # process file
-        with open(full_file_path, mode="r") as file:
+        with open(filename, mode="r") as file:
             # Create a CSV reader object
             csv_reader = csv.DictReader(file)
             headers = csv_reader.fieldnames
@@ -1632,6 +1618,7 @@ class GlossaryManager(GlossaryBrowser):
             # 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 and validate values
             for row in csv_reader:
@@ -1772,10 +1759,7 @@ class GlossaryManager(GlossaryBrowser):
             return
 
     async def _async_export_glossary_to_csv(
-        self,
-        glossary_guid: str,
-        target_file: str,
-        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
+        self, glossary_guid: str, target_file: str
     ) -> int:
         """Export all the terms in a glossary to a CSV file. Async version
 
@@ -1785,9 +1769,6 @@ class GlossaryManager(GlossaryBrowser):
             Identity of the glossary to export.
         target_file: str
             Complete file name with path and extension to export to.
-        file_path: str, default is EGERIA_GLOSSARY_PATH if specified or None
-                If EGERIA_GLOSSARY_PATH environment variable is set, then it will be used in forming the
-                prepended to the filename parameter to form the full path to the file.
 
         Returns:
             int: Number of rows exported.
@@ -1806,12 +1787,8 @@ class GlossaryManager(GlossaryBrowser):
             "Version Identifier",
             "Status",
         ]
-        if file_path:
-            full_file_path = os.path.join(file_path, target_file)
-        else:
-            full_file_path = target_file
 
-        with open(full_file_path, mode="w") as file:
+        with open(target_file, mode="w") as file:
             csv_writer = csv.DictWriter(file, fieldnames=header)
             csv_writer.writeheader()
             count = 0
@@ -1845,12 +1822,7 @@ class GlossaryManager(GlossaryBrowser):
                 count += 1
         return count
 
-    def export_glossary_to_csv(
-        self,
-        glossary_guid: str,
-        target_file: str,
-        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
-    ) -> int:
+    def export_glossary_to_csv(self, glossary_guid: str, target_file: str) -> int:
         """Export all the terms in a glossary to a CSV file.
 
         Parameters:
@@ -1859,9 +1831,6 @@ class GlossaryManager(GlossaryBrowser):
             Identity of the glossary to export.
         target_file: str
             Complete file name with path and extension to export to.
-        file_path: str, default is EGERIA_GLOSSARY_PATH if specified or None
-                If EGERIA_GLOSSARY_PATH environment variable is set, then it will be used in forming the
-                prepended to the filename parameter to form the full path to the file.
 
         Returns:
             int: Number of rows exported.
@@ -1869,7 +1838,7 @@ class GlossaryManager(GlossaryBrowser):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_export_glossary_to_csv(glossary_guid, target_file, file_path)
+            self._async_export_glossary_to_csv(glossary_guid, target_file)
         )
 
         return response
@@ -2501,70 +2470,7 @@ class GlossaryManager(GlossaryBrowser):
             )
         )
 
-    async def _async_undo_term_update(self, glossary_term_guid: str) -> None:
-        """Undo an update to a glossary term
-
-            Async Version.
-
-        Parameters
-        ----------
-            glossary_term_guid: str
-                Unique identifier for the source glossary term.
-
-        Returns
-        -------
-        None
-
-        Raises
-        ------
-         InvalidParameterException
-             If the client passes incorrect parameters on the request - such as bad URLs or invalid values.
-         PropertyServerException
-             Raised by the server when an issue arises in processing a valid request.
-         NotAuthorizedException
-             The principle specified by the user_id does not have authorization for the requested action.
-        Notes
-        -----
-        This creates a new version with the state of the term before the last update.
-
-        """
-
-        validate_guid(glossary_term_guid)
-
-        url = (
-            f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/terms/"
-            f"{glossary_term_guid}/undo"
-        )
-
-        await self._async_make_request("POST", url)
-
-    def undo_term_update(self, glossary_term_guid: str) -> None:
-        """Undo an update to a glossary term
-
-        Parameters
-        ----------
-            glossary_term_guid: str
-                Unique identifier for the source glossary term.
-
-        Returns
-        -------
-        None
-
-        Raises
-        ------
-         InvalidParameterException
-             If the client passes incorrect parameters on the request - such as bad URLs or invalid values.
-         PropertyServerException
-             Raised by the server when an issue arises in processing a valid request.
-         NotAuthorizedException
-             The principle specified by the user_id does not have authorization for the requested action.
-        Notes
-        -----
-        This creates a new version with the state of the term before the last update.
-
-        """
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._async_undo_term_update(glossary_term_guid))
+        return
 
     async def _async_get_terms_for_category(
         self,

pyegeria/server_operations.py

@@ -354,7 +354,7 @@ class ServerOps(Platform):
         if server is None:
             server = self.server_name
 
-        url = f"{self.platform_url}/servers/{server}/open-metadata/integration_daemon/users/{self.user_id}/status"
+        url = f"{self.platform_url}/servers/{server}/open-metadata/integration-daemon/users/{self.user_id}/status"
         response = await self._async_make_request("GET", url)
         return response.json().get("integrationDaemonStatus", "No Integration Groups")
         # return response.json()
@@ -377,7 +377,7 @@ class ServerOps(Platform):
         validate_name(connector_name)
 
         url = (
-            f"{self.platform_url}/servers/{server}/open-metadata/integration_daemon/users/{self.user_id}/"
+            f"{self.platform_url}/servers/{server}/open-metadata/integration-daemon/users/{self.user_id}/"
             f"integration-connectors/{connector_name}/configuration-properties"
         )
 
@@ -411,7 +411,7 @@ class ServerOps(Platform):
             server = self.server_name
 
         url = (
-            f"{self.platform_url}/servers/{server}/open-metadata/integration_daemon/users/"
+            f"{self.platform_url}/servers/{server}/open-metadata/integration-daemon/users/"
             f"{self.user_id}/integration-connectors/restart"
         )
         body = {"class": "NameRequestBody", "name": connector_name}
@@ -439,7 +439,7 @@ class ServerOps(Platform):
             connector_name = None
 
         url = (
-            f"{self.platform_url}/servers/{server}/open-metadata/integration_daemon/users/"
+            f"{self.platform_url}/servers/{server}/open-metadata/integration-daemon/users/"
             f"{self.user_id}/integration-connectors/refresh"
         )
         if connector_name:

pyegeria/template_manager_omvs.py

@@ -665,7 +665,9 @@ class TemplateManager(Client):
         await self._async_make_request("POST", url, body_slimmer(body))
         return
 
-    def archive_metadata_element_in_store(self, element_guid: str, body: dict) -> None:
+    def update_metadata_element_effectivity_in_store(
+        self, element_guid: str, body: dict
+    ) -> None:
         """Archive a specific metadata element.
 
         Parameters

pyegeria/valid_metadata_omvs.py

@@ -1421,7 +1421,7 @@ class ValidMetadataManager(Client):
         url = f"{self.platform_url}/servers/{self.view_server}{self.valid_m_command_base}/open-metadata-types"
 
         resp = await self._async_make_request("GET", url)
-        return resp.json()
+        return resp.json().get("typeDefs", "No TypeDefs Found")
 
     def get_all_entity_types(self) -> list | str:
         """Returns the list of different types of metadata organized into two groups.  The first are the

{pyegeria-5.2.dist-info → pyegeria-5.2.0.1.dist-info}/METADATA

@@ -1,17 +1,18 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 5.2
+Version: 5.2.0.1
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0
 Keywords: egeria,metadata,governance
 Author: Dan Wolfson
 Author-email: dan.wolfson@pdr-associates.com
-Requires-Python: >=3.12.3,<4.0.0
+Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: confluent-kafka (>=2.5.0,<3.0.0)
 Requires-Dist: httpx (>=0.27,<0.28)
@@ -23,7 +24,8 @@ Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich (>=13,<14)
 Requires-Dist: rich-pixels (>=3.0.1,<4.0.0)
 Requires-Dist: textual (>=0.86,<0.87)
-Requires-Dist: trogon (>=0.6.0,<0.7.0)
+Requires-Dist: textual-forms (>=0.3.0,<0.4.0)
+Requires-Dist: trogon (>=0.5.0,<0.6.0)
 Requires-Dist: urllib3 (>=2.2.2,<3.0.0)
 Requires-Dist: validators (>=0.32.0,<0.33.0)
 Project-URL: Repository, https://github.com/odpi/egeria-python