choices support

Author: dantownsend

piccolo/apps/migrations/auto/serialisation.py

@@ -94,6 +94,22 @@ def __lt__(self, other):
         return repr(self) < repr(other)
 
 
+@dataclass
+class SerialisedEnumType:
+    enum_type: t.Type[Enum]
+
+    def __hash__(self):
+        return hash(self.__repr__())
+
+    def __eq__(self, other):
+        return self.__hash__() == other.__hash__()
+
+    def __repr__(self):
+        class_name = self.enum_type.__name__
+        params = {i.name: i.value for i in self.enum_type}
+        return f"Enum('{class_name}', {params})"
+
+
 @dataclass
 class SerialisedCallable:
     callable_: t.Callable
@@ -162,10 +178,7 @@ def serialise_params(params: t.Dict[str, t.Any]) -> SerialisedParams:
     for key, value in params.items():
 
         # Builtins, such as str, list and dict.
-        if (
-            hasattr(value, "__module__")
-            and value.__module__ == builtins.__name__
-        ):
+        if inspect.getmodule(value) == builtins:
             params[key] = SerialisedBuiltin(builtin=value)
             continue
 
@@ -238,6 +251,20 @@ def serialise_params(params: t.Dict[str, t.Any]) -> SerialisedParams:
             )
             continue
 
+        # Enum types
+        if inspect.isclass(value) and issubclass(value, Enum):
+            params[key] = SerialisedEnumType(enum_type=value)
+            extra_imports.append(Import(module="enum", target="Enum"))
+            for member in value:
+                type_ = type(member.value)
+                module = inspect.getmodule(type_)
+
+                if module and module != builtins:
+                    module_name = module.__name__
+                    extra_imports.append(
+                        Import(module=module_name, target=type_.__name__)
+                    )
+
         # Functions
         if inspect.isfunction(value):
             if value.__name__ == "<lambda>":
@@ -300,5 +327,7 @@ def deserialise_params(params: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
             params[key] = value.callable_
         elif isinstance(value, SerialisedTableType):
             params[key] = value.table_type
+        elif isinstance(value, SerialisedEnumType):
+            params[key] = value.enum_type
 
     return params

piccolo/apps/migrations/commands/new.py

@@ -75,10 +75,11 @@ async def _create_new_migration(app_config: AppConfig, auto=False) -> None:
             chain(*[i.statements for i in alter_statements])
         )
         extra_imports = sorted(
-            list(set(chain(*[i.extra_imports for i in alter_statements])))
+            list(set(chain(*[i.extra_imports for i in alter_statements]))),
+            key=lambda x: x.__repr__(),
         )
         extra_definitions = sorted(
-            list(set(chain(*[i.extra_definitions for i in alter_statements])))
+            list(set(chain(*[i.extra_definitions for i in alter_statements]))),
         )
 
         if sum([len(i.statements) for i in alter_statements]) == 0:

piccolo/columns/base.py

@@ -25,6 +25,7 @@
     NotLike,
 )
 from piccolo.columns.combination import Where
+from piccolo.columns.choices import Choice
 from piccolo.columns.defaults.base import Default
 from piccolo.columns.reference import LazyTableReference
 from piccolo.columns.indexes import IndexMethod
@@ -124,6 +125,7 @@ class ColumnMeta:
     index_method: IndexMethod = IndexMethod.btree
     required: bool = False
     help_text: t.Optional[str] = None
+    choices: t.Optional[t.Type[Enum]] = None
 
     # Used for representing the table in migrations and the playground.
     params: t.Dict[str, t.Any] = field(default_factory=dict)
@@ -164,6 +166,30 @@ def engine_type(self) -> str:
         else:
             raise ValueError("The table has no engine defined.")
 
+    def get_choices_dict(self) -> t.Optional[t.Dict[str, t.Any]]:
+        """
+        Return the choices Enum as a dict. It maps the attribute name to a
+        dict containing the display name, and value.
+        """
+        if self.choices is None:
+            return None
+        else:
+            output = {}
+            for element in self.choices:
+                if isinstance(element.value, Choice):
+                    display_name = element.value.display_name
+                    value = element.value.value
+                else:
+                    display_name = element.name.replace("_", " ").title()
+                    value = element.value
+
+                output[element.name] = {
+                    "display_name": display_name,
+                    "value": value,
+                }
+
+            return output
+
     def get_full_name(self, just_alias=False) -> str:
         """
         Returns the full column name, taking into account joins.
@@ -183,6 +209,8 @@ def get_full_name(self, just_alias=False) -> str:
         else:
             return f'{alias} AS "{column_name}"'
 
+    ###########################################################################
+
     def copy(self) -> ColumnMeta:
         kwargs = self.__dict__.copy()
         kwargs.update(
@@ -266,11 +294,14 @@ def __init__(
         index_method: IndexMethod = IndexMethod.btree,
         required: bool = False,
         help_text: t.Optional[str] = None,
+        choices: t.Optional[t.Type[Enum]] = None,
         **kwargs,
     ) -> None:
         # Used for migrations.
         # We deliberately omit 'required', and 'help_text' as they don't effect
         # the actual schema.
+        # 'choices' isn't used directly in the schema, but may be important
+        # for data migrations.
         kwargs.update(
             {
                 "null": null,
@@ -279,6 +310,7 @@ def __init__(
                 "unique": unique,
                 "index": index,
                 "index_method": index_method,
+                "choices": choices,
             }
         )
 
@@ -288,6 +320,9 @@ def __init__(
                 "not nullable."
             )
 
+        if choices is not None:
+            self._validate_choices(choices, allowed_type=self.value_type)
+
         self._meta = ColumnMeta(
             null=null,
             primary=primary,
@@ -298,6 +333,7 @@ def __init__(
             params=kwargs,
             required=required,
             help_text=help_text,
+            choices=choices,
         )
 
         self.alias: t.Optional[str] = None
@@ -324,12 +360,37 @@ def _validate_default(
         elif callable(default):
             self._validated = True
             return True
+        elif (
+            isinstance(default, Enum) and type(default.value) in allowed_types
+        ):
+            self._validated = True
+            return True
         else:
             raise ValueError(
                 f"The default {default} isn't one of the permitted types - "
                 f"{allowed_types}"
             )
 
+    def _validate_choices(
+        self, choices: t.Type[Enum], allowed_type: t.Type[t.Any]
+    ) -> bool:
+        """
+        Make sure the choices value has values of the allowed_type.
+        """
+        for element in choices:
+            if isinstance(element.value, allowed_type):
+                continue
+            elif isinstance(element.value, Choice) and isinstance(
+                element.value.value, allowed_type
+            ):
+                continue
+            else:
+                raise ValueError(
+                    f"{element.name} doesn't have the correct type"
+                )
+
+        return True
+
     def is_in(self, values: t.List[t.Any]) -> Where:
         if len(values) == 0:
             raise ValueError(

piccolo/columns/choices.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+from dataclasses import dataclass
+import typing as t
+
+
+@dataclass
+class Choice:
+    """
+    When defining enums for ``Column`` choices, they can either be defined
+    like:
+
+    .. code-block:: python
+
+        class Title(Enum):
+            mr = 1
+            mrs = 2
+
+    If using Piccolo Admin, the values shown will be ``Mr`` and ``Mrs``. If you
+    want more control, you can use ``Choice`` for the value instead.
+
+    .. code-block:: python
+
+        class Title(Enum):
+            mr = Choice(value=1, display_name="Mr.")
+            mrs = Choice(value=1, display_name="Mrs.")
+
+    Now the values shown will be ``Mr.`` and ``Mrs.``.
+
+    """
+
+    value: t.Any
+    display_name: str

piccolo/columns/column_types.py

@@ -2,6 +2,7 @@
 
 import copy
 import decimal
+from enum import Enum
 import typing as t
 import uuid
 from datetime import date, datetime, time, timedelta
@@ -165,7 +166,7 @@ class Band(Table):
     def __init__(
         self,
         length: int = 255,
-        default: t.Union[str, t.Callable[[], str], None] = "",
+        default: t.Union[str, Enum, t.Callable[[], str], None] = "",
         **kwargs,
     ) -> None:
         self._validate_default(default, (str, None))
@@ -251,7 +252,9 @@ class Band(Table):
     concat_delegate: ConcatDelegate = ConcatDelegate()
 
     def __init__(
-        self, default: t.Union[str, None, t.Callable[[], str]] = "", **kwargs
+        self,
+        default: t.Union[str, Enum, None, t.Callable[[], str]] = "",
+        **kwargs,
     ) -> None:
         self._validate_default(default, (str, None))
         self.default = default
@@ -333,7 +336,9 @@ class Band(Table):
     math_delegate = MathDelegate()
 
     def __init__(
-        self, default: t.Union[int, t.Callable[[], int], None] = 0, **kwargs
+        self,
+        default: t.Union[int, Enum, t.Callable[[], int], None] = 0,
+        **kwargs,
     ) -> None:
         self._validate_default(default, (int, None))
         self.default = default
@@ -771,7 +776,7 @@ class Band(Table):
 
     def __init__(
         self,
-        default: t.Union[bool, t.Callable[[], bool], None] = False,
+        default: t.Union[bool, Enum, t.Callable[[], bool], None] = False,
         **kwargs,
     ) -> None:
         self._validate_default(default, (bool, None))
@@ -841,7 +846,7 @@ def __init__(
         self,
         digits: t.Optional[t.Tuple[int, int]] = None,
         default: t.Union[
-            decimal.Decimal, t.Callable[[], decimal.Decimal], None
+            decimal.Decimal, Enum, t.Callable[[], decimal.Decimal], None
         ] = decimal.Decimal(0.0),
         **kwargs,
     ) -> None:
@@ -897,7 +902,7 @@ class Concert(Table):
 
     def __init__(
         self,
-        default: t.Union[float, t.Callable[[], float], None] = 0.0,
+        default: t.Union[float, Enum, t.Callable[[], float], None] = 0.0,
         **kwargs,
     ) -> None:
         self._validate_default(default, (float, None))
@@ -1087,7 +1092,7 @@ class Band(Table):
     def __init__(
         self,
         references: t.Union[t.Type[Table], LazyTableReference, str],
-        default: t.Union[int, None] = None,
+        default: t.Union[int, Enum, None] = None,
         null: bool = True,
         on_delete: OnDelete = OnDelete.cascade,
         on_update: OnUpdate = OnUpdate.cascade,
@@ -1324,6 +1329,7 @@ def __init__(
         default: t.Union[
             bytes,
             bytearray,
+            Enum,
             t.Callable[[], bytes],
             t.Callable[[], bytearray],
             None,
@@ -1376,7 +1382,7 @@ class Ticket(Table):
     def __init__(
         self,
         base_column: Column,
-        default: t.Union[t.List, t.Callable[[], t.List], None] = list,
+        default: t.Union[t.List, Enum, t.Callable[[], t.List], None] = list,
         **kwargs,
     ) -> None:
         if isinstance(base_column, ForeignKey):

piccolo/columns/combination.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from enum import Enum
 import typing as t
 
 from piccolo.columns.operators.comparison import ComparisonOperator
@@ -100,14 +101,21 @@ def values_querystring(self) -> QueryString:
         if isinstance(self.values, Undefined):
             raise ValueError("values is undefined")
 
-        template = ", ".join(["{}" for i in self.values])
-        return QueryString(template, *self.values)
+        values = [i.value if isinstance(i, Enum) else i for i in self.values]
+
+        template = ", ".join(["{}" for _ in values])
+        return QueryString(template, *values)
 
     @property
     def querystring(self) -> QueryString:
         args: t.List[t.Any] = []
         if self.value != UNDEFINED:
-            args.append(self.value)
+            value = (
+                self.value.value
+                if isinstance(self.value, Enum)
+                else self.value
+            )
+            args.append(value)
         if self.values != UNDEFINED:
             args.append(self.values_querystring)
 

piccolo/columns/defaults/date.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import datetime
+from enum import Enum
 import typing as t
 
 from .base import Default
@@ -66,7 +67,7 @@ def from_date(cls, instance: datetime.date):
 
 
 # Might add an enum back which encapsulates all of the options.
-DateArg = t.Union[DateOffset, DateCustom, DateNow, None, datetime.date]
+DateArg = t.Union[DateOffset, DateCustom, DateNow, Enum, None, datetime.date]
 
 
 __all__ = ["DateArg", "DateOffset", "DateCustom", "DateNow"]