pyegeria 5.2.1.1__py3-none-any.whl → 5.3__py3-none-any.whl

pyegeria/_client.py

@@ -6,31 +6,33 @@ This is a simple class to create and manage a connection to an Egeria backend. I
 different client capabilities. It also provides the common methods used to make restful self.session to Egeria.
 
 """
+
 import asyncio
 import inspect
 import json
 import os
-from pyegeria import body_slimmer
+import re
+from datetime import datetime
+
 import httpx
 from httpx import AsyncClient, Response
 
+from pyegeria.utils import body_slimmer
 from pyegeria._exceptions import (
-    OMAGCommonErrorCode,
     InvalidParameterException,
+    OMAGCommonErrorCode,
     PropertyServerException,
     UserNotAuthorizedException,
 )
-from pyegeria._globals import (
-    max_paging_size,
-    enable_ssl_check,
-)
+from pyegeria._globals import enable_ssl_check, max_paging_size, NO_ELEMENTS_FOUND
 from pyegeria._validators import (
+    is_json,
     validate_name,
     validate_server_name,
     validate_url,
     validate_user_id,
-    is_json,
 )
+from pyegeria.output_formatter import make_preamble, make_md_attribute
 
 ...
 
@@ -147,6 +149,10 @@ class Client:
 
         return False  # allows exceptions to propagate
 
+    def __str__(self):
+        return (f"EgeriaClient(server_name={self.server_name}, platform_url={self.platform_url}, "
+                f"user_id={self.user_id}, page_size={self.page_size})")
+
     async def _async_close_session(self) -> None:
         """Close the session"""
         await self.session.aclose()
@@ -469,7 +475,9 @@ class Client:
                 msg = OMAGCommonErrorCode.CLIENT_SIDE_REST_API_ERROR.value[
                     "message_template"
                 ].format(
-                    str(response.status_code),
+                    str(response.status_code)
+                    + " "
+                    + datetime.now().strftime("%H: %M: %S"),
                     caller_method,
                     class_name,
                     endpoint,
@@ -691,16 +699,16 @@ class Client:
             )
 
             result = await self._async_make_request("POST", url, body_slimmer(body))
-            return result.json().get("guid", "No elements found")
+            return result.json().get("guid", NO_ELEMENTS_FOUND)
 
         try:
             view_server = self.view_server
         except AttributeError:
-            view_server = os.environ.get("VIEW_SERVER", "view-server")
+            view_server = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
 
         if (not qualified_name) and display_name:
             if (tech_type) and (property_name == "qualifiedName"):
-                name = f"{tech_type}:{display_name}"
+                name = f"{tech_type}::{display_name}"
                 body = {
                     "class": "NameRequestBody",
                     "name": name,
@@ -715,7 +723,7 @@ class Client:
                 )
 
                 result = await self._async_make_request("POST", url, body_slimmer(body))
-                return result.json().get("guid", "No elements found")
+                return result.json().get("guid", NO_ELEMENTS_FOUND)
             else:
                 body = {
                     "class": "NameRequestBody",
@@ -731,7 +739,7 @@ class Client:
                 )
 
                 result = await self._async_make_request("POST", url, body_slimmer(body))
-                return result.json().get("guid", "No elements found")
+                return result.json().get("guid", NO_ELEMENTS_FOUND)
         else:
             raise InvalidParameterException(
                 "Neither server_guid nor server_name were provided - please provide."
@@ -763,6 +771,21 @@ class Client:
         )
         return result
 
+    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None,
+                                  version_identifier: str = None) -> str:
+        """Helper function to create a qualified name for a given type and display name.
+           If present, the local qualifier will be prepended to the qualified name."""
+        EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", local_qualifier)
+        # display_name = re.sub(r'\s','-',display_name.strip()) # This changes spaces between words to -; removing
+
+        q_name = f"{type}::{display_name.strip()}"
+        if EGERIA_LOCAL_QUALIFIER:
+            q_name = f"{EGERIA_LOCAL_QUALIFIER}::{q_name}"
+        if version_identifier:
+            q_name = f"{q_name}::{version_identifier}"
+        return q_name
+
+
 
 if __name__ == "__main__":
     print("Main-__client")

pyegeria/_exceptions.py

@@ -19,31 +19,31 @@ Note that not all of the definitions are currently used - they merely serve as p
 
 
 class EgeriaErrorCode(Enum):
-    """ Egeria error codes """
+    """Egeria error codes"""
 
     def __str__(self):
         return (
-                "http_error_code="
-                + self.value["http_error_code"]
-                + "messageId="
-                + self.value["message_id"]
-                + ", message="
-                + self.value["message_template"]
-                + ", systemAction="
-                + self.value["system_action"]
-                + ", userAction="
-                + self.value["user_action"]
+            "http_error_code="
+            + self.value["http_error_code"]
+            + "messageId="
+            + self.value["message_id"]
+            + ", message="
+            + self.value["message_template"]
+            + ", systemAction="
+            + self.value["system_action"]
+            + ", userAction="
+            + self.value["user_action"]
         )
 
 
 class OMAGServerInstanceErrorCode(EgeriaErrorCode):
-    """ OMAGServer instance error codes """
+    """OMAGServer instance error codes"""
 
     BAD_SERVER_SECURITY_CONNECTION = dict(
         https_error_code="400",
         message_id="OMAG-MULTI-TENANT-400-001",
         message_template="The OMAG server {0} has been configured with a bad connection to its security connector."
-                         + " Error message is {1}. Connection is {2}",
+        + " Error message is {1}. Connection is {2}",
         system_action="The system is unable to validate the users issuing requests to this server.",
         user_action="Review the error message to determine the cause of the problem.",
     )
@@ -55,11 +55,11 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
     SERVICES_NOT_SHUTDOWN = dict(
         https_error_code="400",
         message_id="OMAG-MULTI-TENANT-400-002",
-        message_template="The OMAG server {0} has been requested to shutdown but the following services " +
-                         "are still running: {1}",
+        message_template="The OMAG server {0} has been requested to shutdown but the following services "
+        + "are still running: {1}",
         system_action="The system is unable to shutdown the server correctly.",
         user_action="Review other error messages to determine the cause of the problem."
-                    + " This is likely to be a logic error in the services listed in the message",
+        + " This is likely to be a logic error in the services listed in the message",
     )
 
     """
@@ -70,8 +70,8 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
         https_error_code="400",
         message_id="OMAG-MULTI-TENANT-400-003",
         message_template="Method {0} called on behalf of the {1} service is unable to create a client-side open "
-                         + "metadata topic connection because the topic name is not configured in the configuration "
-                         + "for this service.",
+        + "metadata topic connection because the topic name is not configured in the configuration "
+        + "for this service.",
         system_action="This is a configuration error and an exception is sent to the requester.",
         user_action="Correct the configuration of the access service to include the name of the topic.",
     )
@@ -84,10 +84,10 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
         https_error_code="400",
         message_id="OMAG-MULTI-TENANT-400-004",
         message_template="The connector provider class name {0} does not create a connector of class {1} which is"
-                         + " required for the {2}",
+        + " required for the {2}",
         system_action="An invalid parameter exception is returned to the caller.",
         user_action="Either change the connector or the hosting environment because the current"
-                    + " combination is not compatible.",
+        + " combination is not compatible.",
     )
 
     """
@@ -98,9 +98,9 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
         message_id="OMAG-MULTI-TENANT-404-001",
         message_template="The OMAG Server {0} is not available to service a request from user {1}",
         system_action="The system is unable to process the request because the server"
-                      + " is not running on the called platform.",
+        + " is not running on the called platform.",
         user_action="Verify that the correct server is being called on the correct platform and that this server "
-                    + "is running. Retry the request when the server is available.",
+        + "is running. Retry the request when the server is available.",
     )
 
     """
@@ -112,8 +112,8 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
         message_template="The {0} service is not available on OMAG Server {1} to handle a request from user {2}",
         system_action="The system is unable to process the request because the service is not available.",
         user_action="Verify that the correct server is being called on the correct platform and that the "
-                    + "requested service is configured to run there.  "
-                    + "Once the correct environment is in place, retry the request.",
+        + "requested service is configured to run there.  "
+        + "Once the correct environment is in place, retry the request.",
     )
 
     """
@@ -136,7 +136,7 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
         message_id="OMAG-MULTI-TENANT-404-004",
         message_template="The open metadata repository services are not initialized for the {0} operation",
         system_action="The system is unable to connect to the open metadata repository services because"
-                      + " they are not running in this server.",
+        + " they are not running in this server.",
         user_action="Check that the server where the called service is running initialized correctly.  "
         + "Correct any errors discovered and retry the request when the open metadata services are available.",
     )
@@ -150,10 +150,10 @@ class OMAGServerInstanceErrorCode(EgeriaErrorCode):
             message_id="OMAG-MULTI-TENANT-404-005",
             message_template="The open metadata repository services are not available for the {0} operation",
             system_action="The system is unable to connect to the open metadata repository services because"
-                          " they are not in the correct state to be called.",
+            " they are not in the correct state to be called.",
             user_action="Check that the server where the called service is running initialized correctly and is not"
-                        + " in the process of shutting down. Correct any errors discovered and retry the"
-                        + " request when the open metadata repository services are available.",
+            + " in the process of shutting down. Correct any errors discovered and retry the"
+            + " request when the open metadata repository services are available.",
         ),
     )
 
@@ -177,12 +177,12 @@ class OMAGCommonErrorCode(EgeriaErrorCode):
         http_error_code="503",
         message_id="CLIENT-SIDE-REST-API-CONNECTOR-503-002",
         message_template="A client-side error {0} was received by method {1} from API call {2} during the call {3}."
-                         + " The error message was {4}",
+        + " The error message was {4}",
         system_action="The client has issued a call to the open metadata access service REST API in a remote server"
-                      + " and has received an exception from the local client libraries.",
+        + " and has received an exception from the local client libraries.",
         user_action="Review the error message to determine the cause of the error. Check that the server is running"
-                    + " and the URL is correct. Look for errors in the local server's console to understand and"
-                    + " correct the cause of the error. Then rerun the request",
+        + " and the URL is correct. Look for errors in the local server's console to understand and"
+        + " correct the cause of the error. Then rerun the request",
     )
 
     EXCEPTION_RESPONSE_FROM_API = dict(
@@ -190,10 +190,10 @@ class OMAGCommonErrorCode(EgeriaErrorCode):
         message_id="SERVER-SIDE-REST-API-ERROR-503-003 ",
         message_template="A {0} exception was received from REST API call {1} to server {2}: error message was: {3}",
         system_action="The system has issued a call to an open metadata access service REST API in a remote server"
-                      + " and has received an exception response.",
+        + " and has received an exception response.",
         user_action="The error message should indicate the cause of the error. "
-                    + "Otherwise look for errors in the remote server's audit log and console to understand and "
-                    + "correct the source of the error.",
+        + "Otherwise look for errors in the remote server's audit log and console to understand and "
+        + "correct the source of the error.",
     )
 
     SERVER_URL_NOT_SPECIFIED = dict(
@@ -256,7 +256,7 @@ class OMAGCommonErrorCode(EgeriaErrorCode):
         http_error_code="400",
         message_id="OMAG-COMMON-400-008",
         message_template="The starting point for the results {0}, passed on the {1} parameter of the {2}"
-                         + " operation, is negative",
+        + " operation, is negative",
         system_action="The system is unable to process the request with this invalid value."
         + "It should be zero for the start of the values, or a number greater than 0"
         + "to start partway down the list.",
@@ -266,10 +266,10 @@ class OMAGCommonErrorCode(EgeriaErrorCode):
     NEGATIVE_PAGE_SIZE = dict(
         http_error_code="400",
         message_id="OMAG-COMMON-400-009",
-        message_template="The page size for the results {0}, passed on the {1} parameter of the {2} operation, " +
-                         "is negative",
+        message_template="The page size for the results {0}, passed on the {1} parameter of the {2} operation, "
+        + "is negative",
         system_action="The system is unable to process the request with this invalid value. "
-                      + "It should be zero to return all the result, or greater than zero to set a maximum.",
+        + "It should be zero to return all the result, or greater than zero to set a maximum.",
         user_action="Correct the code in the caller to provide a non-negative value for the page size.",
     )
 
@@ -277,8 +277,8 @@ class OMAGCommonErrorCode(EgeriaErrorCode):
         http_error_code="400",
         message_id="OMAG-COMMON-400-010",
         message_template=(
-                "The number of records to return, {0}, passed on the {1} parameter of the {2} operation, "
-                + "is greater than the allowable maximum of {3}"
+            "The number of records to return, {0}, passed on the {1} parameter of the {2} operation, "
+            + "is greater than the allowable maximum of {3}"
         ),
         system_action="The system is unable to process the request with this page size value.",
         user_action="Correct the code in the caller to provide a smaller page size.",
@@ -322,6 +322,7 @@ class EgeriaException(Exception):
     Define the Egeria exceptions raised during error handling. Modeled on the exceptions defined in the Egeria core.
 
     """
+
     raw_error_message = ""
 
     def __init__(self, response_body) -> None:
@@ -331,12 +332,20 @@ class EgeriaException(Exception):
         self.exception_class_name = response_dict["exceptionClassName"]
         self.action_description = response_dict["actionDescription"]
         self.exception_error_message = response_dict["exceptionErrorMessage"]
-        self.exception_error_message_id = response_dict.get("exceptionErrorMessageId", "UNKNOWN-ERROR-CODE")
+        self.exception_error_message_id = response_dict.get(
+            "exceptionErrorMessageId", "UNKNOWN-ERROR-CODE"
+        )
 
         # self.exception_error_message_id = response_dict["exceptionErrorMessageId"]
-        self.exception_error_message_parameters = response_dict.get("exceptionErrorMessageParameters", "{}")
-        self.exception_system_action = response_dict.get("exceptionSystemAction", "UNKNOWN-SYSTEM-ACTION")
-        self.exception_user_action = response_dict.get("exceptionUserAction", "UNKNOWN-USER-ACTION")
+        self.exception_error_message_parameters = response_dict.get(
+            "exceptionErrorMessageParameters", "{}"
+        )
+        self.exception_system_action = response_dict.get(
+            "exceptionSystemAction", "UNKNOWN-SYSTEM-ACTION"
+        )
+        self.exception_user_action = response_dict.get(
+            "exceptionUserAction", "UNKNOWN-USER-ACTION"
+        )
 
     def __str__(self):
         return self.exception_error_message
@@ -364,7 +373,7 @@ class UserNotAuthorizedException(EgeriaException):
 
 
 def print_exception_response(e: EgeriaException):
-    """ Prints the exception response """
+    """Prints the exception response"""
 
     if isinstance(e, EgeriaException):
         print(f"\n\nException: {e.response_class}")

pyegeria/_globals.py

@@ -14,7 +14,7 @@ disable_ssl_warnings = True
 enable_ssl_check = False
 max_paging_size = 500
 default_time_out = 30
-
+DEBUG_LEVEL = "quiet"
 comment_types = (
     "ANSWER",
     "OTHER",
@@ -35,3 +35,13 @@ star_ratings = (
 TEMPLATE_GUIDS: dict = {}
 INTEGRATION_GUIDS: dict = {}
 
+NO_ELEMENTS_FOUND = "No elements found"
+NO_ASSETS_FOUND = "No assets found"
+NO_SERVERS_FOUND = "No servers found"
+NO_CATALOGS_FOUND = "No catalogs found"
+NO_GLOSSARIES_FOUND = "No glossaries found"
+NO_TERMS_FOUND = "No terms found"
+NO_CATEGORIES_FOUND = "No categories found"
+NO_ELEMENT_FOUND = "No element found"
+NO_PROJECTS_FOUND = "No projects found"
+NO_COLLECTION_FOUND = "No collection found"

pyegeria/_validators.py

@@ -2,14 +2,14 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 """
+
 import inspect
 import json
-import validators
 from json import JSONDecodeError
-from pyegeria._exceptions import (
-    OMAGCommonErrorCode,
-    InvalidParameterException,
-)
+
+import validators
+
+from pyegeria._exceptions import InvalidParameterException, OMAGCommonErrorCode
 
 """
 This package contains internally used validators.

pyegeria/asset_catalog_omvs.py

@@ -8,15 +8,16 @@ Copyright Contributors to the ODPi Egeria project.
  This file is in active development...
 
 """
+
 import asyncio
 import json
 
 from httpx import Response
-
-from pyegeria import Client, max_paging_size, body_slimmer, TEMPLATE_GUIDS
-from pyegeria._exceptions import (
-    InvalidParameterException,
-)
+from pyegeria.utils import body_slimmer
+from pyegeria._client import Client
+from pyegeria import TEMPLATE_GUIDS, max_paging_size
+from pyegeria._exceptions import InvalidParameterException
+from pyegeria._globals import NO_ELEMENTS_FOUND, NO_ASSETS_FOUND
 from ._validators import validate_search_string
 
 
@@ -365,7 +366,7 @@ class AssetCatalog(Client):
         )
         body = {"filter": search_string}
         response = await self._async_make_request("POST", url, body, time_out=time_out)
-        return response.json().get("searchMatches", "no assets found")
+        return response.json().get("searchMatches", "NO_ASSETS_FOUND")
 
     def find_in_asset_domain(
         self,
@@ -466,7 +467,7 @@ class AssetCatalog(Client):
         )
 
         response = await self._async_make_request("GET", url)
-        return response.json().get("assetGraph", "no asset found")
+        return response.json().get("assetGraph", NO_ASSETS_FOUND)
 
     def get_asset_graph(
         self,
@@ -543,6 +544,11 @@ class AssetCatalog(Client):
     async def _async_get_asset_lineage_graph(
         self,
         asset_guid: str,
+        effective_time: str = None,
+        as_of_time: str = None,
+        relationship_types: [str] = None,
+        limit_to_isc_q_name: str = None,
+        hilight_isc_q_name: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
     ) -> str | dict:
@@ -551,6 +557,16 @@ class AssetCatalog(Client):
          ----------
          asset_guid : str
              The unique identity of the asset to get the graph for.
+         effective_time: str, default is None
+            Effective time to query on. If not specified, the current time is used.
+         as_of_time: str = None
+            as_of_time to query on. If not specified, the current time is used.
+         relationship_types: [str], default is None,
+            relationship types to include in the lineage graph. If not specified, all relationship types are included.
+         limit_to_isc_q_name: str = None,
+            if specified, filters results to only include information supply chains with the given name.
+         hilight_isc_q_name: str = None,
+            if specified, highlights the information supply chain with the given name.
 
          start_from : int, optional
              The index from which to start fetching the engine actions. Default is 0.
@@ -575,27 +591,48 @@ class AssetCatalog(Client):
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/asset-catalog/assets/{asset_guid}/"
             f"as-lineage-graph?startFrom={start_from}&pageSize={page_size}"
         )
-
-        response = await self._async_make_request("POST", url)
-        return response.json().get("assetLineageGraph", "no asset found")
+        body = {
+            "effectiveTime": effective_time,
+            "asOfTime": as_of_time,
+            "relationshipTypes": relationship_types,
+            "limitToISCQualifiedName": limit_to_isc_q_name,
+            "highlightISCQualifiedName": hilight_isc_q_name,
+            }
+        response = await self._async_make_request("POST", url, body_slimmer(body))
+        return response.json().get("assetLineageGraph", NO_ASSETS_FOUND)
 
     def get_asset_lineage_graph(
         self,
         asset_guid: str,
+        effective_time: str = None,
+        as_of_time: str = None,
+        relationship_types: [str] = None,
+        limit_to_isc_q_name: str = None,
+        hilight_isc_q_name: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
-    ) -> str | dict:
+        ) -> str | dict:
         """Return the asset lineage including a mermaid markdown string. Async Version.
          Parameters
          ----------
          asset_guid : str
              The unique identity of the asset to get the graph for.
+        effective_time: str, default is None
+            Effective time to query on. If not specified, the current time is used.
+        as_of_time: str = None
+            as_of_time to query on. If not specified, the current time is used.
+        relationship_types: [str], default is None,
+            relationship types to include in the lineage graph. If not specified, all relationship types are included.
+        limit_to_isc_q_name: str = None,
+            if specified, filters results to only include information supply chains with the given name.
+        hilight_isc_q_name: str = None,
+            if speficied, highlights the information supply chain with the given name.
 
          start_from : int, optional
              The index from which to start fetching the engine actions. Default is 0.
 
          page_size : int, optional
-             The maximum number of engine actions to fetch in a single request. Default is `max_paging_size`.
+             The maximum number of elements to fetch in a single request. Default is `max_paging_size`.
 
          Returns
          -------
@@ -612,29 +649,46 @@ class AssetCatalog(Client):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_asset_lineage_graph(asset_guid, start_from, page_size)
+            self._async_get_asset_lineage_graph(asset_guid, effective_time, as_of_time, relationship_types,
+                                                limit_to_isc_q_name, hilight_isc_q_name, start_from, page_size)
         )
         return response
 
     def get_asset_lineage_mermaid_graph(
         self,
         asset_guid: str,
+        effective_time: str = None,
+        as_of_time: str = None,
+        relationship_types: [str] = None,
+        limit_to_isc_q_name: str = None,
+        hilight_isc_q_name: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
-    ) -> str:
-        """Return the lineage as mermaid markdown string. Async Version.
+        ) -> str:
+        """Return the asset lineage including a mermaid markdown string. Async Version.
          Parameters
          ----------
          asset_guid : str
              The unique identity of the asset to get the graph for.
+        effective_time: str, default is None
+            Effective time to query on. If not specified, the current time is used.
+        as_of_time: str = None
+            as_of_time to query on. If not specified, the current time is used.
+        relationship_types: [str], default is None,
+            relationship types to include in the lineage graph. If not specified, all relationship types are included.
+        limit_to_isc_q_name: str = None,
+            if specified, filters results to only include information supply chains with the given name.
+        hilight_isc_q_name: str = None,
+            if specified, highlights the information supply chain with the given name.
 
          start_from : int, optional
              The index from which to start fetching the engine actions. Default is 0.
 
          page_size : int, optional
-             The maximum number of engine actions to fetch in a single request. Default is `max_paging_size`.
+             The maximum number of elements to fetch in a single request.
+             Default is `max_paging_size`.
 
-         Returns
+        Returns
          -------
         str
              A mermaid string representing the lineage.
@@ -645,9 +699,12 @@ class AssetCatalog(Client):
          PropertyServerException
          UserNotAuthorizedException
 
-        """
+    """
 
-        asset_graph = self.get_asset_lineage_graph(asset_guid, start_from, page_size)
+        asset_graph = self.get_asset_lineage_graph(asset_guid, effective_time,
+                                                   as_of_time, relationship_types,
+                                                   limit_to_isc_q_name, hilight_isc_q_name,
+                                                   start_from, page_size)
         return asset_graph.get("mermaidGraph")
 
     async def _async_get_assets_by_metadata_collection_id(
@@ -699,7 +756,7 @@ class AssetCatalog(Client):
         body = {"filter": type_name, "effectiveTime": effective_time}
         body_s = body_slimmer(body)
         response = await self._async_make_request("POST", url, body_s)
-        return response.json().get("assets", "no assets found")
+        return response.json().get("assets", "NO_ASSETS_FOUND")
 
     def get_assets_by_metadata_collection_id(
         self,
@@ -777,7 +834,7 @@ class AssetCatalog(Client):
 
         response = await self._async_make_request("GET", url)
 
-        return response.json().get("types", "No assets found")
+        return response.json().get("types", "NO_ASSETS_FOUND")
 
     def get_asset_catalog_types(self) -> str | dict:
         """Return all the elements that are anchored to an asset plus relationships between these elements and to

pyegeria/automated_curation_omvs.py

@@ -5,18 +5,23 @@ Copyright Contributors to the ODPi Egeria project.
  Automated Curation View Service Methods
 
 """
+
 import asyncio
 import datetime
 
 from httpx import Response
 
-from pyegeria import Client, max_paging_size, body_slimmer, TEMPLATE_GUIDS
+from pyegeria.utils import body_slimmer
+from pyegeria._globals import NO_ELEMENTS_FOUND
+from pyegeria._client import Client
+from pyegeria import TEMPLATE_GUIDS, max_paging_size
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
 )
-from ._validators import validate_name, validate_guid, validate_search_string
+
+from ._validators import validate_guid, validate_name, validate_search_string
 
 
 class AutomatedCuration(Client):
@@ -1997,7 +2002,7 @@ class AutomatedCuration(Client):
             datetime.datetime.now() if start_time is None else start_time
         )
 
-        url = f"{self.curation_command_root}/governance-action-processes/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-processes/initiate"
         body = {
             "class": "GovernanceActionProcessRequestBody",
             "processQualifiedName": action_type_qualified_name,
@@ -2456,7 +2461,7 @@ class AutomatedCuration(Client):
                 {
                     "class": "NewActionTarget",
                     "actionTargetName": "serverToSurvey",
-                    "actionTargetGUID": resource_guid,
+                    "actionTargetGUID": resource_guid.strip(),
                 }
             ],
         }
@@ -2468,7 +2473,7 @@ class AutomatedCuration(Client):
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_initiate_survey(
-                "PostgreSQLSurveys:survey-postgres-database", postgres_database_guid
+                "PostgreSQLSurvey:survey-postgres-database", postgres_database_guid
             )
         )
         return response
@@ -2478,7 +2483,7 @@ class AutomatedCuration(Client):
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_initiate_survey(
-                "PostgreSQLSurveys:survey-postgres-server", postgres_server_guid
+                "PostgreSQLSurvey:survey-postgres-server", postgres_server_guid
             )
         )
         return response