pyegeria 5.4.0.28__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

pyegeria/core/utils.py

@@ -0,0 +1,405 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+General utility functions in support of the Egeria Python Client package.
+
+"""
+
+from loguru import logger
+from rich import print, print_json
+from rich.console import Console
+from pyegeria.core.config import settings as app_settings
+from typing import Callable, TypeVar
+
+T = TypeVar('T', bound=Callable)
+
+console = Console(width=200)
+
+def init_log():
+    pass
+
+def print_rest_request_body(body):
+    """
+
+    Args:
+        body:
+    """
+    pretty_body = json.dumps(body, indent=4)
+    print_json(pretty_body, indent=4, sort_keys=True)
+
+
+def print_rest_response(response):
+    """
+
+    Args:
+        response:
+    """
+    print("Returns:")
+    pretty_body = json.dumps(response, indent=4)
+    print_json(pretty_body, indent=4, sort_keys=True)
+
+
+def print_guid_list(guids):
+    """Print a list of guids"""
+    if guids is None:
+        print("No assets created")
+    else:
+        pretty_guids = json.dumps(guids, indent=4)
+        print_json(pretty_guids, indent=4, sort_keys=True)
+
+
+#
+# OCF Common services
+# Working with assets - this set of functions displays assets returned from the open metadata repositories.
+#
+
+
+
+
+def body_slimmer(body: dict) -> dict:
+    """body_slimmer is a little function to remove unused keys from a dict
+    and recursively slim embedded dicts
+
+    Parameters
+    ----------
+    body : the dictionary that you want to slim
+
+    Returns
+    -------
+    dict:
+        a slimmed body with all embedded dictionaries also slimmed
+    """
+    if body is None:
+        return {}
+
+    slimmed = {}
+    for key, value in body.items():
+        if value and not isinstance(value, tuple):
+            if isinstance(value, dict):
+                # Recursively slim embedded dictionaries
+                slimmed_value = body_slimmer(value)
+                if slimmed_value:  # Only include non-empty dictionaries
+                    slimmed[key] = slimmed_value
+            else:
+                slimmed[key] = value
+    return slimmed
+
+
+def camel_to_title_case(input_string):
+    # Add a space before uppercase letters and capitalize each word
+    result = re.sub(r'([a-z])([A-Z])', r'\1 \2', input_string).title()
+    return result
+
+
+def to_camel_case(input_string):
+    """Convert an input string to camelCase, singularizing if plural.
+    
+    This function takes an input string, converts it to singular form if it's plural,
+    and then transforms it to camelCase format (first word lowercase, subsequent words
+    capitalized with no spaces).
+    
+    Parameters
+    ----------
+    input_string : str
+        The string to convert to camelCase
+        
+    Returns
+    -------
+    str:
+        The input string converted to camelCase, after singularization if needed
+        
+    Examples
+    --------
+    >>> to_camel_case("data categories")
+    'dataCategory'
+    >>> to_camel_case("business terms")
+    'businessTerm'
+    >>> to_camel_case("glossary categories")
+    'glossaryCategory'
+    """
+    if not input_string:
+        return ""
+    
+    # Convert to lowercase for consistent processing
+    lowercase_input = input_string.lower()
+    
+    # First, convert to singular if plural
+    singular = lowercase_input
+    
+    # Handle common plural endings
+    if singular.endswith('ies'):
+        singular = singular[:-3] + 'y'
+    elif singular.endswith('es'):
+        # Special cases like 'classes' -> 'class'
+        if singular.endswith('sses') or singular.endswith('ches') or singular.endswith('shes') or singular.endswith('xes'):
+            singular = singular[:-2]
+        else:
+            singular = singular[:-1]
+    elif singular.endswith('s') and not singular.endswith('ss'):
+        singular = singular[:-1]
+    
+    # Split the string into words and convert to camelCase
+    words = singular.split()
+    if not words:
+        return ""
+    
+    # First word is lowercase, rest are capitalized
+    result = words[0]
+    for word in words[1:]:
+        result += word.capitalize()
+    
+    return result
+
+def to_pascal_case(input_string)->str:
+    """
+        Convert input string to PascalCase, singularizing if plural.
+    Args:
+        input_string ():
+
+    Returns:
+        transformed string
+    """
+    result = to_camel_case(input_string)
+    output_string = result[0].upper() + result[1:]
+    return output_string
+
+def flatten_dict_to_string(d: dict) -> str:
+    """Flatten a dictionary into a string and replace quotes with backticks."""
+    try:
+        flat_string = ", ".join(
+            # Change replace(\"'\", '`') to replace("'", '`')
+            f"{key}=`{str(value).replace('\"', '`').replace("'", '`')}`"
+            for key, value in d.items()
+        )
+        return flat_string
+    except Exception as e:
+        # Corrected syntax for exception chaining
+        raise Exception("Error flattening dictionary") from e
+# The decorator logic, which applies @logger.catch dynamically
+
+def dict_to_markdown_list(data: dict, level: int = 0) -> str:
+    """
+    Recursively converts a dictionary into a nested markdown bullet list string.
+
+    Args:
+        data (dict): The dictionary to convert.
+        level (int): The current indentation level (default is 0).
+
+    Returns:
+        str: The markdown formatted string.
+    """
+    markdown_str = ""
+    # Standard markdown indent is often 2 or 4 spaces. Using 2 for compactness in recursion.
+    indent = "  " * level
+
+    for key, value in data.items():
+        if isinstance(value, dict):
+            markdown_str += f"{indent}* **{key}**:\n{dict_to_markdown_list(value, level + 1)}"
+        elif isinstance(value, list):
+            markdown_str += f"{indent}* **{key}**:\n"
+            for item in value:
+                if isinstance(item, dict):
+                    markdown_str += f"{indent}  * \n{dict_to_markdown_list(item, level + 2)}"
+                else:
+                    markdown_str += f"{indent}  * {item}\n"
+        else:
+            markdown_str += f"{indent}* **{key}**: {value}\n"
+
+    return markdown_str
+
+
+import csv
+import io
+from typing import Dict, Any
+
+
+def transform_json_to_tabular(json_data: Dict[str, Any], output_format: str = 'rich'):
+    """
+    Transforms Egeria TabularDataSetReportResponse JSON to CSV, Rich table, or Markdown table (LIST).
+
+    :param json_data: The JSON data as a dictionary.
+    :param output_format: 'CSV', 'RICH-TABLE', or 'LIST'.
+    """
+    report = json_data.json().get('tabularDataSetReport')
+    if not report:
+        print("No tabularDataSetReport found in JSON.")
+        return
+
+    column_descriptions = report.get('columnDescriptions', [])
+    headers = [col.get('columnName') for col in column_descriptions]
+    data_records = report.get('dataRecords', {})
+
+    # Sort keys to ensure correct order if they are numeric strings
+    sorted_record_keys = sorted(data_records.keys(), key=lambda x: int(x))
+    rows = [data_records[key] for key in sorted_record_keys]
+
+    if output_format == 'CSV':
+        output = io.StringIO()
+        writer = csv.writer(output)
+        writer.writerow(headers)
+        writer.writerows(rows)
+        print(output.getvalue())
+    elif output_format == 'RICH-TABLE':
+        try:
+            from rich.console import Console
+            from rich.table import Table
+
+            console = Console()
+            table = Table(title=report.get('tableName', 'Report'))
+
+            for header in headers:
+                table.add_column(header)
+
+            for row in rows:
+                # Convert all items to string for Rich
+                str_row = [str(item) if item is not None else "" for item in row]
+                table.add_row(*str_row)
+
+            console.print(table)
+        except ImportError:
+            print("Rich library not installed. Defaulting to simple text output.")
+            print(f"Headers: {headers}")
+            for row in rows:
+                print(row)
+    elif output_format == 'LIST':
+        # Generate a markdown table
+        markdown_output = f"### {report.get('tableName', 'Report')}\n\n"
+        markdown_output += "| " + " | ".join(headers) + " |\n"
+        markdown_output += "| " + " | ".join(["---"] * len(headers)) + " |\n"
+        for row in rows:
+            str_row = [str(item) if item is not None else "" for item in row]
+            markdown_output += "| " + " | ".join(str_row) + " |\n"
+        print(markdown_output)
+    else:
+        print(f"Unknown output format: {output_format}")
+
+
+# Example usage:
+# with open('path/to/your/file.json', 'r') as f:
+#     data = json.load(f)
+#     transform_json_to_tabular(data, 'CSV') # or 'RICH-TABLE' or 'LIST'
+
+import json
+import re
+
+
+# def parse_to_dict(input_str: str):
+#     """
+#     Check if a string is valid JSON or a name:value list without braces and convert to a dictionary.
+#
+#     Args:
+#         input_str: The input string to parse.
+#
+#     Returns:
+#         dict: A dictionary converted from the input string.
+#         None: If the input is neither valid JSON nor a valid name:value list.
+#     """
+#
+#     if input_str is None:
+#         return None
+#
+#     # Check if the input string is valid JSON
+#     try:
+#         result = json.loads(input_str)
+#         if isinstance(result, dict):  # Ensure it's a dictionary
+#             return result
+#     except json.JSONDecodeError:
+#         pass
+#
+#     # Check if input string looks like a name:value list
+#     # Supports both comma and newline as separators
+#     pattern = r'^(\s*("[^"]+"|\'[^\']+\'|[a-zA-Z0-9_-]+)\s*:\s*("[^"]+"|\'[^\']+\'|[a-zA-Z0-9 _-]*)\s*)' \
+#               r'(\s*[,|\n]\s*("[^"]+"|\'[^\']+\'|[a-zA-Z0-9_-]+)\s*:\s*("[^"]+"|\'[^\']+\'|[a-zA-Z0-9 _-]*)\s*)*$'
+#     if re.match(pattern, input_str.strip()):
+#         try:
+#             # Split by ',' or '\n' and process key-value pairs
+#             pairs = [pair.split(":", 1) for pair in re.split(r'[,|\n]+', input_str.strip())]
+#             return {key.strip().strip('\'"'): value.strip().strip('\'"') for key, value in pairs}
+#         except Exception:
+#             return None
+#
+#     # If neither pattern matches, return None
+#     return None
+
+
+def parse_to_dict(input_str: str) -> dict | None:
+    """
+    Parse input strings into a dictionary, handling both JSON and key-value pairs.
+    Recovers from malformed JSON (e.g., where commas are missing between key-value pairs)
+    and supports multiline values.
+
+    Args:
+        input_str (str): The input string to parse.
+
+    Returns:
+        dict: A parsed dictionary if validation is successful, or None if the string cannot be parsed.
+    """
+    if not input_str:
+        return None
+
+    # Attempt to parse valid JSON
+    try:
+        result = json.loads(input_str)
+        if isinstance(result, dict):
+            return result
+    except json.JSONDecodeError:
+        pass
+
+    # Fix malformed JSON or attempt alternate parsing for "key: value" patterns
+    try:
+        # Step 1: Inject missing commas where they are omitted between key-value pairs
+        fixed_input = re.sub(
+            r'("\s*:[^,}\n]+)\s*("(?![:,}\n]))',  # Find missing commas (key-value-value sequences)
+            r'\1,\2',  # Add a comma between the values
+            input_str
+        )
+
+        # Attempt to parse the fixed string as JSON
+        try:
+            result = json.loads(fixed_input)
+            if isinstance(result, dict):
+                return result
+        except json.JSONDecodeError:
+            pass
+
+        # Step 2: Handle key-value format fallback (supports multiline strings)
+        # Matches `key: value` pairs, including multiline quoted values
+        key_value_pattern = re.compile(r'''
+            (?:"([^"]+)"|'([^']+)'|([a-zA-Z0-9_-]+))  # Key: quoted "key", 'key', or unquoted key
+            \s*:\s*                                   # Key-value separator
+            (?:"((?:\\.|[^"\\])*?)"|'((?:\\.|[^'\\])*?)'|([^\n,]+))  # Value: quoted or unquoted
+        ''', re.VERBOSE | re.DOTALL)
+
+        matches = key_value_pattern.findall(input_str)
+
+        # Build dictionary from matches
+        result_dict = {}
+        for match in matches:
+            key = next((group for group in match[:3] if group), "").strip()
+            value = next((group for group in match[3:] if group), "").strip()
+            result_dict[key] = value
+
+        if result_dict:
+            return result_dict
+    except Exception as e:
+        # Log or handle parsing exception if needed
+        pass
+
+    # If all parsing attempts fail, return None
+    return None
+
+
+def dynamic_catch(func: T) -> T:
+    if app_settings.get("enable_logger_catchh", False):
+        return logger.catch(func)  # Apply the logger.catch decorator
+    else:
+        return func  # Return the function unwrapped
+
+def make_format_set_name_from_type(obj_type: str)-> str:
+    formatted_name = obj_type.replace(" ", "-")
+    return f"{formatted_name}-DrE"
+
+
+if __name__ == "__main__":
+    print("Main-Utils")

pyegeria/{_client.py → deprecated/_client.py}

@@ -11,21 +11,20 @@ import asyncio
 import inspect
 import json
 import os
-import re
 from datetime import datetime
 
 import httpx
 from httpx import AsyncClient, Response
 
-from pyegeria.utils import body_slimmer
-from pyegeria._exceptions import (
+from pyegeria.core.utils import body_slimmer
+from pyegeria.core._exceptions import (
     InvalidParameterException,
     OMAGCommonErrorCode,
     PropertyServerException,
     UserNotAuthorizedException,
 )
-from pyegeria._globals import enable_ssl_check, max_paging_size, NO_ELEMENTS_FOUND
-from pyegeria._validators import (
+from pyegeria.core._globals import enable_ssl_check, max_paging_size, NO_ELEMENTS_FOUND
+from pyegeria.core._validators import (
     is_json,
     validate_name,
     validate_server_name,
@@ -180,9 +179,9 @@ class Client:
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
           If the client passes incorrect parameters on the request - such as bad URLs or invalid values
-        PropertyServerException
+        PyegeriaAPIException
           Raised by the server when an issue arises in processing a valid request
         NotAuthorizedException
           The principle specified by the user_id does not have authorization for the requested action
@@ -236,9 +235,9 @@ class Client:
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
           If the client passes incorrect parameters on the request - such as bad URLs or invalid values
-        PropertyServerException
+        PyegeriaAPIException
           Raised by the server when an issue arises in processing a valid request
         NotAuthorizedException
           The principle specified by the user_id does not have authorization for the requested action
@@ -262,7 +261,7 @@ class Client:
         This method is used to refresh the bearer token used for authentication with Egeria. It checks if the token
         source is 'Egeria', and if the user ID and password are valid. If all conditions are met, it calls the
         `create_egeria_bearer_token` method to create a new bearer token. Otherwise,
-        it raises an `InvalidParameterException`.
+        it raises an `PyegeriaInvalidParameterException`.
 
         Parameters:
 
@@ -270,7 +269,7 @@ class Client:
             None
 
         Raises:
-            InvalidParameterException: If the token source is invalid.
+            PyegeriaInvalidParameterException: If the token source is invalid.
         """
         if (
             (self.token_src == "Egeria")
@@ -291,7 +290,7 @@ class Client:
         This method is used to refresh the bearer token used for authentication with Egeria. It checks if the token
         source is 'Egeria', and if the user ID and password are valid. If all conditions are met, it calls the
         `create_egeria_bearer_token` method to create a new bearer token. Otherwise,
-        it raises an `InvalidParameterException`.
+        it raises an `PyegeriaInvalidParameterException`.
 
         Parameters:
 
@@ -299,8 +298,8 @@ class Client:
             None
 
         Raises:
-            InvalidParameterException: If the token source is invalid.
-            PropertyServerException
+            PyegeriaInvalidParameterException: If the token source is invalid.
+            PyegeriaAPIException
                 Raised by the server when an issue arises in processing a valid request
             NotAuthorizedException
                 The principle specified by the user_id does not have authorization for the requested action
@@ -323,9 +322,9 @@ class Client:
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
           If the client passes incorrect parameters on the request - such as bad URLs or invalid values
-        PropertyServerException
+        PyegeriaAPIException
           Raised by the server when an issue arises in processing a valid request
         NotAuthorizedException
           The principle specified by the user_id does not have authorization for the requested action
@@ -365,7 +364,7 @@ class Client:
     ) -> Response | str:
         """Make a request to the Egeria API - Async Version
         Function to make an API call via the self.session Library. Raise an exception if the HTTP response code
-        is not 200/201. IF there is a REST communication exception, raise InvalidParameterException.
+        is not 200/201. IF there is a REST communication exception, raise PyegeriaInvalidParameterException.
 
         :param request_type: Type of Request.
                Supported Values - GET, POST, (not PUT, PATCH, DELETE).
@@ -443,7 +442,7 @@ class Client:
                         {
                             "class": "VoidResponse",
                             "relatedHTTPCode": response.status_code,
-                            "exceptionClassName": "InvalidParameterException",
+                            "exceptionClassName": "PyegeriaInvalidParameterException",
                             "actionDescription": caller_method,
                             "exceptionErrorMessage": msg,
                             "exceptionErrorMessageId": OMAGCommonErrorCode.CLIENT_SIDE_REST_API_ERROR.value[
@@ -486,7 +485,7 @@ class Client:
                     {
                         "class": "VoidResponse",
                         "relatedHTTPCode": response.status_code,
-                        "exceptionClassName": "InvalidParameterException",
+                        "exceptionClassName": "PyegeriaInvalidParameterException",
                         "actionDescription": caller_method,
                         "exceptionErrorMessage": msg,
                         "exceptionErrorMessageId": OMAGCommonErrorCode.CLIENT_SIDE_REST_API_ERROR.value[
@@ -536,7 +535,7 @@ class Client:
                     {
                         "class": "VoidResponse",
                         "relatedHTTPCode": response.status_code,
-                        "exceptionClassName": "PropertyServerException",
+                        "exceptionClassName": "PyegeriaAPIException",
                         "actionDescription": caller_method,
                         "exceptionErrorMessage": msg,
                         "exceptionErrorMessageId": OMAGCommonErrorCode.CLIENT_SIDE_REST_API_ERROR.value[
@@ -595,7 +594,7 @@ class Client:
                 {
                     "class": "VoidResponse",
                     "relatedHTTPCode": 400,
-                    "exceptionClassName": "InvalidParameterException",
+                    "exceptionClassName": "PyegeriaInvalidParameterException",
                     "actionDescription": caller_method,
                     "exceptionErrorMessage": msg,
                     "exceptionErrorMessageId": OMAGCommonErrorCode.CLIENT_SIDE_REST_API_ERROR.value[
@@ -770,7 +769,7 @@ class Client:
         )
         return result
 
-    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None,
+    def __create_qualified_name__(self, type_name: 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."""
@@ -803,11 +802,11 @@ class Client:
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
         """
 

pyegeria/{_deprecated_gov_engine.py → deprecated/_deprecated_gov_engine.py}

@@ -78,7 +78,7 @@ class GovEng(Client):
             List[str]: A list of JSON representations of governance action processes matching the provided name.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note:
@@ -110,9 +110,9 @@ class GovEng(Client):
 
         Raises
         ------
-        InvalidParameterException
-        PropertyServerException
-        UserNotAuthorizedException
+        PyegeriaInvalidParameterException
+        PyegeriaAPIException
+        PyegeriaUnauthorizedException
         """
 
         url = self.engine_command_root + "/engine-actions/" + engine_action_guid
@@ -134,7 +134,7 @@ class GovEng(Client):
             List[str]: A list of JSON representations of governance action processes matching the provided name.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note:
@@ -165,7 +165,7 @@ class GovEng(Client):
             List[str]: A list of JSON representations of governance action processes matching the provided name.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note:
@@ -199,7 +199,7 @@ class GovEng(Client):
             List[str]: A list of JSON representations of governance action processes matching the provided name.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note:
@@ -229,10 +229,10 @@ class GovEng(Client):
             str: The JSON representation of the governance action process element.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
-            PropertyServerException: If the API response indicates a server side error.
-            UserNotAuthorizedException:
+            PyegeriaAPIException: If the API response indicates a server side error.
+            PyegeriaUnauthorizedException:
 
         Note:
             This method assumes that the provided GUID is valid and corresponds to an existing
@@ -263,7 +263,7 @@ class GovEng(Client):
             List[str]: A list of JSON representations of governance action processes matching the provided name.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note:
@@ -296,7 +296,7 @@ class GovEng(Client):
             List[str]: A list of JSON representations of governance action processes matching the provided name.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note:
@@ -353,9 +353,9 @@ class GovEng(Client):
 
         Raises
         ------
-        InvalidParameterException
-        PropertyServerException
-        UserNotAuthorizedException
+        PyegeriaInvalidParameterException
+        PyegeriaAPIException
+        PyegeriaUnauthorizedException
 
         """
         url = self.engine_command_root + "/governance-action-processes/initiate"
@@ -416,7 +416,7 @@ class GovEng(Client):
             str: The GUID (Globally Unique Identifier) of the initiated governance action.
 
         Raises:
-            InvalidParameterException: If the API response indicates an error (non-200 status code),
+            PyegeriaInvalidParameterException: If the API response indicates an error (non-200 status code),
             this exception is raised with details from the response content.
 
         Note: