maleo-foundation 0.0.29__py3-none-any.whl → 0.0.31__py3-none-any.whl

maleo_foundation/controller.py

@@ -4,14 +4,14 @@ from maleo_foundation.models.enums import BaseEnums
 from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.results.service.controllers.rest import BaseServiceRESTControllerResults
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
-from maleo_foundation.models.extended_types.service import ExtendedServiceTypes
+from maleo_foundation.models.expanded_types.service import ExpandedServiceTypes
 
 class BaseController:
     @staticmethod
     def check_unique_existence(
         check:BaseServiceParametersTransfers.UniqueFieldCheck,
-        get_single_parameters_class:Type[ExtendedServiceTypes.GetSingleParameter],
-        get_single_service_function:ExtendedServiceTypes.SyncGetSingleFunction,
+        get_single_parameters_class:Type[ExpandedServiceTypes.GetSingleParameter],
+        get_single_service_function:ExpandedServiceTypes.SyncGetSingleFunction,
         create_failed_response_class:Type[BaseResponses.Fail],
         update_failed_response_class:Type[BaseResponses.Fail],
         **additional_get_parameters:Any
@@ -30,7 +30,7 @@ class BaseController:
         get_single_parameters = get_single_parameters_class(identifier=check.field, value=check.new_value)
 
         #* Query the existing data using provided function
-        service_result:ExtendedServiceTypes.GetSingleResult = get_single_service_function(parameters=get_single_parameters, **additional_get_parameters)
+        service_result:ExpandedServiceTypes.GetSingleResult = get_single_service_function(parameters=get_single_parameters, **additional_get_parameters)
         if not service_result.success:
             content = BaseResponses.ServerError.model_validate(service_result.model_dump(exclude_unset=True)).model_dump()
             return BaseServiceRESTControllerResults(success=False, content=content, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)

maleo_foundation/models/__init__.py

@@ -5,6 +5,7 @@ from .transfers import BaseTransfers
 from .responses import BaseResponses
 from .types import BaseTypes
 from .extended_types import ExtendedTypes
+from .expanded_types import ExpandedTypes
 
 class BaseModels:
     Enums = BaseEnums
@@ -12,4 +13,5 @@ class BaseModels:
     Transfers = BaseTransfers
     Responses = BaseResponses
     Types = BaseTypes
-    ExtendedTypes = ExtendedTypes
+    ExtendedTypes = ExtendedTypes
+    ExpandedTypes = ExpandedTypes

maleo_foundation/models/expanded_types/__init__.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+from .query import ExpandedQueryTypes
+from .service import ExpandedServiceTypes
+from .client import ExpandedClientTypes
+
+class ExpandedTypes:
+    Query = ExpandedQueryTypes
+    Service = ExpandedServiceTypes
+    Client = ExpandedClientTypes

maleo_foundation/models/{extended_types → expanded_types}/client.py

@@ -3,7 +3,7 @@ from maleo_foundation.models.transfers.parameters.general import BaseGeneralPara
 from maleo_foundation.models.transfers.parameters.client import BaseClientParametersTransfers
 from maleo_foundation.models.transfers.results.client.service import BaseClientServiceResultsTransfers
 
-class ExtendedClientTypes:
+class ExpandedClientTypes:
     GetMultipleParameter = BaseClientParametersTransfers.GetMultiple
 
     GetMultipleResult = Union[

maleo_foundation/models/{extended_types → expanded_types}/query.py

@@ -3,7 +3,7 @@ from maleo_foundation.models.transfers.parameters.general import BaseGeneralPara
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
 from maleo_foundation.models.transfers.results.service.query import BaseServiceQueryResultsTransfers
 
-class ExtendedQueryTypes:
+class ExpandedQueryTypes:
     GetMultipleParameter = BaseServiceParametersTransfers.GetMultiple
 
     GetMultipleResult = Union[

maleo_foundation/models/{extended_types → expanded_types}/service.py

@@ -3,7 +3,7 @@ from maleo_foundation.models.transfers.parameters.general import BaseGeneralPara
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
 from maleo_foundation.models.transfers.results.service.general import BaseServiceGeneralResultsTransfers
 
-class ExtendedServiceTypes:
+class ExpandedServiceTypes:
     GetMultipleParameter = BaseServiceParametersTransfers.GetMultiple
 
     GetMultipleResult = Union[

maleo_foundation/models/{types/parameter.py → extended_types.py}

@@ -1,7 +1,7 @@
 from typing import List
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 
-class BaseParameterTypes:
+class ExtendedTypes:
     #* DateFilter-related types
     ListOfDateFilters = List[BaseGeneralSchemas.DateFilter]
 

maleo_foundation/models/schemas/general.py

@@ -5,22 +5,22 @@ from typing import Optional, Any
 from uuid import UUID
 from maleo_foundation.constants import REFRESH_TOKEN_DURATION_DAYS, ACCESS_TOKEN_DURATION_MINUTES
 from maleo_foundation.models.enums import BaseEnums
-from maleo_foundation.models.types.general import BaseGeneralTypes
+from maleo_foundation.models.types import BaseTypes
 
 class BaseGeneralSchemas:
     class IDs(BaseModel):
-        ids:BaseGeneralTypes.OptionalListOfIntegers = Field(None, description="Specific IDs")
+        ids:BaseTypes.OptionalListOfIntegers = Field(None, description="Specific IDs")
 
     class Search(BaseModel):
-        search:BaseGeneralTypes.OptionalString = Field(None, description="Search parameter string.")
+        search:BaseTypes.OptionalString = Field(None, description="Search parameter string.")
 
     class DateFilter(BaseModel):
         name:str = Field(..., description="Column name.")
-        from_date:BaseGeneralTypes.OptionalDatetime = Field(None, description="From date.")
-        to_date:BaseGeneralTypes.OptionalDatetime = Field(None, description="To date.")
+        from_date:BaseTypes.OptionalDatetime = Field(None, description="From date.")
+        to_date:BaseTypes.OptionalDatetime = Field(None, description="To date.")
 
     class Statuses(BaseModel):
-        statuses:BaseGeneralTypes.OptionalListOfStatuses = Field(None, description="Data's status")
+        statuses:BaseTypes.OptionalListOfStatuses = Field(None, description="Data's status")
 
     class SortColumn(BaseModel):
         name:str = Field(..., description="Column name.")
@@ -30,7 +30,7 @@ class BaseGeneralSchemas:
         page:int = Field(1, ge=1, description="Page number, must be >= 1.")
         limit:int = Field(10, ge=1, le=100, description="Page size, must be 1 <= limit <= 100.")
 
-    class ExtendedPagination(SimplePagination):
+    class ExpandedPagination(SimplePagination):
         data_count:int = Field(..., description="Fetched data count")
         total_data:int = Field(..., description="Total data count")
         total_pages:int = Field(..., description="Total pages count")
@@ -39,7 +39,7 @@ class BaseGeneralSchemas:
         action:BaseEnums.StatusUpdateAction = Field(..., description="Status update's action to be executed")
 
     class Expand(BaseModel):
-        expand:BaseGeneralTypes.OptionalListOfStrings = Field(None, description="Expanded field(s)")
+        expand:BaseTypes.OptionalListOfStrings = Field(None, description="Expanded field(s)")
 
     class PrivateKey(BaseModel):
         private_key:str = Field(..., description="Private key in str format.")
@@ -61,13 +61,13 @@ class BaseGeneralSchemas:
     class Timestamps(BaseModel):
         created_at:datetime = Field(..., description="Data's created_at timestamp")
         updated_at:datetime = Field(..., description="Data's updated_at timestamp")
-        deleted_at:BaseGeneralTypes.OptionalDatetime = Field(..., description="Data's deleted_at timestamp")
-        restored_at:BaseGeneralTypes.OptionalDatetime = Field(..., description="Data's restored_at timestamp")
-        deactivated_at:BaseGeneralTypes.OptionalDatetime = Field(..., description="Data's deactivated_at timestamp")
+        deleted_at:BaseTypes.OptionalDatetime = Field(..., description="Data's deleted_at timestamp")
+        restored_at:BaseTypes.OptionalDatetime = Field(..., description="Data's restored_at timestamp")
+        deactivated_at:BaseTypes.OptionalDatetime = Field(..., description="Data's deactivated_at timestamp")
         activated_at:datetime = Field(..., description="Data's activated_at timestamp")
 
         @field_serializer('created_at', 'updated_at', 'deleted_at', 'restored_at', 'deactivated_at', 'activated_at')
-        def serialize_timestamps(self, value:BaseGeneralTypes.OptionalDatetime, info:FieldSerializationInfo) -> str:
+        def serialize_timestamps(self, value:BaseTypes.OptionalDatetime, info:FieldSerializationInfo) -> str:
             """Serializes datetime/date fields to ISO format."""
             if value is not None:
                 return value.isoformat()
@@ -77,7 +77,7 @@ class BaseGeneralSchemas:
         status:BaseEnums.StatusType = Field(..., description="Data's status")
 
     class Order(BaseModel):
-        order:BaseGeneralTypes.OptionalInteger = Field(..., description="Data's order")
+        order:BaseTypes.OptionalInteger = Field(..., description="Data's order")
 
     class Key(BaseModel):
         key:str = Field(..., description="Data's key")
@@ -89,8 +89,8 @@ class BaseGeneralSchemas:
         t:BaseEnums.TokenType = Field(..., description="Token Type")
         sr:UUID = Field(..., description="System role")
         u:UUID = Field(..., description="user")
-        o:BaseGeneralTypes.OptionalUUID = Field(..., description="Organization")
-        uor:BaseGeneralTypes.OptionalListOfUUIDs = Field(..., description="User Organization Role")
+        o:BaseTypes.OptionalUUID = Field(..., description="Organization")
+        uor:BaseTypes.OptionalListOfUUIDs = Field(..., description="User Organization Role")
         iat_dt:datetime = Field(datetime.now(timezone.utc), description="Issued at (datetime)")
         iat:int = Field(None, description="Issued at (integer)")
         exp_dt:datetime = Field(None, description="Expired at (datetime)")

maleo_foundation/models/schemas/parameter.py

@@ -1,18 +1,18 @@
 from pydantic import BaseModel, Field
 from maleo_foundation.models.enums import BaseEnums
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_foundation.models.types.general import BaseGeneralTypes
+from maleo_foundation.models.types import BaseTypes
 # from maleo_foundation.models.types.parameter import BaseParameterTypes
 
 class BaseParameterSchemas:
     class Filters(BaseModel):
-        filters:BaseGeneralTypes.ListOfStrings = Field([], description="Filters for date range, e.g. 'created_at|from::<ISO_DATETIME>|to::<ISO_DATETIME>'.")
+        filters:BaseTypes.ListOfStrings = Field([], description="Filters for date range, e.g. 'created_at|from::<ISO_DATETIME>|to::<ISO_DATETIME>'.")
 
     class DateFilters(BaseModel):
         date_filters:list[BaseGeneralSchemas.DateFilter] = Field([], description="Date filters to be applied")
 
     class Sorts(BaseModel):
-        sorts:BaseGeneralTypes.ListOfStrings = Field(["id.asc"], description="Sorting columns in 'column_name.asc' or 'column_name.desc' format.")
+        sorts:BaseTypes.ListOfStrings = Field(["id.asc"], description="Sorting columns in 'column_name.asc' or 'column_name.desc' format.")
 
     class SortColumns(BaseModel):
         sort_columns:list[BaseGeneralSchemas.SortColumn] = Field([BaseGeneralSchemas.SortColumn(name="id", order=BaseEnums.SortOrder.ASC)], description="List of columns to be sorted")

maleo_foundation/models/schemas/result.py

@@ -1,24 +1,24 @@
 from pydantic import BaseModel, Field
-from typing import Literal, Optional, Any
+from typing import Any
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_foundation.models.types.general import BaseGeneralTypes
+from maleo_foundation.models.types import BaseTypes
 
 class BaseResultSchemas:
     class Base(BaseModel):
         success:bool = Field(..., description="Success status")
-        code:BaseGeneralTypes.OptionalString = Field(None, description="Optional result code")
-        message:BaseGeneralTypes.OptionalString = Field(None, description="Optional message")
-        description:BaseGeneralTypes.OptionalString = Field(None, description="Optional description")
+        code:BaseTypes.OptionalString = Field(None, description="Optional result code")
+        message:BaseTypes.OptionalString = Field(None, description="Optional message")
+        description:BaseTypes.OptionalString = Field(None, description="Optional description")
         data:Any = Field(..., description="Data")
-        other:BaseGeneralTypes.OptionalAny = Field(None, description="Optional other information")
+        other:BaseTypes.OptionalAny = Field(None, description="Optional other information")
 
     #* ----- ----- ----- Intermediary ----- ----- ----- *#
     class Fail(Base):
-        success:BaseGeneralTypes.LiteralFalse = Field(False, description="Success status")
+        success:BaseTypes.LiteralFalse = Field(False, description="Success status")
         data:None = Field(None, description="No data")
 
     class Success(Base):
-        success:BaseGeneralTypes.LiteralTrue = Field(True, description="Success status")
+        success:BaseTypes.LiteralTrue = Field(True, description="Success status")
         data:Any = Field(..., description="Data")
 
     #* ----- ----- ----- Derived ----- ----- ----- *#
@@ -29,7 +29,7 @@ class BaseResultSchemas:
         data:Any = Field(..., description="Fetched single data")
 
     class UnpaginatedMultipleData(Success):
-        data:BaseGeneralTypes.ListOfAny = Field(..., description="Unpaginated multiple data")
+        data:BaseTypes.ListOfAny = Field(..., description="Unpaginated multiple data")
 
     class PaginatedMultipleData(
         UnpaginatedMultipleData,

maleo_foundation/models/{types/general.py → types.py}

@@ -3,7 +3,7 @@ from typing import Optional, Union, Literal, List, Any
 from uuid import UUID
 from maleo_foundation.models.enums import BaseEnums
 
-class BaseGeneralTypes:
+class BaseTypes:
     #* Any-related types
     ListOfAny = List[Any]
     OptionalAny = Optional[Any]

{maleo_foundation-0.0.29.dist-info → maleo_foundation-0.0.31.dist-info}/METADATA

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

{maleo_foundation-0.0.29.dist-info → maleo_foundation-0.0.31.dist-info}/RECORD

@@ -1,6 +1,6 @@
 maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/constants.py,sha256=l6WQp0nu2y4Ucs8bFcEdzVUJfR1dRM_nveuHGMhe3rY,424
-maleo_foundation/controller.py,sha256=3u-2P5RwzdWv5uzYSNNJ7LfqQn5HbY7aPukHG1Q2BYQ,3005
+maleo_foundation/controller.py,sha256=Z5WbsrkTFYqC7GrnXR-gsqTN6IC_jz-wrOK3mU4GaU0,3005
 maleo_foundation/query.py,sha256=Wv9smUNuAa8ZMvb9KiG_sUqyNFG9KXFo3JX6kpxjWQ4,3868
 maleo_foundation/clients/__init__.py,sha256=W8vydJYeDEi6gdmOZSBFSSDsfZJtb8C05CHErZgsZ30,188
 maleo_foundation/clients/general/__init__.py,sha256=l9eQrBeLW4aXtGU5aK3i6fD-msVR4526W7D9V8WCXIg,91
@@ -17,17 +17,19 @@ maleo_foundation/db/session.py,sha256=tI13DJ6rLo8FOpSIFZrmD4dbuxY_c0RTjwEGb76ZOo
 maleo_foundation/middlewares/__init__.py,sha256=bqE2EIFC3rWcR2AwFPR0fk2kSFfeTRzgA24GbnuT5RA,3697
 maleo_foundation/middlewares/base.py,sha256=KcpODNs0DQXX8Cwc6T9dC6aiZIqxTLtuJjVAGWXPSKk,11633
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
-maleo_foundation/models/__init__.py,sha256=o1XI5JgHLH7yEnFlNIM_17ZDnBVzs2WGsAeWeI_v9nQ,424
+maleo_foundation/models/__init__.py,sha256=HTiSh5eRZ6_iBR2fmylLw_UZNE82GsmzHG3HFBqH2uE,500
 maleo_foundation/models/enums.py,sha256=Ob2v312JxypHEq7hTKZKOV462FEeLkIjIhpx-YF6Jdw,2203
+maleo_foundation/models/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/models/responses.py,sha256=1Rs3EflBJdsTC8PSbaOFbbTyxwRwK031eU3qLEj21sU,4215
-maleo_foundation/models/extended_types/__init__.py,sha256=rv2_EO_97UwaJq3NxTBrw-08E786vb3boSlIezMnA48,275
-maleo_foundation/models/extended_types/client.py,sha256=zHY2yvSKf6vMHr08FUjSh9n-nXjdFR0CD1J1S_nAa0M,1582
-maleo_foundation/models/extended_types/query.py,sha256=9hI_w5xuCNkzOL6VW4LcDta60vlT-AZ5WYyRJyucsv8,1571
-maleo_foundation/models/extended_types/service.py,sha256=Xos2wYJUwTODKeJ95DIQPn0udfA7pS1JkLnQ2XrtscE,1599
+maleo_foundation/models/types.py,sha256=rg9AoNwwECJ2BhYdoz3DiUMlBgFRWVEl4KGrfTCntnI,1213
+maleo_foundation/models/expanded_types/__init__.py,sha256=RohoIQCiMvo2g6Jacq2dlqNXg3WLmRc-TD8nvMsyDKs,275
+maleo_foundation/models/expanded_types/client.py,sha256=FlZnuPmYmjexXe8afxKXUzWX2Eq7Xw4tsyekZbVAHts,1582
+maleo_foundation/models/expanded_types/query.py,sha256=0rNLdaqKL-QGzd5EX1RRphJQpXb1XCZQfEfVFIIdBUc,1571
+maleo_foundation/models/expanded_types/service.py,sha256=N-HT6DXah839YefCHuLUB63Zpl1YUogzcHbVwdW2vXA,1599
 maleo_foundation/models/schemas/__init__.py,sha256=Xj8Ahsqyra-fmEaVcGPok5GOOsPQlKcknHYMvbjvENA,277
-maleo_foundation/models/schemas/general.py,sha256=LYhwCyzRGoGi0RhDvyq_SLE9VdUqYMlzc1rfkuvUV_w,6786
-maleo_foundation/models/schemas/parameter.py,sha256=BwvUJuQvAxr0K_3oypygp-hJC2anVAciKTtsUVg9GtI,1057
-maleo_foundation/models/schemas/result.py,sha256=qiqp2FxkmpSh0erQ3nob5X6lpdK7bzjpw5GKDn4w8f0,1837
+maleo_foundation/models/schemas/general.py,sha256=0ASBJrwoBQJtDV_Yhm9FnGHaZex_vNWJ9PPmJeDs8yY,6680
+maleo_foundation/models/schemas/parameter.py,sha256=NYB1gOnTCIaju8WZ66TeH03kQGtmPSprxlqatdiWoX0,1028
+maleo_foundation/models/schemas/result.py,sha256=69JsTor9gNTVhUErFsFWN8CC9SZ9aXUO08kziGbXxsY,1754
 maleo_foundation/models/transfers/__init__.py,sha256=B8oCZHE3NTsrJ_rviSXaDsuc-gc25jpjuhJO40lpQiE,222
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
 maleo_foundation/models/transfers/parameters/client.py,sha256=Q43A-Z7JPXcxb_v7iUKoA1_WV8AMdEaeSl9Z39WSF_8,2287
@@ -43,15 +45,12 @@ maleo_foundation/models/transfers/results/service/general.py,sha256=G4x-MhQI7Km9
 maleo_foundation/models/transfers/results/service/query.py,sha256=Wj9GCWk7FrKP0EoK55vJcr9YJ42Lo24mLXbRk9j0IJw,2566
 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=bZ4NibT58aim6p3epFJ9ipR8Z54FkOuFx2GniK4CUfM,1114
-maleo_foundation/models/types/__init__.py,sha256=qR0IswZWJSbe_Pa-SSHGbi38bK1_M5M3fhuq4q8b4hw,198
-maleo_foundation/models/types/general.py,sha256=j_bwdMYaYoUpI4CsA5_xMyk_J1PMGzD2Ms8TpDNN1MQ,1220
-maleo_foundation/models/types/parameter.py,sha256=TXZ3WHvtn8g6jOQY5k4h5GQQk_8e4unpg1Q7W1J3EY0,306
 maleo_foundation/utils/__init__.py,sha256=tfgaHZI2PDgxEVSQztfnDMN5S6L5Y4FcK5v_Wkf5snE,245
 maleo_foundation/utils/exceptions.py,sha256=mcvBwHm6uWpVQkPtO1T2j-GaTYEiyPOeGxiDL9-sjNA,3639
 maleo_foundation/utils/logger.py,sha256=ICrFi0MxuAjDy8KTRL7pex1miwzZqZX-HHArgN3niJM,2453
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
-maleo_foundation-0.0.29.dist-info/METADATA,sha256=UlqkYIE0HkXepe9cGlSt1tp8EirHMBn7nBZQ_hN03FY,3160
-maleo_foundation-0.0.29.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-maleo_foundation-0.0.29.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.0.29.dist-info/RECORD,,
+maleo_foundation-0.0.31.dist-info/METADATA,sha256=l_S-rUkX3DRGss0g6xXSxP-qyW6X29TwD7gs82fAXOs,3160
+maleo_foundation-0.0.31.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+maleo_foundation-0.0.31.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.0.31.dist-info/RECORD,,

maleo_foundation/models/extended_types/__init__.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-from .query import ExtendedQueryTypes
-from .service import ExtendedServiceTypes
-from .client import ExtendedClientTypes
-
-class ExtendedTypes:
-    Query = ExtendedQueryTypes
-    Service = ExtendedServiceTypes
-    Client = ExtendedClientTypes

maleo_foundation/models/types/__init__.py

@@ -1,7 +0,0 @@
-from __future__ import annotations
-from .general import BaseGeneralTypes
-from .parameter import BaseParameterTypes
-
-class BaseTypes:
-    General = BaseGeneralTypes
-    Parameter = BaseParameterTypes