Merge pull request #866 from CitrineInformatics/maintain/update-enume…

…ration

Maintain/update enumeration

requirements.txt

@@ -1,4 +1,4 @@
-gemd==1.13.0
+gemd==1.15.0
 requests==2.31.0
 pyjwt==2.4.0
 arrow==0.15.4

setup.py

@@ -25,7 +25,7 @@
           "requests>=2.31.0,<3",
           "pyjwt>=2,<3",
           "arrow>=0.15.4,<2",
-          "gemd>=1.13.0,<2",
+          "gemd>=1.15.0,<2",
           "boto3>=1.17.93,<2",
           "botocore>=1.20.95,<2",
           "deprecation>=2.1.0,<3",

src/citrine/__version__.py

@@ -1 +1 @@
-__version__ = '2.24.0'
+__version__ = '2.24.1'

src/citrine/_serialization/properties.py

@@ -689,11 +689,11 @@ def underlying_types(self):
     def serialized_types(self):
         return str
 
-    def _deserialize(self, value: str) -> uuid.UUID:
-        return self.klass.get_enum(value)
+    def _deserialize(self, value: str) -> BaseEnumeration:
+        return self.klass.from_str(value, exception=True)
 
     def _serialize(self, value: typing.Any) -> str:
-        return self.klass.get_value(value)
+        return self.klass.from_str(value, exception=True).value
 
 
 @lru_cache(maxsize=1024)

src/citrine/gemtables/variables.py

@@ -572,9 +572,8 @@ def __init__(self,
         self.type_selector = type_selector
 
         # Cast to make sure the string is valid
-        if not isinstance(quantity_dimension, IngredientQuantityDimension):
-            quantity_dimension = IngredientQuantityDimension.get_enum(quantity_dimension)
-        self.quantity_dimension = quantity_dimension
+        self.quantity_dimension = IngredientQuantityDimension.from_str(quantity_dimension,
+                                                                       exception=True)
 
         if quantity_dimension == IngredientQuantityDimension.ABSOLUTE:
             if unit is None:
@@ -927,9 +926,8 @@ def __init__(self,
         self.type_selector = type_selector
 
         # Cast to make sure the string is valid
-        if not isinstance(quantity_dimension, IngredientQuantityDimension):
-            quantity_dimension = IngredientQuantityDimension.get_enum(quantity_dimension)
-        self.quantity_dimension = quantity_dimension
+        self.quantity_dimension = IngredientQuantityDimension.from_str(quantity_dimension,
+                                                                       exception=True)
 
         if quantity_dimension == IngredientQuantityDimension.ABSOLUTE:
             if unit is None:
@@ -1086,9 +1084,8 @@ def __init__(self,
         self.type_selector = type_selector
 
         # Cast to make sure the string is valid
-        if not isinstance(quantity_dimension, IngredientQuantityDimension):
-            quantity_dimension = IngredientQuantityDimension.get_enum(quantity_dimension)
-        self.quantity_dimension = quantity_dimension
+        self.quantity_dimension = IngredientQuantityDimension.from_str(quantity_dimension,
+                                                                       exception=True)
 
         if quantity_dimension == IngredientQuantityDimension.ABSOLUTE:
             if unit is None:

src/citrine/informatics/constraints/ingredient_count_constraint.py

@@ -43,4 +43,4 @@ def __init__(self, *,
         self.label: Optional[str] = label
 
     def __str__(self):
-        return '<IngredientCountConstraint {!r}>'.format(self.formulation_descriptor.key)
+        return f"<IngredientCountConstraint '{self.formulation_descriptor.key}'>"

src/citrine/informatics/constraints/ingredient_fraction_constraint.py

@@ -47,7 +47,7 @@ def __init__(self, *,
         self.is_required: bool = is_required
 
     def __str__(self):
-        return '<IngredientFractionConstraint {!r}::{!r}>'.format(
-            self.formulation_descriptor.key,
-            self.ingredient
+        return (
+            f"<IngredientFractionConstraint "
+            f"'{self.formulation_descriptor.key}'::'{self.ingredient}'>"
         )

src/citrine/informatics/constraints/ingredient_ratio_constraint.py

@@ -171,4 +171,4 @@ def _numerator_validate(self, value, input_type):
             return {}
 
     def __str__(self):
-        return f'<IngredientRatioConstraint {self.formulation_descriptor.key!r}>'
+        return f"<IngredientRatioConstraint '{self.formulation_descriptor.key}'>"

src/citrine/informatics/constraints/label_fraction_constraint.py

@@ -47,7 +47,4 @@ def __init__(self, *,
         self.is_required: bool = is_required
 
     def __str__(self):
-        return '<LabelFractionConstraint {!r}::{!r}>'.format(
-            self.formulation_descriptor.key,
-            self.label
-        )
+        return f"<LabelFractionConstraint '{self.formulation_descriptor.key}'::'{self.label}'>"

src/citrine/informatics/descriptors.py

@@ -261,15 +261,13 @@ class FormulationDescriptor(Serializable['FormulationDescriptor'], Descriptor):
     )
 
     def __init__(self, key: Union[FormulationKey, str]):
-        if not isinstance(key, FormulationKey):
-            key = FormulationKey.get_enum(key)
-        self.key: str = key.value
+        self.key = FormulationKey.from_str(key, exception=True)
 
     def __eq__(self, other):
         return self._equals(other, ["key", "typ"])
 
     def __str__(self):
-        return "<FormulationDescriptor {!r}>".format(self.key)
+        return f"<FormulationDescriptor '{self.key}'>"
 
     def __repr__(self):
         return "FormulationDescriptor(key={})".format(self.key)

src/citrine/resources/file_link.py

@@ -3,7 +3,6 @@
 import mimetypes
 import os
 from pathlib import Path
-from enum import Enum
 from logging import getLogger
 from tempfile import TemporaryDirectory
 from typing import Optional, Tuple, Union, List, Dict, Iterable, Sequence
@@ -68,7 +67,7 @@ def __init__(self):
         self.s3_addressing_style = 'auto'
 
 
-class FileProcessingType(Enum):
+class FileProcessingType(BaseEnumeration):
     """The supported File Processing Types."""
 
     VALIDATE_CSV = "VALIDATE_CSV"

src/citrine/resources/predictor.py

@@ -528,9 +528,7 @@ def _create_default_payload(training_data: DataSource,
                                 pattern: Union[str, AutoConfigureMode] = AutoConfigureMode.INFER,
                                 prefer_valid: bool = True) -> dict:
         # Continue handling string pattern inputs
-        if not isinstance(pattern, AutoConfigureMode):
-            pattern = AutoConfigureMode.get_enum(pattern)
-        pattern = pattern.value
+        pattern = AutoConfigureMode.from_str(pattern, exception=True)
 
         return {"data_source": training_data.dump(), "pattern": pattern,
                 "prefer_valid": prefer_valid}

src/citrine/resources/status_detail.py

@@ -25,11 +25,8 @@ class StatusDetail(Serializable[StatusDetailType]):
     level = properties.String("level")
 
     def __init__(self, *, msg: str, level: Union[str, StatusLevelEnum]):
-        if not isinstance(level, StatusLevelEnum):
-            level = StatusLevelEnum.get_enum(level)
-
         self.msg = msg
-        self.level = level.value
+        self.level = StatusLevelEnum.from_str(level, exception=True)
 
     def __str__(self):
         return f"[{self.level.upper()}] {self.msg}"  # pragma: no cover