maleo-identity 0.0.90__py3-none-any.whl → 0.0.92__py3-none-any.whl

maleo/identity/constants/organization.py

@@ -1,17 +1,24 @@
 from typing import Callable, Dict
 from uuid import UUID
-from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.organization import IdentifierType
-from maleo.identity.types.base.organization import IdentifierValueType
+from maleo.schemas.resource import Resource, ResourceIdentifier
+from ..enums.organization import IdentifierType
+from ..types.organization import IdentifierValueType
 
-IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
-    IdentifierType, Callable[..., IdentifierValueType]
-] = {IdentifierType.ID: int, IdentifierType.UUID: UUID, IdentifierType.KEY: str}
 
-RESOURCE = Resource(
+IDENTIFIER_VALUE_TYPE_MAP: Dict[
+    IdentifierType,
+    Callable[..., IdentifierValueType],
+] = {
+    IdentifierType.ID: int,
+    IdentifierType.UUID: UUID,
+    IdentifierType.KEY: str,
+}
+
+
+ORGANIZATION_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="organizations", name="Organizations", url_slug="organizations"
+            key="organizations", name="Organizations", slug="organizations"
         )
     ],
     details=None,

maleo/identity/constants/organization_registration_code.py

@@ -1,11 +1,13 @@
 from typing import Callable, Dict
 from uuid import UUID
-from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.organization_registration_code import IdentifierType
-from maleo.identity.types.base.organization_registration_code import IdentifierValueType
+from maleo.schemas.resource import Resource, ResourceIdentifier
+from ..enums.organization_registration_code import IdentifierType
+from ..types.organization_registration_code import IdentifierValueType
 
-IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
-    IdentifierType, Callable[..., IdentifierValueType]
+
+IDENTIFIER_VALUE_TYPE_MAP: Dict[
+    IdentifierType,
+    Callable[..., IdentifierValueType],
 ] = {
     IdentifierType.ID: int,
     IdentifierType.UUID: UUID,
@@ -13,12 +15,13 @@ IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
     IdentifierType.CODE: UUID,
 }
 
-RESOURCE = Resource(
+
+ORGANIZATION_REGISTRATION_CODE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
             key="organization_registration_codes",
             name="Organization Registration Codes",
-            url_slug="organization-registration-codes",
+            slug="organization-registration-codes",
         )
     ],
     details=None,

maleo/identity/constants/user.py

@@ -1,24 +1,22 @@
-from typing import Callable, Dict, List
+from typing import Callable, Dict
 from uuid import UUID
-from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.user import IdentifierType, ExpandableField
-from maleo.identity.types.base.user import IdentifierValueType
+from maleo.schemas.resource import Resource, ResourceIdentifier
+from ..enums.user import IdentifierType
+from ..types.user import IdentifierValueType
 
-IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
-    IdentifierType, Callable[..., IdentifierValueType]
+
+IDENTIFIER_VALUE_TYPE_MAP: Dict[
+    IdentifierType,
+    Callable[..., IdentifierValueType],
 ] = {
     IdentifierType.ID: int,
     IdentifierType.UUID: UUID,
-    IdentifierType.USERNAME: str,
     IdentifierType.EMAIL: str,
+    IdentifierType.USERNAME: str,
 }
 
-EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[ExpandableField, List[ExpandableField]] = {
-    ExpandableField.PROFILE: [ExpandableField.GENDER, ExpandableField.BLOOD_TYPE],
-    ExpandableField.SYSTEM_ROLES: [ExpandableField.SYSTEM_ROLE_DETAILS],
-}
 
-RESOURCE = Resource(
-    identifiers=[ResourceIdentifier(key="users", name="Users", url_slug="users")],
+USER_RESOURCE = Resource(
+    identifiers=[ResourceIdentifier(key="users", name="Users", slug="users")],
     details=None,
 )

maleo/identity/constants/user_profile.py

@@ -1,11 +1,13 @@
 from typing import Callable, Dict
 from uuid import UUID
-from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.user_profile import IdentifierType, ValidImageMimeType
-from maleo.identity.types.base.user_profile import IdentifierValueType
+from maleo.schemas.resource import Resource, ResourceIdentifier
+from ..enums.user_profile import IdentifierType
+from ..types.user_profile import IdentifierValueType
 
-IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
-    IdentifierType, Callable[..., IdentifierValueType]
+
+IDENTIFIER_VALUE_TYPE_MAP: Dict[
+    IdentifierType,
+    Callable[..., IdentifierValueType],
 ] = {
     IdentifierType.ID: int,
     IdentifierType.UUID: UUID,
@@ -13,16 +15,11 @@ IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
     IdentifierType.ID_CARD: str,
 }
 
-MIME_TYPE_EXTENSION_MAP: Dict[ValidImageMimeType, str] = {
-    ValidImageMimeType.JPEG: ".jpeg",
-    ValidImageMimeType.JPG: ".jpg",
-    ValidImageMimeType.PNG: ".png",
-}
 
-RESOURCE = Resource(
+USER_PROFILE_RESOURCE = Resource(
     identifiers=[
         ResourceIdentifier(
-            key="user_profiles", name="User Profiles", url_slug="user-profiles"
+            key="user_profiles", name="User Profiles", slug="user-profiles"
         )
     ],
     details=None,

maleo/identity/enums/organization.py

@@ -1,4 +1,5 @@
 from enum import StrEnum
+from maleo.types.string import ListOfStrs
 
 
 class IdentifierType(StrEnum):
@@ -6,7 +7,6 @@ class IdentifierType(StrEnum):
     UUID = "uuid"
     KEY = "key"
 
-
-class ExpandableField(StrEnum):
-    ORGANIZATION_TYPE = "organization_type"
-    REGISTRATION_CODE = "registration_code"
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]

maleo/identity/enums/organization_registration_code.py

@@ -1,4 +1,5 @@
 from enum import StrEnum
+from maleo.types.string import ListOfStrs
 
 
 class IdentifierType(StrEnum):
@@ -6,3 +7,7 @@ class IdentifierType(StrEnum):
     UUID = "uuid"
     ORGANIZATION_ID = "organization_id"
     CODE = "code"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]

maleo/identity/enums/user.py

@@ -1,4 +1,5 @@
 from enum import StrEnum
+from maleo.types.string import ListOfStrs
 
 
 class IdentifierType(StrEnum):
@@ -7,11 +8,6 @@ class IdentifierType(StrEnum):
     USERNAME = "username"
     EMAIL = "email"
 
-
-class ExpandableField(StrEnum):
-    USER_TYPE = "user_type"
-    SYSTEM_ROLES = "system_roles"
-    SYSTEM_ROLE_DETAILS = "system_roles.system_role_details"
-    PROFILE = "profile"
-    GENDER = "profile.gender"
-    BLOOD_TYPE = "profile.blood_type"
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]

maleo/identity/enums/user_profile.py

@@ -1,4 +1,5 @@
 from enum import StrEnum
+from maleo.types.string import ListOfStrs
 
 
 class IdentifierType(StrEnum):
@@ -7,13 +8,6 @@ class IdentifierType(StrEnum):
     USER_ID = "user_id"
     ID_CARD = "id_card"
 
-
-class ValidImageMimeType(StrEnum):
-    JPEG = "image/jpeg"
-    JPG = "image/jpg"
-    PNG = "image/png"
-
-
-class ExpandableField(StrEnum):
-    GENDER = "gender_details"
-    BLOOD_TYPE = "blood_type_details"
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]

maleo/identity/mixins/organization.py

@@ -1,15 +1,17 @@
 from pydantic import BaseModel, Field
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.identity.enums.organization import ExpandableField
+from typing import Annotated, Generic
+from maleo.schemas.mixins.identity import Key as BaseKey, Name as BaseName
+from maleo.types.string import OptStrT
+from maleo.types.uuid import OptUUIDT
 
 
-class Expand(BaseExpand[ExpandableField]):
-    pass
+class Key(BaseKey, Generic[OptStrT]):
+    key: Annotated[OptStrT, Field(..., description="Key", max_length=255)]
 
 
-class Key(BaseModel):
-    key: str = Field(..., max_length=255, description="Organization's key")
+class Name(BaseName, Generic[OptStrT]):
+    name: Annotated[OptStrT, Field(..., description="Name", max_length=255)]
 
 
-class Name(BaseModel):
-    name: str = Field(..., max_length=255, description="Organization's name")
+class Secret(BaseModel, Generic[OptUUIDT]):
+    secret: Annotated[OptUUIDT, Field(..., description="Secret")]

maleo/identity/mixins/organization_registration_code.py

@@ -1,19 +1,16 @@
 from pydantic import BaseModel, Field
-from uuid import UUID
-from maleo.soma.types.base import OptionalInteger
+from typing import Annotated, Generic
+from maleo.types.integer import OptIntT
+from maleo.types.string import OptStrT
 
 
-class Code(BaseModel):
-    code: UUID = Field(..., description="Registration code")
+class Code(BaseModel, Generic[OptStrT]):
+    code: Annotated[OptStrT, Field(..., description="Code", max_length=36)]
 
 
-class MaxUses(BaseModel):
-    max_uses: int = Field(1, ge=1, description="Max code uses")
-
-
-class OptionalMaxUses(BaseModel):
-    max_uses: OptionalInteger = Field(None, ge=1, description="Max code uses")
+class MaxUses(BaseModel, Generic[OptIntT]):
+    max_uses: Annotated[OptIntT, Field(..., description="Max Uses", ge=1)]
 
 
 class CurrentUses(BaseModel):
-    current_uses: int = Field(0, ge=0, description="Current code uses")
+    current_uses: Annotated[int, Field(0, description="Current Uses", ge=0)] = 0

maleo/identity/mixins/user.py

@@ -1,47 +1,33 @@
 from pydantic import BaseModel, Field
-from uuid import UUID
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.soma.types.base import OptionalListOfStrings
-from maleo.identity.enums.user import ExpandableField
+from typing import Annotated, Generic
+from maleo.types.string import OptStrT, OptListOfStrsT
 
 
-class Expand(BaseExpand[ExpandableField]):
-    pass
+class Username(BaseModel, Generic[OptStrT]):
+    username: Annotated[
+        OptStrT, Field(..., description="User's username", max_length=50)
+    ]
 
 
-class Username(BaseModel):
-    username: str = Field(..., max_length=50, description="User's username")
+class Usernames(BaseModel, Generic[OptListOfStrsT]):
+    usernames: Annotated[OptListOfStrsT, Field(..., description="User's Usernames")]
 
 
-class OptionalListOfUsernames(BaseModel):
-    usernames: OptionalListOfStrings = Field(None, description="Specific usernames")
+class Email(BaseModel, Generic[OptStrT]):
+    email: Annotated[OptStrT, Field(..., description="User's email", max_length=255)]
 
 
-class Email(BaseModel):
-    email: str = Field(..., max_length=255, description="User's email")
+class Emails(BaseModel, Generic[OptListOfStrsT]):
+    emais: Annotated[OptListOfStrsT, Field(..., description="User's Emails")]
 
 
-class OptionalListOfEmails(BaseModel):
-    emails: OptionalListOfStrings = Field(None, description="Specific emails")
+class Phone(BaseModel, Generic[OptStrT]):
+    phone: Annotated[OptStrT, Field(..., description="User's phone", max_length=15)]
 
 
-class Phone(BaseModel):
-    phone: str = Field(..., min_length=4, max_length=15, description="User's phone")
-
-
-class OptionalListOfPhones(BaseModel):
-    phones: OptionalListOfStrings = Field(None, description="Specific phones")
+class Phones(BaseModel, Generic[OptListOfStrsT]):
+    phones: Annotated[OptListOfStrsT, Field(..., description="User's Phones")]
 
 
 class Password(BaseModel):
-    password: str = Field(..., max_length=255, description="User's password")
-
-
-class PasswordConfirmation(BaseModel):
-    password_confirmation: str = Field(
-        ..., max_length=255, description="User's password confirmation"
-    )
-
-
-class RegistrationCode(BaseModel):
-    registration_code: UUID = Field(..., description="Registration code")
+    password: Annotated[str, Field(..., description="Password", max_length=255)]

maleo/identity/mixins/user_profile.py

@@ -1,88 +1,58 @@
 from pydantic import BaseModel, Field
-from typing import Optional
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.soma.types.base import OptionalDate, OptionalString
-from maleo.identity.enums.user_profile import ExpandableField
+from typing import Annotated, Generic
+from maleo.types.datetime import OptDateT
+from maleo.types.string import OptStrT
 
 
-class Expand(BaseExpand[ExpandableField]):
-    pass
+class IdCard(BaseModel, Generic[OptStrT]):
+    id_card: Annotated[OptStrT, Field(..., description="User's Id Card", max_length=16)]
 
 
-class IdCard(BaseModel):
-    id_card: str = Field(..., max_length=16, description="User's ID Card")
+class LeadingTitle(BaseModel, Generic[OptStrT]):
+    leading_title: Annotated[
+        OptStrT, Field(..., description="User's Leading Title", max_length=25)
+    ]
 
 
-class OptionalIdCard(BaseModel):
-    id_card: OptionalString = Field(
-        None, max_length=16, description="Optional User's ID Card"
-    )
+class FirstName(BaseModel, Generic[OptStrT]):
+    first_name: Annotated[
+        OptStrT, Field(..., description="User's First Name", max_length=50)
+    ]
 
 
-class LeadingTitle(BaseModel):
-    leading_title: OptionalString = Field(
-        None, max_length=25, description="User's leading title"
-    )
+class MiddleName(BaseModel, Generic[OptStrT]):
+    middle_name: Annotated[
+        OptStrT, Field(..., description="User's Middle Name", max_length=50)
+    ]
 
 
-class FirstName(BaseModel):
-    first_name: str = Field(..., max_length=50, description="User's first name")
+class LastName(BaseModel, Generic[OptStrT]):
+    last_name: Annotated[
+        OptStrT, Field(..., description="User's Last Name", max_length=50)
+    ]
 
 
-class MiddleName(BaseModel):
-    middle_name: OptionalString = Field(
-        None, max_length=50, description="User's middle name"
-    )
+class EndingTitle(BaseModel, Generic[OptStrT]):
+    ending_title: Annotated[
+        OptStrT, Field(..., description="User's Ending Title", max_length=25)
+    ]
 
 
-class LastName(BaseModel):
-    last_name: str = Field(..., max_length=50, description="User's last name")
+class FullName(BaseModel, Generic[OptStrT]):
+    full_name: Annotated[
+        OptStrT, Field(..., description="User's Full Name", max_length=200)
+    ]
 
 
-class EndingTitle(BaseModel):
-    ending_title: OptionalString = Field(
-        None, max_length=25, description="User's ending title"
-    )
+class BirthPlace(BaseModel, Generic[OptStrT]):
+    birth_place: Annotated[
+        OptStrT, Field(..., description="User's Birth Place", max_length=50)
+    ]
 
 
-class FullName(BaseModel):
-    full_name: str = Field(..., max_length=200, description="User's full name")
+class BirthDate(BaseModel, Generic[OptDateT]):
+    birth_date: Annotated[OptDateT, Field(..., description="User's birth date")]
 
 
-class BirthPlace(BaseModel):
-    birth_place: OptionalString = Field(
-        None, max_length=50, description="User's birth place"
-    )
-
-
-class BirthDate(BaseModel):
-    birth_date: OptionalDate = Field(None, description="User's birth date")
-
-
-class AvatarName(BaseModel):
-    avatar_name: str = Field(..., description="User's avatar's name")
-
-
-class OptionalAvatarUrl(BaseModel):
-    avatar_url: OptionalString = Field(None, description="Avatar's URL")
-
-
-class OptionalAvatar(BaseModel):
-    avatar: Optional[bytes] = Field(None, description="Optional Avatar")
-
-
-class OptionalAvatarName(BaseModel):
-    avatar_name: OptionalString = Field(None, description="Optional avatar's name")
-
-
-class OptionalAvatarContentType(BaseModel):
-    content_type: OptionalString = Field(
-        None, description="Optional avatar's content type"
-    )
-
-
-class AvatarData(
-    OptionalAvatarContentType,
-    OptionalAvatar,
-):
-    pass
+class AvatarName(BaseModel, Generic[OptStrT]):
+    avatar_name: Annotated[OptStrT, Field(..., description="User's Avatar Name")]