Encryptors 2.51__tar.gz → 2.53__tar.gz

{encryptors-2.51 → encryptors-2.53}/PKG-INFO

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

{encryptors-2.51 → encryptors-2.53}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 # ANDERSON REVISAR EL CACHE LOCAL DEL KEYVAULT PARA VALIDAR SI FUNCIONA
 setup(
     name="Encryptors", 
-    version="2.51",
+    version="2.53",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",

{encryptors-2.51 → encryptors-2.53}/src/Encryptors.egg-info/PKG-INFO

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

{encryptors-2.51 → encryptors-2.53}/src/Encryptors.egg-info/SOURCES.txt

@@ -10,14 +10,15 @@ src/Osdental/__init__.py
 src/Osdental/Cache/Redis.py
 src/Osdental/Cache/__init__.py
 src/Osdental/Cli/__init__.py
+src/Osdental/Constants/Constant.py
+src/Osdental/Constants/Message.py
+src/Osdental/Constants/__init__.py
 src/Osdental/Database/BaseRepository.py
 src/Osdental/Database/Connection.py
 src/Osdental/Database/__init__.py
 src/Osdental/Decorators/Grpc.py
-src/Osdental/Decorators/PublicResolver.py
 src/Osdental/Decorators/Retry.py
 src/Osdental/Decorators/SecureResolver.py
-src/Osdental/Decorators/SqlDataNormalizer.py
 src/Osdental/Decorators/__init__.py
 src/Osdental/Encryptor/Aes.py
 src/Osdental/Encryptor/Argon2.py
@@ -26,6 +27,11 @@ src/Osdental/Encryptor/Jwt.py
 src/Osdental/Encryptor/Rsa.py
 src/Osdental/Encryptor/Sha512.py
 src/Osdental/Encryptor/__init__.py
+src/Osdental/Enums/FileType.py
+src/Osdental/Enums/GrahpqlOperation.py
+src/Osdental/Enums/Profile.py
+src/Osdental/Enums/StatusCode.py
+src/Osdental/Enums/__init__.py
 src/Osdental/Exception/ControlledException.py
 src/Osdental/Exception/__init__.py
 src/Osdental/Graphql/__init__.py
@@ -41,14 +47,10 @@ src/Osdental/Graphql/_Helpers/__init__.py
 src/Osdental/Helpers/AuditDispatcher.py
 src/Osdental/Helpers/AzureClassifier.py
 src/Osdental/Helpers/GrpcConnection.py
-src/Osdental/Helpers/JwtAuthTokenService.py
 src/Osdental/Helpers/JwtTokenHelper.py
-src/Osdental/Helpers/KeyVaultService.py
 src/Osdental/Helpers/Resilience.py
 src/Osdental/Helpers/ResponseDecryptor.py
-src/Osdental/Helpers/WebsocketClient.py
 src/Osdental/Helpers/_AuthTokenProcessor.py
-src/Osdental/Helpers/_Ports.py
 src/Osdental/Helpers/__init__.py
 src/Osdental/Http/APIClient.py
 src/Osdental/Http/_Helpers.py
@@ -70,28 +72,24 @@ src/Osdental/Rest/Context/RequestContext.py
 src/Osdental/Rest/Context/__init__.py
 src/Osdental/Rest/Middlewares/RequestContextMiddleware.py
 src/Osdental/Rest/Middlewares/__init__.py
-src/Osdental/Shared/Logger.py
-src/Osdental/Shared/__init__.py
-src/Osdental/Shared/Enums/Constant.py
-src/Osdental/Shared/Enums/FileType.py
-src/Osdental/Shared/Enums/GrahpqlOperation.py
-src/Osdental/Shared/Enums/Message.py
-src/Osdental/Shared/Enums/Profile.py
-src/Osdental/Shared/Enums/StatusCode.py
-src/Osdental/Shared/Enums/__init__.py
-src/Osdental/Shared/Utils/CaseConverter.py
-src/Osdental/Shared/Utils/CodeGenerator.py
-src/Osdental/Shared/Utils/DataNormalizer.py
-src/Osdental/Shared/Utils/DataUtils.py
-src/Osdental/Shared/Utils/DateUtils.py
-src/Osdental/Shared/Utils/FileMetaData.py
-src/Osdental/Shared/Utils/HashValidator.py
-src/Osdental/Shared/Utils/Mapper.py
-src/Osdental/Shared/Utils/PasswordGenerator.py
-src/Osdental/Shared/Utils/QueryGenerator.py
-src/Osdental/Shared/Utils/RsaUtils.py
-src/Osdental/Shared/Utils/TextProcessor.py
-src/Osdental/Shared/Utils/__init__.py
+src/Osdental/Secrets/AzureKeyVaultProvider.py
+src/Osdental/Secrets/__init__.py
+src/Osdental/Services/JwtAuthTokenService.py
+src/Osdental/Services/WebsocketClient.py
+src/Osdental/Services/__init__.py
 src/Osdental/Storage/AzureBlobStorage.py
 src/Osdental/Storage/S3Storage.py
-src/Osdental/Storage/__init__.py
+src/Osdental/Storage/__init__.py
+src/Osdental/Utils/CaseConverter.py
+src/Osdental/Utils/CodeGenerator.py
+src/Osdental/Utils/DataNormalizer.py
+src/Osdental/Utils/DataUtils.py
+src/Osdental/Utils/DateUtils.py
+src/Osdental/Utils/FileMetaData.py
+src/Osdental/Utils/HashValidator.py
+src/Osdental/Utils/Mapper.py
+src/Osdental/Utils/PasswordGenerator.py
+src/Osdental/Utils/QueryGenerator.py
+src/Osdental/Utils/RsaUtils.py
+src/Osdental/Utils/TextProcessor.py
+src/Osdental/Utils/__init__.py

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Cache/Redis.py

@@ -1,3 +1,4 @@
+import logging
 import asyncio
 import json
 from typing import Dict, List, Optional, Any
@@ -9,10 +10,11 @@ from Osdental.Cache import ICacheService
 from Osdental.Exception.ControlledException import RedisException
 from Osdental.Helpers.Resilience import AzureResiliencePolicy, AzureTransientError
 from Osdental.Helpers.AzureClassifier import classify_redis
-from Osdental.Shared.Logger import logger
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 
 
+logger = logging.getLogger(__name__)
+
 class RedisCacheAsync(ICacheService):
 
     _instances: Dict[str, "RedisCacheAsync"] = {}
@@ -74,12 +76,12 @@ class RedisCacheAsync(ICacheService):
                 await self._reconnect()
 
             except Exception as reconnect_exc:
-                logger.error(
+                logger.exception(
                     "redis.reconnect.failed error=%s",
                     reconnect_exc
                 )
 
-            logger.error(
+            logger.exception(
                 "redis.exhausted error=%s",
                 exc
             )
@@ -131,7 +133,7 @@ class RedisCacheAsync(ICacheService):
             except Exception as e:
                 self.client = None
 
-                logger.error(
+                logger.exception(
                     f"Redis connection error: {str(e)}"
                 )
 
@@ -320,6 +322,6 @@ class RedisCacheAsync(ICacheService):
 
         except Exception as e:
 
-            logger.error(
+            logger.exception(
                 f"Redis close error: {str(e)}"
             )

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Cli/__init__.py

@@ -1,10 +1,12 @@
+import logging
 import os
 import sys
 import subprocess
 import platform
 import click
-from Osdental.Shared.Logger import logger
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
+
+logger = logging.getLogger(__name__)
 
 
 @click.group()
@@ -29,7 +31,7 @@ def start(port: int):
     try:
         subprocess.run(['uvicorn', 'app:app', '--port', str(port), '--reload'], check=True)
     except subprocess.CalledProcessError as e:
-        logger.error(f'{Message.SERVER_NETWORK_ACCESS_ERROR_MSG}: {e}')
+        logger.exception(f'{Message.SERVER_NETWORK_ACCESS_ERROR_MSG}: {e}')
 
 @cli.command()
 @click.argument('port')
@@ -38,7 +40,7 @@ def serve(port: int):
     try:
         subprocess.run(['uvicorn', 'app:app', '--host', '0.0.0.0', '--port', str(port), '--reload'], check=True)
     except subprocess.CalledProcessError as e:
-        logger.error(f'{Message.SERVER_NETWORK_ACCESS_ERROR_MSG}: {e}')
+        logger.exception(f'{Message.SERVER_NETWORK_ACCESS_ERROR_MSG}: {e}')
 
 @cli.command("clean-redis")
 @click.argument('redis_env')
@@ -54,7 +56,7 @@ async def clean_redis(redis_env: str):
         await redis.flush()
         logger.info(Message.REDIS_CLEANUP_SUCCESS_MSG)
     except Exception as e:
-        logger.error(f'{Message.REDIS_CLEANUP_ERROR_MSG}: {e}')
+        logger.exception(f'{Message.REDIS_CLEANUP_ERROR_MSG}: {e}')
 
 @cli.command(name='proto-files')
 @click.argument('name')

encryptors-2.53/src/Osdental/Constants/Constant.py

@@ -0,0 +1,10 @@
+
+
+class Constant:
+    DEFAULT_ENCODING = "utf-8"
+    MESSAGE_LOG_INTERNAL = "MESSAGE_LOG_INTERNAL"
+    DEFAULT_EMPTY_VALUE = "*"
+    RESPONSE_TYPE_ERROR = "ERROR"
+    RESPONSE_TYPE_REQUEST = "REQUEST"
+    RESPONSE_TYPE_RESPONSE = "RESPONSE"
+    MESSAGE_LOG_EXTERNAL = "MESSAGE_LOG_EXTERNAL"

{encryptors-2.51/src/Osdental/Shared/Enums → encryptors-2.53/src/Osdental/Constants}/Message.py

@@ -1,6 +1,6 @@
-from enum import StrEnum
 
-class Message(StrEnum):
+class Message:
+
     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."

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Database/BaseRepository.py

@@ -6,7 +6,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from Osdental.Exception.ControlledException import DatabaseException
 from Osdental.Helpers.Resilience import AzureResiliencePolicy, AzureTransientError
 from Osdental.Shared.Utils.DataNormalizer import normalize
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 
 _TRANSIENT_SQL_ERRORS = {
     "08S01", "40197", "40501", "40613", "49918",

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Decorators/Grpc.py

@@ -1,6 +1,8 @@
+import logging
 import json
 from functools import wraps
-from Osdental.Shared.Logger import logger
+
+logger = logging.getLogger(__name__)
 
 def parse_rpc_request_payload(func):
 

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Decorators/SecureResolver.py

@@ -1,3 +1,4 @@
+import logging
 from functools import wraps
 from typing import Callable
 from graphql import GraphQLResolveInfo
@@ -7,13 +8,15 @@ from Osdental.Exception.ControlledException import (
     OSDException, AccessDeniedException
 )
 from Osdental.Graphql.Models import BaseGraphQLContext
-from Osdental.Shared.Logger import logger
 from Osdental.Helpers._Ports import IAuthTokenService
 from Osdental.Helpers._AuthTokenProcessor import (
     extract_bearer_token, build_auth_token, decrypt_and_parse_payload
 )
 from Osdental.Models.TokenClaims import UserTokenClaims
-from Osdental.Shared.Enums.StatusCode import StatusCode
+from Osdental.Enums.StatusCode import StatusCode
+
+
+logger = logging.getLogger(__name__)
 
 
 def __test(dispatcher, request, request_payload, result, decrypted_key):

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Encryptor/Aes.py

@@ -1,13 +1,15 @@
+import logging
 import os
 import json
 import base64
 from typing import Dict, List
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from Osdental.Exception.ControlledException import AESEncryptException
-from Osdental.Shared.Logger import logger
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 from Osdental.Shared.Enums.Constant import Constant
 
+logger = logging.getLogger(__name__)
+
 class AES:
 
     IV_LENGTH = 32
@@ -49,7 +51,7 @@ class AES:
             return base64.b64encode(encrypted_data).decode(Constant.DEFAULT_ENCODING)
 
         except Exception as e:
-            logger.error(f'Unexpected AES encryption error: {str(e)}')
+            logger.exception(f'Unexpected AES encryption error: {str(e)}')
             raise AESEncryptException(error=str(e))
  
     @classmethod
@@ -80,6 +82,6 @@ class AES:
 
         except Exception as e:
             if not silent:
-                logger.error(f'Unexpected AES decryption error: {str(e)}')
+                logger.exception(f'Unexpected AES decryption error: {str(e)}')
                 
             raise AESEncryptException(error=str(e))

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Encryptor/Jwt.py

@@ -1,12 +1,14 @@
+import logging
 import jwt
 from typing import Dict, Any
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.backends import default_backend
 from Osdental.Exception.ControlledException import JWTokenException
-from Osdental.Shared.Logger import logger
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 
 
+logger = logging.getLogger(__name__)
+
 class JWT:
 
     @staticmethod
@@ -18,7 +20,7 @@ class JWT:
             return token
 
         except Exception as e:
-            logger.error(f"Unexpected jwt generating error: {str(e)}")
+            logger.exception(f"Unexpected jwt generating error: {str(e)}")
             raise JWTokenException(message=Message.UNEXPECTED_ERROR_MSG, error=str(e))
 
     @staticmethod
@@ -28,7 +30,7 @@ class JWT:
             return payload
 
         except Exception as e:
-            logger.error(f"Unexpected jwt extract payload error: {str(e)}")
+            logger.exception(f"Unexpected jwt extract payload error: {str(e)}")
             raise JWTokenException(message=Message.UNEXPECTED_ERROR_MSG, error=str(e))
 
     @staticmethod
@@ -39,5 +41,5 @@ class JWT:
             )
             return private_key
         except Exception as e:
-            logger.error(f"Unexpected jwt private key generating error: {str(e)}")
+            logger.exception(f"Unexpected jwt private key generating error: {str(e)}")
             raise JWTokenException(message=Message.UNEXPECTED_ERROR_MSG, error=str(e))

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Encryptor/Rsa.py

@@ -1,3 +1,4 @@
+import logging
 import json
 from base64 import b64decode, b64encode
 from typing import Dict, Any
@@ -5,10 +6,11 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.hazmat.primitives import hashes
 from Osdental.Exception.ControlledException import RSAEncryptException
-from Osdental.Shared.Logger import logger
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 from Osdental.Shared.Enums.Constant import Constant
 
+
+logger = logging.getLogger(__name__)
 class RSAEncryptor:
 
     @staticmethod
@@ -31,7 +33,7 @@ class RSAEncryptor:
             return b64encode(encrypted_bytes).decode(Constant.DEFAULT_ENCODING)
 
         except Exception as e:
-            logger.error(f'Unexpected RSA encryption error: {str(e)}')
+            logger.exception(f'Unexpected RSA encryption error: {str(e)}')
             raise RSAEncryptException(message=Message.UNEXPECTED_ERROR_MSG, error=str(e)) 
 
 
@@ -53,6 +55,6 @@ class RSAEncryptor:
 
         except Exception as e:
             if not silent:
-                logger.error(f'Unexpected RSA decryption error: {str(e)}')
+                logger.exception(f'Unexpected RSA decryption error: {str(e)}')
                 
             raise RSAEncryptException(message=Message.UNEXPECTED_ERROR_MSG, error=str(e))

encryptors-2.53/src/Osdental/Enums/FileType.py

@@ -0,0 +1,9 @@
+from enum import StrEnum
+
+class FileType(StrEnum):
+    IMAGE = "image"
+    VIDEO = "video"
+    AUDIO = "audio"
+    DOCUMENT = "document"
+    ARCHIVE = "archive"
+    OTHER = "other"

{encryptors-2.51/src/Osdental/Shared → encryptors-2.53/src/Osdental}/Enums/GrahpqlOperation.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
 
 class GraphqlOperation(StrEnum):
-    QUERY = 'query'
-    MUTATION = 'mutation'
+    QUERY = "query"
+    MUTATION = "mutation"

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Exception/ControlledException.py

@@ -1,6 +1,6 @@
 from typing import Any
-from Osdental.Shared.Enums.StatusCode import StatusCode
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Enums.StatusCode import StatusCode
+from Osdental.Constants.Message import Message
 
 class OSDException(Exception):
     """ Base class for all custom exceptions. """

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Graphql/Extensions/AuditExtension.py

@@ -1,8 +1,8 @@
 import inspect
+import logging
 import json
 from graphql.pyutils import is_awaitable
 from ariadne.types import Extension
-from Osdental.Shared.Logger import logger
 from Osdental.Encryptor.Aes import AES
 from Osdental.Graphql._Helpers._TenantPolicy import TenantPolicy
 from Osdental.Rest.Context.RequestContext import (
@@ -13,6 +13,8 @@ from Osdental.Models.Response import Response
 from Osdental.Graphql.Models import BaseGraphQLContext
 from Osdental.Shared.Enums.Constant import Constant
 
+logger = logging.getLogger(__name__)
+
 class AuditExtension(Extension):
 
     def request_started(self, context):

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Helpers/AuditDispatcher.py

@@ -1,3 +1,4 @@
+import logging
 import asyncio
 from typing import Dict, Any, Optional
 from fastapi import Request
@@ -10,7 +11,9 @@ 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
+
+
+logger = logging.getLogger(__name__)
 
 class AuditDispatcher:
 

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Helpers/JwtTokenHelper.py

@@ -6,7 +6,7 @@ from jwcrypto import jwe
 from jwcrypto.jwt import JWTExpired
 from Osdental.Models.TokenClaims import TokenValidationOptions
 from Osdental.Exception.ControlledException import UnauthorizedException
-from Osdental.Shared.Enums.StatusCode import StatusCode
+from Osdental.Enums.StatusCode import StatusCode
 
 class JwtTokenHelper:
 

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Helpers/ResponseDecryptor.py

@@ -1,7 +1,10 @@
+import logging
 from typing import Dict, Any
 from Osdental.Encryptor.Aes import AES
 from Osdental.Encryptor.Rsa import RSAEncryptor
-from Osdental.Shared.Logger import logger
+
+logger = logging.getLogger(__name__)
+
 
 VALID_TYPES = {"RSA", "AES"}
 

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Http/APIClient.py

@@ -1,12 +1,16 @@
-import httpx
+import logging
 from typing import Optional, Dict, Any
+import httpx
+from http import HTTPMethod
 from Osdental.Decorators.Retry import rest_retry
 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
+
+
+logger = logging.getLogger(__name__)
 
 class APIClient:
 
@@ -28,7 +32,7 @@ class APIClient:
         await self._client.aclose()
 
     @rest_retry
-    async def _request(self, method: str, url: str, **kwargs) -> httpx.Response:
+    async def _request(self, method: HTTPMethod, url: str, **kwargs) -> httpx.Response:
 
         try:
 
@@ -68,7 +72,7 @@ class APIClient:
     
     async def request(
         self,
-        method: str,
+        method: HTTPMethod,
         url: str,
         **kwargs
     ) -> Any:

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Http/_Helpers.py

@@ -1,7 +1,10 @@
+import logging
 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
+
+
+logger = logging.getLogger(__name__)
 
 """
     Helpers to control external API audit logging.
@@ -22,7 +25,7 @@ def _safe_dispatch(**kwargs):
         if dispatcher:
             dispatcher.dispatch(**kwargs)
     except Exception as e:
-        logger.error(f"Audit error: {str(e)}")
+        logger.exception(f"Audit error: {str(e)}")
 
 def _build_payload(method, url, kwargs):
     return {

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Models/ApiResponse.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field, asdict
 from typing import Any, Optional
-from Osdental.Shared.Enums.StatusCode import StatusCode
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Enums.StatusCode import StatusCode
+from Osdental.Constants.Message import Message
 
 @dataclass
 class ApiResponse:

{encryptors-2.51 → encryptors-2.53}/src/Osdental/Models/Response.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field, asdict
 from typing import Optional, Any, Literal
-from Osdental.Shared.Enums.StatusCode import StatusCode
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Enums.StatusCode import StatusCode
+from Osdental.Constants.Message import Message
 
 @dataclass
 class Response:

encryptors-2.51/src/Osdental/Helpers/KeyVaultService.py → encryptors-2.53/src/Osdental/Secrets/AzureKeyVaultProvider.py

@@ -1,16 +1,9 @@
 import asyncio
 import time
 from typing import Dict
-from abc import ABC, abstractmethod
 from azure.identity.aio import DefaultAzureCredential
 from azure.keyvault.secrets.aio import SecretClient
-
-
-class ISecretProvider(ABC):
-
-    @abstractmethod
-    async def get(self, name: str) -> str:
-        pass
+from Osdental.Secrets import ISecretProvider
 
 class AzureKeyVaultSecretProvider(ISecretProvider):
 

encryptors-2.53/src/Osdental/Secrets/__init__.py

@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+
+class ISecretProvider(ABC):
+
+    @abstractmethod
+    async def get(self, name: str) -> str:
+        pass

{encryptors-2.51/src/Osdental/Helpers → encryptors-2.53/src/Osdental/Services}/JwtAuthTokenService.py

@@ -5,14 +5,13 @@ from Osdental.Models.TokenClaims import (
     ActionTokenClaims, TokenValidationOptions
 )
 
-from Osdental.Helpers._Ports import IAuthTokenService
+from Osdental.Services import IAuthTokenService
 
 from Osdental.Helpers.JwtTokenHelper import JwtTokenHelper
 
-
 from Osdental.Shared.Utils.RsaUtils import normalize_rsa_keys
 
-from Osdental.Helpers.KeyVaultService import ISecretProvider
+from Osdental.Secrets import ISecretProvider
 
 class JwtAuthTokenService(IAuthTokenService):
 

{encryptors-2.51/src/Osdental/Helpers → encryptors-2.53/src/Osdental/Services}/WebsocketClient.py

@@ -1,9 +1,10 @@
+import logging
 import json
 from Osdental.Http.APIClient import APIClient
-from Osdental.Shared.Logger import logger
-from Osdental.Helpers._Ports import INotificationPublisher
+from Osdental.Services import INotificationPublisher
 from Osdental.Models.Notification import Notification
 
+logger = logging.getLogger(__name__)
 
 class WebsocketClient(INotificationPublisher):
 
@@ -37,7 +38,7 @@ class WebsocketClient(INotificationPublisher):
 
         except Exception as e:
 
-            logger.error(
+            logger.exception(
                 f"Error sending websocket notification: {e}"
             )
 

{encryptors-2.51/src/Osdental/Shared → encryptors-2.53/src/Osdental}/Utils/FileMetaData.py

@@ -1,7 +1,7 @@
 import os
 import mimetypes
 from Osdental.Exception.ControlledException import ValidationDataException
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 from Osdental.Shared.Enums.FileType import FileType
 
 class FileMetaData:

{encryptors-2.51/src/Osdental/Shared → encryptors-2.53/src/Osdental}/Utils/PasswordGenerator.py

@@ -1,6 +1,6 @@
 import random
 import string
-from Osdental.Shared.Enums.Message import Message
+from Osdental.Constants.Message import Message
 
 class PasswordGenerator:
 

encryptors-2.51/src/Osdental/Decorators/PublicResolver.py

@@ -1,3 +0,0 @@
-def public_resolver(resolver):
-    setattr(resolver, "_is_public", True)
-    return resolver

encryptors-2.51/src/Osdental/Decorators/SqlDataNormalizer.py

@@ -1,60 +0,0 @@
-import uuid
-from functools import wraps
-from sqlalchemy.engine.row import RowMapping, Row
-from sqlalchemy.engine import Result
-from typing import Any, Callable, Awaitable
-
-
-def dictify_sql_result(func: Callable[..., Awaitable[Any]]) -> Callable[..., Awaitable[Any]]:
-    """
-    Decorador que convierte automáticamente los resultados devueltos por funciones asíncronas
-    que usan SQLAlchemy (ORM o Core), transformando RowMapping o Row en dicts puros.
-    
-    Maneja correctamente:
-    - None
-    - Escalares (int, str, etc.)
-    - RowMapping / Row únicos o listas
-    - Result devuelto sin procesar
-    """
-
-    def normalize_value(value: Any) -> Any:
-        if isinstance(value, uuid.UUID):
-            return str(value).lower()
-        elif isinstance(value, dict):
-            return {k: normalize_value(v) for k, v in value.items()}
-        elif isinstance(value, (list, tuple)):
-            return [normalize_value(v) for v in value]
-        return value
-    
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        result = await func(*args, **kwargs)
-
-        if result is None:
-            return None
-
-        if isinstance(result, Result):
-            try:
-                rows = result.mappings().all()
-                return [normalize_value(dict(r)) for r in rows]
-            except Exception:
-                rows = result.all()
-                return [normalize_value(dict(r._mapping)) for r in rows]
-
-        if isinstance(result, list) and result:
-            first_item = result[0]
-            if isinstance(first_item, RowMapping):
-                return [normalize_value(dict(r)) for r in result]
-            if isinstance(first_item, Row):
-                return [normalize_value(dict(r._mapping)) for r in result]
-            
-            return [normalize_value(r) for r in result]
-
-        if isinstance(result, RowMapping):
-            return normalize_value(dict(result))
-        if isinstance(result, Row):
-            return normalize_value(dict(result._mapping))
-
-        return normalize_value(result)
-
-    return wrapper

encryptors-2.51/src/Osdental/Shared/Enums/Constant.py

@@ -1,10 +0,0 @@
-from enum import StrEnum
-
-class Constant(StrEnum):
-    DEFAULT_ENCODING = 'utf-8'
-    MESSAGE_LOG_INTERNAL = 'MESSAGE_LOG_INTERNAL'
-    DEFAULT_EMPTY_VALUE = '*'
-    RESPONSE_TYPE_ERROR = 'ERROR'
-    RESPONSE_TYPE_REQUEST = 'REQUEST'
-    RESPONSE_TYPE_RESPONSE = 'RESPONSE'
-    MESSAGE_LOG_EXTERNAL = 'MESSAGE_LOG_EXTERNAL'

encryptors-2.51/src/Osdental/Shared/Enums/FileType.py

@@ -1,9 +0,0 @@
-from enum import StrEnum
-
-class FileType(StrEnum):
-    IMAGE = 'image'
-    VIDEO = 'video'
-    AUDIO = 'audio'
-    DOCUMENT = 'document'
-    ARCHIVE = 'archive'
-    OTHER = 'other'

encryptors-2.51/src/Osdental/Shared/Logger.py

@@ -1,17 +0,0 @@
-import logging
-import colorlog
-
-handler = colorlog.StreamHandler()
-handler.setFormatter(colorlog.ColoredFormatter(
-    '%(log_color)s%(levelname)s:%(name)s:%(message)s',  
-    log_colors={
-        'DEBUG': 'cyan',
-        'INFO': 'green',
-        'WARNING': 'yellow',
-        'ERROR': 'red',
-        'CRITICAL': 'bold_red',
-    }
-))
-logger = colorlog.getLogger('my_logger')
-logger.addHandler(handler)
-logger.setLevel(logging.DEBUG)