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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.20
+Version: 0.1.45
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -41,14 +41,15 @@ Requires-Dist: identify>=2.6.15
 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-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: maleo-enums>=0.0.81
+Requires-Dist: maleo-metadata>=0.7.75
 Requires-Dist: mypy_extensions>=1.1.0
+Requires-Dist: nexo-crypto>=0.0.4
+Requires-Dist: nexo-enums>=0.0.4
+Requires-Dist: nexo-logging>=0.0.4
+Requires-Dist: nexo-schemas>=0.0.4
+Requires-Dist: nexo-types>=0.0.4
+Requires-Dist: nexo-utils>=0.0.4
 Requires-Dist: nodeenv>=1.9.1
 Requires-Dist: opentelemetry-api>=1.37.0
 Requires-Dist: opentelemetry-sdk>=1.37.0
@@ -72,7 +73,7 @@ Requires-Dist: PyJWT>=2.10.1
 Requires-Dist: pytest>=8.4.2
 Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: pytokens>=0.1.10
-Requires-Dist: PyYAML>=6.0.3
+Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: requests>=2.32.5
 Requires-Dist: rsa>=4.9.1
 Requires-Dist: sniffio>=1.3.1

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.20
+Version: 0.1.45
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -41,14 +41,15 @@ Requires-Dist: identify>=2.6.15
 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-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: maleo-enums>=0.0.81
+Requires-Dist: maleo-metadata>=0.7.75
 Requires-Dist: mypy_extensions>=1.1.0
+Requires-Dist: nexo-crypto>=0.0.4
+Requires-Dist: nexo-enums>=0.0.4
+Requires-Dist: nexo-logging>=0.0.4
+Requires-Dist: nexo-schemas>=0.0.4
+Requires-Dist: nexo-types>=0.0.4
+Requires-Dist: nexo-utils>=0.0.4
 Requires-Dist: nodeenv>=1.9.1
 Requires-Dist: opentelemetry-api>=1.37.0
 Requires-Dist: opentelemetry-sdk>=1.37.0
@@ -72,7 +73,7 @@ Requires-Dist: PyJWT>=2.10.1
 Requires-Dist: pytest>=8.4.2
 Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: pytokens>=0.1.10
-Requires-Dist: PyYAML>=6.0.3
+Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: requests>=2.32.5
 Requires-Dist: rsa>=4.9.1
 Requires-Dist: sniffio>=1.3.1

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/maleo_identity.egg-info/SOURCES.txt

@@ -65,5 +65,4 @@ src/types/user_organization_role.py
 src/types/user_profile.py
 src/types/user_system_role.py
 src/utils/__init__.py
-src/utils/organization.py
-src/utils/user.py
+src/utils/organization.py

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/maleo_identity.egg-info/requires.txt

@@ -32,14 +32,15 @@ identify>=2.6.15
 idna>=3.11
 importlib_metadata>=8.7.0
 iniconfig>=2.1.0
-maleo-crypto>=0.0.50
-maleo-enums>=0.0.50
-maleo-logging>=0.0.50
-maleo-metadata>=0.7.50
-maleo-schemas>=0.7.50
-maleo-types>=0.0.50
-maleo-utils>=0.0.50
+maleo-enums>=0.0.81
+maleo-metadata>=0.7.75
 mypy_extensions>=1.1.0
+nexo-crypto>=0.0.4
+nexo-enums>=0.0.4
+nexo-logging>=0.0.4
+nexo-schemas>=0.0.4
+nexo-types>=0.0.4
+nexo-utils>=0.0.4
 nodeenv>=1.9.1
 opentelemetry-api>=1.37.0
 opentelemetry-sdk>=1.37.0
@@ -63,7 +64,7 @@ PyJWT>=2.10.1
 pytest>=8.4.2
 python-dotenv>=1.1.1
 pytokens>=0.1.10
-PyYAML>=6.0.3
+PyYAML>=6.0.2
 requests>=2.32.5
 rsa>=4.9.1
 sniffio>=1.3.1

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo-identity"
-version = "0.1.20"
+version = "0.1.45"
 description = "MaleoIdentity service package"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }
@@ -47,14 +47,15 @@ dependencies = [
     "idna>=3.11",
     "importlib_metadata>=8.7.0",
     "iniconfig>=2.1.0",
-    "maleo-crypto>=0.0.50",
-    "maleo-enums>=0.0.50",
-    "maleo-logging>=0.0.50",
-    "maleo-metadata>=0.7.50",
-    "maleo-schemas>=0.7.50",
-    "maleo-types>=0.0.50",
-    "maleo-utils>=0.0.50",
+    "maleo-enums>=0.0.81",
+    "maleo-metadata>=0.7.75",
     "mypy_extensions>=1.1.0",
+    "nexo-crypto>=0.0.4",
+    "nexo-enums>=0.0.4",
+    "nexo-logging>=0.0.4",
+    "nexo-schemas>=0.0.4",
+    "nexo-types>=0.0.4",
+    "nexo-utils>=0.0.4",
     "nodeenv>=1.9.1",
     "opentelemetry-api>=1.37.0",
     "opentelemetry-sdk>=1.37.0",
@@ -78,7 +79,7 @@ dependencies = [
     "pytest>=8.4.2",
     "python-dotenv>=1.1.1",
     "pytokens>=0.1.10",
-    "PyYAML>=6.0.3",
+    "PyYAML>=6.0.2",
     "requests>=2.32.5",
     "rsa>=4.9.1",
     "sniffio>=1.3.1",

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/api_key.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 API_KEY_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/organization.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 ORGANIZATION_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/organization_registration_code.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 ORGANIZATION_REGISTRATION_CODE_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/organization_relation.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 ORGANIZATION_RELATION_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/patient.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 PATIENT_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/user.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 USER_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/user_medical_role.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 USER_MEDICAL_ROLE_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/constants/user_organization_role.py

@@ -1,4 +1,4 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
+from nexo.schemas.resource import Resource, ResourceIdentifier
 
 
 USER_ORGANIZATION_ROLE_RESOURCE = Resource(

maleo_identity-0.1.45/src/constants/user_profile.py

@@ -0,0 +1,26 @@
+from nexo.schemas.resource import Resource, ResourceIdentifier
+from nexo.types.string import SeqOfStrs
+
+
+USER_PROFILE_RESOURCE = Resource(
+    identifiers=[
+        ResourceIdentifier(
+            key="user_profile", name="User Profile", slug="user-profiles"
+        )
+    ],
+    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.45}/src/constants/user_system_role.py

@@ -1,5 +1,5 @@
-from maleo.schemas.resource import Resource, ResourceIdentifier
-from maleo.types.string import DoubleStrs
+from nexo.schemas.resource import Resource, ResourceIdentifier
+from nexo.types.string import DoubleStrs
 
 
 USER_SYSTEM_ROLE_RESOURCE = Resource(

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/enums/api_key.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs, ManyStrs
+from nexo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/enums/organization.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from nexo.types.string import ListOfStrs
 
 
 class Granularity(StrEnum):

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/enums/organization_registration_code.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from nexo.types.string import ListOfStrs
 
 
 class IdentifierType(StrEnum):

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

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs, ManyStrs
+from nexo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -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.45}/src/enums/patient.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from nexo.types.string import ListOfStrs
 
 
 class IdentifierType(StrEnum):

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/enums/user.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs
+from nexo.types.string import ListOfStrs
 
 
 class Granularity(StrEnum):
@@ -24,3 +24,18 @@ class IdentifierType(StrEnum):
     @property
     def column(self) -> str:
         return self.value
+
+
+class ExpandableField(StrEnum):
+    USER_TYPE = "user_type"
+    BLOOD_TYPE = "blood_type"
+    GENDER = "gender"
+
+    @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.45}/src/enums/user_medical_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs, ManyStrs
+from nexo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -20,3 +20,16 @@ class IdentifierType(StrEnum):
         elif self is IdentifierType.COMPOSITE:
             return ("user_id", "organization_id", "medical_role")
         raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    MEDICAL_ROLE = "medical_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.45}/src/enums/user_organization_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs, ManyStrs
+from nexo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -20,3 +20,16 @@ class IdentifierType(StrEnum):
         elif self is IdentifierType.COMPOSITE:
             return ("user_id", "organization_id", "organization_role")
         raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    ORGANIZATION_ROLE = "organization_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.45/src/enums/user_profile.py

@@ -0,0 +1,31 @@
+from enum import StrEnum
+from nexo.types.string import ListOfStrs
+
+
+class IdentifierType(StrEnum):
+    ID = "id"
+    UUID = "uuid"
+    USER_ID = "user_id"
+    ID_CARD = "id_card"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+    @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.45}/src/enums/user_system_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
-from maleo.types.string import ListOfStrs, ManyStrs
+from nexo.types.string import ListOfStrs, ManyStrs
 
 
 class IdentifierType(StrEnum):
@@ -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.45}/src/mixins/api_key.py

@@ -1,11 +1,11 @@
 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 nexo.schemas.mixins.identity import Identifier
+from nexo.types.any import ManyAny
+from nexo.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):
@@ -34,20 +34,30 @@ class UUIDAPIKeyIdentifier(Identifier[Literal[IdentifierType.UUID], UUID]):
     ] = IdentifierType.UUID
 
 
+class APIKeyAPIKeyIdentifier(Identifier[Literal[IdentifierType.API_KEY], str]):
+    type: Annotated[
+        Literal[IdentifierType.API_KEY],
+        Field(IdentifierType.API_KEY, description="Identifier's type"),
+    ] = IdentifierType.API_KEY
+
+
 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 = (
     APIKeyIdentifier
     | IdAPIKeyIdentifier
     | UUIDAPIKeyIdentifier
+    | APIKeyAPIKeyIdentifier
     | CompositeAPIKeyIdentifier
 )
 
@@ -58,6 +68,14 @@ def is_id_identifier(
     return identifier.type is IdentifierType.ID and isinstance(identifier.value, int)
 
 
+def is_api_key_identifier(
+    identifier: AnyAPIKeyIdentifier,
+) -> TypeGuard[APIKeyAPIKeyIdentifier]:
+    return identifier.type is IdentifierType.API_KEY and isinstance(
+        identifier.value, str
+    )
+
+
 def is_uuid_identifier(
     identifier: AnyAPIKeyIdentifier,
 ) -> TypeGuard[UUIDAPIKeyIdentifier]:

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/mixins/common.py

@@ -1,12 +1,12 @@
 from pydantic import Field
 from typing import Annotated, Generic
-from maleo.schemas.mixins.identity import (
+from nexo.schemas.mixins.identity import (
     IdCard as BaseIdCard,
     FullName as BaseFullName,
     BirthPlace as BaseBirthPlace,
     PlaceOfBirth as BasePlaceOfBirth,
 )
-from maleo.types.string import OptStrT
+from nexo.types.string import OptStrT
 
 
 class IdCard(BaseIdCard[OptStrT], Generic[OptStrT]):

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/src/mixins/organization.py

@@ -1,9 +1,9 @@
 from pydantic import BaseModel, Field
 from typing import Annotated, Generic, Literal, TypeGuard
 from uuid import UUID
-from maleo.schemas.mixins.identity import Identifier, Key as BaseKey, Name as BaseName
-from maleo.types.string import OptStrT
-from maleo.types.uuid import OptUUIDT
+from nexo.schemas.mixins.identity import Identifier, Key as BaseKey, Name as BaseName
+from nexo.types.string import OptStrT
+from nexo.types.uuid import OptUUIDT
 from ..enums.organization import IdentifierType
 from ..types.organization import IdentifierValueType
 

{maleo_identity-0.1.20 → maleo_identity-0.1.45}/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.string import OptStrT
+from nexo.schemas.mixins.identity import Identifier
+from nexo.types.integer import OptIntT
+from nexo.types.misc import OptIntOrStr
+from nexo.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.45}/src/mixins/organization_relation.py

@@ -1,13 +1,13 @@
 from pydantic import BaseModel, Field
 from typing import Annotated, Generic, Literal, TypeGuard
 from uuid import UUID
-from maleo.schemas.mixins.identity import Identifier
-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 nexo.schemas.mixins.identity import Identifier
+from nexo.types.any import ManyAny
+from nexo.types.boolean import OptBoolT
+from nexo.types.misc import OptListOfAnyOrStrToAnyDict
+from nexo.types.string import ManyStrs
+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 = (