Merge pull request #38 from digital-asset/python-enum-fix

python: Fix a bug that broke enum support.

Author: da-tanabe

.gitignore

@@ -13,6 +13,7 @@
 python/build
 python/dazl.egg-info
 python/dist
+python/pip-wheel-metadata
 app.log
 sandbox.log
 target

VERSION

@@ -1 +1 @@
-6.2.1
+6.2.2

python/dazl/client/_writer_verify.py

@@ -6,7 +6,7 @@
 from ..model.core import ContractId
 from ..model.types import Type, UnsupportedType, VariantType, RecordType, ListType, \
     ContractIdType, TemplateChoice, TypeEvaluationContext, OptionalType, MapType, \
-    UnresolvedTypeReference, TypeReference
+    UnresolvedTypeReference, TypeReference, EnumType
 from ..model.writing import Command, CreateCommand, ExerciseCommand, ExerciseByKeyCommand, \
     CreateAndExerciseCommand, AbstractSerializer
 from ..util.prim_types import to_int, to_str, to_decimal, to_date, to_datetime, \
@@ -186,6 +186,13 @@ def serialize_variant(self, context: TypeEvaluationContext, tt: VariantType, obj
             error = 'variants must be encoded as dictionaries with a single key and a value'
             raise ValueError(f'{error} (got {obj!r} instead)', obj)
 
+    def serialize_enum(self, context: TypeEvaluationContext, tt: EnumType, obj: Any) -> Any:
+        if obj in tt.constructors:
+            return obj
+        else:
+            error = f'expected one of {tt.constructors}'
+            raise ValueError(f'{error} (got {obj!r} instead')
+
     def serialize_unsupported(self, context: TypeEvaluationContext, tt: UnsupportedType, obj: Any) \
             -> Any:
         return obj

python/dazl/protocols/v1/pb_parse_event.py

@@ -403,6 +403,8 @@ def to_natural_type(context: TypeEvaluationContext, data_type: Type, obj: 'G.Val
         return to_list(context, data_type, obj.list)
     elif ctor == 'optional':
         return to_optional(context, data_type, obj.optional)
+    elif ctor == 'enum':
+        return to_enum(obj.enum)
     elif ctor == 'int64':
         return to_int64(obj.int64)
     elif ctor == 'decimal':
@@ -497,6 +499,10 @@ def process(child_context: TypeEvaluationContext, ot: OptionalType) -> list:
     return type_evaluate_dispatch_default_error(on_optional=process)(context, tt)
 
 
+def to_enum(enum: str) -> str:
+    return enum
+
+
 def to_int64(int64: int) -> int:
     return int64
 

python/dazl/protocols/v1/pb_ser_command.py

@@ -13,7 +13,7 @@
 from ...model.core import ContractId
 from ...model.types import VariantType, RecordType, ListType, ContractIdType, \
     UnsupportedType, TemplateChoice, TypeReference, TypeEvaluationContext, SCALAR_TYPE_UNIT, \
-    MapType, OptionalType
+    MapType, OptionalType, EnumType
 from ...model.writing import AbstractSerializer, CommandPayload
 from ...util.prim_types import to_boolean, to_date, to_datetime, to_decimal, to_int, to_str, \
     decode_variant_dict
@@ -244,6 +244,12 @@ def serialize_variant(self, context: TypeEvaluationContext, tt: VariantType, obj
         _set_value(variant_message.value, ctor, value)
         return 'variant', variant_message
 
+    def serialize_enum(self, context: TypeEvaluationContext, tt: EnumType, obj: Any) -> R:
+        from ..._gen.com.digitalasset.ledger.api.v1.value_pb2 import Enum
+        enum_message = Enum()
+        enum_message.constructor = obj
+        return 'enum', enum_message
+
     def serialize_unsupported(
             self, context: TypeEvaluationContext, tt: UnsupportedType, obj: Any) -> R:
         raise Exception(f'UnsupportedType {tt} is not serializable in gRPC')
@@ -275,7 +281,7 @@ def _set_value(message: G.Value, ctor: 'Optional[str]', value) -> None:
             message.MergeFrom(value)
         elif ctor == 'unit':
             message.unit.SetInParent()
-        elif ctor in ('record', 'variant', 'list', 'optional'):
+        elif ctor in ('record', 'variant', 'list', 'optional', 'enum'):
             getattr(message, ctor).MergeFrom(value)
         else:
             setattr(message, ctor, value)

python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dazl"
-version = "6.2.1"
+version = "6.2.2"
 description = "high-level Ledger API client for DAML ledgers"
 license = "Apache-2.0"
 authors = ["Davin K. Tanabe <davin.tanabe@digitalasset.com>"]
@@ -13,7 +13,6 @@ keywords = ["daml", "blockchain", "dlt", "distributed ledger", "digital asset"]
 python = ">=3.6"
 aiohttp = "*"
 dataclasses = { version = "*", python = "~=3.6.0" }
- 
 google-auth = "*"
 grpcio = ">=1.20.1"
 oauthlib = "*"
@@ -24,6 +23,7 @@ pyyaml = "*"
 requests = "*"
 semver = "*"
 toposort = "*"
+typing_extensions = "*"
 
 [tool.poetry.dev-dependencies]
 grpcio-tools = ">=1.20.1"