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

pyegeria/commands/tech/list_relationship_types.py

@@ -14,6 +14,7 @@ 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
 
@@ -69,16 +70,11 @@ def display_relationship_types(
             expand=True,
         )
 
-        table.add_column("Status")
         table.add_column("Name")
-        # table.add_column("GUID", no_wrap=True,)
-
+        table.add_column("Status")
         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)
 
@@ -99,27 +95,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"]
-                        table.add_row(
-                            status,
-                            name,
-                            description,
-                            attr_name,
-                            attr_status,
-                            attr_type,
-                            attr_desc,
-                            description_wiki,
-                        )
+                        att_table.add_row(attr_name, attr_desc, attr_status, attr_type)
+
                 else:
-                    table.add_row(
-                        status, name, description, description_wiki, " ", " ", " ", " "
-                    )
+                    att_md = False
+            att_out = att_table if att_md else " "
 
+            table.add_row(name, status, description, description_wiki, att_out)
         p_client.close_session()
         return table
 
@@ -157,7 +153,9 @@ 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 Type Name to retrieve:", default="AssetOwner")
+    type_name = Prompt.ask(
+        "Enter the OM Type Name to retrieve relationships for:", default="AssetOwner"
+    )
 
     display_relationship_types(type_name, server, url, userid, user_pass, save_output)
 

pyegeria/commands/tech/list_relationships.py

@@ -16,6 +16,7 @@ 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 (
@@ -23,6 +24,7 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     ClassificationManager,
+    max_paging_size,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -87,7 +89,7 @@ def list_relationships(
         table.add_column("Properties", min_width=40)
 
         rel_list = g_client.get_relationships(
-            search_string, page_size=100, time_out=time_out
+            search_string, page_size=max_paging_size, time_out=time_out
         )
         if type(rel_list) is str:
             return table
@@ -164,8 +166,10 @@ 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="*")
-        search_string = "Certification"
+        search_string = Prompt.ask(
+            "Enter an asset search string:", default="Certification"
+        )
+
         list_relationships(search_string, server, url, userid, user_pass, time_out)
     except KeyboardInterrupt:
         pass

pyegeria/commands/tech/table_tech_templates.py

@@ -181,6 +181,7 @@ def display_templates_spec(
             sys.exit(1)
 
     try:
+        start_time = time.perf_counter()
         if data_table:
             return generate_table(data_table)
         else:
@@ -188,7 +189,8 @@ 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/core_omag_server_config.py

@@ -818,6 +818,42 @@ class CoreServerConfig(Client):
         )
         self.make_request("POST", url, severities)
 
+    def add_postgres_log_destinations(
+        self, config_body: dict, server_name: str = None
+    ) -> None:
+        """Adds a postgres log destination to a server.
+
+        Parameters
+        ----------
+        config_body : str
+            Configuration of the postgres database for the audit log destination.
+        server_name : str
+            Name of the server to update.
+
+        Returns
+        -------
+        Void
+
+        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
+        ConfigurationErrorException:
+            Raised when configuration parameters passed on earlier calls turn out to be
+            invalid or make the new call invalid.
+
+        """
+        if server_name is None:
+            server_name = self.server_name
+
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/postgres"
+        self.make_request("POST", url, config_body)
+
     def add_slf4j_log_destination(
         self, severities: [str] = None, server_name: str = None
     ) -> None:

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

pyegeria/egeria_tech_client.py

@@ -23,6 +23,7 @@ from pyegeria import (
     RuntimeManager,
     TEMPLATE_GUIDS,
     INTEGRATION_GUIDS,
+    MetadataExplorer,
 )
 
 
@@ -34,6 +35,7 @@ class EgeriaTech(
     RegisteredInfo,
     RuntimeManager,
     ValidMetadataManager,
+    MetadataExplorer,
 ):
     """
     Client for technical Egeria users.
@@ -82,6 +84,9 @@ 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,6 +1535,7 @@ 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:
@@ -1544,6 +1545,9 @@ 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.
@@ -1609,8 +1613,18 @@ 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(filename, mode="r") as file:
+        with open(full_file_path, mode="r") as file:
             # Create a CSV reader object
             csv_reader = csv.DictReader(file)
             headers = csv_reader.fieldnames
@@ -1618,7 +1632,6 @@ 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:
@@ -1759,7 +1772,10 @@ class GlossaryManager(GlossaryBrowser):
             return
 
     async def _async_export_glossary_to_csv(
-        self, glossary_guid: str, target_file: str
+        self,
+        glossary_guid: str,
+        target_file: str,
+        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
     ) -> int:
         """Export all the terms in a glossary to a CSV file. Async version
 
@@ -1769,6 +1785,9 @@ 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.
@@ -1787,8 +1806,12 @@ 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(target_file, mode="w") as file:
+        with open(full_file_path, mode="w") as file:
             csv_writer = csv.DictWriter(file, fieldnames=header)
             csv_writer.writeheader()
             count = 0
@@ -1822,7 +1845,12 @@ class GlossaryManager(GlossaryBrowser):
                 count += 1
         return count
 
-    def export_glossary_to_csv(self, glossary_guid: str, target_file: str) -> int:
+    def export_glossary_to_csv(
+        self,
+        glossary_guid: str,
+        target_file: str,
+        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
+    ) -> int:
         """Export all the terms in a glossary to a CSV file.
 
         Parameters:
@@ -1831,6 +1859,9 @@ 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.
@@ -1838,7 +1869,7 @@ class GlossaryManager(GlossaryBrowser):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_export_glossary_to_csv(glossary_guid, target_file)
+            self._async_export_glossary_to_csv(glossary_guid, target_file, file_path)
         )
 
         return response
@@ -2470,7 +2501,70 @@ class GlossaryManager(GlossaryBrowser):
             )
         )
 
-        return
+    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))
 
     async def _async_get_terms_for_category(
         self,