Encryptors 2.46__tar.gz → 2.48__tar.gz

{encryptors-2.46 → encryptors-2.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.46
+Version: 2.48
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai

{encryptors-2.46 → encryptors-2.48}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 # ANDERSON ESTO YA SE SUBIO Y ESTA ESTABLE, AUN TE QUEDA PENDIENTE LA AUDITORIA CON RSA Y AES DE ACCESSTOKEN
 setup(
     name="Encryptors", 
-    version="2.46",
+    version="2.48",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",

{encryptors-2.46 → encryptors-2.48}/src/Encryptors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.46
+Version: 2.48
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai

{encryptors-2.46 → encryptors-2.48}/src/Encryptors.egg-info/SOURCES.txt

@@ -41,12 +41,13 @@ src/Osdental/Helpers/KeyVaultService.py
 src/Osdental/Helpers/ResponseDecryptor.py
 src/Osdental/Helpers/__init__.py
 src/Osdental/Http/APIClient.py
-src/Osdental/Http/_Exceptions.py
+src/Osdental/Http/_Helpers.py
 src/Osdental/Http/__init__.py
 src/Osdental/Messaging/AzureServiceBus.py
 src/Osdental/Messaging/Kafka.py
 src/Osdental/Messaging/RabbitMQ.py
 src/Osdental/Messaging/__init__.py
+src/Osdental/Models/ApiResponse.py
 src/Osdental/Models/AuditConfig.py
 src/Osdental/Models/Response.py
 src/Osdental/Models/Token.py

{encryptors-2.46 → encryptors-2.48}/src/Osdental/Exception/ControlledException.py

@@ -147,5 +147,14 @@ class InvalidFormatException(OSDException):
         message: str = Message.INVALID_FORMAT_MSG,
         error: str = None,
         status_code: str = Code.INVALID_FORMAT_CODE
+    ):
+        super().__init__(message=message, error=error, status_code=status_code)
+
+class HttpClientException(OSDException):
+    def __init__(
+        self, 
+        message: str = Message.EXTERNAL_API_ERROR_MESSAGE, 
+        error: str = None, 
+        status_code: str = Code.HTTP_ERROR_CODE
     ):
         super().__init__(message=message, error=error, status_code=status_code)

{encryptors-2.46 → encryptors-2.48}/src/Osdental/Graphql/_Helpers/_AuditHelper.py

@@ -48,13 +48,20 @@ class AuditHelper:
     @staticmethod
     def build_final_payload(
         _type: Literal["RESPONSE", "ERROR"],
-        status_code: Any,
+        status_code: int,
         result: Optional[Any] = None,
-        error: Optional[Any] = "*"
+        error: Optional[Any] = None
     ) -> Dict[str, Any]:
+
+        result = "*" if result is None else result
+        error = "*" if error is None else error
+
+        if isinstance(result, (dict, list)):
+            result = json.dumps(result)
+
         return {
             "type": _type,
             "httpResponseCode": status_code,
-            "messageOut": json.dumps(result) if isinstance(result, dict) else "*",
+            "messageOut": result,
             "errorProducer": error
         }

{encryptors-2.46 → encryptors-2.48}/src/Osdental/Helpers/AuditDispatcher.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Dict, Any
+from typing import Dict, Any, Optional
 from fastapi import Request
 from Osdental.Models.AuditConfig import AuditConfig
 from Osdental.Messaging import IMessageQueue
@@ -7,6 +7,7 @@ from Osdental.Graphql._Helpers._AuditHelper import AuditHelper
 from Osdental.Helpers.ResponseDecryptor import decryptor_data, VALID_TYPES
 from Osdental.Models._Audit import Audit
 from Osdental.Models.Response import Response
+from Osdental.Models.ApiResponse import ApiResponse
 from Osdental.Shared.Enums.Constant import Constant
 from Osdental.Shared.Logger import logger
 
@@ -39,8 +40,8 @@ class AuditDispatcher:
         self, 
         request: Request, 
         request_payload: Dict[str, Any], 
-        result: Response,
-        metadata: Dict[str, Any],
+        result: Response | ApiResponse,
+        metadata: Optional[Dict[str, Any]] = None,
         audit_type: str = None
     ):
         try:
@@ -77,10 +78,9 @@ class AuditDispatcher:
     async def _process(self, payload: Dict[str, Any]) -> None:
         request = payload["request"]
         request_payload = payload["request_payload"]
-        result: Response = payload["result"]
+        result: Response | ApiResponse = payload["result"]
         audit_type = payload["audit_type"]
-        metadata = payload["metadata"]
-
+        
         operation_name = request_payload.get("operation_name")
         if operation_name == 'UnknownOperation':
             logger.info("Skipping audit: no data in GraphQL response")
@@ -101,10 +101,6 @@ class AuditDispatcher:
         data = result.data
         error = result.error if result.error else message
 
-        # Obtencion de campos adicionales cuando es otro tipo de encriptacion o clave
-        encryption_type = result.encryption_type
-        decrypted_key = metadata.get("decrypted_key")
-
         if audit_type == Constant.MESSAGE_LOG_INTERNAL:
 
             ERROR_PREFIXES = ("DB_ERROR", "DB_WARNING")
@@ -128,8 +124,13 @@ class AuditDispatcher:
             audit_message = request_audit_payload | payload
 
         else:
-            if encryption_type in VALID_TYPES and decrypted_key and data:
-                data = decryptor_data(encryption_type, decrypted_key, data)
+            if isinstance(result, Response):
+                metadata = payload["metadata"]
+                encryption_type = result.encryption_type
+                decrypted_key = metadata.get("decrypted_key")
+            
+                if encryption_type in VALID_TYPES and decrypted_key and data:
+                    data = decryptor_data(encryption_type, decrypted_key, data)
 
             payload = AuditHelper.build_final_payload(
                 _type="RESPONSE",

{encryptors-2.46 → encryptors-2.48}/src/Osdental/Http/APIClient.py

@@ -1,10 +1,11 @@
 import httpx
 from typing import Optional, Dict, Any
 from Osdental.Decorators.Retry import rest_retry
-from Osdental.Rest.Context.RequestContext import current_context
-from Osdental.Models.Response import Response
-from Osdental.Http._Exceptions import HttpClientException
-from Osdental.Shared.Enums.Constant import Constant
+from Osdental.Http._Helpers import (
+    audit_success, audit_http_error, audit_exception_error,
+    audit_unknown_error, audit_graphql_error
+)
+from Osdental.Exception.ControlledException import HttpClientException
 from Osdental.Shared.Logger import logger
 
 class APIClient:
@@ -37,33 +38,15 @@ class APIClient:
                 **kwargs
             )
 
-            ctx = current_context.get()
-
-            if ctx and ctx.request:
-                request = ctx.request
-
-                dispatcher = request.app.state.audit_dispatcher
-                dispatcher.dispatch(
-                    request=request,
-                    request_payload={
-                        "operation_name": "ExternalAPI",
-                        "query": url,
-                        "variables": kwargs.get("json") or kwargs.get("params")
-                    },
-                    result=Response(
-                        status=response.status_code,
-                        message="External API",
-                        data=response.text
-                    ),
-                    audit_type=Constant.MESSAGE_LOG_EXTERNAL
-                )
-
             response.raise_for_status()
 
+            audit_success(response, method, url, kwargs)
+
             return response
 
         except httpx.HTTPStatusError as exc:
-
+            
+            audit_http_error(exc.response, method, url, kwargs)
             raise HttpClientException(
                 status_code=exc.response.status_code,
                 message=exc.response.text
@@ -71,11 +54,17 @@ class APIClient:
         
         except httpx.RequestError as exc:
 
+            audit_exception_error(exc, method, url, kwargs)
             raise HttpClientException(
                 status_code=0,
                 message=str(exc)
             ) from exc
         
+        except Exception as exc:
+
+            audit_unknown_error(exc, method, url, kwargs)
+
+            raise
     
     async def request(
         self,
@@ -131,6 +120,7 @@ class APIClient:
                 f"GraphQL error: {data['errors']}"
             )
 
+            audit_graphql_error(data["errors"], url, payload)
             raise HttpClientException(
                 message="GraphQL execution failed",
                 error=str(data["errors"])

encryptors-2.48/src/Osdental/Http/_Helpers.py

@@ -0,0 +1,122 @@
+from Osdental.Rest.Context.RequestContext import current_context
+from Osdental.Models.ApiResponse import ApiResponse
+from Osdental.Shared.Enums.Constant import Constant
+from Osdental.Shared.Logger import logger
+
+"""
+    Helpers to control external API audit logging.
+"""
+
+def _get_dispatcher():
+    try:
+        ctx = current_context.get()
+        if ctx and ctx.request:
+            return ctx.request, ctx.request.app.state.audit_dispatcher
+    except Exception:
+        return None, None
+    return None, None
+
+def _safe_dispatch(**kwargs):
+    try:
+        _, dispatcher = _get_dispatcher()
+        if dispatcher:
+            dispatcher.dispatch(**kwargs)
+    except Exception as e:
+        logger.error(f"Audit error: {str(e)}")
+
+def _build_payload(method, url, kwargs):
+    return {
+        "operation_name": "ExternalAPI",
+        "method": method,
+        "query": url,
+        "variables": kwargs.get("json") or kwargs.get("params")
+    }
+
+# ✅ Success
+def audit_success(response, method, url, kwargs):
+    request, _ = _get_dispatcher()
+    if not request:
+        return
+    
+    _safe_dispatch(
+        request=request,
+        request_payload=_build_payload(method, url, kwargs),
+        result=ApiResponse(
+            status=response.status_code,
+            message="External API SUCCESS",
+            data=response.text
+        ),
+        audit_type=Constant.MESSAGE_LOG_EXTERNAL
+    )
+
+# ❌ HTTP Error
+def audit_http_error(response, method, url, kwargs):
+    request, _ = _get_dispatcher()
+    if not request:
+        return
+    
+    _safe_dispatch(
+        request=request,
+        request_payload=_build_payload(method, url, kwargs),
+        result=ApiResponse(
+            status=response.status_code,
+            message="External API ERROR",
+            error=response.text
+        ),
+        audit_type=Constant.MESSAGE_LOG_EXTERNAL
+    )
+
+# ❌ Network Error
+def audit_exception_error(exc, method, url, kwargs):
+    request, _ = _get_dispatcher()
+    if not request:
+        return
+    
+    _safe_dispatch(
+        request=request,
+        request_payload=_build_payload(method, url, kwargs),
+        result=ApiResponse(
+            status=0,
+            message="External API NETWORK ERROR",
+            error=str(exc)
+        ),
+        audit_type=Constant.MESSAGE_LOG_EXTERNAL
+    )
+
+# ❌ Unknown Error
+def audit_unknown_error(exc, method, url, kwargs):
+    request, _ = _get_dispatcher()
+    if not request:
+        return
+    
+    _safe_dispatch(
+        request=request,
+        request_payload=_build_payload(method, url, kwargs),
+        result=ApiResponse(
+            status=0,
+            message="External API UNKNOWN ERROR",
+            error=str(exc)
+        ),
+        audit_type=Constant.MESSAGE_LOG_EXTERNAL
+    )
+
+# ❌ GraphQL Error
+def audit_graphql_error(errors, url, payload):
+    request, _ = _get_dispatcher()
+    if not request:
+        return
+    
+    _safe_dispatch(
+        request=request,
+        request_payload={
+            "operation_name": "GraphQL",
+            "query": url,
+            "variables": payload
+        },
+        result=ApiResponse(
+            status=400,
+            message="GraphQL ERROR",
+            error=str(errors)
+        ),
+        audit_type=Constant.MESSAGE_LOG_EXTERNAL
+    )

encryptors-2.48/src/Osdental/Models/ApiResponse.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass, field, asdict
+from typing import Any, Optional
+from Osdental.Shared.Enums.Code import Code
+from Osdental.Shared.Enums.Message import Message
+
+@dataclass
+class ApiResponse:
+    status: Any = field(default=Code.PROCESS_SUCCESS_CODE)
+    message: str = field(default=Message.PROCESS_SUCCESS_MSG)
+    data: Optional[Any] = None
+    error: Optional[str] = None
+
+    def send(self):
+        api_response = asdict(self)
+
+        if api_response["error"] is None:
+            api_response.pop("error")

encryptors-2.48/src/Osdental/Shared/Enums/Message.py

@@ -0,0 +1,40 @@
+from enum import StrEnum
+
+class Message(StrEnum):
+    ACCESS_DENIED_MSG = "You do not have the necessary privileges for this operation."
+    UNEXPECTED_ERROR_MSG = "Something went wrong while processing your request. Please try again later."
+    PORTAL_ACCESS_RESTRICTED_MSG = "You are not authorized to access this portal."
+    PROCESS_SUCCESS_MSG = "Process executed successfully."
+    NO_RESULTS_FOUND_MSG = "No records were found matching your request."
+    INVALID_REQUEST_PARAMS_MSG = "Please review the required fields and try again."
+    SERVER_NETWORK_ACCESS_ERROR_MSG = "Error making the server accessible on the network."
+    HEXAGONAL_SERVICE_CREATED_MSG = "The hexagonal service structure was created."
+    PYCACHE_CLEANUP_SUCCESS_MSG = "All __pycache__ have been removed."
+    NO_PASSWORD_CHARACTERS_MSG = "There are no characters available to generate the password."
+    INSUFFICIENT_LENGTH_MSG = "Insufficient length to meet minimum rules."
+    LEGACY_NAME_REQUIRED_MSG = "Legacy name cannot be empty."
+    REFRESH_TOKEN_EXP_REQUIRED_MSG = "Refresh token expiration time cannot be empty."
+    ACCESS_TOKEN_EXP_REQUIRED_MSG = "Access token expiration time cannot be empty."
+    PUBLIC_KEY2_REQUIRED_MSG = "Public key 2 cannot be empty."
+    PRIVATE_KEY1_REQUIRED_MSG = "Private key 1 cannot be empty."
+    PRIVATE_KEY2_REQUIRED_MSG = "Private key 2 cannot be empty."
+    AES_KEY_USER_REQUIRED_MSG = "AES key user cannot be empty."
+    AES_KEY_AUTH_REQUIRED_MSG = "AES key auth cannot be empty."
+    MISSING_FIELD_ERROR_MSG = "A required field is missing. Please review the data."
+    EXP_TIME_REQUIRED = "Expiration time (cdata integration) cannot be empty or null"
+    KEY_PRIVATE_REQUIRED = "Key private cannot be empty or null"
+    SUB_ACCOUNT_REQUIRED = "Sub account parameter is required"
+    CATALOG_DATA_CREDENTIALS_MISSED = "Catalog data or/and data credentials not found"
+    PROFILE_PERMISSION_DENIED_MSG = "Your profile does not have permission to perform this action."
+    INVALID_FORMAT_MSG = "The provided data format is invalid."
+    INVALID_AES_JSON_FORMAT_MSG = "Invalid JSON format in AES decrypted data."
+    UNEXPECTED_DECRYPTED_DATA_FORMAT_MSG = "Unexpected format in decrypted data."
+    REDIS_CLEANUP_SUCCESS_MSG = "Redis cleanup completed successfully."
+    REDIS_CLEANUP_ERROR_MSG = "An error occurred while attempting to clean up Redis."
+    DATABASE_EXECUTION_ERROR_MSG = "An unexpected error occurred while executing a database operation."
+    DATABASE_INTEGRITY_ERROR_MSG = "A database integrity constraint was violated during execution."
+    QUERY_NOT_PROVIDED_MSG = "Query not provided. Please include a valid query in your request."
+    FILE_PATH_NOT_PROVIDED_MSG = "File path not provided."
+    PROTO_FILES_GENERATED_MSG = "Proto files have been successfully generated."
+    ERROR_INVALID_DATA_TYPE = "Invalid data type: expected dict, str, or list."
+    EXTERNAL_API_ERROR_MESSAGE = "An error occurred while consuming an external API."

encryptors-2.46/src/Osdental/Http/_Exceptions.py

@@ -1,12 +0,0 @@
-from Osdental.Exception.ControlledException import OSDException
-from Osdental.Shared.Enums.Code import Code
-from Osdental.Shared.Enums.Message import Message
-
-class HttpClientException(OSDException):
-    def __init__(
-        self, 
-        message: str = Message.UNEXPECTED_ERROR_MSG, 
-        error: str = None, 
-        status_code: str = Code.HTTP_ERROR_CODE
-    ):
-        super().__init__(message=message, error=error, status_code=status_code)

encryptors-2.46/src/Osdental/Shared/Enums/Message.py

@@ -1,39 +0,0 @@
-from enum import StrEnum
-
-class Message(StrEnum):
-    ACCESS_DENIED_MSG = "You do not have the necessary privileges for this operation."
-    UNEXPECTED_ERROR_MSG = 'Something went wrong while processing your request. Please try again later.'
-    PORTAL_ACCESS_RESTRICTED_MSG = 'You are not authorized to access this portal.'
-    PROCESS_SUCCESS_MSG = 'Process executed successfully.'
-    NO_RESULTS_FOUND_MSG = 'No records were found matching your request.'
-    INVALID_REQUEST_PARAMS_MSG = 'Please review the required fields and try again.'
-    SERVER_NETWORK_ACCESS_ERROR_MSG = 'Error making the server accessible on the network.'
-    HEXAGONAL_SERVICE_CREATED_MSG = 'The hexagonal service structure was created.'
-    PYCACHE_CLEANUP_SUCCESS_MSG = 'All __pycache__ have been removed.'
-    NO_PASSWORD_CHARACTERS_MSG = 'There are no characters available to generate the password.'
-    INSUFFICIENT_LENGTH_MSG = 'Insufficient length to meet minimum rules.'
-    LEGACY_NAME_REQUIRED_MSG = 'Legacy name cannot be empty.'
-    REFRESH_TOKEN_EXP_REQUIRED_MSG = 'Refresh token expiration time cannot be empty.'
-    ACCESS_TOKEN_EXP_REQUIRED_MSG = 'Access token expiration time cannot be empty.'
-    PUBLIC_KEY2_REQUIRED_MSG = 'Public key 2 cannot be empty.'
-    PRIVATE_KEY1_REQUIRED_MSG = 'Private key 1 cannot be empty.'
-    PRIVATE_KEY2_REQUIRED_MSG = 'Private key 2 cannot be empty.'
-    AES_KEY_USER_REQUIRED_MSG = 'AES key user cannot be empty.'
-    AES_KEY_AUTH_REQUIRED_MSG = 'AES key auth cannot be empty.'
-    MISSING_FIELD_ERROR_MSG = 'A required field is missing. Please review the data.'
-    EXP_TIME_REQUIRED = 'Expiration time (cdata integration) cannot be empty or null'
-    KEY_PRIVATE_REQUIRED = 'Key private cannot be empty or null'
-    SUB_ACCOUNT_REQUIRED = 'Sub account parameter is required'
-    CATALOG_DATA_CREDENTIALS_MISSED = 'Catalog data or/and data credentials not found'
-    PROFILE_PERMISSION_DENIED_MSG = 'Your profile does not have permission to perform this action.'
-    INVALID_FORMAT_MSG = 'The provided data format is invalid.'
-    INVALID_AES_JSON_FORMAT_MSG = 'Invalid JSON format in AES decrypted data.'
-    UNEXPECTED_DECRYPTED_DATA_FORMAT_MSG = 'Unexpected format in decrypted data.'
-    REDIS_CLEANUP_SUCCESS_MSG = 'Redis cleanup completed successfully.'
-    REDIS_CLEANUP_ERROR_MSG = 'An error occurred while attempting to clean up Redis.'
-    DATABASE_EXECUTION_ERROR_MSG = 'An unexpected error occurred while executing a database operation.'
-    DATABASE_INTEGRITY_ERROR_MSG = 'A database integrity constraint was violated during execution.'
-    QUERY_NOT_PROVIDED_MSG = 'Query not provided. Please include a valid query in your request.'
-    FILE_PATH_NOT_PROVIDED_MSG = 'File path not provided.'
-    PROTO_FILES_GENERATED_MSG = 'Proto files have been successfully generated.'
-    ERROR_INVALID_DATA_TYPE = 'Invalid data type: expected dict, str, or list.'