maleo-foundation 0.0.60__tar.gz → 0.0.62__tar.gz

{maleo_foundation-0.0.60 → maleo_foundation-0.0.62}/PKG-INFO

@@ -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.62/maleo_foundation/db/database.py

@@ -0,0 +1,41 @@
+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 BaseMixin:
+    __abstract__ = True
+
+    @declared_attr
+    def __tablename__(cls) -> str:
+        return CaseFormatter.to_snake_case(cls.__name__)
+
+    #* ----- ----- Common columns definition ----- ----- *#
+
+    #* 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)
+
+    #* Statuses
+    status = Column(Enum(BaseEnums.StatusType, name="statustype"), default=BaseEnums.StatusType.ACTIVE, nullable=False)
+
+class DatabaseManager:
+    Base:DeclarativeMeta = declarative_base()  #* Correct way to define a declarative base
+
+    #* Explicitly define the type of metadata
+    metadata:MetaData = Base.metadata
+
+    @classmethod
+    def initialize(cls, engine:Engine):
+        """Creates the database tables if they do not exist."""
+        cls.metadata.create_all(engine)

{maleo_foundation-0.0.60 → maleo_foundation-0.0.62}/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-0.0.60 → maleo_foundation-0.0.62}/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-0.0.60 → maleo_foundation-0.0.62}/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 → maleo_foundation-0.0.62}/maleo_foundation.egg-info/PKG-INFO

@@ -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 → maleo_foundation-0.0.62}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.0.60"
+version = "0.0.62"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

maleo_foundation-0.0.60/maleo_foundation/db/database.py

@@ -1,40 +0,0 @@
-from sqlalchemy import Engine, MetaData, Column, Integer, UUID, TIMESTAMP, Enum, func
-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
-
-        @declared_attr
-        def __tablename__(cls) -> str:
-            return CaseFormatter.to_snake_case(cls.__name__)
-
-        #* ----- ----- Common columns definition ----- ----- *#
-
-        #* 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)
-
-        #* Statuses
-        status = Column(Enum(BaseEnums.StatusType, name="statustype"), default=BaseEnums.StatusType.ACTIVE, nullable=False)
-
-    Base = declarative_base()  #* Correct way to define a declarative base
-
-    #* Explicitly define the type of metadata
-    metadata:MetaData = Base.metadata
-
-    @classmethod
-    def initialize(cls, engine:Engine):
-        """Creates the database tables if they do not exist."""
-        cls.metadata.create_all(engine)