maleo-foundation 0.2.49__py3-none-any.whl → 0.2.51__py3-none-any.whl

maleo_foundation/models/schemas/result.py

@@ -14,10 +14,6 @@ class ResultMetadata(BaseModel):
     field_expansion:Optional[Union[str, Dict[str, FieldExpansionMetadata]]] = Field(None, description="Field expansion metadata")
 
 class BaseResultSchemas:
-    class BaseRow(BaseModel):
-        class Config:
-            from_attributes=True
-
     class Base(BaseModel):
         success:bool = Field(..., description="Success status")
         code:BaseTypes.OptionalString = Field(None, description="Optional result code")

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

@@ -4,28 +4,17 @@ from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 
 class BaseServiceRepositoryResultsTransfers:
-    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:BaseServiceRepositoryResultsTransfers.Row
+    class SingleData(BaseResultSchemas.SingleData): pass
 
-    class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData):
-        data:list[BaseServiceRepositoryResultsTransfers.Row]
+    class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData): pass
 
     class PaginatedMultipleData(BaseResultSchemas.PaginatedMultipleData):
-        data:list[BaseServiceRepositoryResultsTransfers.Row]
-
         @model_validator(mode="before")
         @classmethod
         def calculate_pagination(cls, values: dict) -> dict:

maleo_foundation/types.py

@@ -12,6 +12,7 @@ class BaseTypes:
     LiteralFalse = Literal[False]
     LiteralTrue = Literal[True]
     ListOfBools = List[bool]
+    OptionalBoolean = Optional[bool]
 
     #* Float-related types
     ListOfFloats = List[float]

maleo_foundation/utils/query.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Column, Table
 from sqlalchemy.ext.declarative import DeclarativeMeta
-from sqlalchemy.orm import Query
+from sqlalchemy.orm import Query, Session
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.sql.expression import or_, asc, cast, desc
 from sqlalchemy.types import DATE, String, TEXT, TIMESTAMP
@@ -14,18 +14,22 @@ class BaseQueryUtils:
         query:Query,
         table:Type[DeclarativeMeta],
         column:str,
-        value:BaseTypes.OptionalAny
+        value:BaseTypes.OptionalAny = None,
+        include_null:bool = False
     ) -> Query:
-        if not value:
-            return query
         column_attr = getattr(table, column, None)
-        if not column_attr:
+        if column_attr is None or not isinstance(column_attr, InstrumentedAttribute):
             return query
-        if isinstance(value, list):
-            value_filters = [column_attr == val for val in value]
+
+        value_filters = []
+        if value is not None:
+            value_filters.extend([column_attr == val for val in value])
+        if include_null:
+            value_filters.append(column_attr.is_(None))
+
+        if value_filters:
             query = query.filter(or_(*value_filters))
-            return query
-        query = query.filter(column_attr == value)
+
         return query
 
     @staticmethod
@@ -33,15 +37,24 @@ class BaseQueryUtils:
         query:Query,
         table:Type[DeclarativeMeta],
         column:str,
-        ids:BaseTypes.OptionalListOfIntegers
+        ids:BaseTypes.OptionalListOfIntegers = None,
+        include_null:bool = False
     ) -> Query:
+        column_attr = getattr(table, column, None)
+        if column_attr is None or not isinstance(column_attr, InstrumentedAttribute):
+            return query
+        
+        id_filters = []
         if ids is not None:
-            column_attr = getattr(table, column, None)
-            if column_attr:
-                id_filters = [column_attr == id for id in ids]
-                query = query.filter(or_(*id_filters))
+            id_filters.extend([column_attr == id for id in ids])
+        if include_null:
+            id_filters.append(column_attr.is_(None))
+
+        if id_filters:
+            query = query.filter(or_(*id_filters))
+
         return query
-    
+
     @staticmethod
     def filter_timestamps(
         query:Query,
@@ -69,7 +82,7 @@ class BaseQueryUtils:
                 except KeyError:
                     continue
         return query
-    
+
     @staticmethod
     def filter_statuses(
         query:Query,
@@ -80,7 +93,75 @@ class BaseQueryUtils:
             status_filters = [table.status == status for status in statuses]
             query = query.filter(or_(*status_filters))
         return query
-    
+
+    @staticmethod
+    def filter_is_root(
+        query:Query,
+        table:Type[DeclarativeMeta],
+        parent_column:str="parent_id",
+        is_root:BaseTypes.OptionalBoolean=None
+    ) -> Query:
+        parent_attr = getattr(table, parent_column, None)
+        if parent_attr is None or not isinstance(parent_attr, InstrumentedAttribute):
+            return query
+        if is_root is not None:
+            query = query.filter(parent_attr.is_(None) if is_root else parent_attr.is_not(None))
+        return query
+
+    @staticmethod
+    def filter_is_parent(
+        session:Session,
+        query:Query,
+        table:Type[DeclarativeMeta],
+        id_column:str="id",
+        parent_column:str="parent_id",
+        is_parent:BaseTypes.OptionalBoolean=None
+    ) -> Query:
+        id_attr = getattr(table, id_column, None)
+        if id_attr is None or not isinstance(id_attr, InstrumentedAttribute):
+            return query
+        parent_attr = getattr(table, parent_column, None)
+        if parent_attr is None or not isinstance(parent_attr, InstrumentedAttribute):
+            return query
+        if is_parent is not None:
+            subq = session.query(table).filter(parent_attr == id_attr).exists()
+            query = query.filter(subq if is_parent else ~subq)
+        return query
+
+    @staticmethod
+    def filter_is_children(
+        query:Query,
+        table:Type[DeclarativeMeta],
+        parent_column:str = "parent_id",
+        is_children:BaseTypes.OptionalBoolean = None
+    ) -> Query:
+        parent_attr = getattr(table, parent_column, None)
+        if parent_attr is None or not isinstance(parent_attr, InstrumentedAttribute):
+            return query
+        if is_children is not None:
+            query = query.filter(parent_attr.is_not(None) if is_children else parent_attr.is_(None))
+        return query
+
+    @staticmethod
+    def filter_is_leaf(
+        session:Session,
+        query:Query,
+        table:Type[DeclarativeMeta],
+        id_column:str="id",
+        parent_column:str="parent_id",
+        is_leaf:BaseTypes.OptionalBoolean=None
+    ) -> Query:
+        id_attr = getattr(table, id_column, None)
+        if id_attr is None or not isinstance(id_attr, InstrumentedAttribute):
+            return query
+        parent_attr = getattr(table, parent_column, None)
+        if parent_attr is None or not isinstance(parent_attr, InstrumentedAttribute):
+            return query
+        if is_leaf is not None:
+            subq = session.query(table).filter(parent_attr == id_attr).exists()
+            query = query.filter(~subq if is_leaf else subq)
+        return query
+
     @staticmethod
     def filter_search(
         query:Query,
@@ -103,7 +184,8 @@ class BaseQueryUtils:
             if search_filters:
                 query = query.filter(or_(*search_filters))
         return query
-    
+
+
     @staticmethod
     def sort(
         query:Query,

{maleo_foundation-0.2.49.dist-info → maleo_foundation-0.2.51.dist-info}/METADATA

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

{maleo_foundation-0.2.49.dist-info → maleo_foundation-0.2.51.dist-info}/RECORD

@@ -5,7 +5,7 @@ maleo_foundation/constants.py,sha256=aBmEfWlBqZxi0k-n6h2NM1YRLOjMnheEiLyQcjP-zCQ
 maleo_foundation/enums.py,sha256=OLVgb0rKk2gfG19FEyq9YGrQcmovr_FgtGFUcIu23Lo,3596
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/rest_controller_result.py,sha256=4KbCmk70IEHj1L1bNJfFg1Y3ifnRSnmvK6dYyVJddok,2014
-maleo_foundation/types.py,sha256=aKXnIgEhYGSfFqNMGLc4qIKGkINBRpkOo9R9cb2CbwI,2414
+maleo_foundation/types.py,sha256=bUcCR-qRlxxttMxJQnVmtBic3EXEd_urcC2P55evWPc,2451
 maleo_foundation/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/client/manager.py,sha256=pFWLFYW4eE9MLyFmFS05IgnMBdqqUHbdyTkSbnBtm5E,2620
 maleo_foundation/client/services/__init__.py,sha256=uIBnAeQ9a2otQbUAbKBQfYrkEUugXjxXoV8W5QYHuic,1051
@@ -58,7 +58,7 @@ maleo_foundation/models/schemas/general.py,sha256=PCnGRV_WL8xiBuECDlt7E0Mg_pEVrM
 maleo_foundation/models/schemas/hash.py,sha256=db2uyCeUzvF2zDCcbiZMh1MxIOGOGezOMOx-M1ta4zI,441
 maleo_foundation/models/schemas/key.py,sha256=7FZxVqTL5qRK48AXL1odrMNhAwhwtCwSkBUPsJwuBII,594
 maleo_foundation/models/schemas/parameter.py,sha256=K47z2NzmTEhUiOfRiRLyRPXoQurbWsKBL7ObXAxIWRY,2100
-maleo_foundation/models/schemas/result.py,sha256=MwjJVBwbAg3f4ibBhsN-256ZH9mGPenPv5sPEkB3Wao,3637
+maleo_foundation/models/schemas/result.py,sha256=uYVV5MHeK2aKEWmbmI8azDuD4_xG3MKmo3_wDAl5i6E,3551
 maleo_foundation/models/schemas/signature.py,sha256=-5ldTnJsjwqPRbHw7PFcLKITqEXJ_qKDdRHShK75NVA,620
 maleo_foundation/models/schemas/token.py,sha256=RYq8v1T_WZIu8lcjwyV6Pp7ZjFkr_lW9x6QyDmXBsfw,563
 maleo_foundation/models/transfers/__init__.py,sha256=oJLJ3Geeme6vBw7R2Dhvdvg4ziVvzEYAGJaP-tm_90w,299
@@ -94,7 +94,7 @@ maleo_foundation/models/transfers/results/encryption/aes.py,sha256=yx3hZNhge2lfj
 maleo_foundation/models/transfers/results/encryption/rsa.py,sha256=hlCtiT1TZwmMBEn-sgGs-WocNEmJ4qxWcHS5y9m7Voc,683
 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/repository.py,sha256=xz9RakOBEbtdGnnK0fM4KVZOL-AjRsaIE9J3TQqkIBo,1887
+maleo_foundation/models/transfers/results/service/repository.py,sha256=Ach5lLjEC4IB_fEJPMEYgwBWNKq-TYLzbsHuc6e1vsw,1543
 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
@@ -104,7 +104,7 @@ maleo_foundation/utils/exceptions.py,sha256=kDLTWiUauvc-fSKrEyxlGvIi2NtZIAhJ9bV3
 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
-maleo_foundation/utils/query.py,sha256=OQJNf42XeIh-J6tBa_f8iX-UoAib1vg_z8LsVE3zfGk,4739
+maleo_foundation/utils/query.py,sha256=fLPUZQx8JuFpt8joLq-bfbuKnTKrLQAaQlRLS7WSpKY,7718
 maleo_foundation/utils/repository.py,sha256=knBi3xOLlhBIEtChvqbZh4wXmgrFCB3rDwQXy41d7_c,2852
 maleo_foundation/utils/dependencies/__init__.py,sha256=0KKGrdfj8Cc5A4SRk_ZBAxzOP795Mizdb4zIBh07KC4,122
 maleo_foundation/utils/dependencies/auth.py,sha256=wS9qnmd1n2WsFhiSfyq_3Io3wwZKTENVPv4rMwxJslE,727
@@ -117,7 +117,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.49.dist-info/METADATA,sha256=8U6ht0Me4xfpRVvEEqRlbdAyee_2wiIEXtPifCoQSBY,3598
-maleo_foundation-0.2.49.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-maleo_foundation-0.2.49.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.49.dist-info/RECORD,,
+maleo_foundation-0.2.51.dist-info/METADATA,sha256=KUPBDR3c1SUqEkjF-p9hwN5HRhUsRpb9PE9tRdW4V2Q,3598
+maleo_foundation-0.2.51.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+maleo_foundation-0.2.51.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.51.dist-info/RECORD,,