pyegeria 5.4.8__py3-none-any.whl → 5.4.8.3__py3-none-any.whl

pyegeria/_client_new.py

@@ -12,6 +12,7 @@ import os
 import re
 import time
 from collections.abc import Callable
+from datetime import datetime
 from typing import Any
 
 from httpx import Response
@@ -28,11 +29,12 @@ from pyegeria.base_report_formats import select_report_spec
 from pyegeria.models import (SearchStringRequestBody, FilterRequestBody, GetRequestBody, NewElementRequestBody,
                              TemplateRequestBody, UpdateStatusRequestBody, UpdateElementRequestBody,
                              NewRelationshipRequestBody,
-                             DeleteRequestBody, UpdateRelationshipRequestBody, ResultsRequestBody,
+                             UpdateRelationshipRequestBody, ResultsRequestBody,
                              NewClassificationRequestBody,
                              DeleteElementRequestBody, DeleteRelationshipRequestBody, DeleteClassificationRequestBody,
                              LevelIdentifierQueryBody)
-from pyegeria.output_formatter import populate_common_columns, resolve_output_formats, generate_output
+from pyegeria.output_formatter import populate_common_columns, resolve_output_formats, generate_output, \
+    overlay_additional_values
 from pyegeria.utils import body_slimmer, dynamic_catch
 
 ...
@@ -102,7 +104,6 @@ class Client2(BaseClient):
         self._update_status_request_adapter = TypeAdapter(UpdateStatusRequestBody)
         self._new_relationship_request_adapter = TypeAdapter(NewRelationshipRequestBody)
         self._new_classification_request_adapter = TypeAdapter(NewClassificationRequestBody)
-        self._delete_request_adapter = TypeAdapter(DeleteRequestBody)
         self._delete_element_request_adapter = TypeAdapter(DeleteElementRequestBody)
         self._delete_relationship_request_adapter = TypeAdapter(DeleteRelationshipRequestBody)
         self._delete_classification_request_adapter = TypeAdapter(DeleteClassificationRequestBody)
@@ -511,7 +512,7 @@ class Client2(BaseClient):
             - Normally false. Set true when the caller is part of a deduplication function
         start_from: int, default = 0
             - index of the list to start from (0 for start).
-        page_size
+        page_size: int, default = 0
             - maximum number of elements to return.
         time_out: int, default = default_time_out
             - http request timeout for this request
@@ -536,7 +537,7 @@ class Client2(BaseClient):
 
     async def _async_get_guid_for_name(
             self, name: str, property_name: list[str] = ["qualifiedName", "displayName"],
-            type_name: str = "ValidMetadataValue"
+            type_name: str = None
 
     ) -> list | str:
         """
@@ -548,7 +549,7 @@ class Client2(BaseClient):
         name: str
             - element name to be searched.
         property_name: [str], default = ["qualifiedName","displayName"]
-            - propertys to search in.
+            - properties to search in.
         type_name: str, default = "ValidMetadataValue"
             - metadata element type name to be used to restrict the search
         Returns
@@ -570,6 +571,8 @@ class Client2(BaseClient):
                 raise PyegeriaException(context={"issue": "Multiple elements found for supplied name!"})
             elif len(elements) == 1:
                 return elements[0]["elementHeader"]["guid"]
+        else:
+            return NO_ELEMENTS_FOUND
         return elements
 
     def get_guid_for_name(
@@ -585,7 +588,7 @@ class Client2(BaseClient):
         name: str
             - element name to be searched.
         property_name: [str], default = ["qualifiedName","displayName"]
-            - propertys to search in.
+            - properties to search in.
         type_name: str, default = "ValidMetadataValue"
             - metadata element type name to be used to restrict the search
         Returns
@@ -595,7 +598,7 @@ class Client2(BaseClient):
 
         Raises
         ------
-        PyegeriaExeception
+        PyegeriaException
         """
 
         loop = asyncio.get_event_loop()
@@ -742,7 +745,7 @@ class Client2(BaseClient):
             relationship_type="RegisteredIntegrationConnector",
             property_names=["connectorName"],
             property_value=connector_name,
-            )
+        )
         if rel == "No elements found":
             logger.error(f"\n\n===> No connector found with name '{connector_name}'\n\n")
             return "No connector found"
@@ -771,12 +774,12 @@ class Client2(BaseClient):
         return result
 
     async def _async_add_archive_file(
-        self,
-        archive_file: str,
-        server_guid: str = None,
-        display_name: str = None,
-        qualified_name: str = None,
-        time_out: int = 120,
+            self,
+            archive_file: str,
+            server_guid: str = None,
+            display_name: str = None,
+            qualified_name: str = None,
+            time_out: int = 120,
     ) -> None:
         """Add a new open metadata archive to running OMAG Server's repository.
             An open metadata archive contains metadata types and instances.  This operation loads an open metadata archive
@@ -826,12 +829,12 @@ class Client2(BaseClient):
         return
 
     def add_archive_file(
-        self,
-        archive_file: str,
-        server_guid: str = None,
-        display_name: str = None,
-        qualified_name: str = None,
-        time_out: int = 120,
+            self,
+            archive_file: str,
+            server_guid: str = None,
+            display_name: str = None,
+            qualified_name: str = None,
+            time_out: int = 120,
     ) -> None:
         """Add a new open metadata archive to running OMAG Server's repository.
             An open metadata archive contains metadata types and instances.  This operation loads an open metadata archive
@@ -872,7 +875,6 @@ class Client2(BaseClient):
         )
         return
 
-
     #
     #   Common feedback commands
     #
@@ -919,7 +921,7 @@ class Client2(BaseClient):
         """
         if body is None:
             body = {
-                "class": "NewFeedbackRequestBody",
+                "class": "NewAttachmentRequestBody",
                 "properties": {
                     "class": "CommentProperties",
                     "qualifiedName": self.make_feedback_qn("Reply", comment_guid),
@@ -1004,7 +1006,7 @@ class Client2(BaseClient):
         """
         if body is None:
             body = {
-                "class": "NewFeedbackRequestBody",
+                "class": "NewAttachmentRequestBody",
                 "properties": {
                     "class": "CommentProperties",
                     "qualifiedName": self.make_feedback_qn("Comment", element_guid),
@@ -1217,11 +1219,10 @@ class Client2(BaseClient):
 
     ) -> None:
         """
-        Link a comment that contains the best answer to a question posed in another comment. Async version.
+        Remove the accepted-answer link between a question comment and its answer. Async version.
 
         Parameters
         ----------
-
         question_comment_guid: str
             - unique id for the question comment.
         answer_comment_guid: str
@@ -1234,7 +1235,6 @@ class Client2(BaseClient):
         Raises
         ------
         PyEgeriaException
-
         """
 
         url = f"{self.command_root}feedback-manager/comments/questions/{question_comment_guid}/answers/{answer_comment_guid}/remove"
@@ -1247,11 +1247,10 @@ class Client2(BaseClient):
 
     ) -> None:
         """
-        Link a comment that contains the best answer to a question posed in another comment.
+        Remove the accepted-answer link between a question comment and its answer.
 
         Parameters
         ----------
-
         question_comment_guid: str
             - unique id for the question comment.
         answer_comment_guid: str
@@ -1264,7 +1263,6 @@ class Client2(BaseClient):
         Raises
         ------
         PyEgeriaException
-
         """
 
         loop = asyncio.get_event_loop()
@@ -1274,9 +1272,8 @@ class Client2(BaseClient):
 
     async def _async_remove_comment_from_element(
             self,
-            element_guid: str,
             comment_guid: str,
-            body: dict | DeleteRequestBody = None,
+            body: dict | DeleteElementRequestBody = None,
             cascade_delete: bool = False,
     ) -> None:
         """
@@ -1296,7 +1293,7 @@ class Client2(BaseClient):
 
         Returns
         -------
-        VoidResponse
+        None
 
         Raises
         ------
@@ -1306,34 +1303,36 @@ class Client2(BaseClient):
             cascade_delete ():
         """
 
-        url = f"{self.command_root}feedback-manager/elements/{element_guid}/comments/{comment_guid}/remove"
+        url = f"{self.command_root}feedback-manager/comments/{comment_guid}/remove"
         await self._async_delete_element_request(url, body, cascade_delete)
 
     def remove_comment_from_element(
             self,
             element_guid: str,
             comment_guid: str,
-            body: dict | DeleteRequestBody = None,
+            body: dict | DeleteElementRequestBody = None,
             cascade_delete: bool = False,
 
     ) -> None:
         """
-        Removes a comment added to the element by this user.
+        Remove a comment from an element added by this user.
 
         This deletes the link to the comment, the comment itself and any comment replies attached to it.
 
         Parameters
         ----------
-        comment_guid
-            - String - unique id for the comment object
-        body
-            - containing type of comment enum and the text of the comment.
-        cascade_delete: bool = False
-
+        element_guid: str
+            - unique id for the element
+        comment_guid: str
+            - unique id for the comment object
+        body: dict | DeleteElementRequestBody, optional
+            - contains comment type and text
+        cascade_delete: bool, default = False
+            - whether to cascade delete
 
         Returns
         -------
-        VoidResponse
+        None
 
         Raises
         ------
@@ -1530,7 +1529,6 @@ class Client2(BaseClient):
         )
         return response
 
-
     async def _async_find_comments(
             self,
             search_string: str = None,
@@ -1692,7 +1690,7 @@ class Client2(BaseClient):
     @dynamic_catch
     async def _async_create_note_log(
             self,
-            element_guid: str,
+            element_guid: str = None,
             display_name: str = None,
             description: str = None,
             body: dict = None,
@@ -1702,8 +1700,8 @@ class Client2(BaseClient):
 
         Parameters
         ----------
-        element_guid: str
-            - unique identifier of the element where the note log is located
+        element_guid: str, optional
+            - unique identifier of the element where the note log is attached
         display_name: str, optional
             - name of the note log
         description: str, optional
@@ -1724,7 +1722,7 @@ class Client2(BaseClient):
         Sample Body:
 
         {
-            "class" : "NewFeedbackRequestBody",
+            "class" : "NewAttachmentRequestBody",
             "initialClassifications": {
               "ZoneMembership" : {
                 "class" : "ZoneMembershipProperties",
@@ -1745,7 +1743,7 @@ class Client2(BaseClient):
         """
         if body is None:
             body = {
-                "class": "NewFeedbackRequestBody",
+                "class": "NewAttachmentRequestBody",
                 "properties": {
                     "class": "NoteLogProperties",
                     "displayName": display_name,
@@ -1757,14 +1755,17 @@ class Client2(BaseClient):
             context = {"issue": "Invalid display name and body not provided"}
             raise PyegeriaInvalidParameterException(context=context)
 
-        url = f"{self.command_root}feedback-manager/elements/{element_guid}/note-logs"
+        if element_guid:
+            url = f"{self.command_root}feedback-manager/elements/{element_guid}/note-logs"
+        else:
+            url = f"{self.command_root}feedback-manager/elements/note-logs"
         response = await self._async_make_request("POST", url, body_slimmer(body))
         return response.json()
 
     @dynamic_catch
     def create_note_log(
             self,
-            element_guid: str,
+            element_guid: str = None,
             display_name: str = None,
             description: str = None,
             body: dict = None,
@@ -1774,8 +1775,8 @@ class Client2(BaseClient):
 
         Parameters
         ----------
-        element_guid
-            - unique identifier of the element where the note log is located
+        element_guid, str, optional
+            - unique identifier of the element where the note log is attached
         display_name: str, optional
             - name of the note log
         description: str, optional
@@ -1796,7 +1797,7 @@ class Client2(BaseClient):
         Sample Body:
 
         {
-            "class" : "NewFeedbackRequestBody",
+            "class" : "NewAttachmentRequestBody",
             "initialClassifications": {
               "ZoneMembership" : {
                 "class" : "ZoneMembershipProperties",
@@ -1961,7 +1962,7 @@ class Client2(BaseClient):
     async def _async_remove_note_log(
             self,
             note_log_guid: str,
-            body: dict | DeleteRequestBody = None,
+            body: dict | DeleteElementRequestBody = None,
             cascade_delete: bool = False,
     ) -> None:
         """
@@ -1971,14 +1972,14 @@ class Client2(BaseClient):
         ----------
         note_log_guid: str
             - String - unique id for the note log.
-        body: dict | DeleteRequestBody, optional
+        body: dict | DeleteElementRequestBody, optional
             - containing type of comment enum and the text of the comment.
         cascade_delete: bool, optional
             - If True, deletes all comments and replies associated with the note log.
 
         Returns
         -------
-        VoidResponse
+        None
 
         Raises
         ------
@@ -1986,34 +1987,32 @@ class Client2(BaseClient):
 
         """
 
-        url = f"{self.command_root}feedback-manager/elements/{note_log_guid}/remove"
+        url = f"{self.command_root}feedback-manager/note-logs/{note_log_guid}/remove"
         await self._async_delete_element_request(url, body, cascade_delete)
 
     @dynamic_catch
     def remove_note_log(
             self,
             note_log_guid: str,
-            body: dict | DeleteRequestBody = None,
+            body: dict | DeleteElementRequestBody = None,
             cascade_delete: bool = False,
 
     ) -> None:
         """
-        Removes a comment added to the element by this user.
-
-        This deletes the link to the comment, the comment itself and any comment replies attached to it.
+        Remove a note log from the repository. All relationships to referenceables are lost.
 
         Parameters
         ----------
-        note_log_guid
-            - String - unique id for the comment object
-        body
-            - containing type of comment enum and the text of the comment.
-        cascade_delete: bool = False
-
+        note_log_guid: str
+            - unique id for the note log
+        body: dict | DeleteElementRequestBody, optional
+            - request body details (if provided, supersedes other parameters)
+        cascade_delete: bool, default = False
+            - if True, deletes all comments and replies associated with the note log
 
         Returns
         -------
-        VoidResponse
+        None
 
         Raises
         ------
@@ -2097,7 +2096,7 @@ class Client2(BaseClient):
 
         url = f"{self.command_root}feedback-manager/note-logs/by-search-string"
         response = await self._async_find_request(url, _type="NoteLog",
-                                                  _gen_output=self._generate_note_log_output,
+                                                  _gen_output=self._generate_feedback_output,
                                                   search_string=search_string,
                                                   classification_names=classification_names,
                                                   metadata_element_types=metadata_element_types,
@@ -2169,7 +2168,7 @@ class Client2(BaseClient):
         return resp
 
     @dynamic_catch
-    async def _async_get_note_logs_by_gname(
+    async def _async_get_note_logs_by_name(
             self, filter: str,
             element_type: str = "NoteLog",
             body: dict | FilterRequestBody = None,
@@ -2201,7 +2200,7 @@ class Client2(BaseClient):
 
         url = f"{self.command_root}feedback-manager/note-logs/by-name"
         response = await self._async_get_name_request(url, _type=element_type,
-                                                      _gen_output=self._generate_note_log_output, start_from=start_from,
+                                                      _gen_output=self._generate_feedback_output, start_from=start_from,
                                                       page_size=page_size, output_format=output_format,
                                                       report_spec=report_spec,
                                                       body=body)
@@ -2240,7 +2239,7 @@ class Client2(BaseClient):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_note_log_by_name(filter, element_type, body, output_format, report_spec, start_from,
+            self._async_get_note_logs_by_name(filter, element_type, body, output_format, report_spec, start_from,
                                              page_size)
         )
         return response
@@ -2288,7 +2287,7 @@ class Client2(BaseClient):
         if element == NO_ELEMENTS_FOUND:
             return NO_ELEMENTS_FOUND
         if output_format != 'JSON':  # return a simplified markdown representation
-            return self._generate_note_log_output(element, None, output_format, report_spec)
+            return self._generate_feedback_output(element, None, output_format, report_spec)
         return response.json().get("elements", NO_ELEMENTS_FOUND)
 
     @dynamic_catch
@@ -2505,6 +2504,183 @@ class Client2(BaseClient):
         )
         return response
 
+    @dynamic_catch
+    async def _async_add_journal_entry(self, note_log_qn: str = None, element_qn: str =  None, note_log_display_name: str = None, journal_entry_display_name: str = None, journal_entry_description: str = None,
+                                body: dict | NewElementRequestBody = None ) -> str:
+        """
+        Creates a new journal entry for a note log and returns the unique identifier for it. The note_log will be
+        created if it does not exist. Async version.
+
+        Parameters
+        ----------
+        note_log_qn: str = None
+            - If provided, the journal entry will be attached to this note log. If not provided, a new note_log will be created.
+        element_qn: str = None
+            - If provided, and note log needs to be created, this will be used to define the new note log and attach it
+             to the specified element.
+        note_log_display_name: str = None
+            - optional note log display name
+        journal_entry_display_name: str = None
+            - optional journal entry display name
+        journal_entry_description: str = None
+            - the journal entry text
+
+        body
+            - optional body for the note - if provided, details here will supercede other parameters.
+
+        Returns
+        -------
+        GUID for the journal entry (note).
+
+        Raises
+        ------
+        PyegeriaException
+
+        Notes
+        _____
+
+        Sample body (a note is an asset)
+        {
+          "class" : "NewElementRequestBody",
+          "anchorGUID" : "{{noteLogGUID}}",
+          "isOwnAnchor": false,
+          "parentGUID": "{{noteLogGUID}}",
+          "parentRelationshipTypeName": "AttachedNoteLogEntry",
+          "parentAtEnd1": true,
+          "properties": {
+            "class" : "NotificationProperties",
+            "typeName" : "Notification",
+            "qualifiedName": "add unique name here",
+            "displayName": "add short name here",
+            "description": "add description here",
+            "systemAction" : "add optional system action that occurred as part of this notification processing",
+            "userResponse" : "add optional action that the reader should take",
+            "priority" : 1,
+            "activityStatus" : "FOR_INFO",
+            "additionalProperties": {
+              "property1" : "propertyValue1",
+              "property2" : "propertyValue2"
+            },
+            "extendedProperties": {
+              "property1" : "propertyValue1",
+              "property2" : "propertyValue2"
+            },
+            "effectiveFrom": "{{$isoTimestamp}}",
+            "effectiveTo": "{{$isoTimestamp}}"
+          },
+          "externalSourceGUID": "add guid here",
+          "externalSourceName": "add qualified name here",
+          "effectiveTime" : "{{$isoTimestamp}}",
+          "forLineage" : false,
+          "forDuplicateProcessing" : false
+        }
+
+        """
+        note_log_guid = None
+        element_guid = None
+        # If a note_log_qn has been provided, look up its GUID
+        if note_log_qn:
+            note_log_guid = await self._async_get_guid_for_name(note_log_qn, ["qualifiedName"],'NoteLog' ) if note_log_qn else None
+
+        # If we need to create a new note_log, then use the qualified name from the element_qn parameter, if provided.
+        if note_log_guid is None or note_log_guid == NO_ELEMENTS_FOUND:
+            if element_qn is None:
+                if note_log_display_name is None:
+                    note_log_display_name = f"NoName-{datetime.now().strftime('%Y-%m-%d %H:%M')}"
+
+            else:
+                element_guid = await self._async_get_guid_for_name(element_qn, ["qualifiedName"])
+
+            note_log = await self._async_create_note_log(element_guid = element_guid, display_name = note_log_display_name)
+            note_log_guid = note_log["guid"]
+
+        # Create the Journal Entry (Note)
+        journal_entry_guid = await self._async_create_note(note_log_guid, journal_entry_display_name,
+                                                                 journal_entry_description, body)
+
+        return journal_entry_guid
+
+    @dynamic_catch
+    def add_journal_entry(self, note_log_qn: str = None, element_qn: str = None,
+                           note_log_display_name: str = None, journal_entry_display_name: str = None,
+                           journal_entry_description: str = None,
+                           body: dict | NewElementRequestBody = None) -> str:
+        """
+        Creates a new journal entry for a note log and returns the unique identifier for it. The note_log will be
+        created if it does not exist.
+
+        Parameters
+        ----------
+        note_log_qn: str = None
+            - If provided, the journal entry will be attached to this note log. If not provided, a new note_log will be created.
+        element_qn: str = None
+            - If provided, and note log needs to be created, this will be used to define the new note log and attach it
+             to the specified element.
+        note_log_display_name: str = None
+            - optional note log display name
+        journal_entry_display_name: str = None
+            - optional journal entry display name
+        journal_entry_description: str = None
+            - the journal entry text
+
+        body
+            - optional body for the note - if provided, details here will supercede other parameters.
+
+        Returns
+        -------
+        GUID for the journal entry (note).
+
+        Raises
+        ------
+        PyegeriaException
+
+        Notes
+        _____
+
+        Sample body (a note is an asset)
+        {
+          "class" : "NewElementRequestBody",
+          "anchorGUID" : "{{noteLogGUID}}",
+          "isOwnAnchor": false,
+          "parentGUID": "{{noteLogGUID}}",
+          "parentRelationshipTypeName": "AttachedNoteLogEntry",
+          "parentAtEnd1": true,
+          "properties": {
+            "class" : "NotificationProperties",
+            "typeName" : "Notification",
+            "qualifiedName": "add unique name here",
+            "displayName": "add short name here",
+            "description": "add description here",
+            "systemAction" : "add optional system action that occurred as part of this notification processing",
+            "userResponse" : "add optional action that the reader should take",
+            "priority" : 1,
+            "activityStatus" : "FOR_INFO",
+            "additionalProperties": {
+              "property1" : "propertyValue1",
+              "property2" : "propertyValue2"
+            },
+            "extendedProperties": {
+              "property1" : "propertyValue1",
+              "property2" : "propertyValue2"
+            },
+            "effectiveFrom": "{{$isoTimestamp}}",
+            "effectiveTo": "{{$isoTimestamp}}"
+          },
+          "externalSourceGUID": "add guid here",
+          "externalSourceName": "add qualified name here",
+          "effectiveTime" : "{{$isoTimestamp}}",
+          "forLineage" : false,
+          "forDuplicateProcessing" : false
+        }
+
+        """
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_add_journal_entry(note_log_qn, element_qn, note_log_display_name, journal_entry_display_name, journal_entry_description, body)
+        )
+        return response
+
+
     @dynamic_catch
     async def _async_update_note(self, note_guid: str, display_name: str = None, description: str = None,
                                  body: dict | UpdateElementRequestBody = None, merge_update: bool = True) -> None:
@@ -2687,7 +2863,7 @@ class Client2(BaseClient):
         PyegeriaException
         """
         url = f"{self.command_root}feedback-manager/assets/{note_guid}/delete"
-        await self._async_delete_request(url, body)
+        await self._async_delete_element_request(url, body)
 
     @dynamic_catch
     def remove_note(
@@ -2774,19 +2950,19 @@ class Client2(BaseClient):
 
         url = f"{self.command_root}feedback-manager/assets/by-search-string"
         response = await self._async_find_request(url, "Notification", self._generate_feedback_output,
-                                                  search_string, [], ["Notification"],
+                                                  search_string, None, ["Notification"] ,
                                                   starts_with, ends_with, ignore_case,
                                                   start_from, page_size, output_format, report_spec,
-                                                  body, )
+                                                  body )
         return response
 
     @dynamic_catch
     def find_notes(
             self, search_string: str = None,
             body: dict | SearchStringRequestBody = None,
-            starts_with: bool = None,
-            ends_with: bool = None,
-            ignore_case: bool = None,
+            starts_with: bool = True,
+            ends_with: bool = False,
+            ignore_case: bool = False,
             start_from: int = 0,
             page_size: int = 0,
             output_format: str = "JSON",
@@ -2936,7 +3112,7 @@ class Client2(BaseClient):
 
         """
 
-        url = f"{self.command_root}feedback-manager/note-logs/by-name"
+        url = f"{self.command_root}feedback-manager/note-logs/{note_log_guid}/retrieve"
         response = await self._async_get_results_body_request(url, "Notification", self._generate_feedback_output,
                                                               0, 0, output_format, report_spec, body)
         return response
@@ -2979,16 +3155,14 @@ class Client2(BaseClient):
         )
         return response
 
-
-
     #
     # Tags
     #
     @dynamic_catch
     async def _async_create_informal_tag(
-        self,
-        display_name: str,
-        description: str
+            self,
+            display_name: str,
+            description: str
     ) -> str:
         """
         Creates a new informal tag and returns the unique identifier for it. Async Version.
@@ -3011,7 +3185,7 @@ class Client2(BaseClient):
         """
         url = f"{self.command_root}feedback-manager/tags"
         if display_name is None:
-            raise PyegeriaInvalidParameterException(context = {"reason": "display_name is required"})
+            raise PyegeriaInvalidParameterException(context={"reason": "display_name is required"})
         body = {
             "class": "TagProperties",
             "displayName": display_name,
@@ -3020,7 +3194,6 @@ class Client2(BaseClient):
         response = await self._async_make_request("POST", url, body)
         return response.json()
 
-
     @dynamic_catch
     def create_informal_tag(
             self,
@@ -3054,9 +3227,9 @@ class Client2(BaseClient):
 
     @dynamic_catch
     async def _async_update_tag_description(
-        self,
-        tag_guid: str,
-        description: str,
+            self,
+            tag_guid: str,
+            description: str,
 
     ) -> None:
         """
@@ -3072,7 +3245,7 @@ class Client2(BaseClient):
 
         Returns
         -------
-        VoidResponse :
+        None
 
         Raises
         ------
@@ -3089,29 +3262,28 @@ class Client2(BaseClient):
 
     @dynamic_catch
     def update_tag_description(
-        self,
-        tag_guid: str,
-        description: str,
+            self,
+            tag_guid: str,
+            description: str,
 
     ) -> None:
         """
-          Updates the description of an existing tag. Async version.
+        Update the description of an existing tag.
 
-          Parameters
-          ----------
-
-         tag_guid
-              - unique id for the tag
-         description: str
+        Parameters
+        ----------
+        tag_guid: str
+            - unique id for the tag
+        description: str
             - description of the tag
 
-          Returns
-          -------
-          VoidResponse :
+        Returns
+        -------
+        None
 
-          Raises
-          ------
-          PyegeriaException
+        Raises
+        ------
+        PyegeriaException
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
@@ -3140,7 +3312,7 @@ class Client2(BaseClient):
             - String - unique id for the tag.
         Returns
         -------
-        VOIDResponse
+        None
 
         Raises
         ------
@@ -3181,7 +3353,6 @@ class Client2(BaseClient):
             self._async_delete_tag(tag_guid)
         )
 
-
     @dynamic_catch
     async def _async_get_tag(
             self,
@@ -3224,7 +3395,6 @@ class Client2(BaseClient):
                                                       output_format, report_spec, body)
         return response
 
-
     @dynamic_catch
     def get_tag(
             self,
@@ -3232,7 +3402,7 @@ class Client2(BaseClient):
             body: dict | GetRequestBody = None,
             output_format: str = "json",
             report_spec: str = None,
-        ) -> dict | str:
+    ) -> dict | str:
         """
                 Return the informal tag for the supplied unique identifier (tag_guid).
 
@@ -3296,7 +3466,7 @@ class Client2(BaseClient):
 
         url = f"{self.command_root}feedback-manager/tags/by-name"
 
-        response = await self._async_get_name_request(url,"InformalTag", self._generate_feedback_output,
+        response = await self._async_get_name_request(url, "InformalTag", self._generate_feedback_output,
                                                       tag_name, [], start_from,
                                                       page_size, output_format, report_spec)
         return response
@@ -3351,7 +3521,7 @@ class Client2(BaseClient):
             search_string: str = None,
             body: dict | SearchStringRequestBody = None,
             starts_with: bool = True,
-            ends_with:  bool = False,
+            ends_with: bool = False,
             ignore_case: bool = False,
             start_from: int = 0,
             page_size: int = max_paging_size, output_format: str = "json", report_spec: str = None,
@@ -3392,7 +3562,7 @@ class Client2(BaseClient):
 
         url = f"{self.command_root}feedback-manager/tags/by-search-string"
         response = await self._async_find_request(url, "InformalTag", self._generate_feedback_output,
-                                                  search_string, [],[],
+                                                  search_string, [], [],
                                                   starts_with, ends_with, ignore_case,
                                                   start_from, page_size, output_format,
                                                   report_spec, body)
@@ -3401,14 +3571,13 @@ class Client2(BaseClient):
     @dynamic_catch
     def find_tags(
             self,
-            search_string: str =  None,
+            search_string: str = None,
             body: dict | SearchStringRequestBody = None,
             starts_with: bool = True,
             ends_with: bool = False,
             ignore_case: bool = False,
             start_from: int = 0,
             page_size: int = max_paging_size, output_format: str = "json", report_spec: str = None,
-
     ) -> dict | str:
         """
         Return the list of informal tags containing the supplied string in their name or description. The search string
@@ -3449,137 +3618,126 @@ class Client2(BaseClient):
         )
         return response
 
+    async def _async_find_my_tags(
+            self,
+            search_string: str = None,
+            body: dict | SearchStringRequestBody = None,
+            starts_with: bool = None,
+            ends_with: bool = None,
+            ignore_case: bool = None,
+            start_from: int = 0,
+            page_size: int = max_paging_size,
 
-    # async def _async_find_my_tags(
-    #         self,
-    #         body: str,
-    #         starts_with: bool = None,
-    #         ends_with: bool = None,
-    #         ignore_case: bool = None,
-    #         start_from: int = 0,
-    #         page_size: int = max_paging_size,
-    #
-    # ) -> dict | str:
-    #     """
-    #     Return the list of the calling user's private tags containing the supplied string in either the name or description. The search string is a regular expression (RegEx).
-    #
-    #
-    #     Parameters
-    #     ----------
-    #
-    #     starts_with
-    #         - does the value start with the supplied string?
-    #     ends_with
-    #         - does the value end with the supplied string?
-    #     ignore_case
-    #         - should the search ignore case?
-    #     start_from
-    #         - index of the list to start from (0 for start).
-    #     page_size
-    #         - maximum number of elements to return.
-    #     view_service_url_marker
-    #         - optional view service URL marker (overrides access_service_url_marker)
-    #     access_service_url_marker
-    #         - optional access service URL marker used to identify which back end service to call
-    #     body
-    #         - search string and effective time.
-    #
-    #     Returns
-    #     -------
-    #     list of tag objects
-    #
-    #     Raises
-    #     ------
-    #     InvalidParameterException
-    #         one of the parameters is null or invalid or
-    #     PropertyServerException
-    #         There is a problem adding the element properties to the metadata repository or
-    #     UserNotAuthorizedException
-    #         the requesting user is not authorized to issue this request.
-    #     """
-    #
-    #     url = f"{self.command_root}feedback-manager/tags/update"
-    #     response = await self._async_make_request("POST", url, body)
-    #     return response
-    #
-    # def find_my_tags(
-    #         self,
-    #         body: str,
-    #         starts_with: bool = None,
-    #         ends_with: bool = None,
-    #         ignore_case: bool = None,
-    #         start_from: int = 0,
-    #         page_size: int = max_paging_size,
-    #
-    # ) -> dict | str:
-    #     """
-    #     Return the list of the calling user's private tags containing the supplied string in either the name or description. The search string is a regular expression (RegEx).
-    #
-    #
-    #     Parameters
-    #     ----------
-    #
-    #     starts_with
-    #         - does the value start with the supplied string?
-    #     ends_with
-    #         - does the value end with the supplied string?
-    #     ignore_case
-    #         - should the search ignore case?
-    #     start_from
-    #         - index of the list to start from (0 for start).
-    #     page_size
-    #         - maximum number of elements to return.
-    #     view_service_url_marker
-    #         - optional view service URL marker (overrides access_service_url_marker)
-    #     access_service_url_marker
-    #         - optional access service URL marker used to identify which back end service to call
-    #     body
-    #         - search string and effective time.
-    #
-    #     Returns
-    #     -------
-    #     list of tag objects
-    #
-    #     Raises
-    #     ------
-    #     InvalidParameterException
-    #         one of the parameters is null or invalid or
-    #     PropertyServerException
-    #         There is a problem adding the element properties to the metadata repository or
-    #     UserNotAuthorizedException
-    #         the requesting user is not authorized to issue this request.
-    #     """
-    #     loop = asyncio.get_event_loop()
-    #     response = loop.run_until_complete(
-    #         self._async_find_my_tags(
-    #             body,
-    #             starts_with=starts_with,
-    #             ends_with=ends_with,
-    #             ignore_case=ignore_case,
-    #             start_from=start_from,
-    #             page_size=page_size,
-    #
-    #         )
-    #     )
-    #     return response
-
-    @dynamic_catch
-    async def _async_add_tag_to_element(
-        self,
-        element_guid: str,
-        tag_guid: str,
-        is_public: bool = False,
-        body: dict| NewRelationshipRequestBody = None,
-
-    ) -> None:
+    ) -> dict | str:
         """
-        Adds an informal tag (either private of public) to an element. Async Version.
+        Return the list of the calling user's private tags containing the supplied string in either the name or description.
 
         Parameters
         ----------
-
-        element_guid
-            - unique id for the element.
+        search_string: str
+        - string to search for.
+        body: dict | SearchStringRequestBody
+        - details of the request. Supersedes other parameters if present.
+        starts_with
+            - does the value start with the supplied string?
+        ends_with
+            - does the value end with the supplied string?
+        ignore_case
+            - should the search ignore case?
+        start_from
+            - index of the list to start from (0 for start).
+        page_size
+            - maximum number of elements to return.
+
+        Returns
+        -------
+        list of tag objects
+
+        Raises
+        ------
+        PyegeriaException
+        """
+
+        url = f"{self.command_root}feedback-manager/tags/update"
+        response = await self._async_make_request("POST", url, body)
+        return response
+
+    def find_my_tags(
+            self,
+            search_string: str = None,
+            body: dict | SearchStringRequestBody = None,
+            starts_with: bool = None,
+            ends_with: bool = None,
+            ignore_case: bool = None,
+            start_from: int = 0,
+            page_size: int = max_paging_size,
+
+    ) -> dict | str:
+        """
+        Return the list of the calling user's private tags containing the supplied string in either the name or description.
+
+        Parameters
+        ----------
+        search_string: str
+        body: dict | SearchStringRequestBody
+            - detailed request - supersedes other parameters.
+        starts_with
+            - does the value start with the supplied string?
+        ends_with
+            - does the value end with the supplied string?
+        ignore_case
+            - should the search ignore case?
+        start_from
+            - index of the list to start from (0 for start).
+        page_size
+            - maximum number of elements to return.
+
+
+        Returns
+        -------
+        list of tag objects
+
+        Raises
+        ------
+        InvalidParameterException
+            one of the parameters is null or invalid or
+        PropertyServerException
+            There is a problem adding the element properties to the metadata repository or
+        UserNotAuthorizedException
+            the requesting user is not authorized to issue this request.
+        """
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_find_my_tags(
+                search_string,
+                body,
+                starts_with=starts_with,
+                ends_with=ends_with,
+                ignore_case=ignore_case,
+                start_from=start_from,
+                page_size=page_size,
+
+            )
+        )
+        return response
+
+    @dynamic_catch
+    async def _async_add_tag_to_element(
+            self,
+            element_guid: str,
+            tag_guid: str,
+            is_public: bool = False,
+            body: dict | NewRelationshipRequestBody = None,
+
+    ) -> None:
+        """
+        Adds an informal tag (either private of public) to an element. Async Version.
+
+        Parameters
+        ----------
+
+        element_guid
+            - unique id for the element.
         tag_guid
             - unique id of the tag.
 
@@ -3596,11 +3754,9 @@ class Client2(BaseClient):
         """
         is_public_s = str(is_public).lower()
 
-
         url = f"{self.command_root}feedback-manager/elements/{element_guid}/tags/{tag_guid}?isPublic={is_public_s}"
         await self._async_new_relationship_request(url, 'InformalTag', body)
 
-
     @dynamic_catch
     def add_tag_to_element(
             self,
@@ -3644,12 +3800,11 @@ class Client2(BaseClient):
 
     @dynamic_catch
     async def _async_get_elements_by_tag(
-        self,
-        tag_guid: str,
-        body: dict = {},
-        start_from: int = 0,
-        page_size: int = max_paging_size,
-
+            self,
+            tag_guid: str,
+            body: dict = {},
+            start_from: int = 0,
+            page_size: int = max_paging_size,
 
     ) -> dict | str:
         """
@@ -3684,14 +3839,13 @@ class Client2(BaseClient):
         response = await self._async_make_request("POST", url, body)
         return response.json()
 
-
     @dynamic_catch
     def get_elements_by_tag(
-        self,
-        tag_guid: str,
-        body: dict = {},
-        start_from: int = 0,
-        page_size: int = max_paging_size,
+            self,
+            tag_guid: str,
+            body: dict = {},
+            start_from: int = 0,
+            page_size: int = 0,
 
     ) -> dict | str:
         """
@@ -3723,22 +3877,17 @@ class Client2(BaseClient):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_elements_by_tag(
-                tag_guid,
-                body,
-                start_from,
-                page_size,
-            )
+            self._async_get_elements_by_tag(tag_guid, body, start_from, page_size)
         )
         return response
 
     @dynamic_catch
     async def _async_get_attached_tags(
-        self,
-        element_guid: str,
-        body: dict = {},
-        start_from: int = 0,
-        page_size: int = max_paging_size,
+            self,
+            element_guid: str,
+            body: dict = {},
+            start_from: int = 0,
+            page_size: int = max_paging_size,
 
     ) -> dict | str:
         """
@@ -3769,14 +3918,13 @@ class Client2(BaseClient):
         response = await self._async_make_request("POST", url, body)
         return response.json()
 
-
     @dynamic_catch
     def get_attached_tags(
-        self,
-        element_guid: str,
-        body: dict = {},
-        start_from: int = 0,
-        page_size: int = max_paging_size,
+            self,
+            element_guid: str,
+            body: dict = {},
+            start_from: int = 0,
+            page_size: int = max_paging_size,
 
     ) -> dict | str:
         """
@@ -3818,7 +3966,6 @@ class Client2(BaseClient):
         )
         return response
 
-
     async def _async_remove_tag_from_element(
             self,
             element_guid: str,
@@ -3906,6 +4053,517 @@ class Client2(BaseClient):
         )
         return response
 
+    #
+    # Search Tags
+    #
+    @dynamic_catch
+    async def _async_add_search_keyword_to_element(
+            self,
+            element_guid: str,
+            keyword: str = None,
+            body: dict = None
+    ) -> str:
+        """
+        Creates a search keyword and attaches it to an element.
+        The GUID returned is the identifier of the relationship. Async Version.
+
+        Parameters
+        ----------
+        element_guid: str
+            - the identity of the element to update
+        keyword: str = None
+            - the name of the search keyword to add
+        body: dict, optional
+            - structure containing search string information - see Notes
+
+        Returns
+        -------
+        Guid of the search keyword.
+
+        Raises
+        ------
+        PyegeriaException
+
+        Notes
+        -----
+        Sample body:
+        {
+          "class" : "NewAttachmentRequestBody",
+          "properties" : {
+            "class" : "SearchKeywordProperties",
+            "keyword" : "myKeyword",
+            "description" : "Add search keyword text here"
+          }
+        }
+
+        """
+        if body is None and keyword:
+            body = {
+                "class": "NewAttachmentRequestBody",
+                "properties": {
+                    "class": "SearchKeywordProperties",
+                    "keyword": keyword
+                }
+            }
+        elif body is None:
+            raise PyegeriaInvalidParameterException(context={"reason": "keyword or body is required"})
+
+        url = f"{self.command_root}classification-manager/elements/{element_guid}/search-keywords"
+
+        response = await self._async_make_request("POST", url, body_slimmer(body))
+        return response.json().get('guid', 'Search keyword was not created')
+
+    @dynamic_catch
+    def add_search_keyword_to_element(
+            self,
+            element_guid: str,
+            keyword: str = None,
+            body: dict = None,
+    ) -> str:
+        """
+        Creates a search keyword and attaches it to an element.
+        The GUID returned is the identifier of the relationship.
+
+        Parameters
+        ----------
+        element_guid: str
+            - the identity of the element to update
+        keyword: str = None
+            - the name of the search keyword to add
+        body: dict, optional
+            - structure containing search string information - see Notes
+
+        Returns
+        -------
+        Guid of the search keyword.
+
+        Raises
+        ------
+        PyegeriaException
+
+        Notes
+        -----
+        Sample body:
+        {
+          "class" : "NewAttachmentRequestBody",
+          "properties" : {
+            "class" : "SearchKeywordProperties",
+            "keyword" : "myKeyword",
+            "description" : "Add search keyword text here"
+          }
+        }
+
+        """
+
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_add_search_keyword_to_element(element_guid, keyword, body)
+        )
+        return response
+
+
+    @dynamic_catch
+    async def _async_update_search_keyword(
+            self,
+            keyword_guid: str,
+            body: dict | UpdateElementRequestBody = None,
+    ) -> str:
+        """
+       Update the properties of a search keyword. Async Version.
+
+        Parameters
+        ----------
+        keyword_guid: str
+            - identity of the keyword to update
+        body: dict | UpdateElementRequestBody, optional
+            - structure containing keyword information - see Notes
+
+        Returns
+        -------
+        None
+
+        Raises
+        ------
+        PyegeriaException
+
+        Notes
+        -----
+        Sample body:
+        {
+          "class" : "UpdateElementRequestBody",
+          "mergeUpdate": true,
+          "properties" : {
+            "class" : "SearchKeywordProperties",
+            "keyword" : "myKeyword",
+            "description" : "Add search keyword text here"
+          }
+        }
+
+        """
+
+        url = f"{self.command_root}classification-manager/search-keywords/{keyword_guid}/update"
+        await self._async_update_relationship_request(url, None, body_slimmer(body))
+
+    @dynamic_catch
+    def update_search_keyword(
+            self,
+            keyword_guid: str,
+            body: dict | UpdateElementRequestBody = None,
+    ) -> None:
+        """
+        Update the properties of a search keyword.
+
+         Parameters
+         ----------
+         keyword_guid: str
+             - identity of the keyword to update
+         body: dict | UpdateElementRequestBody, optional
+             - structure containing keyword information - see Notes
+
+         Returns
+         -------
+         None
+
+         Raises
+         ------
+         PyegeriaException
+
+         Notes
+         -----
+         Sample body:
+         {
+           "class" : "UpdateElementRequestBody",
+           "mergeUpdate": true,
+           "properties" : {
+             "class" : "SearchKeywordProperties",
+             "keyword" : "myKeyword",
+             "description" : "Add search keyword text here"
+           }
+         }
+
+         """
+
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(
+            self._async_update_search_keyword(keyword_guid, body)
+        )
+
+    @dynamic_catch
+    async def _async_remove_search_keyword(
+            self,
+            keyword_guid: str
+    ) -> None:
+        """
+        Remove the search keyword for an element. Async Version.
+
+        Parameters
+        ----------
+        keyword_guid: str
+            - identity of the search keyword to remove.
+
+        Returns
+        -------
+
+        Raises
+        ------
+        PyegeriaException
+
+
+        """
+
+        url = f"{self.command_root}classification-manager/search-keywords/{keyword_guid}/remove"
+        await self._async_delete_relationship_request(url = url, body = None, cascade_delete = False)
+
+    @dynamic_catch
+    def remove_search_keyword(
+            self,
+            keyword_guid,
+    ) -> None:
+        """
+        Remove the search keyword for an element.
+
+        Parameters
+        ----------
+        license_guid: str
+            - identity of the license to remove
+
+        Returns
+        -------
+        None
+
+        Raises
+        ------
+        PyegeriaException
+
+        """
+
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(
+            self._async_remove_search_keyword(keyword_guid )
+        )
+
+    @dynamic_catch
+    async def _async_get_search_keyword_by_guid(
+            self,
+            keyword_guid: str,
+            output_format: str | None = "JSON",
+            report_spec: dict | str = None
+    ) -> dict | str:
+        """
+        Return information about the specified search keyword.
+
+        Parameters
+        ----------
+        keyword_guid: str
+            - unique identifier of tag.
+        output_format: str, default "JSON"
+            - output format for the response
+        report_spec: str | dict, default None
+            - report specification
+
+        Returns
+        -------
+        Details of the search keyword in the requested format.
+
+        Raises
+        ------
+        PyegeriaException
+
+        """
+
+        url = f"{self.command_root}classification-manager/search-keywords/{keyword_guid}"
+        response = await self._async_get_guid_request(url, "SearchKeyword", self._generate_feedback_output,
+                                                      output_format, report_spec)
+        return response
+
+    @dynamic_catch
+    def get_search_keyword_by_guid(
+            self,
+            keyword_guid: str,
+            output_format: str | None = "JSON",
+            report_spec: dict | str = None
+
+    ) -> dict | str:
+        """
+               Return information about the specified search keyword.
+
+               Parameters
+               ----------
+               keyword_guid: str
+                   - unique identifier of tag.
+               output_format: str, default "JSON"
+                   - output format for the response
+               report_spec: str | dict, default None
+                   - report specification
+
+               Returns
+               -------
+               Details of the search keyword in the requested format.
+
+               Raises
+               ------
+               PyegeriaException
+
+               """
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_get_search_keyword_by_guid(keyword_guid, output_format, report_spec)
+        )
+        return response
+
+    @dynamic_catch
+    async def _async_get_search_keyword_by_keyword(
+            self,
+            keyword: str,
+            start_from: int = 0,
+            page_size: int = 0,
+            output_format: str | None = "JSON",
+            report_spec: dict | str = None,
+            body: dict | FilterRequestBody = None
+    ) -> dict | str:
+        """
+        Return information about the specified search keyword. Async Version.
+
+        Parameters
+        ----------
+        keyword : str
+            - keyword to search for.
+        start_from: int, default 0
+            - start index of the search keyword
+        page size
+            - output_format: str, default "JSON
+        output_format: str, default "JSON"
+            - output format for the response
+        report_spec: str | dict, default None
+            - report specification
+        body: dict | FilterRequestBody, optional
+            - structure containing detailed request information.
+
+        Returns
+        -------
+        Details of the search keyword in the requested format.
+
+        Raises
+        ------
+        PyegeriaException
+
+        """
+        if body is None and keyword:
+            body = {
+                "class": "FilterRequestBody",
+                "filter": filter,
+                "startFrom": start_from,
+                "pageSize": page_size
+            }
+        url = f"{self.command_root}classification-manager/search-keywords/by-keyword"
+        response = await self._async_get_name_request(url, "SearchKeyword", self._generate_feedback_output,
+                                                      keyword, None, None, start_from,
+                                                      page_size, output_format, report_spec, body)
+        return response
+
+    @dynamic_catch
+    def get_search_keyword_by_keyword(
+            self,
+            keyword: str,
+            start_from: int = 0,
+            page_size: int = 0,
+            output_format: str | None = "JSON",
+            report_spec: dict | str = None,
+            body: dict | FilterRequestBody = None
+    ) -> dict | str:
+        """
+        Return information about the specified search keyword.
+
+        Parameters
+        ----------
+        keyword : str
+            - keyword to search for.
+        start_from: int, default 0
+            - start index of the search keyword
+        page size
+            - output_format: str, default "JSON
+        output_format: str, default "JSON"
+            - output format for the response
+        report_spec: str | dict, default None
+            - report specification
+        body: dict | FilterRequestBody, optional
+            - structure containing detailed request information.
+
+        Returns
+        -------
+        Details of the search keyword in the requested format.
+
+        Raises
+        ------
+        PyegeriaException
+
+        """
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_find_search_keywords(keyword, start_from, page_size, output_format, report_spec, body)
+        )
+        return response
+
+    async def _async_find_search_keywords(
+            self,
+            search_string: str,
+            start_from: int = 0,
+            page_size: int = 0,
+            output_format: str | None = "JSON",
+            report_spec: dict | str = None,
+            body: dict | SearchStringRequestBody = None
+    ) -> dict | str:
+        """
+        Return the list of search keywords containing the supplied string. The search string is located in the request
+         body and is interpreted as a plain string.  The request parameters, startsWith, endsWith and ignoreCase can
+         be used to allow a fuzzy search.  The request body also supports the specification of an effective time to
+         restrict the search to element that are/were effective at a particular time. Async Version.
+
+        Parameters
+        ----------
+        search_string : str
+            - keyword to search for.
+        start_from: int, default 0
+            - start index of the search keyword
+        page size
+            - output_format: str, default "JSON
+        output_format: str, default "JSON"
+            - output format for the response
+        report_spec: str | dict, default None
+            - report specification
+        body: dict | SearchStringRequestBody, optional
+            - structure containing detailed request information.
+
+        Returns
+        -------
+        Details of the search keyword in the requested format.
+
+        Raises
+        ------
+        PyegeriaException
+
+        """
+        if body is None and search_string:
+            body = {
+                "class": "SearchStringRequestBody",
+                "filter": filter,
+                "startFrom": start_from,
+                "pageSize": page_size
+            }
+        url = f"{self.command_root}classification-manager/search-keywords/by-search-string"
+        response = await self._async_find_request(url, "SearchKeyword", self._generate_feedback_output, search_string,
+                                                  None, None, True, False, False,
+                                                  start_from, page_size, output_format, report_spec, body
+                                                  )
+        return response
+
+    @dynamic_catch
+    def find_search_keywords(
+            self,
+            search_string: str,
+            start_from: int = 0,
+            page_size: int = 0,
+            output_format: str | None = "JSON",
+            report_spec: dict | str = None,
+            body: dict | SearchStringRequestBody = None
+    ) -> dict | str:
+        """
+        Return the list of search keywords containing the supplied string. The search string is located in the request
+         body and is interpreted as a plain string.  The request parameters, startsWith, endsWith and ignoreCase can
+         be used to allow a fuzzy search.  The request body also supports the specification of an effective time to
+         restrict the search to element that are/were effective at a particular time. Async Version.
+
+        Parameters
+        ----------
+        search_string : str
+            - keyword to search for.
+        start_from: int, default 0
+            - start index of the search keyword
+        page size
+            - output_format: str, default "JSON
+        output_format: str, default "JSON"
+            - output format for the response
+        report_spec: str | dict, default None
+            - report specification
+        body: dict | SearchStringRequestBody, optional
+            - structure containing detailed request information.
+
+        Returns
+        -------
+        Details of the search keyword in the requested format.
+
+        Raises
+        ------
+        PyegeriaException
+
+        """
+        loop = asyncio.get_event_loop()
+        response = loop.run_until_complete(
+            self._async_find_search_keywords(search_string, start_from, page_size, output_format, report_spec, body)
+        )
+        return response
+
+    @dynamic_catch
     def _extract_comment_properties(self, element: dict, columns_struct: dict) -> dict:
         props = element.get('properties', {}) or {}
         normalized = {
@@ -3920,6 +4578,27 @@ class Client2(BaseClient):
         # col_data = overlay_additional_values(col_data, extra)
         return col_data
 
+    def _extract_element_properties_for_keyword(self, element: dict, columns_struct: dict) -> dict:
+        keyword_elements = None
+        keyword_elements = element["keywordElements"]
+        out_body = {}
+        keyword = element["properties"].get('keyword', '')
+        for el in keyword_elements:
+            element = el.get("relatedElement", {})
+            element_guid = element['elementHeader']['guid']
+            element_type = element['elementHeader']['type']['typeName']
+            element_display_name = element['properties'].get('displayName',"")
+            element_description = element['properties'].get('description',"")
+            element_category = element['properties'].get('category',"")
+            out_body = {
+                "element_display_name": element_display_name,
+                "element_description": element_description,
+                "element_category": element_category,
+                "element_type": element_type,
+                "element_guid": element_guid,
+                "keyword": keyword
+            }
+        return out_body
 
     @dynamic_catch
     def _extract_feedback_properties(self, element: dict, columns_struct: dict) -> dict:
@@ -3932,10 +4611,15 @@ class Client2(BaseClient):
         col_data = populate_common_columns(element, columns_struct)
         columns_list = col_data.get('formats', {}).get('attributes', [])
         # Overlay extras (project roles) only where empty
-        # extra = self._extract_additional_project_properties(element, columns_struct)
-        # col_data = overlay_additional_values(col_data, extra)
+        keyword_elements = element.get("keywordElements", [])
+
+        if keyword_elements != [] and isinstance(element['keywordElements'], list):
+            extra = self._extract_element_properties_for_keyword(element, columns_struct)
+            col_data = overlay_additional_values(col_data, extra)
+
         return col_data
 
+    @dynamic_catch
     def _generate_feedback_output(self, elements: dict | list[dict], search_string: str,
                                   element_type_name: str | None,
                                   output_format: str = 'DICT',
@@ -3962,12 +4646,14 @@ class Client2(BaseClient):
             columns_struct=output_formats,
         )
 
+
     #
     # Helper functions for requests
     #
 
+    @dynamic_catch
     def validate_new_element_request(self, body: dict | NewElementRequestBody,
-                                     prop: list[str]) -> NewElementRequestBody | None:
+                                     prop: list[str] = None) -> NewElementRequestBody | None:
         if isinstance(body, NewElementRequestBody):
             # if body.properties.class_ in prop:
             validated_body = body
@@ -3985,6 +4671,7 @@ class Client2(BaseClient):
             return None
         return validated_body
 
+    @dynamic_catch
     def validate_new_element_from_template_request(self, body: dict | TemplateRequestBody
                                                    ) -> NewElementRequestBody | None:
         if isinstance(body, TemplateRequestBody):
@@ -3997,37 +4684,37 @@ class Client2(BaseClient):
             return None
         return validated_body
 
+    @dynamic_catch
     def validate_new_relationship_request(self, body: dict | NewRelationshipRequestBody,
                                           prop: str = None) -> NewRelationshipRequestBody | None:
         if isinstance(body, NewRelationshipRequestBody):
-            if (prop and body.properties.class_ == prop) or (prop is None):
+            if (prop and body.properties.class_ in prop) or (prop is None):
                 validated_body = body
             else:
                 raise PyegeriaInvalidParameterException(additional_info=
                                                         {"reason": "unexpected property class name"})
-
         elif isinstance(body, dict):
-            if body.get("properties", {}).get("class", "") == prop:
+            if prop is None or body.get("properties", {}).get("class", "") == prop:
                 validated_body = self._new_relationship_request_adapter.validate_python(body)
             else:
                 raise PyegeriaInvalidParameterException(additional_info=
                                                         {"reason": "unexpected property class name"})
         else:
             return None
-
         return validated_body
 
+    @dynamic_catch
     def validate_new_classification_request(self, body: dict | NewClassificationRequestBody,
                                             prop: str = None) -> NewClassificationRequestBody | None:
         if isinstance(body, NewClassificationRequestBody):
-            if (prop and body.properties.class_ == prop) or (prop is None):
+            if (prop and body.properties.class_ in prop) or (prop is None):
                 validated_body = body
             else:
                 raise PyegeriaInvalidParameterException(additional_info=
                                                         {"reason": "unexpected property class name"})
 
         elif isinstance(body, dict):
-            if body.get("properties", {}).get("class", "") == prop:
+            if prop is None or body.get("properties", {}).get("class", "") == prop:
                 validated_body = self._new_classification_request_adapter.validate_python(body)
             else:
                 raise PyegeriaInvalidParameterException(additional_info=
@@ -4037,20 +4724,7 @@ class Client2(BaseClient):
 
         return validated_body
 
-    def validate_delete_request(self, body: dict | DeleteRequestBody,
-                                cascade_delete: bool = False) -> DeleteRequestBody | None:
-        if isinstance(body, DeleteRequestBody):
-            validated_body = body
-        elif isinstance(body, dict):
-            validated_body = self._delete_request_adapter.validate_python(body)
-        else:  # handle case where body not provided
-            body = {
-                "class": "DeleteRequestBody",
-                "cascadeDelete": cascade_delete
-            }
-            validated_body = DeleteRequestBody.model_validate(body)
-        return validated_body
-
+    @dynamic_catch
     def validate_delete_element_request(self, body: dict | DeleteElementRequestBody,
                                         cascade_delete: bool = False) -> DeleteElementRequestBody | None:
         if isinstance(body, DeleteElementRequestBody):
@@ -4065,6 +4739,7 @@ class Client2(BaseClient):
             validated_body = DeleteElementRequestBody.model_validate(body)
         return validated_body
 
+    @dynamic_catch
     def validate_delete_relationship_request(self, body: dict | DeleteRelationshipRequestBody,
                                              cascade_delete: bool = False) -> DeleteRelationshipRequestBody | None:
         if isinstance(body, DeleteRelationshipRequestBody):
@@ -4072,13 +4747,15 @@ class Client2(BaseClient):
         elif isinstance(body, dict):
             validated_body = self._delete_relationship_request_adapter.validate_python(body)
         else:  # handle case where body not provided
-            body = {
-                "class": "DeleteRelationshipRequestBody",
-                "cascadeDelete": cascade_delete
-            }
-            validated_body = DeleteRelationshipRequestBody.model_validate(body)
+            # body = {
+            #     "class": "DeleteRelationshipRequestBody",
+            #     "cascadeDelete": cascade_delete
+            # }
+            # validated_body = DeleteRelationshipRequestBody.model_validate(body)
+            return None
         return validated_body
 
+    @dynamic_catch
     def validate_delete_classification_request(self, body: dict | DeleteClassificationRequestBody,
                                                cascade_delete: bool = False) -> DeleteClassificationRequestBody | None:
         if isinstance(body, DeleteClassificationRequestBody):
@@ -4093,10 +4770,11 @@ class Client2(BaseClient):
             validated_body = DeleteClassificationRequestBody.model_validate(body)
         return validated_body
 
+    @dynamic_catch
     def validate_update_element_request(self, body: dict | UpdateElementRequestBody,
-                                        prop: list[str]) -> UpdateElementRequestBody | None:
+                                        prop: list[str] = None) -> UpdateElementRequestBody | None:
         if isinstance(body, UpdateElementRequestBody):
-            if body.properties.class_ in prop:
+            if prop is None or body.properties.class_ in prop:
                 validated_body = body
             else:
                 raise PyegeriaInvalidParameterException(additional_info=
@@ -4112,6 +4790,7 @@ class Client2(BaseClient):
             validated_body = None
         return validated_body
 
+    @dynamic_catch
     def validate_update_status_request(self, status: str = None, body: dict | UpdateStatusRequestBody = None,
                                        prop: list[str] = None) -> UpdateStatusRequestBody | None:
         if isinstance(body, UpdateStatusRequestBody):
@@ -4131,8 +4810,9 @@ class Client2(BaseClient):
 
         return validated_body
 
+    @dynamic_catch
     def validate_update_relationship_request(self, body: dict | UpdateRelationshipRequestBody,
-                                             prop: [str]) -> UpdateRelationshipRequestBody | None:
+                                             prop: [str] = None) -> UpdateRelationshipRequestBody | None:
         if isinstance(body, UpdateRelationshipRequestBody):
             # if body.properties.class_ == prop:
             validated_body = body
@@ -4150,6 +4830,7 @@ class Client2(BaseClient):
             validated_body = None
         return validated_body
 
+    @dynamic_catch
     async def _async_find_request(self, url: str, _type: str, _gen_output: Callable[..., Any],
                                   search_string: str = '*', classification_names: list[str] = None,
                                   metadata_element_types: list[str] = None,
@@ -4194,6 +4875,7 @@ class Client2(BaseClient):
                                output_format, report_spec)
         return elements
 
+    @dynamic_catch
     async def _async_get_name_request(self, url: str, _type: str, _gen_output: Callable[..., Any],
                                       filter_string: str, classification_names: list[str] = None,
                                       start_from: int = 0, page_size: int = 0, output_format: str = 'JSON',
@@ -4233,6 +4915,7 @@ class Client2(BaseClient):
                                output_format, report_spec)
         return elements
 
+    @dynamic_catch
     async def _async_get_guid_request(self, url: str, _type: str, _gen_output: Callable[..., Any],
                                       output_format: str = 'JSON', report_spec: str | dict = None,
                                       body: dict | GetRequestBody = None) -> Any:
@@ -4261,6 +4944,7 @@ class Client2(BaseClient):
             return _gen_output(elements, "GUID", _type, output_format, report_spec)
         return elements
 
+    @dynamic_catch
     async def _async_get_results_body_request(self, url: str, _type: str, _gen_output: Callable[..., Any],
                                               start_from: int = 0, page_size: int = 0, output_format: str = 'JSON',
                                               report_spec: str | dict = None,
@@ -4294,6 +4978,7 @@ class Client2(BaseClient):
                                output_format, report_spec)
         return elements
 
+    @dynamic_catch
     async def _async_get_level_identifier_query_body_request(self, url: str, _gen_output: Callable[..., Any],
                                                              output_format: str = 'JSON',
                                                              report_spec: str | dict = None,
@@ -4322,7 +5007,8 @@ class Client2(BaseClient):
                                output_format, report_spec)
         return elements
 
-    async def _async_create_element_body_request(self, url: str, prop: list[str],
+    @dynamic_catch
+    async def _async_create_element_body_request(self, url: str, prop: list[str] = None,
                                                  body: dict | NewElementRequestBody = None) -> str:
         validated_body = self.validate_new_element_request(body, prop)
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
@@ -4331,6 +5017,7 @@ class Client2(BaseClient):
         logger.info(response.json())
         return response.json().get("guid", "NO_GUID_RETURNED")
 
+    @dynamic_catch
     async def _async_create_element_from_template(self, url: str, body: dict | TemplateRequestBody = None) -> str:
         validated_body = self.validate_new_element_from_template_request(body)
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
@@ -4339,7 +5026,8 @@ class Client2(BaseClient):
         logger.info(response.json())
         return response.json().get("guid", "NO_GUID_RETURNED")
 
-    async def _async_update_element_body_request(self, url: str, prop: list[str],
+    @dynamic_catch
+    async def _async_update_element_body_request(self, url: str, prop: list[str] = None,
                                                  body: dict | UpdateElementRequestBody = None) -> None:
         validated_body = self.validate_update_element_request(body, prop)
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
@@ -4347,6 +5035,7 @@ class Client2(BaseClient):
         response = await self._async_make_request("POST", url, json_body)
         logger.info(response.json())
 
+    @dynamic_catch
     async def _async_update_status_request(self, url: str, status: str = None,
                                            body: dict | UpdateStatusRequestBody = None) -> None:
         validated_body = self.validate_update_status_request(status, body)
@@ -4355,7 +5044,8 @@ class Client2(BaseClient):
         response = await self._async_make_request("POST", url, json_body)
         logger.info(response.json())
 
-    async def _async_new_relationship_request(self, url: str, prop: list[str],
+    @dynamic_catch
+    async def _async_new_relationship_request(self, url: str, prop: list[str] = None,
                                               body: dict | NewRelationshipRequestBody = None) -> None:
         validated_body = self.validate_new_relationship_request(body, prop)
         if validated_body:
@@ -4365,8 +5055,9 @@ class Client2(BaseClient):
         else:
             await self._async_make_request("POST", url)
 
-    async def _async_new_classification_request(self, url: str, prop: str,
-                                                body: dict | NewRelationshipRequestBody = None) -> None:
+    @dynamic_catch
+    async def _async_new_classification_request(self, url: str, prop: list[str] = None,
+                                                body: dict | NewClassificationRequestBody = None) -> None:
         validated_body = self.validate_new_classification_request(body, prop)
         if validated_body:
             json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
@@ -4375,16 +5066,7 @@ class Client2(BaseClient):
         else:
             await self._async_make_request("POST", url)
 
-    async def _async_delete_request(self, url: str, body: dict | DeleteRequestBody = None,
-                                    cascade_delete: bool = False) -> None:
-        validated_body = self.validate_delete_request(body, cascade_delete)
-        if validated_body:
-            json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
-            logger.info(json_body)
-            await self._async_make_request("POST", url, json_body)
-        else:
-            await self._async_make_request("POST", url)
-
+    @dynamic_catch
     async def _async_delete_element_request(self, url: str, body: dict | DeleteElementRequestBody = None,
                                             cascade_delete: bool = False) -> None:
         validated_body = self.validate_delete_element_request(body, cascade_delete)
@@ -4395,9 +5077,10 @@ class Client2(BaseClient):
         else:
             await self._async_make_request("POST", url)
 
+    @dynamic_catch
     async def _async_delete_relationship_request(self, url: str, body: dict | DeleteRelationshipRequestBody = None,
                                                  cascade_delete: bool = False) -> None:
-        validated_body = self.validate_delete_relationshp_request(body, cascade_delete)
+        validated_body = self.validate_delete_relationship_request(body, cascade_delete)
         if validated_body:
             json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
             logger.info(json_body)
@@ -4405,6 +5088,7 @@ class Client2(BaseClient):
         else:
             await self._async_make_request("POST", url)
 
+    @dynamic_catch
     async def _async_delete_classification_request(self, url: str, body: dict | DeleteClassificationRequestBody = None,
                                                    cascade_delete: bool = False) -> None:
         validated_body = self.validate_delete_classification_request(body, cascade_delete)
@@ -4415,7 +5099,8 @@ class Client2(BaseClient):
         else:
             await self._async_make_request("POST", url)
 
-    async def _async_update_relationship_request(self, url: str, prop: str,
+    @dynamic_catch
+    async def _async_update_relationship_request(self, url: str, prop: list[str] = None,
                                                  body: dict | UpdateRelationshipRequestBody = None) -> None:
         validated_body = self.validate_update_relationship_request(body, prop)
         if validated_body: