maleo-identity 0.1.11__py3-none-any.whl → 0.1.27__py3-none-any.whl

maleo/identity/schemas/user_profile.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Generic, Literal, TypeVar, overload
+from typing import Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.identity import (
     OptBloodType,
@@ -21,7 +21,7 @@ from maleo.schemas.mixins.identity import (
     Ids,
     UUIDs,
     IntUserId,
-    IntOrganizationIds,
+    IntUserIds,
     BirthDate,
 )
 from maleo.schemas.mixins.sort import convert as convert_sort
@@ -37,7 +37,7 @@ from maleo.types.dict import StrToAnyDict
 from maleo.types.integer import OptListOfInts
 from maleo.types.string import OptStr
 from maleo.types.uuid import OptListOfUUIDs
-from ..enums.user_profile import IdentifierType
+from ..enums.user_profile import IdentifierType, OptListOfExpandableFields
 from ..mixins.common import (
     IdCard,
     FullName,
@@ -49,12 +49,15 @@ from ..mixins.user_profile import (
     MiddleName,
     LastName,
     EndingTitle,
+    AvatarMixin,
+    Expand,
     UserProfileIdentifier,
 )
 from ..types.user_profile import IdentifierValueType
 
 
-class CreateParameter(
+class StandardCreateData(
+    AvatarMixin,
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
     BirthDate[OptDate],
@@ -66,32 +69,52 @@ class CreateParameter(
     FirstName[str],
     LeadingTitle[OptStr],
     IdCard[OptStr],
+):
+    pass
+
+
+class FullCreateData(
+    StandardCreateData,
     IntUserId[int],
 ):
     pass
 
 
+class CreateParameter(Expand, FullCreateData):
+    pass
+
+
 class ReadMultipleParameter(
+    Expand,
     ReadPaginatedMultipleParameter,
     BloodTypesMixin[OptListOfBloodTypes],
     GendersMixin[OptListOfGenders],
+    IntUserIds[OptListOfInts],
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
-    IntOrganizationIds[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    user_ids: Annotated[OptListOfInts, Field(None, description="User's IDs")] = None
+    genders: Annotated[OptListOfGenders, Field(None, description="Genders")] = None
+    blood_types: Annotated[
+        OptListOfBloodTypes, Field(None, description="Blood Types")
+    ] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
-            "organization_ids",
             "ids",
             "uuids",
             "statuses",
+            "user_ids",
             "genders",
             "blood_types",
             "search",
             "page",
             "limit",
             "use_cache",
+            "expand",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -104,7 +127,19 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
+class ReadSingleParameter(Expand, BaseReadSingleParameter[UserProfileIdentifier]):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: UserProfileIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+    ) -> "ReadSingleParameter":
+        return cls(
+            identifier=identifier, statuses=statuses, use_cache=use_cache, expand=expand
+        )
+
     @overload
     @classmethod
     def new(
@@ -113,6 +148,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -122,6 +158,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -131,6 +168,17 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: str,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+    ) -> "ReadSingleParameter": ...
+    @overload
+    @classmethod
+    def new(
+        cls,
+        identifier_type: IdentifierType,
+        identifier_value: IdentifierValueType,
+        statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
+        use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -139,6 +187,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=UserProfileIdentifier(
@@ -147,6 +196,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
             ),
             statuses=statuses,
             use_cache=use_cache,
+            expand=expand,
         )
 
     def to_query_params(self) -> StrToAnyDict:
@@ -156,6 +206,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserProfileIdentifier]):
 
 
 class FullUpdateData(
+    AvatarMixin,
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
     BirthDate[OptDate],
@@ -171,6 +222,7 @@ class FullUpdateData(
 
 
 class PartialUpdateData(
+    AvatarMixin,
     BloodTypeMixin[OptBloodType],
     GenderMixin[OptGender],
     BirthDate[OptDate],
@@ -193,6 +245,7 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
+    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierMixin[UserProfileIdentifier],
     Generic[UpdateDataT],
@@ -204,6 +257,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID, IdentifierType.USER_ID],
         identifier_value: int,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -212,6 +266,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -220,6 +275,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID_CARD],
         identifier_value: str,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -228,6 +284,7 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @classmethod
     def new(
@@ -235,16 +292,19 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter":
         return cls(
             identifier=UserProfileIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             data=data,
+            expand=expand,
         )
 
 
 class StatusUpdateParameter(
+    Expand,
     BaseStatusUpdateParameter[UserProfileIdentifier],
 ):
     @overload
@@ -254,6 +314,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID, IdentifierType.USER_ID],
         identifier_value: int,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -262,6 +323,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -270,6 +332,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID_CARD],
         identifier_value: str,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -278,6 +341,7 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @classmethod
     def new(
@@ -285,12 +349,14 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter":
         return cls(
             identifier=UserProfileIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             type=type,
+            expand=expand,
         )
 
 

maleo/identity/schemas/user_system_role.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Generic, Literal, TypeVar, overload
+from typing import Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
 from maleo.enums.system import (
     SystemRole,
@@ -31,9 +31,9 @@ from maleo.schemas.parameter import (
 from maleo.types.dict import StrToAnyDict
 from maleo.types.integer import OptInt, OptListOfInts
 from maleo.types.uuid import OptListOfUUIDs
-from ..enums.user_system_role import IdentifierType
-from ..mixins.user_system_role import UserSystemRoleIdentifier
-from ..types.user_system_role import CompositeIdentifier, IdentifierValueType
+from ..enums.user_system_role import IdentifierType, OptListOfExpandableFields
+from ..mixins.user_system_role import Expand, UserSystemRoleIdentifier
+from ..types.user_system_role import CompositeIdentifierType, IdentifierValueType
 
 
 class StandardCreateData(FullSystemRoleMixin[SystemRole]):
@@ -47,17 +47,25 @@ class FullCreateData(
     pass
 
 
-class CreateParameter(FullCreateData):
+class CreateParameter(Expand, FullCreateData):
     pass
 
 
 class ReadMultipleParameter(
+    Expand,
     ReadPaginatedMultipleParameter,
     FullSystemRolesMixin[OptListOfSystemRoles],
     IntUserIds[OptListOfInts],
     UUIDs[OptListOfUUIDs],
     Ids[OptListOfInts],
 ):
+    ids: Annotated[OptListOfInts, Field(None, description="Ids")] = None
+    uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
+    user_ids: Annotated[OptListOfInts, Field(None, description="User's IDs")] = None
+    system_roles: Annotated[
+        OptListOfSystemRoles, Field(None, description="System Roles")
+    ] = None
+
     @property
     def _query_param_fields(self) -> set[str]:
         return {
@@ -70,6 +78,7 @@ class ReadMultipleParameter(
             "page",
             "limit",
             "use_cache",
+            "expand",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -82,7 +91,19 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(BaseReadSingleParameter[UserSystemRoleIdentifier]):
+class ReadSingleParameter(Expand, BaseReadSingleParameter[UserSystemRoleIdentifier]):
+    @classmethod
+    def from_identifier(
+        cls,
+        identifier: UserSystemRoleIdentifier,
+        statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
+        use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+    ) -> "ReadSingleParameter":
+        return cls(
+            identifier=identifier, statuses=statuses, use_cache=use_cache, expand=expand
+        )
+
     @overload
     @classmethod
     def new(
@@ -91,6 +112,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserSystemRoleIdentifier]):
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -100,15 +122,17 @@ class ReadSingleParameter(BaseReadSingleParameter[UserSystemRoleIdentifier]):
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -118,6 +142,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserSystemRoleIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -126,6 +151,7 @@ class ReadSingleParameter(BaseReadSingleParameter[UserSystemRoleIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=UserSystemRoleIdentifier(
@@ -133,11 +159,12 @@ class ReadSingleParameter(BaseReadSingleParameter[UserSystemRoleIdentifier]):
             ),
             statuses=statuses,
             use_cache=use_cache,
+            expand=expand,
         )
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache"}, exclude_none=True
+            mode="json", include={"statuses", "use_cache", "expand"}, exclude_none=True
         )
 
 
@@ -163,6 +190,7 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
+    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierMixin[UserSystemRoleIdentifier],
     Generic[UpdateDataT],
@@ -174,6 +202,7 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -182,14 +211,16 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -198,6 +229,7 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter": ...
     @classmethod
     def new(
@@ -205,16 +237,19 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
     ) -> "UpdateParameter":
         return cls(
             identifier=UserSystemRoleIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             data=data,
+            expand=expand,
         )
 
 
 class StatusUpdateParameter(
+    Expand,
     BaseStatusUpdateParameter[UserSystemRoleIdentifier],
 ):
     @overload
@@ -224,6 +259,7 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -232,14 +268,16 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -248,6 +286,7 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter": ...
     @classmethod
     def new(
@@ -255,12 +294,14 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
     ) -> "StatusUpdateParameter":
         return cls(
             identifier=UserSystemRoleIdentifier(
                 type=identifier_type, value=identifier_value
             ),
             type=type,
+            expand=expand,
         )
 
 
@@ -280,7 +321,7 @@ class DeleteSingleParameter(BaseDeleteSingleParameter[UserSystemRoleIdentifier])
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
     ) -> "DeleteSingleParameter": ...
     @overload
     @classmethod

maleo/identity/types/api_key.py

@@ -3,5 +3,5 @@ from uuid import UUID
 from maleo.types.integer import OptInt
 
 
-CompositeIdentifier = Tuple[int, OptInt]
-IdentifierValueType = int | UUID | str | CompositeIdentifier
+CompositeIdentifierType = Tuple[int, OptInt]
+IdentifierValueType = int | UUID | str | CompositeIdentifierType

maleo/identity/types/organization_relation.py

@@ -3,5 +3,5 @@ from uuid import UUID
 from maleo.enums.organization import OrganizationRelation
 
 
-CompositeIdentifier = Tuple[int, int, OrganizationRelation]
-IdentifierValueType = int | UUID | CompositeIdentifier
+CompositeIdentifierType = Tuple[int, int, OrganizationRelation]
+IdentifierValueType = int | UUID | CompositeIdentifierType

maleo/identity/types/patient.py

@@ -1,4 +1,4 @@
 from uuid import UUID
 
 
-IdentifierValueType = int | UUID | str
+IdentifierValueType = int | UUID

maleo/identity/types/user_medical_role.py

@@ -3,5 +3,5 @@ from uuid import UUID
 from maleo.enums.medical import MedicalRole
 
 
-CompositeIdentifier = Tuple[int, int, MedicalRole]
-IdentifierValueType = int | UUID | CompositeIdentifier
+CompositeIdentifierType = Tuple[int, int, MedicalRole]
+IdentifierValueType = int | UUID | CompositeIdentifierType

maleo/identity/types/user_organization_role.py

@@ -3,5 +3,5 @@ from uuid import UUID
 from maleo.enums.organization import OrganizationRole
 
 
-CompositeIdentifier = Tuple[int, int, OrganizationRole]
-IdentifierValueType = int | UUID | CompositeIdentifier
+CompositeIdentifierType = Tuple[int, int, OrganizationRole]
+IdentifierValueType = int | UUID | CompositeIdentifierType

maleo/identity/types/user_system_role.py

@@ -3,5 +3,6 @@ from uuid import UUID
 from maleo.enums.system import SystemRole
 
 
-CompositeIdentifier = Tuple[int, SystemRole]
-IdentifierValueType = int | UUID | CompositeIdentifier
+BasicIdentifierType = int | UUID
+CompositeIdentifierType = Tuple[int, SystemRole]
+IdentifierValueType = BasicIdentifierType | CompositeIdentifierType

{maleo_identity-0.1.11.dist-info → maleo_identity-0.1.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.11
+Version: 0.1.27
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -11,7 +11,7 @@ Requires-Dist: annotated-types>=0.7.0
 Requires-Dist: anyio>=4.11.0
 Requires-Dist: bcrypt>=5.0.0
 Requires-Dist: black>=25.9.0
-Requires-Dist: cachetools>=6.2.0
+Requires-Dist: cachetools>=6.2.1
 Requires-Dist: certifi>=2025.10.5
 Requires-Dist: cffi>=2.0.0
 Requires-Dist: cfgv>=3.4.0
@@ -20,7 +20,7 @@ Requires-Dist: click>=8.3.0
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: cryptography>=46.0.2
 Requires-Dist: distlib>=0.4.0
-Requires-Dist: fastapi>=0.118.3
+Requires-Dist: fastapi>=0.119.0
 Requires-Dist: filelock>=3.20.0
 Requires-Dist: google-api-core>=2.26.0
 Requires-Dist: google-auth>=2.41.1
@@ -38,13 +38,14 @@ Requires-Dist: h11>=0.16.0
 Requires-Dist: httpcore>=1.0.9
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: identify>=2.6.15
-Requires-Dist: idna>=3.10
+Requires-Dist: idna>=3.11
 Requires-Dist: importlib_metadata>=8.7.0
 Requires-Dist: iniconfig>=2.1.0
 Requires-Dist: maleo-crypto>=0.0.50
 Requires-Dist: maleo-enums>=0.0.50
 Requires-Dist: maleo-logging>=0.0.50
-Requires-Dist: maleo-schemas>=0.1.80
+Requires-Dist: maleo-metadata>=0.7.50
+Requires-Dist: maleo-schemas>=0.7.50
 Requires-Dist: maleo-types>=0.0.50
 Requires-Dist: maleo-utils>=0.0.50
 Requires-Dist: mypy_extensions>=1.1.0