maleo-foundation 0.0.60__py3-none-any.whl → 0.0.62__py3-none-any.whl

maleo_foundation/db/database.py

@@ -1,35 +1,36 @@
 from sqlalchemy import Engine, MetaData, Column, Integer, UUID, TIMESTAMP, Enum, func
+from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm import declarative_base, declared_attr
 from uuid import uuid4
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.utils.formatter.case import CaseFormatter
 
-class DatabaseManager:
-    class BaseMixin:
-        __abstract__ = True
+class BaseMixin:
+    __abstract__ = True
 
-        @declared_attr
-        def __tablename__(cls) -> str:
-            return CaseFormatter.to_snake_case(cls.__name__)
+    @declared_attr
+    def __tablename__(cls) -> str:
+        return CaseFormatter.to_snake_case(cls.__name__)
 
-        #* ----- ----- Common columns definition ----- ----- *#
+    #* ----- ----- Common columns definition ----- ----- *#
 
-        #* Identifiers
-        id = Column(Integer, primary_key=True)
-        uuid = Column(UUID, default=uuid4, unique=True, nullable=False)
+    #* Identifiers
+    id = Column(Integer, primary_key=True)
+    uuid = Column(UUID, default=uuid4, unique=True, nullable=False)
 
-        #* Timestamps
-        created_at = Column(TIMESTAMP(timezone=True), server_default=func.now(), nullable=False)
-        updated_at = Column(TIMESTAMP(timezone=True), server_default=func.now(), onupdate=func.now(), nullable=False)
-        deleted_at = Column(TIMESTAMP(timezone=True))
-        restored_at = Column(TIMESTAMP(timezone=True))
-        deactivated_at = Column(TIMESTAMP(timezone=True))
-        activated_at = Column(TIMESTAMP(timezone=True), server_default=func.now(), nullable=False)
+    #* Timestamps
+    created_at = Column(TIMESTAMP(timezone=True), server_default=func.now(), nullable=False)
+    updated_at = Column(TIMESTAMP(timezone=True), server_default=func.now(), onupdate=func.now(), nullable=False)
+    deleted_at = Column(TIMESTAMP(timezone=True))
+    restored_at = Column(TIMESTAMP(timezone=True))
+    deactivated_at = Column(TIMESTAMP(timezone=True))
+    activated_at = Column(TIMESTAMP(timezone=True), server_default=func.now(), nullable=False)
 
-        #* Statuses
-        status = Column(Enum(BaseEnums.StatusType, name="statustype"), default=BaseEnums.StatusType.ACTIVE, nullable=False)
+    #* Statuses
+    status = Column(Enum(BaseEnums.StatusType, name="statustype"), default=BaseEnums.StatusType.ACTIVE, nullable=False)
 
-    Base = declarative_base()  #* Correct way to define a declarative base
+class DatabaseManager:
+    Base:DeclarativeMeta = declarative_base()  #* Correct way to define a declarative base
 
     #* Explicitly define the type of metadata
     metadata:MetaData = Base.metadata

maleo_foundation/models/schemas/general.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
-from datetime import date, datetime, timedelta, timezone
-from pydantic import BaseModel, Field, model_validator, field_serializer, FieldSerializationInfo
-from typing import Any
+from datetime import datetime, timedelta, timezone
+from pydantic import BaseModel, Field, model_validator
 from uuid import UUID
 from maleo_foundation.constants import REFRESH_TOKEN_DURATION_DAYS, ACCESS_TOKEN_DURATION_MINUTES
 from maleo_foundation.enums import BaseEnums
@@ -59,11 +58,6 @@ class BaseGeneralSchemas:
         id:int = Field(..., ge=1, description="Data's ID, must be >= 1.")
         uuid:UUID = Field(..., description="Data's UUID.")
 
-        # @field_serializer('uuid')
-        # def serialize_uuid(self, value:UUID, info:FieldSerializationInfo) -> str:
-        #     """Serializes UUID to a hex string."""
-        #     return str(value)
-
     class Timestamps(BaseModel):
         created_at:datetime = Field(..., description="Data's created_at timestamp")
         updated_at:datetime = Field(..., description="Data's updated_at timestamp")
@@ -72,13 +66,6 @@ class BaseGeneralSchemas:
         deactivated_at:BaseTypes.OptionalDatetime = Field(..., description="Data's deactivated_at timestamp")
         activated_at:datetime = Field(..., description="Data's activated_at timestamp")
 
-        # @field_serializer('created_at', 'updated_at', 'deleted_at', 'restored_at', 'deactivated_at', 'activated_at')
-        # def serialize_timestamps(self, value:BaseTypes.OptionalDatetime, info:FieldSerializationInfo) -> str:
-        #     """Serializes datetime/date fields to ISO format."""
-        #     if value is not None:
-        #         return value.isoformat()
-        #     return value
-
     class Status(BaseModel):
         status:BaseEnums.StatusType = Field(..., description="Data's status")
 
@@ -129,23 +116,4 @@ class BaseGeneralSchemas:
             values["exp_dt"] = exp_dt
             #* Convert `exp_dt` to timestamp (int)
             values["exp"] = int(exp_dt.timestamp())
-            return values
-        
-        # @field_serializer('*')
-        # def serialize_fields(self, value, info: FieldSerializationInfo) -> Any:
-        #     """Recursively serialize UUIDs, datetimes, and dates in complex structures."""
-
-        #     def serialize(v: Any) -> Any:
-        #         if isinstance(v, UUID):
-        #             return str(v)
-        #         if isinstance(v, (datetime, date)):
-        #             return v.isoformat()
-        #         if isinstance(v, list):
-        #             return [serialize(item) for item in v]
-        #         if isinstance(v, tuple):
-        #             return tuple(serialize(item) for item in v)
-        #         if isinstance(v, dict):
-        #             return {serialize(k): serialize(val) for k, val in v.items()}
-        #         return v
-
-        #     return serialize(value)
+            return values

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

@@ -1,8 +1,5 @@
 from __future__ import annotations
-from datetime import datetime, date
-from pydantic import FieldSerializationInfo, field_validator, field_serializer, model_validator
-from uuid import UUID
-from typing import Any
+from pydantic import model_validator
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 
@@ -12,21 +9,6 @@ class BaseServiceQueryResultsTransfers:
         BaseGeneralSchemas.Timestamps,
         BaseGeneralSchemas.Identifiers
     ):
-        @field_validator('*', mode="before")
-        def set_none(cls, values):
-            if isinstance(values, str) and (values == "" or len(values) == 0):
-                return None
-            return values
-        
-        @field_serializer('*')
-        def serialize_fields(self, value, info:FieldSerializationInfo) -> Any:
-            """Serializes all unique-typed fields."""
-            if isinstance(value, UUID):
-                return str(value)
-            if isinstance(value, datetime) or isinstance(value, date):
-                return value.isoformat()
-            return value
-
         class Config:
             from_attributes=True
 

maleo_foundation/utils/query.py

@@ -1,16 +1,16 @@
 from sqlalchemy import Column, Table
+from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm import Query
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.sql.expression import or_, asc, cast, desc
 from sqlalchemy.types import DATE, String, TEXT, TIMESTAMP
 from typing import Type
-from maleo_foundation.db import DatabaseManager
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.extended_types import ExtendedTypes
 
 class BaseQueryUtils:
     @staticmethod
-    def filter_column(query:Query, table:Type[DatabaseManager.Base], column:str, value:BaseTypes.OptionalAny) -> Query:
+    def filter_column(query:Query, table:Type[DeclarativeMeta], column:str, value:BaseTypes.OptionalAny) -> Query:
         if not value:
             return query
         column_attr = getattr(table, column, None)
@@ -24,7 +24,7 @@ class BaseQueryUtils:
         return query
 
     @staticmethod
-    def filter_ids(query:Query, table:Type[DatabaseManager.Base], column:str, ids:BaseTypes.OptionalListOfIntegers) -> Query:
+    def filter_ids(query:Query, table:Type[DeclarativeMeta], column:str, ids:BaseTypes.OptionalListOfIntegers) -> Query:
         if ids is not None:
             column_attr = getattr(table, column, None)
             if column_attr:
@@ -33,7 +33,7 @@ class BaseQueryUtils:
         return query
     
     @staticmethod
-    def filter_timestamps(query:Query, table:Type[DatabaseManager.Base], date_filters:ExtendedTypes.ListOfDateFilters) -> Query:
+    def filter_timestamps(query:Query, table:Type[DeclarativeMeta], date_filters:ExtendedTypes.ListOfDateFilters) -> Query:
         if date_filters and len(date_filters) > 0:
             for date_filter in date_filters:
                 try:
@@ -52,14 +52,14 @@ class BaseQueryUtils:
         return query
     
     @staticmethod
-    def filter_statuses(query:Query, table:Type[DatabaseManager.Base], statuses:BaseTypes.OptionalListOfStatuses) -> Query:
+    def filter_statuses(query:Query, table:Type[DeclarativeMeta], statuses:BaseTypes.OptionalListOfStatuses) -> Query:
         if statuses is not None:
             status_filters = [table.status == status for status in statuses]
             query = query.filter(or_(*status_filters))
         return query
     
     @staticmethod
-    def filter_search(query:Query, table:Type[DatabaseManager.Base], search:BaseTypes.OptionalString) -> Query:
+    def filter_search(query:Query, table:Type[DeclarativeMeta], search:BaseTypes.OptionalString) -> Query:
         if search:
             search_term = f"%{search}%" #* Use wildcard for partial matching
             search_filters = []
@@ -78,7 +78,7 @@ class BaseQueryUtils:
         return query
     
     @staticmethod
-    def sort(query:Query, table:Type[DatabaseManager.Base], sort_columns:ExtendedTypes.ListOfSortColumns) -> Query:
+    def sort(query:Query, table:Type[DeclarativeMeta], sort_columns:ExtendedTypes.ListOfSortColumns) -> Query:
         for sort_column in sort_columns:
             try:
                 sort_col = getattr(table, sort_column.name)

{maleo_foundation-0.0.60.dist-info → maleo_foundation-0.0.62.dist-info}/METADATA

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

{maleo_foundation-0.0.60.dist-info → maleo_foundation-0.0.62.dist-info}/RECORD

@@ -14,7 +14,7 @@ maleo_foundation/clients/google/cloud/storage.py,sha256=y_HAsbcGSnu5sxZPxaQWFWvO
 maleo_foundation/clients/utils/__init__.py,sha256=hChEGABHH4tOFxPRcpxmlhkM9PgF18M7wXapH88hpu4,131
 maleo_foundation/clients/utils/logger.py,sha256=QhxljzrvNY_gXAHCqaOUJJAgwvvcE9v3IQK6AWYxzM4,1144
 maleo_foundation/db/__init__.py,sha256=fFqGxpsiowiws70AqOfcOWFhwaahfOj9_05JSJ0iRaE,107
-maleo_foundation/db/database.py,sha256=I0dJ4DPWOxlgoARJa6dYtff37NswOj3oPICvP41hmgc,1653
+maleo_foundation/db/database.py,sha256=wrgNUCyScSbkBngaYjckZaePRlw84Z_srlXPsVn4yto,1652
 maleo_foundation/db/engine.py,sha256=kw2SMMiWy5KARquh4TLk7v6HwlHW97lUIUvqdFbhNxk,1600
 maleo_foundation/db/session.py,sha256=tI13DJ6rLo8FOpSIFZrmD4dbuxY_c0RTjwEGb76ZOo0,2681
 maleo_foundation/expanded_types/__init__.py,sha256=RohoIQCiMvo2g6Jacq2dlqNXg3WLmRc-TD8nvMsyDKs,275
@@ -27,7 +27,7 @@ maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG
 maleo_foundation/models/__init__.py,sha256=AaKehO7c1HyKhoTGRmNHDddSeBXkW-_YNrpOGBu8Ms8,246
 maleo_foundation/models/responses.py,sha256=ePz7yNEYVCNxxrQlj_dnWXspv1HAnBAHCQfyaaqTHdo,4541
 maleo_foundation/models/schemas/__init__.py,sha256=Xj8Ahsqyra-fmEaVcGPok5GOOsPQlKcknHYMvbjvENA,277
-maleo_foundation/models/schemas/general.py,sha256=QJ9U_tbIF53FC72CNA4fp_8R_sg0ec9i7wWc7DfVycE,7020
+maleo_foundation/models/schemas/general.py,sha256=ROPzAd7b8lgZlc9tahh4XqrXjE5rZxPIQCeCvV53v_8,5497
 maleo_foundation/models/schemas/parameter.py,sha256=K47z2NzmTEhUiOfRiRLyRPXoQurbWsKBL7ObXAxIWRY,2100
 maleo_foundation/models/schemas/result.py,sha256=V3dljS2AdtWW4Pf8YsnQuiCylN1bZtEY1AtYC7okWuI,1747
 maleo_foundation/models/transfers/__init__.py,sha256=B8oCZHE3NTsrJ_rviSXaDsuc-gc25jpjuhJO40lpQiE,222
@@ -42,17 +42,17 @@ maleo_foundation/models/transfers/results/client/controllers/__init__.py,sha256=
 maleo_foundation/models/transfers/results/client/controllers/http.py,sha256=vhjfjchvlTq347mLY2mcE84n_xYMpLkALi_ecQNOAGY,1499
 maleo_foundation/models/transfers/results/service/__init__.py,sha256=dTjHe1iGIpdulrzawQoOj003sxxObumF63YpUptKrDA,390
 maleo_foundation/models/transfers/results/service/general.py,sha256=G4x-MhQI7Km9UAcx2uJmrsqA6RBvxpH6VFAd_ynFFd4,1486
-maleo_foundation/models/transfers/results/service/query.py,sha256=Wj9GCWk7FrKP0EoK55vJcr9YJ42Lo24mLXbRk9j0IJw,2566
+maleo_foundation/models/transfers/results/service/query.py,sha256=G5A4FRkHyRRlpuGWrPV5-vqgyyBjMqu8f-Ka9BjD0lA,1828
 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=FavmL5XYGCm955EAKiWWcXYeU15p5rSzfcglpV2yI6c,387
 maleo_foundation/utils/controller.py,sha256=hapDGng4q5XTfaG18M3bbFsFGqEOlkNKRzGf8BMKrhs,2996
 maleo_foundation/utils/exceptions.py,sha256=nk3rD57fDR-D7BQkU1JEKV-Mu7FGMpLSEsqxdDZdKjU,4532
 maleo_foundation/utils/logger.py,sha256=978P57JOhGR-WIu7xdPXBIwd3JrfLLA8WerVzxhE_Fs,3408
-maleo_foundation/utils/query.py,sha256=qKNcjf5J7_Q7NjA79BO6_TpZVdYcF8YIO68F9M501ew,4398
+maleo_foundation/utils/query.py,sha256=ODQ3adOYQNj5E2cRW9ytbjBz56nEDcnfq8mQ6YZbCCM,4375
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
-maleo_foundation-0.0.60.dist-info/METADATA,sha256=yS10g0mYJcgRzGN7eXIX-Pmdahjh9pAe4zAWjHZi79Y,3160
-maleo_foundation-0.0.60.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-maleo_foundation-0.0.60.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.0.60.dist-info/RECORD,,
+maleo_foundation-0.0.62.dist-info/METADATA,sha256=w396sabhoQLXTy_eD5QHWshrvlq-Gj7yuA-ufxCGh5o,3160
+maleo_foundation-0.0.62.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+maleo_foundation-0.0.62.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.0.62.dist-info/RECORD,,