maleo-foundation 0.0.6__tar.gz → 0.0.8__tar.gz

{maleo_foundation-0.0.6 → maleo_foundation-0.0.8}/PKG-INFO

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

{maleo_foundation-0.0.6 → maleo_foundation-0.0.8}/maleo_foundation/models/schemas/general.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from datetime import date, datetime, timedelta, timezone
 from pydantic import BaseModel, Field, model_validator, field_serializer, FieldSerializationInfo
-from typing import Optional, Any
+from typing import Optional, Union, Any
 from uuid import UUID
 from maleo_foundation.models.enums import BaseEnums
 from maleo_foundation.constants import REFRESH_TOKEN_DURATION_DAYS, ACCESS_TOKEN_DURATION_MINUTES
@@ -48,6 +48,40 @@ class BaseGeneralSchemas:
 
     class KeyPair(PublicKey, PrivateKey): pass
 
+    class Identifiers(BaseModel):
+        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")
+        deleted_at:Optional[datetime] = Field(..., description="Data's deleted_at timestamp")
+        restored_at:Optional[datetime] = Field(..., description="Data's restored_at timestamp")
+        deactivated_at:Optional[datetime] = 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:Union[datetime, date], info:FieldSerializationInfo) -> str:
+            """Serializes datetime/date fields to ISO format."""
+            return value.isoformat()
+
+    class Status(BaseModel):
+        status:BaseEnums.StatusType = Field(..., description="Data's status")
+
+    class Order(BaseModel):
+        order:Optional[int] = Field(..., description="Data's order")
+
+    class Key(BaseModel):
+        key:str = Field(..., description="Data's key")
+
+    class Name(BaseModel):
+        name:str = Field(..., description="Data's name")
+
     class TokenPayload(BaseModel):
         t:BaseEnums.TokenType = Field(..., description="Token Type")
         sr:UUID = Field(..., description="System role")

maleo_foundation-0.0.8/maleo_foundation/models/schemas/result.py

@@ -0,0 +1,41 @@
+from pydantic import BaseModel, Field
+from typing import Literal, Optional, Any
+from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+
+class BaseResultSchemas:
+    class Base(BaseModel):
+        success:bool = Field(..., description="Success status")
+        code:Optional[str] = Field(None, description="Optional result code")
+        message:Optional[str] = Field(None, description="Optional message")
+        description:Optional[str] = Field(None, description="Optional description")
+        data:Any = Field(..., description="Data")
+        other:Optional[Any] = Field(None, description="Optional other information")
+
+    #* ----- ----- ----- Intermediary ----- ----- ----- *#
+    class Fail(Base):
+        success:Literal[False] = Field(False, description="Success status")
+        data:None = Field(None, description="No data")
+
+    class Success(Base):
+        success:Literal[True] = Field(True, description="Success status")
+        data:Any = Field(..., description="Data")
+
+    #* ----- ----- ----- Derived ----- ----- ----- *#
+    class NoData(Success):
+        success:Literal[True] = Field(True, description="Success status")
+        data:None = Field(None, description="No data")
+
+    class SingleData(Success):
+        success:Literal[True] = Field(True, description="Success status")
+        data:Any = Field(..., description="Fetched single data")
+
+    class UnpaginatedMultipleData(Success):
+        success:Literal[True] = Field(True, description="Success status")
+        data:list[Any] = Field(..., description="Unpaginated multiple data")
+
+    class PaginatedMultipleData(
+        UnpaginatedMultipleData,
+        BaseGeneralSchemas.SimplePagination
+    ):
+        total_data:int = Field(..., description="Total data count")
+        pagination:BaseGeneralSchemas.ExtendedPagination = Field(..., description="Pagination metadata")

{maleo_foundation-0.0.6 → maleo_foundation-0.0.8}/maleo_foundation/models/transfers/results/service/query.py

@@ -1,21 +1,47 @@
 from __future__ import annotations
-from pydantic import model_validator
+from datetime import datetime, date
+from pydantic import FieldSerializationInfo, field_validator, field_serializer, model_validator
+from uuid import UUID
+from typing import Any
 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
+    ):
+        @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
+
     class Fail(BaseResultSchemas.Fail): pass
 
     class NoData(BaseResultSchemas.NoData): pass
 
     class SingleData(BaseResultSchemas.SingleData):
-        data:BaseResultSchemas.Row
+        data:BaseServiceQueryResultsTransfers.Row
 
     class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData):
-        data:list[BaseResultSchemas.Row]
+        data:list[BaseServiceQueryResultsTransfers.Row]
 
     class PaginatedMultipleData(BaseResultSchemas.PaginatedMultipleData):
-        data:list[BaseResultSchemas.Row]
+        data:list[BaseServiceQueryResultsTransfers.Row]
 
         @model_validator(mode="before")
         @classmethod

{maleo_foundation-0.0.6 → maleo_foundation-0.0.8}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.0.6 → maleo_foundation-0.0.8}/pyproject.toml

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

maleo_foundation-0.0.6/maleo_foundation/models/schemas/result.py

@@ -1,89 +0,0 @@
-from datetime import datetime, date
-from pydantic import BaseModel, FieldSerializationInfo, Field, field_serializer, field_validator
-from typing import Literal, Optional, Union, Any
-from uuid import UUID
-from maleo_foundation.models.enums import BaseEnums
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-
-class BaseResultSchemas:
-    class Identifiers(BaseModel):
-        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")
-        deleted_at:Optional[datetime] = Field(..., description="Data's deleted_at timestamp")
-        restored_at:Optional[datetime] = Field(..., description="Data's restored_at timestamp")
-        deactivated_at:Optional[datetime] = 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:Union[datetime, date], info:FieldSerializationInfo) -> str:
-            """Serializes datetime/date fields to ISO format."""
-            return value.isoformat()
-
-    class Status(BaseModel):
-        status:BaseEnums.StatusType = Field(..., description="Data's status")
-
-    class Row(Status, Timestamps, 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
-
-    #* ----- ----- ----- Base ----- ----- ----- *#
-    class Base(BaseModel):
-        success:bool = Field(..., description="Success status")
-        code:Optional[str] = Field(None, description="Optional result code")
-        message:Optional[str] = Field(None, description="Optional message")
-        description:Optional[str] = Field(None, description="Optional description")
-        data:Any = Field(..., description="Data")
-        other:Optional[Any] = Field(None, description="Optional other information")
-
-    #* ----- ----- ----- Intermediary ----- ----- ----- *#
-    class Fail(Base):
-        success:Literal[False] = Field(False, description="Success status")
-        data:None = Field(None, description="No data")
-
-    class Success(Base):
-        success:Literal[True] = Field(True, description="Success status")
-        data:Any = Field(..., description="Data")
-
-    #* ----- ----- ----- Derived ----- ----- ----- *#
-    class NoData(Success):
-        success:Literal[True] = Field(True, description="Success status")
-        data:None = Field(None, description="No data")
-
-    class SingleData(Success):
-        success:Literal[True] = Field(True, description="Success status")
-        data:Any = Field(..., description="Fetched single data")
-
-    class UnpaginatedMultipleData(Success):
-        success:Literal[True] = Field(True, description="Success status")
-        data:list[Any] = Field(..., description="Unpaginated multiple data")
-
-    class PaginatedMultipleData(
-        UnpaginatedMultipleData,
-        BaseGeneralSchemas.SimplePagination
-    ):
-        total_data:int = Field(..., description="Total data count")
-        pagination:BaseGeneralSchemas.ExtendedPagination = Field(..., description="Pagination metadata")