maleo-foundation 0.2.51__tar.gz → 0.2.53__tar.gz

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/PKG-INFO

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

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/responses.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 from fastapi import status
 from pydantic import Field, model_validator
 from typing import Dict, Type, Union
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 from maleo_foundation.types import BaseTypes
 
@@ -83,7 +82,7 @@ class BaseResponses:
             total_pages = (total_data // limit) + (1 if total_data % limit > 0 else 0)
 
             #* Assign computed pagination object before validation
-            values["pagination"] = BaseGeneralSchemas.ExtendedPagination(
+            values["pagination"] = BaseResultSchemas.ExtendedPagination(
                 page=page,
                 limit=limit,
                 data_count=len(data),

maleo_foundation-0.2.53/maleo_foundation/models/schemas/general.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+from pydantic import BaseModel, Field
+from maleo_foundation.enums import BaseEnums
+from maleo_foundation.types import BaseTypes
+
+class BaseGeneralSchemas:
+    class DateFilter(BaseModel):
+        name:str = Field(..., description="Column name.")
+        from_date:BaseTypes.OptionalDatetime = Field(None, description="From date.")
+        to_date:BaseTypes.OptionalDatetime = Field(None, description="To date.")
+
+    class SortColumn(BaseModel):
+        name:str = Field(..., description="Column name.")
+        order:BaseEnums.SortOrder = Field(..., description="Sort order.")
+
+    class SimplePagination(BaseModel):
+        page:int = Field(1, ge=1, description="Page number, must be >= 1.")
+        limit:int = Field(10, ge=1, le=100, description="Page size, must be 1 <= limit <= 100.")
+
+    class PrivateKey(BaseModel):
+        private_key:str = Field(..., description="Private key in str format.")
+
+    class PublicKey(BaseModel):
+        public_key:str = Field(..., description="Public key in str format.")
+
+    class KeyPair(PublicKey, PrivateKey): pass
+
+    class Status(BaseModel):
+        status:BaseEnums.StatusType = Field(..., description="Data's status")
+
+    class RSAKeys(BaseModel):
+        password:str = Field(..., description="Key's password")
+        private:str = Field(..., description="Private key")
+        public:str = Field(..., description="Public key")

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/schemas/parameter.py

@@ -8,6 +8,18 @@ from maleo_foundation.types import BaseTypes
 from maleo_foundation.extended_types import ExtendedTypes
 
 class BaseParameterSchemas:
+    class IdentifierType(BaseModel):
+        identifier:BaseEnums.IdentifierTypes = Field(..., description="Data's identifier type")
+
+    class IdentifierValue(BaseModel):
+        value:BaseTypes.IdentifierValue = Field(..., description="Data's identifier value")
+
+    class OptionalListOfIds(BaseModel):
+        ids:BaseTypes.OptionalListOfIntegers = Field(None, description="Specific Ids")
+
+    class OptionalListOfUuids(BaseModel):
+        uuids:BaseTypes.OptionalListOfUUIDs = Field(None, description="Specific Uuids")
+
     class Filters(BaseModel):
         filters:BaseTypes.ListOfStrings = Field([], description="Filters for date range, e.g. 'created_at|from::<ISO_DATETIME>|to::<ISO_DATETIME>'.")
 
@@ -28,6 +40,33 @@ class BaseParameterSchemas:
     class DateFilters(BaseModel):
         date_filters:ExtendedTypes.ListOfDateFilters = Field([], description="Date filters to be applied")
 
+    class OptionalListOfStatuses(BaseModel):
+        statuses:BaseTypes.OptionalListOfStatuses = Field(None, description="Data's status")
+
+    class IsRoot(BaseModel):
+        is_root:BaseTypes.OptionalBoolean = Field(None, description="Whether data is root")
+
+    class IsParent(BaseModel):
+        is_parent:BaseTypes.OptionalBoolean = Field(None, description="Whether data is parent")
+
+    class IsChild(BaseModel):
+        is_child:BaseTypes.OptionalBoolean = Field(None, description="Whether data is child")
+
+    class IsLeaf(BaseModel):
+        is_leaf:BaseTypes.OptionalBoolean = Field(None, description="Whether data is leaf")
+
+    class OptionalListOfCodes(BaseModel):
+        codes:BaseTypes.OptionalListOfStrings = Field(None, description="Specific Codes")
+
+    class OptionalListOfKeys(BaseModel):
+        keys:BaseTypes.OptionalListOfStrings = Field(None, description="Specific Keys")
+
+    class OptionalListOfNames(BaseModel):
+        names:BaseTypes.OptionalListOfStrings = Field(None, description="Specific Names")
+
+    class Search(BaseModel):
+        search:BaseTypes.OptionalString = Field(None, description="Search string.")
+
     class Sorts(BaseModel):
         sorts:BaseTypes.ListOfStrings = Field(["id.asc"], description="Sorting columns in 'column_name.asc' or 'column_name.desc' format.")
 
@@ -37,4 +76,10 @@ class BaseParameterSchemas:
             return [value for value in values if SORT_COLUMN_PATTERN.match(value)]
 
     class SortColumns(BaseModel):
-        sort_columns:ExtendedTypes.ListOfSortColumns = Field([BaseGeneralSchemas.SortColumn(name="id", order=BaseEnums.SortOrder.ASC)], description="List of columns to be sorted")
+        sort_columns:ExtendedTypes.ListOfSortColumns = Field([BaseGeneralSchemas.SortColumn(name="id", order=BaseEnums.SortOrder.ASC)], description="List of columns to be sorted")
+
+    class Expand(BaseModel):
+        expand:BaseTypes.OptionalListOfStrings = Field(None, description="Expanded field(s)")
+
+    class Data(BaseModel):
+        data:BaseTypes.StringToAnyDict = Field(..., description="Data")

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/schemas/result.py

@@ -1,5 +1,7 @@
 from pydantic import BaseModel, Field
+from datetime import datetime
 from typing import Dict, Optional, Union, Any
+from uuid import UUID
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.types import BaseTypes
 
@@ -14,6 +16,39 @@ class ResultMetadata(BaseModel):
     field_expansion:Optional[Union[str, Dict[str, FieldExpansionMetadata]]] = Field(None, description="Field expansion metadata")
 
 class BaseResultSchemas:
+    class Identifiers(BaseModel):
+        id:int = Field(..., ge=1, description="Data's ID, must be >= 1.")
+        uuid:UUID = Field(..., description="Data's UUID.")
+
+    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:BaseTypes.OptionalDatetime = Field(..., description="Data's deleted_at timestamp")
+        restored_at:BaseTypes.OptionalDatetime = Field(..., description="Data's restored_at timestamp")
+        deactivated_at:BaseTypes.OptionalDatetime = Field(..., description="Data's deactivated_at timestamp")
+        activated_at:datetime = Field(..., description="Data's activated_at timestamp")
+
+    class Order(BaseModel):
+        order:BaseTypes.OptionalInteger = Field(..., description="Data's order")
+
+    class Code(BaseModel):
+        code:str = Field(..., description="Data's code")
+
+    class Key(BaseModel):
+        key:str = Field(..., description="Data's key")
+
+    class Name(BaseModel):
+        name:str = Field(..., description="Data's name")
+
+    class Secret(BaseModel):
+        secret:UUID = Field(..., description="Data's secret")
+
+    class ExtendedPagination(BaseGeneralSchemas.SimplePagination):
+        data_count:int = Field(..., description="Fetched data count")
+        total_data:int = Field(..., description="Total data count")
+        total_pages:int = Field(..., description="Total pages count")
+
+    #* ----- ----- ----- Base ----- ----- ----- *#
     class Base(BaseModel):
         success:bool = Field(..., description="Success status")
         code:BaseTypes.OptionalString = Field(None, description="Optional result code")
@@ -71,4 +106,6 @@ class BaseResultSchemas:
         message:str = "Multiple paginated data found"
         description:str = "Requested paginated data found in database."
         total_data:int = Field(..., ge=0, description="Total data count")
-        pagination:BaseGeneralSchemas.ExtendedPagination = Field(..., description="Pagination metadata")
+        pagination:"BaseResultSchemas.ExtendedPagination" = Field(..., description="Pagination metadata")
+
+BaseResultSchemas.PaginatedMultipleData.model_rebuild()

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/transfers/parameters/client.py

@@ -8,8 +8,8 @@ from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 class BaseClientParametersTransfers:
     class GetUnpaginatedMultiple(
         BaseParameterSchemas.SortColumns,
-        BaseGeneralSchemas.Search,
-        BaseGeneralSchemas.Statuses,
+        BaseParameterSchemas.Search,
+        BaseParameterSchemas.OptionalListOfStatuses,
         BaseParameterSchemas.DateFilters
     ):
         pass

maleo_foundation-0.2.53/maleo_foundation/models/transfers/parameters/general.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+
+class BaseGeneralParametersTransfers:
+    class FieldExpansionProcessor(
+        BaseParameterSchemas.Expand,
+        BaseParameterSchemas.Data
+    ): pass
+
+    class GetSingleQuery(BaseParameterSchemas.OptionalListOfStatuses): pass
+
+    class BaseGetSingle(
+        BaseParameterSchemas.IdentifierValue,
+        BaseParameterSchemas.IdentifierType
+    ): pass
+
+    class GetSingle(
+        BaseParameterSchemas.OptionalListOfStatuses,
+        BaseGetSingle
+    ): pass
+
+    class StatusUpdate(BaseGeneralSchemas.Status): pass

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/transfers/parameters/service.py

@@ -9,8 +9,8 @@ from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 class BaseServiceParametersTransfers:
     class GetUnpaginatedMultipleQuery(
         BaseParameterSchemas.Sorts,
-        BaseGeneralSchemas.Search,
-        BaseGeneralSchemas.Statuses,
+        BaseParameterSchemas.Search,
+        BaseParameterSchemas.OptionalListOfStatuses,
         BaseParameterSchemas.Filters
     ): pass
 

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/transfers/results/client/service.py

@@ -1,6 +1,5 @@
 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 BaseClientServiceResultsTransfers:
@@ -22,7 +21,7 @@ class BaseClientServiceResultsTransfers:
             pagination = values.get("pagination")
             if pagination is None:
                 raise ValueError("Pagination field did not exists")
-            pagination = BaseGeneralSchemas.ExtendedPagination.model_validate(pagination)
+            pagination = BaseResultSchemas.ExtendedPagination.model_validate(pagination)
             values["page"] = pagination.page
             values["limit"] = pagination.limit
             values["total_data"] = pagination.total_data

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/transfers/results/service/general.py

@@ -1,6 +1,5 @@
 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 BaseServiceGeneralResultsTransfers:
@@ -30,7 +29,7 @@ class BaseServiceGeneralResultsTransfers:
             total_pages = (total_data // limit) + (1 if total_data % limit > 0 else 0)
 
             #* Assign computed pagination object before validation
-            values["pagination"] = BaseGeneralSchemas.ExtendedPagination(
+            values["pagination"] = BaseResultSchemas.ExtendedPagination(
                 page=page,
                 limit=limit,
                 data_count=len(data),

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation/models/transfers/results/service/repository.py

@@ -1,6 +1,5 @@
 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 BaseServiceRepositoryResultsTransfers:
@@ -30,7 +29,7 @@ class BaseServiceRepositoryResultsTransfers:
             total_pages = (total_data // limit) + (1 if total_data % limit > 0 else 0)
 
             #* Assign computed pagination object before validation
-            values["pagination"] = BaseGeneralSchemas.ExtendedPagination(
+            values["pagination"] = BaseResultSchemas.ExtendedPagination(
                 page=page,
                 limit=limit,
                 data_count=len(data),

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.51 → maleo_foundation-0.2.53}/pyproject.toml

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

maleo_foundation-0.2.51/maleo_foundation/models/schemas/general.py

@@ -1,104 +0,0 @@
-from __future__ import annotations
-from datetime import datetime
-from pydantic import BaseModel, Field
-from uuid import UUID
-from maleo_foundation.enums import BaseEnums
-from maleo_foundation.types import BaseTypes
-
-class BaseGeneralSchemas:
-    class IdentifierType(BaseModel):
-        identifier:BaseEnums.IdentifierTypes = Field(..., description="Data's identifier type")
-
-    class IdentifierValue(BaseModel):
-        value:BaseTypes.IdentifierValue = Field(..., description="Data's identifier value")
-
-    class Ids(BaseModel):
-        ids:BaseTypes.OptionalListOfIntegers = Field(None, description="Specific Ids")
-
-    class Uuids(BaseModel):
-        uuids:BaseTypes.OptionalListOfUUIDs = Field(None, description="Specific Uuids")
-
-    class Codes(BaseModel):
-        codes:BaseTypes.OptionalListOfStrings = Field(None, description="Specific Codes")
-
-    class Keys(BaseModel):
-        keys:BaseTypes.OptionalListOfStrings = Field(None, description="Specific Keys")
-
-    class Names(BaseModel):
-        names:BaseTypes.OptionalListOfStrings = Field(None, description="Specific Names")
-
-    class Search(BaseModel):
-        search:BaseTypes.OptionalString = Field(None, description="Search parameter string.")
-
-    class DateFilter(BaseModel):
-        name:str = Field(..., description="Column name.")
-        from_date:BaseTypes.OptionalDatetime = Field(None, description="From date.")
-        to_date:BaseTypes.OptionalDatetime = Field(None, description="To date.")
-
-    class Statuses(BaseModel):
-        statuses:BaseTypes.OptionalListOfStatuses = Field(None, description="Data's status")
-
-    class SortColumn(BaseModel):
-        name:str = Field(..., description="Column name.")
-        order:BaseEnums.SortOrder = Field(..., description="Sort order.")
-
-    class SimplePagination(BaseModel):
-        page:int = Field(1, ge=1, description="Page number, must be >= 1.")
-        limit:int = Field(10, ge=1, le=100, description="Page size, must be 1 <= limit <= 100.")
-
-    class ExtendedPagination(SimplePagination):
-        data_count:int = Field(..., description="Fetched data count")
-        total_data:int = Field(..., description="Total data count")
-        total_pages:int = Field(..., description="Total pages count")
-
-    class Status(BaseModel):
-        status:BaseEnums.StatusType = Field(..., description="Status")
-
-    class Expand(BaseModel):
-        expand:BaseTypes.OptionalListOfStrings = Field(None, description="Expanded field(s)")
-
-    class PrivateKey(BaseModel):
-        private_key:str = Field(..., description="Private key in str format.")
-
-    class PublicKey(BaseModel):
-        public_key:str = Field(..., description="Public key in str format.")
-
-    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.")
-
-    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:BaseTypes.OptionalDatetime = Field(..., description="Data's deleted_at timestamp")
-        restored_at:BaseTypes.OptionalDatetime = Field(..., description="Data's restored_at timestamp")
-        deactivated_at:BaseTypes.OptionalDatetime = Field(..., description="Data's deactivated_at timestamp")
-        activated_at:datetime = Field(..., description="Data's activated_at timestamp")
-
-    class Status(BaseModel):
-        status:BaseEnums.StatusType = Field(..., description="Data's status")
-
-    class Order(BaseModel):
-        order:BaseTypes.OptionalInteger = Field(..., description="Data's order")
-
-    class Code(BaseModel):
-        code:str = Field(..., description="Data's code")
-
-    class Key(BaseModel):
-        key:str = Field(..., description="Data's key")
-
-    class Name(BaseModel):
-        name:str = Field(..., description="Data's name")
-
-    class Secret(BaseModel):
-        secret:UUID = Field(..., description="Data's secret")
-
-    class Data(BaseModel):
-        data:BaseTypes.StringToAnyDict = Field(..., description="Data")
-
-    class RSAKeys(BaseModel):
-        password:str = Field(..., description="Key's password")
-        private:str = Field(..., description="Private key")
-        public:str = Field(..., description="Public key")

maleo_foundation-0.2.51/maleo_foundation/models/transfers/parameters/general.py

@@ -1,20 +0,0 @@
-from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-
-class BaseGeneralParametersTransfers:
-    class FieldExpansionProcessor(
-        BaseGeneralSchemas.Expand,
-        BaseGeneralSchemas.Data
-    ): pass
-
-    class GetSingleQuery(BaseGeneralSchemas.Statuses): pass
-
-    class BaseGetSingle(
-        BaseGeneralSchemas.IdentifierValue,
-        BaseGeneralSchemas.IdentifierType
-    ):
-        pass
-
-    class GetSingle(BaseGeneralSchemas.Statuses, BaseGetSingle): pass
-
-    class StatusUpdate(BaseGeneralSchemas.Status): pass