maleo-identity 0.1.20__tar.gz → 0.1.37__tar.gz

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.20
+Version: 0.1.37
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/maleo_identity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.20
+Version: 0.1.37
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo-identity"
-version = "0.1.20"
+version = "0.1.37"
 description = "MaleoIdentity service package"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/constants/user_profile.py

@@ -1,4 +1,5 @@
 from maleo.schemas.resource import Resource, ResourceIdentifier
+from maleo.types.string import SeqOfStrs
 
 
 USER_PROFILE_RESOURCE = Resource(
@@ -9,3 +10,17 @@ USER_PROFILE_RESOURCE = Resource(
     ],
     details=None,
 )
+
+
+VALID_EXTENSIONS: SeqOfStrs = (
+    ".jpeg",
+    ".jpg",
+    ".png",
+)
+
+
+VALID_MIME_TYPES: SeqOfStrs = (
+    "image/jpeg",
+    "image/jpg",
+    "image/png",
+)

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/enums/organization_relation.py

@@ -20,3 +20,16 @@ class IdentifierType(StrEnum):
         elif self is IdentifierType.COMPOSITE:
             return ("source_id", "target_id", "relation")
         raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    ORGANIZATION_TYPE = "organization_type"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/enums/user_profile.py

@@ -15,3 +15,17 @@ class IdentifierType(StrEnum):
     @property
     def column(self) -> str:
         return self.value
+
+
+class ExpandableField(StrEnum):
+    GENDER = "gender"
+    BLOOD_TYPE = "blood_type"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/enums/user_system_role.py

@@ -20,3 +20,16 @@ class IdentifierType(StrEnum):
         elif self is IdentifierType.COMPOSITE:
             return ("user_id", "system_role")
         raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    SYSTEM_ROLE = "system_role"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/api_key.py

@@ -5,7 +5,7 @@ from maleo.schemas.mixins.identity import Identifier
 from maleo.types.any import ManyAny
 from maleo.types.string import ManyStrs
 from ..enums.api_key import IdentifierType
-from ..types.api_key import CompositeIdentifier, IdentifierValueType
+from ..types.api_key import CompositeIdentifierType, IdentifierValueType
 
 
 class APIKey(BaseModel):
@@ -35,13 +35,15 @@ class UUIDAPIKeyIdentifier(Identifier[Literal[IdentifierType.UUID], UUID]):
 
 
 class CompositeAPIKeyIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyAPIKeyIdentifier = (

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/organization_registration_code.py

@@ -1,15 +1,49 @@
-from pydantic import BaseModel, Field
-from typing import Annotated, Generic, Literal, TypeGuard
+from pydantic import BaseModel, Field, model_validator
+from typing import Annotated, Generic, Literal, Self, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
 from maleo.types.integer import OptIntT
+from maleo.types.misc import OptIntOrStr
 from maleo.types.string import OptStrT
 from ..enums.organization_registration_code import IdentifierType
 from ..types.organization_registration_code import IdentifierValueType
 
 
+class CodeOrLength(BaseModel):
+    code_or_length: Annotated[
+        OptIntOrStr,
+        Field(
+            None,
+            description=(
+                "Code (str) or length (int). "
+                "If code is given, the length must be between 6 and 36 inclusive. "
+                "If length is given, the value must be between 6 and 36 inclusive. "
+                "Will generate random 6 char string if omitted"
+            ),
+        ),
+    ]
+
+    @model_validator(mode="after")
+    def validate_code_or_length(self) -> Self:
+        code_or_length = self.code_or_length
+        if code_or_length is None:
+            return self
+        print(code_or_length)
+        if isinstance(code_or_length, int):
+            length = code_or_length
+        elif isinstance(code_or_length, str):
+            length = len(code_or_length)
+        else:
+            raise ValueError("Code or Length must be either int or str")
+        if length < 6 or length > 36:
+            raise ValueError("Code or Length must be between 6 and 36 inclusive")
+        return self
+
+
 class Code(BaseModel, Generic[OptStrT]):
-    code: Annotated[OptStrT, Field(..., description="Code", max_length=36)]
+    code: Annotated[
+        OptStrT, Field(..., description="Code", min_length=6, max_length=36)
+    ]
 
 
 class MaxUses(BaseModel, Generic[OptIntT]):

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/organization_relation.py

@@ -6,8 +6,8 @@ from maleo.types.any import ManyAny
 from maleo.types.boolean import OptBoolT
 from maleo.types.misc import OptListOfAnyOrStrToAnyDict
 from maleo.types.string import ManyStrs
-from ..enums.organization_relation import IdentifierType
-from ..types.organization_relation import CompositeIdentifier, IdentifierValueType
+from ..enums.organization_relation import IdentifierType, OptListOfExpandableFields
+from ..types.organization_relation import CompositeIdentifierType, IdentifierValueType
 
 
 class IsBidirectional(BaseModel, Generic[OptBoolT]):
@@ -18,6 +18,12 @@ class Meta(BaseModel):
     meta: Annotated[OptListOfAnyOrStrToAnyDict, Field(None, description="Meta")] = None
 
 
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
 class OrganizationRelationIdentifier(Identifier[IdentifierType, IdentifierValueType]):
     @property
     def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
@@ -43,13 +49,15 @@ class UUIDOrganizationRelationIdentifier(
 
 
 class CompositeOrganizationRelationIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyOrganizationRelationIdentifier = (

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/user_medical_role.py

@@ -5,7 +5,7 @@ from maleo.schemas.mixins.identity import Identifier
 from maleo.types.any import ManyAny
 from maleo.types.string import ManyStrs
 from ..enums.user_medical_role import IdentifierType
-from ..types.user_medical_role import CompositeIdentifier, IdentifierValueType
+from ..types.user_medical_role import CompositeIdentifierType, IdentifierValueType
 
 
 class UserMedicalRoleIdentifier(Identifier[IdentifierType, IdentifierValueType]):
@@ -31,13 +31,15 @@ class UUIDUserMedicalRoleIdentifier(Identifier[Literal[IdentifierType.UUID], UUI
 
 
 class CompositeUserMedicalRoleIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyUserMedicalRoleIdentifier = (

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/user_organization_role.py

@@ -5,7 +5,7 @@ from maleo.schemas.mixins.identity import Identifier
 from maleo.types.any import ManyAny
 from maleo.types.string import ManyStrs
 from ..enums.user_organization_role import IdentifierType
-from ..types.user_organization_role import CompositeIdentifier, IdentifierValueType
+from ..types.user_organization_role import CompositeIdentifierType, IdentifierValueType
 
 
 class UserOrganizationRoleIdentifier(Identifier[IdentifierType, IdentifierValueType]):
@@ -33,13 +33,15 @@ class UUIDUserOrganizationRoleIdentifier(
 
 
 class CompositeUserOrganizationRoleIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyUserOrganizationRoleIdentifier = (

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/user_profile.py

@@ -3,7 +3,7 @@ from typing import Annotated, Generic, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
 from maleo.types.string import OptStrT
-from ..enums.user_profile import IdentifierType
+from ..enums.user_profile import IdentifierType, OptListOfExpandableFields
 from ..types.user_profile import IdentifierValueType
 
 
@@ -37,6 +37,19 @@ class EndingTitle(BaseModel, Generic[OptStrT]):
     ]
 
 
+class Avatar(BaseModel):
+    content: Annotated[bytes, Field(..., description="Avatar's content")]
+    content_type: Annotated[str, Field(..., description="Avatar's content type")]
+    filename: Annotated[str, Field(..., description="Avatar's filename")]
+
+
+OptAvatar = Avatar | None
+
+
+class AvatarMixin(BaseModel):
+    avatar: Annotated[OptAvatar, Field(None, description="Avatar")]
+
+
 class AvatarName(BaseModel, Generic[OptStrT]):
     avatar_name: Annotated[OptStrT, Field(..., description="User's Avatar Name")]
 
@@ -45,6 +58,12 @@ class AvatarUrl(BaseModel, Generic[OptStrT]):
     avatar_url: Annotated[OptStrT, Field(..., description="User's Avatar URL")]
 
 
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
 class UserProfileIdentifier(Identifier[IdentifierType, IdentifierValueType]):
     @property
     def column_and_value(self) -> tuple[str, IdentifierValueType]:

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/mixins/user_system_role.py

@@ -1,11 +1,17 @@
-from pydantic import Field
+from pydantic import BaseModel, Field
 from typing import Annotated, Literal, TypeGuard
 from uuid import UUID
 from maleo.schemas.mixins.identity import Identifier
 from maleo.types.any import ManyAny
 from maleo.types.string import ManyStrs
-from ..enums.user_system_role import IdentifierType
-from ..types.user_system_role import CompositeIdentifier, IdentifierValueType
+from ..enums.user_system_role import IdentifierType, OptListOfExpandableFields
+from ..types.user_system_role import CompositeIdentifierType, IdentifierValueType
+
+
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
 
 
 class UserSystemRoleIdentifier(Identifier[IdentifierType, IdentifierValueType]):
@@ -31,13 +37,15 @@ class UUIDUserSystemRoleIdentifier(Identifier[Literal[IdentifierType.UUID], UUID
 
 
 class CompositeUserSystemRoleIdentifier(
-    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifier]
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
 ):
     type: Annotated[
         Literal[IdentifierType.COMPOSITE],
         Field(IdentifierType.COMPOSITE, description="Identifier's type"),
     ] = IdentifierType.COMPOSITE
-    value: Annotated[CompositeIdentifier, Field(..., description="Identifier's value")]
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
 
 
 AnyUserSystemRoleIdentifier = (

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/schemas/api_key.py

@@ -25,7 +25,7 @@ from maleo.types.integer import OptInt, OptListOfInts
 from maleo.types.uuid import OptListOfUUIDs
 from ..enums.api_key import IdentifierType
 from ..mixins.api_key import APIKeyIdentifier
-from ..types.api_key import CompositeIdentifier, IdentifierValueType
+from ..types.api_key import CompositeIdentifierType, IdentifierValueType
 
 
 class CreateParameter(
@@ -106,7 +106,7 @@ class ReadSingleParameter(BaseReadSingleParameter[APIKeyIdentifier]):
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
     ) -> "ReadSingleParameter": ...
@@ -155,7 +155,7 @@ class DeleteSingleParameter(BaseDeleteSingleParameter[APIKeyIdentifier]):
     def new(
         cls,
         identifier_type: Literal[IdentifierType.COMPOSITE],
-        identifier_value: CompositeIdentifier,
+        identifier_value: CompositeIdentifierType,
     ) -> "DeleteSingleParameter": ...
     @overload
     @classmethod

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/schemas/common.py

@@ -2,6 +2,10 @@ from datetime import date
 from pydantic import BaseModel, Field
 from typing import Annotated, Generic, TypeVar, Type
 from maleo.enums.identity import OptRhesus, RhesusMixin
+from maleo.enums.organization import (
+    OrganizationRelation,
+    SimpleOrganizationRelationMixin,
+)
 from maleo.enums.status import DataStatus as DataStatusEnum, SimpleDataStatusMixin
 from maleo.metadata.schemas.blood_type import (
     OptKeyOrStandardSchema as BloodTypeOptKeyOrStandardSchema,
@@ -130,6 +134,7 @@ class SourceOrganizationSchemaMixin(BaseModel):
 class SourceOrganizationRelationSchema(
     Meta,
     IsBidirectional[bool],
+    SimpleOrganizationRelationMixin[OrganizationRelation],
     SourceOrganizationSchemaMixin,
     SimpleDataStatusMixin[DataStatusEnum],
     LifecycleTimestamp,
@@ -154,6 +159,7 @@ class TargetOrganizationSchemaMixin(BaseModel):
 class TargetOrganizationRelationSchema(
     Meta,
     IsBidirectional[bool],
+    SimpleOrganizationRelationMixin[OrganizationRelation],
     TargetOrganizationSchemaMixin,
     SimpleDataStatusMixin[DataStatusEnum],
     LifecycleTimestamp,
@@ -191,6 +197,19 @@ class OrganizationSchemaMixin(BaseModel, Generic[AnyOrganizationSchemaT]):
     ]
 
 
+class OrganizationRelationSchema(
+    Meta,
+    IsBidirectional[bool],
+    SimpleOrganizationRelationMixin[OrganizationRelation],
+    TargetOrganizationSchemaMixin,
+    SourceOrganizationSchemaMixin,
+    SimpleDataStatusMixin[DataStatusEnum],
+    LifecycleTimestamp,
+    DataIdentifier,
+):
+    pass
+
+
 class UserMedicalRoleSchema(
     FullMedicalRoleMixin[MedicalRoleKeyOrStandardSchema],
     IntOrganizationId[int],
@@ -246,7 +265,7 @@ class UserProfileSchema(
     LifecycleTimestamp,
     DataIdentifier,
 ):
-    pass
+    avatar_url: Annotated[OptStr, Field(None, description="Avatar URL")]
 
 
 OptUserProfileSchema = UserProfileSchema | None

{maleo_identity-0.1.20 → maleo_identity-0.1.37}/src/schemas/organization_registration_code.py

@@ -28,6 +28,7 @@ from maleo.types.string import OptStr, OptListOfStrs
 from maleo.types.uuid import OptListOfUUIDs
 from ..enums.organization_registration_code import IdentifierType
 from ..mixins.organization_registration_code import (
+    CodeOrLength,
     Code,
     MaxUses,
     OrganizationRegistrationCodeIdentifier,
@@ -35,7 +36,7 @@ from ..mixins.organization_registration_code import (
 from ..types.organization_registration_code import IdentifierValueType
 
 
-class StandardCreateData(Code[OptStr]):
+class StandardCreateData(CodeOrLength):
     pass