maleo-foundation 0.2.24__py3-none-any.whl → 0.2.26__py3-none-any.whl

maleo_foundation/enums.py

@@ -120,6 +120,7 @@ class BaseEnums:
         TTL_6HR = int(6*60*60)
         TTL_12HR = int(12*60*60)
         TTL_1DY = int(1*24*60*60)
-        TTL_7DY = int(7*24*60*60)
+        TTL_3DY = int(3*24*60*60)
         TTL_1WK = int(1*24*60*60)
-        TTL_7WK = int(7*24*60*60)
+        TTL_2WK = int(2*24*60*60)
+        TTL_1MO = int(1*30*24*60*60)

maleo_foundation/expanded_types/__init__.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 from .general import BaseGeneralExpandedTypes
-from .query import ExpandedQueryTypes
+from .repository import ExpandedRepositoryTypes
 from .service import ExpandedServiceTypes
 from .client import ExpandedClientTypes
 
 class BaseExpandedTypes:
     General = BaseGeneralExpandedTypes
-    Query = ExpandedQueryTypes
+    Repository = ExpandedRepositoryTypes
     Service = ExpandedServiceTypes
     Client = ExpandedClientTypes

maleo_foundation/expanded_types/query.py

@@ -3,16 +3,16 @@ from maleo_foundation.models.transfers.parameters.general \
     import BaseGeneralParametersTransfers
 from maleo_foundation.models.transfers.parameters.service \
     import BaseServiceParametersTransfers
-from maleo_foundation.models.transfers.results.service.query \
-    import BaseServiceQueryResultsTransfers
+from maleo_foundation.models.transfers.results.service.repository \
+    import BaseServiceRepositoryResultsTransfers
 
-class ExpandedQueryTypes:
+class ExpandedRepositoryTypes:
     #* Unpaginated multiple data
     GetUnpaginatedMultipleParameter = BaseServiceParametersTransfers.GetUnpaginatedMultiple
     GetUnpaginatedMultipleResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.NoData,
-        BaseServiceQueryResultsTransfers.UnpaginatedMultipleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.NoData,
+        BaseServiceRepositoryResultsTransfers.UnpaginatedMultipleData
     ]
     SyncGetUnpaginatedMultipleFunction = Callable[
         [GetUnpaginatedMultipleParameter],
@@ -26,9 +26,9 @@ class ExpandedQueryTypes:
     #* Paginated multiple data
     GetPaginatedMultipleParameter = BaseServiceParametersTransfers.GetPaginatedMultiple
     GetPaginatedMultipleResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.NoData,
-        BaseServiceQueryResultsTransfers.PaginatedMultipleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.NoData,
+        BaseServiceRepositoryResultsTransfers.PaginatedMultipleData
     ]
     SyncGetPaginatedMultipleFunction = Callable[
         [GetPaginatedMultipleParameter],
@@ -42,9 +42,9 @@ class ExpandedQueryTypes:
     #* Single data
     GetSingleParameter = BaseGeneralParametersTransfers.GetSingle
     GetSingleResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.NoData,
-        BaseServiceQueryResultsTransfers.SingleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.NoData,
+        BaseServiceRepositoryResultsTransfers.SingleData
     ]
     SyncGetSingleFunction = Callable[
         [GetSingleParameter],
@@ -57,12 +57,12 @@ class ExpandedQueryTypes:
 
     #* Create or Update
     CreateOrUpdateResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.SingleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.SingleData
     ]
 
     #* Status update
     StatusUpdateResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.SingleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.SingleData
     ]

maleo_foundation/models/transfers/results/service/__init__.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 from .general import BaseServiceGeneralResultsTransfers
-from .query import BaseServiceQueryResultsTransfers
 from .repository import BaseServiceRepositoryResultsTransfers
 from .controllers import BaseServiceControllerResultsTransfers
 
 class BaseServiceResultsTransfers:
     General = BaseServiceGeneralResultsTransfers
-    Query = BaseServiceQueryResultsTransfers
     Repository = BaseServiceRepositoryResultsTransfers
     Controller = BaseServiceControllerResultsTransfers

maleo_foundation/utils/exceptions.py

@@ -10,8 +10,6 @@ from typing import Optional
 from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.results.service.general \
     import BaseServiceGeneralResultsTransfers
-from maleo_foundation.models.transfers.results.service.query \
-    import BaseServiceQueryResultsTransfers
 from maleo_foundation.models.transfers.results.service.repository \
     import BaseServiceRepositoryResultsTransfers
 from maleo_foundation.utils.logging import BaseLogger
@@ -44,35 +42,6 @@ class BaseExceptions:
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
         )
 
-    @staticmethod
-    def database_exception_handler(
-        operation:str,
-        logger:Optional[BaseLogger] = None,
-        fail_result_class:type[BaseServiceQueryResultsTransfers.Fail] = BaseServiceQueryResultsTransfers.Fail
-    ):
-        """Decorator to handle database-related exceptions consistently."""
-        def decorator(func):
-            @wraps(func)
-            def wrapper(*args, **kwargs):
-                try:
-                    return func(*args, **kwargs)
-                except SQLAlchemyError as e:
-                    logger.error("Database error occurred while %s: '%s'", operation, str(e), exc_info=True)
-                    return fail_result_class(
-                        message=f"Failed {operation}",
-                        description=f"A database error occurred while {operation}. Please try again later or contact administrator.",
-                        other="Database operation failed"
-                    )
-                except Exception as e:
-                    logger.error("Unexpected error occurred while %s: '%s'", operation, str(e), exc_info=True)
-                    return fail_result_class(
-                        message=f"Failed {operation}",
-                        description=f"An unexpected error occurred while {operation}. Please try again later or contact administrator.",
-                        other="Internal processing error"
-                    )
-            return wrapper
-        return decorator
-
     @staticmethod
     def repository_exception_handler(
         operation:str,

{maleo_foundation-0.2.24.dist-info → maleo_foundation-0.2.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.2.24
+Version: 0.2.26
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.2.24.dist-info → maleo_foundation-0.2.26.dist-info}/RECORD

@@ -2,7 +2,7 @@ maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 maleo_foundation/authentication.py,sha256=kJfuRKgQY5cjmn0r36z4a4jF4bg7UifZ9D9mgMMnTsw,1840
 maleo_foundation/authorization.py,sha256=euq24UEhTaimmM24Ies-kZF1zqVwM_x0Zox_6k7zyqI,281
 maleo_foundation/constants.py,sha256=aBmEfWlBqZxi0k-n6h2NM1YRLOjMnheEiLyQcjP-zCQ,1164
-maleo_foundation/enums.py,sha256=SQKrX4nHuVocMixgOxqy1Z3Rrf7t7aPu9nf6pk7xzEk,3559
+maleo_foundation/enums.py,sha256=OLVgb0rKk2gfG19FEyq9YGrQcmovr_FgtGFUcIu23Lo,3596
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/types.py,sha256=aKXnIgEhYGSfFqNMGLc4qIKGkINBRpkOo9R9cb2CbwI,2414
 maleo_foundation/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,12 +18,13 @@ maleo_foundation/client/services/hash/__init__.py,sha256=A4Olb-RpeNFQEfToU9t8LfZ
 maleo_foundation/client/services/hash/bcrypt.py,sha256=Lc2FGR2oQj5yuq4mHer5NnFjhw-IuPuBp_EijLsOaCk,2231
 maleo_foundation/client/services/hash/hmac.py,sha256=-L0sTv5tcmfu-UyBD_InpxFJ2w738M76HYmeRg30Yao,2358
 maleo_foundation/client/services/hash/sha256.py,sha256=af08036kkEZ61IY_ktxwHmQnAACd6hWXYA_ZC9S1-tg,2142
-maleo_foundation/expanded_types/__init__.py,sha256=lm_r7rxlLA0sgSTGQBMR9ZbZbVDpD7Te-UYb3oRVi1g,364
+maleo_foundation/expanded_types/__init__.py,sha256=Jz2NoY9609QIM84UonmJU-10CMUR9t9fkk9ZFLnU7Js,384
 maleo_foundation/expanded_types/client.py,sha256=WvT911cDsfWtCCYVaDeQ90ba_eCYnzC-CRSXCHtLIuo,2414
 maleo_foundation/expanded_types/general.py,sha256=_nSG5jgMgA1ntjBdVjQqkg0h1WNytLsIqkUrsKDmrfU,832
 maleo_foundation/expanded_types/hash.py,sha256=QOH_HczGY7CRUZJ5gC84RunCAiUzNSt7DYXI7uqtwkM,416
 maleo_foundation/expanded_types/key.py,sha256=qopQcO6V82RxiCtixe--IBce5MRT4buOun4RSA-LLm0,573
-maleo_foundation/expanded_types/query.py,sha256=ritR1xdNG7zTMhhZwnQvsT6Q_WBEhh84io6iLtYGU2Q,2402
+maleo_foundation/expanded_types/query.py,sha256=hemtQGDqSQO8N4_y7pktXqBlrcDacs4EiUZ3hFk4n2o,2482
+maleo_foundation/expanded_types/repository.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/expanded_types/service.py,sha256=9LxwJHSBTgqOGD2CiV3gsRp1EbLB793jrTNGgCtrbjk,2434
 maleo_foundation/expanded_types/signature.py,sha256=RgMU7MHADfVwSlGezjBcHXJiPwfnJb5ovuJ93qFRps0,451
 maleo_foundation/expanded_types/token.py,sha256=xsy2F8Mzba1sPztBHL9J3DWv79QP8P3vqPwXahEG5mA,427
@@ -90,15 +91,14 @@ maleo_foundation/models/transfers/results/client/controllers/http.py,sha256=vhjf
 maleo_foundation/models/transfers/results/encryption/__init__.py,sha256=Uo8lKBcjlvtCjgPk4sz44GY_fjG3QooatbVYBDFwF8g,307
 maleo_foundation/models/transfers/results/encryption/aes.py,sha256=yx3hZNhge2lfj8qNM-u9poFs1Ex926ZItOPZJUCFa4c,828
 maleo_foundation/models/transfers/results/encryption/rsa.py,sha256=hlCtiT1TZwmMBEn-sgGs-WocNEmJ4qxWcHS5y9m7Voc,683
-maleo_foundation/models/transfers/results/service/__init__.py,sha256=Bf8cNLk613-ArEhNmuASWQENtRKbIJHOzc8-69cHlCE,507
+maleo_foundation/models/transfers/results/service/__init__.py,sha256=qKCJTtuLJeda-xrRL99OVdZR91PLFK1JyYVItjreLbQ,410
 maleo_foundation/models/transfers/results/service/general.py,sha256=-4VE7mV103nQIRRxIy_dGIU6XDe_wiMgrCFJJ6eXUMM,1540
-maleo_foundation/models/transfers/results/service/query.py,sha256=xHHPWCYx6NrKK9I88S2T-PKOndsWib4GWiiTKheLzZo,1867
 maleo_foundation/models/transfers/results/service/repository.py,sha256=xz9RakOBEbtdGnnK0fM4KVZOL-AjRsaIE9J3TQqkIBo,1887
 maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256=HZJWMy2dskzOCzLmp_UaL9rjbQ-sDMI7sd2bXb-4QOU,175
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/utils/__init__.py,sha256=SRPEVoqjZoO6W8rtF_Ti8VIangg6Auwm6eHbZMdOthY,520
 maleo_foundation/utils/controller.py,sha256=3n9HcWHqywLhfpgTkzd_NrjWNJgTwGBSokqGgJKeBAU,4132
-maleo_foundation/utils/exceptions.py,sha256=IrcacknOubwdUqNweEeOSQvYt2Qj1cBP2c62TVP5dRw,7830
+maleo_foundation/utils/exceptions.py,sha256=kDLTWiUauvc-fSKrEyxlGvIi2NtZIAhJ9bV3OXnpTyo,6253
 maleo_foundation/utils/extractor.py,sha256=SZXVYDHWGaA-Dd1BUydwF2HHdZqexEielS4CjL0Ceng,814
 maleo_foundation/utils/logging.py,sha256=W5Fhk_xAXVqSujaY8mv3hRH4wlQSpUn4ReuMoiKcQa4,7759
 maleo_foundation/utils/mergers.py,sha256=DniUu3Ot4qkYH_YSw4uD1cn9cfirum4S_Opp8fMkQwA,702
@@ -115,7 +115,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=SKsqPuFnAiCcYLf24CxKnMybhVHpgqnq1gGSlThqjts,994
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.24.dist-info/METADATA,sha256=TSu32C-FotlV06Xf7GsaGSrw6yQjC-g8Q2_DP_NyFaw,3598
-maleo_foundation-0.2.24.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-maleo_foundation-0.2.24.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.24.dist-info/RECORD,,
+maleo_foundation-0.2.26.dist-info/METADATA,sha256=X-3GBxwmqjzuox2JY4zR_DIlzLBwrdMSPZVoOZDL18g,3598
+maleo_foundation-0.2.26.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+maleo_foundation-0.2.26.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.26.dist-info/RECORD,,

maleo_foundation/models/transfers/results/service/query.py

@@ -1,51 +0,0 @@
-from __future__ import annotations
-from pydantic import model_validator
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_foundation.models.schemas.result import BaseResultSchemas
-
-class BaseServiceQueryResultsTransfers:
-    class Row(
-        BaseGeneralSchemas.Status,
-        BaseGeneralSchemas.Timestamps,
-        BaseGeneralSchemas.Identifiers,
-        BaseResultSchemas.BaseRow
-    ): pass
-
-    class Fail(BaseResultSchemas.Fail): pass
-
-    class NotFound(BaseResultSchemas.NotFound): pass
-
-    class NoData(BaseResultSchemas.NoData): pass
-
-    class SingleData(BaseResultSchemas.SingleData):
-        data:BaseServiceQueryResultsTransfers.Row
-
-    class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData):
-        data:list[BaseServiceQueryResultsTransfers.Row]
-
-    class PaginatedMultipleData(BaseResultSchemas.PaginatedMultipleData):
-        data:list[BaseServiceQueryResultsTransfers.Row]
-
-        @model_validator(mode="before")
-        @classmethod
-        def calculate_pagination(cls, values: dict) -> dict:
-            """Calculates pagination metadata before validation."""
-            total_data = values.get("total_data", 0)
-            data = values.get("data", [])
-
-            #* Get pagination values from inherited SimplePagination
-            page = values.get("page", 1)
-            limit = values.get("limit", 10)
-
-            #* Calculate total pages
-            total_pages = (total_data // limit) + (1 if total_data % limit > 0 else 0)
-
-            #* Assign computed pagination object before validation
-            values["pagination"] = BaseGeneralSchemas.ExtendedPagination(
-                page=page,
-                limit=limit,
-                data_count=len(data),
-                total_data=total_data,
-                total_pages=total_pages
-            )
-            return values