benchling-sdk 1.10.0a5__py3-none-any.whl → 1.10.0a7__py3-none-any.whl

benchling_sdk/apps/canvas/framework.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from typing import cast, Dict, Generic, List, Optional, Protocol, Set, Type, TypeVar, Union
 
 from benchling_api_client.v2.extensions import UnknownType
@@ -13,6 +14,7 @@ from benchling_sdk.apps.canvas.types import (
     UiBlock,
     UiBlockType,
 )
+from benchling_sdk.apps.types import JsonType
 from benchling_sdk.models import (
     AppCanvas,
     AppCanvasApp,
@@ -366,6 +368,7 @@ class CanvasBuilder:
         enabled: bool = True,
         session_id: Optional[str] = None,
         blocks: Optional[List[UiBlock]] = None,
+        data: Optional[JsonType] = None,
     ):
         """
         Init AppCanvas.
@@ -379,6 +382,7 @@ class CanvasBuilder:
             enabled=enabled,
             session_id=session_id,
             blocks=blocks if blocks else [],
+            data=json.dumps(data) if data is not None else None,
         )
 
     @classmethod
@@ -395,6 +399,7 @@ class CanvasBuilder:
             enabled=canvas.enabled,
             session_id=canvas.session_id,
             blocks=canvas.blocks,
+            data=json.loads(canvas.data) if canvas.data is not None else None,
         )
 
     def _with_enabled(self, value: bool) -> CanvasBuilder:
@@ -406,6 +411,7 @@ class CanvasBuilder:
             enabled=value,
             session_id=self._source_canvas.session_id,
             blocks=self._source_canvas.blocks,
+            data=self._source_canvas.data,
         )
 
     def with_enabled(self, enabled: bool = True) -> CanvasBuilder:
@@ -430,6 +436,23 @@ class CanvasBuilder:
             enabled=self._source_canvas.enabled,
             session_id=self._source_canvas.session_id,
             blocks=new_blocks,
+            data=self._source_canvas.data,
+        )
+
+    def with_data(self, new_data: Optional[JsonType]) -> CanvasBuilder:
+        """
+        Return a new CanvasBuilder with the underlying data replaced.
+
+        This does not call the API, it only assigns state in the CanvasBuilder.
+        """
+        return CanvasBuilder(
+            app_id=self._source_canvas.app.id,
+            feature_id=self._source_canvas.feature_id,
+            resource_id=self._source_canvas.resource_id,
+            enabled=self._source_canvas.enabled,
+            session_id=self._source_canvas.session_id,
+            blocks=self._source_canvas.blocks,
+            data=new_data,
         )
 
     def with_session_id(self, session_id: Optional[str]) -> CanvasBuilder:
@@ -445,6 +468,7 @@ class CanvasBuilder:
             enabled=self._source_canvas.enabled,
             session_id=session_id,
             blocks=self._source_canvas.blocks,
+            data=self._source_canvas.data,
         )
 
     def inputs_to_dict(self) -> Dict[str, Union[str, List[str]]]:
@@ -574,6 +598,7 @@ class CanvasBuilder:
             enabled=self._source_canvas.enabled,
             session_id=self._source_canvas.session_id,
             blocks=[_ui_block_to_update(block) for block in self._source_canvas.blocks],
+            data=self._source_canvas.data,
         )
 
     def to_create(self) -> AppCanvasCreate:
@@ -585,6 +610,7 @@ class CanvasBuilder:
             enabled=self._source_canvas.enabled,
             session_id=self._source_canvas.session_id,
             blocks=[_ui_block_to_create(block) for block in self._source_canvas.blocks],
+            data=self._source_canvas.data,
         )
 
     @property
@@ -597,6 +623,14 @@ class CanvasBuilder:
         """
         return CanvasBuilderBlockStream.from_builder(self)
 
+    def data_to_json(self) -> Optional[JsonType]:
+        """
+        Convert Canvas data to JSON.
+
+        Return a JSON object parsed from the string of the canvas's `data`, if present. Otherwise, return None.
+        """
+        return json.loads(self._source_canvas.data) if self._source_canvas.data is not None else None
+
 
 def _is_included_class(included_classes: Set[Type[UiBlock]], target_class: UiBlock) -> bool:
     return isinstance(target_class, tuple(c for c in included_classes))

benchling_sdk/apps/config/__init__.py

@@ -1,3 +0,0 @@
-from benchling_sdk.helpers.logging_helpers import log_stability_warning, StabilityLevel
-
-log_stability_warning(StabilityLevel.BETA)

benchling_sdk/apps/config/decryption_provider.py

@@ -11,9 +11,6 @@ class BaseDecryptionProvider(ABC):
     Various implementations might use AWS KMS, Azure, etc.
     """
 
-    # TODO BNCH-52772 should we loosen this method to accept None and not attempt decryption,
-    # now that config is no longer type safe?
-
     @abstractmethod
     def decrypt(self, ciphertext: str) -> str:
         """

benchling_sdk/apps/config/framework.py

@@ -77,7 +77,8 @@ class BenchlingConfigProvider(ConfigProvider):
 
         # Eager load all config items for now since we don't yet have a way of lazily querying by path
         all_config_pages = list(app_pages)
-        # Punt on UnknownType for now as apps using manifests with new types + older client could lead to unpredictable results
+        # Punt on UnknownType for now as apps using manifests with new types +
+        # older client could lead to unpredictable results
         all_config_items = [
             _supported_config_item(config_item) for page in all_config_pages for config_item in page
         ]
@@ -220,13 +221,13 @@ class ConfigItemStore:
     """
     Dependency Link Store.
 
-    Marshals an app configuration from the configuration provider into an indexable structure.
+    Marshals an app configuration from the configuration provider into an indexed structure.
     Only retrieves app configuration once unless its cache is invalidated.
     """
 
     _configuration_provider: ConfigProvider
     _configuration: Optional[List[ConfigurationReference]] = None
-    _configuration_map: Optional[Dict[ConfigItemPath, ConfigItemWrapper]] = None
+    _configuration_dict: Optional[Dict[ConfigItemPath, ConfigItemWrapper]] = None
     _array_path_row_names: Dict[Tuple[str, ...], OrderedSet[str]] = dict()
 
     def __init__(self, configuration_provider: ConfigProvider):
@@ -252,17 +253,17 @@ class ConfigItemStore:
         return self._configuration
 
     @property
-    def configuration_path_map(self) -> Dict[ConfigItemPath, ConfigItemWrapper]:
+    def configuration_path_dict(self) -> Dict[ConfigItemPath, ConfigItemWrapper]:
         """
         Config links.
 
-        Return a map of configuration item paths to their corresponding configuration items.
+        Return a dict of configuration item paths to their corresponding configuration items.
         """
-        if not self._configuration_map:
-            self._configuration_map = {
+        if not self._configuration_dict:
+            self._configuration_dict = {
                 tuple(item.path): ConfigItemWrapper(item, item.path) for item in self.configuration
             }
-        return self._configuration_map
+        return self._configuration_dict
 
     def config_by_path(self, path: List[str]) -> ConfigItemWrapper:
         """
@@ -272,7 +273,7 @@ class ConfigItemStore:
         """
         # Since we eager load all config now, we know that missing path means it's not configured in Benchling
         # Later if we support lazy loading, we'll need to differentiate what's in our cache versus missing
-        return self.configuration_path_map.get(tuple(path), ConfigItemWrapper(None, path))
+        return self.configuration_path_dict.get(tuple(path), ConfigItemWrapper(None, path))
 
     def config_keys_by_path(self, path: List[str]) -> OrderedSet[str]:
         """
@@ -296,7 +297,7 @@ class ConfigItemStore:
             self._array_path_row_names[path_tuple] = OrderedSet(
                 [
                     config_item.path[len(path)]
-                    # Use the list instead of configuration_map to preserve order
+                    # Use the list instead of configuration_dict to preserve order
                     for config_item in self.configuration
                     # The +1 is the name of the array row
                     if len(config_item.path) >= len(path) + 1
@@ -330,7 +331,7 @@ class ConfigItemStore:
         Will force retrieval of configuration from the ConfigProvider the next time the link store is accessed.
         """
         self._configuration = None
-        self._configuration_map = None
+        self._configuration_dict = None
         self._array_path_row_names = dict()
 
 

benchling_sdk/apps/{helpers/config_helpers.py → config/helpers.py}

@@ -1,7 +1,6 @@
-from datetime import date, datetime
+from datetime import datetime
 from typing import List, Optional, Union
 
-from benchling_api_client.v2.beta.models.app_config_field_type import AppConfigFieldType
 from benchling_api_client.v2.beta.models.base_manifest_config import BaseManifestConfig
 from benchling_api_client.v2.beta.models.dropdown_dependency import DropdownDependency
 from benchling_api_client.v2.beta.models.dropdown_dependency_types import DropdownDependencyTypes
@@ -29,92 +28,7 @@ from benchling_api_client.v2.beta.models.workflow_task_schema_dependency_type im
 from benchling_api_client.v2.extensions import UnknownType
 from benchling_api_client.v2.stable.extensions import NotPresentError
 
-from benchling_sdk.apps.config.scalars import JsonType
-from benchling_sdk.models import (
-    AaSequence,
-    AssayResult,
-    AssayRun,
-    Box,
-    Container,
-    CustomEntity,
-    DnaOligo,
-    DnaSequence,
-    Entry,
-    Location,
-    Mixture,
-    Molecule,
-    Plate,
-    Request,
-    RnaOligo,
-    RnaSequence,
-    WorkflowTask,
-)
-
-_MODEL_TYPES_FROM_SCHEMA_TYPE = {
-    SchemaDependencyTypes.CONTAINER_SCHEMA: Container,
-    SchemaDependencyTypes.PLATE_SCHEMA: Plate,
-    SchemaDependencyTypes.BOX_SCHEMA: Box,
-    SchemaDependencyTypes.LOCATION_SCHEMA: Location,
-    SchemaDependencyTypes.ENTRY_SCHEMA: Entry,
-    SchemaDependencyTypes.REQUEST_SCHEMA: Request,
-    SchemaDependencyTypes.RESULT_SCHEMA: AssayResult,
-    SchemaDependencyTypes.RUN_SCHEMA: AssayRun,
-    SchemaDependencyTypes.WORKFLOW_TASK_SCHEMA: WorkflowTask,
-}
-
-
-_SCALAR_TYPES_FROM_CONFIG = {
-    ScalarConfigTypes.BOOLEAN: bool,
-    ScalarConfigTypes.DATE: date,
-    ScalarConfigTypes.DATETIME: datetime,
-    ScalarConfigTypes.FLOAT: float,
-    ScalarConfigTypes.INTEGER: int,
-    ScalarConfigTypes.JSON: JsonType,
-    ScalarConfigTypes.TEXT: str,
-}
-
-
-_FIELD_SCALAR_TYPES_FROM_CONFIG = {
-    AppConfigFieldType.BOOLEAN: bool,
-    AppConfigFieldType.DATE: date,
-    AppConfigFieldType.DATETIME: datetime,
-    AppConfigFieldType.FLOAT: float,
-    AppConfigFieldType.INTEGER: int,
-    AppConfigFieldType.JSON: JsonType,
-    AppConfigFieldType.TEXT: str,
-}
-
-
-ModelType = Union[AssayResult, AssayRun, Box, Container, Entry, Location, Plate, Request]
-
-_INSTANCE_FROM_SCHEMA_SUBTYPE = {
-    SchemaDependencySubtypes.AA_SEQUENCE: AaSequence,
-    SchemaDependencySubtypes.CUSTOM_ENTITY: CustomEntity,
-    SchemaDependencySubtypes.DNA_SEQUENCE: DnaSequence,
-    SchemaDependencySubtypes.DNA_OLIGO: DnaOligo,
-    SchemaDependencySubtypes.MIXTURE: Mixture,
-    SchemaDependencySubtypes.MOLECULE: Molecule,
-    SchemaDependencySubtypes.RNA_OLIGO: RnaOligo,
-    SchemaDependencySubtypes.RNA_SEQUENCE: RnaSequence,
-}
-
-EntitySubtype = Union[
-    AaSequence, CustomEntity, DnaOligo, DnaSequence, Mixture, Molecule, RnaOligo, RnaSequence
-]
-
-AnyDependency = Union[
-    BaseManifestConfig,
-    DropdownDependency,
-    EntitySchemaDependency,
-    FieldDefinitionsManifest,
-    ManifestArrayConfig,
-    ManifestScalarConfig,
-    ResourceDependency,
-    SchemaDependency,
-    WorkflowTaskSchemaDependency,
-]
-
-ArrayElementDependency = Union[
+_ArrayElementDependency = Union[
     SchemaDependency,
     EntitySchemaDependency,
     WorkflowTaskSchemaDependency,
@@ -124,13 +38,13 @@ ArrayElementDependency = Union[
 ]
 
 
-class UnsupportedSubTypeError(Exception):
+class _UnsupportedSubTypeError(Exception):
     """Error when an unsupported subtype is encountered."""
 
     pass
 
 
-def field_definitions_from_dependency(
+def _field_definitions_from_dependency(
     dependency: Union[
         EntitySchemaDependency,
         SchemaDependency,
@@ -148,7 +62,7 @@ def field_definitions_from_dependency(
     return []
 
 
-def element_definition_from_dependency(dependency: ManifestArrayConfig) -> List[ArrayElementDependency]:
+def _element_definition_from_dependency(dependency: ManifestArrayConfig) -> List[_ArrayElementDependency]:
     """Safely return an element definition as a list of dependencies from an array dependency or empty list."""
     try:
         if hasattr(dependency, "element_definition"):
@@ -161,7 +75,7 @@ def element_definition_from_dependency(dependency: ManifestArrayConfig) -> List[
     return []
 
 
-def enum_from_dependency(
+def _enum_from_dependency(
     dependency: Union[
         ManifestFloatScalarConfig,
         ManifestIntegerScalarConfig,
@@ -180,8 +94,8 @@ def enum_from_dependency(
 
 # TODO BNCH-57036 All element definitions currently deserialize to UnknownType. Hack around this temporarily
 def _fix_element_definition_deserialization(
-    element: Union[UnknownType, ArrayElementDependency]
-) -> ArrayElementDependency:
+    element: Union[UnknownType, _ArrayElementDependency]
+) -> _ArrayElementDependency:
     if isinstance(element, UnknownType):
         if "type" in element.value:
             element_type = element.value["type"]
@@ -201,7 +115,7 @@ def _fix_element_definition_deserialization(
     return element
 
 
-def workflow_task_schema_output_from_dependency(
+def _workflow_task_schema_output_from_dependency(
     dependency: WorkflowTaskSchemaDependency,
 ) -> Optional[WorkflowTaskSchemaDependencyOutput]:
     """Safely return a workflow task schema output from a workflow task schema or None."""
@@ -214,7 +128,7 @@ def workflow_task_schema_output_from_dependency(
     return None
 
 
-def options_from_dependency(dependency: DropdownDependency) -> List[BaseManifestConfig]:
+def _options_from_dependency(dependency: DropdownDependency) -> List[BaseManifestConfig]:
     """Safely return a list of options from a dropdown dependency or empty list."""
     try:
         if hasattr(dependency, "options"):
@@ -225,7 +139,7 @@ def options_from_dependency(dependency: DropdownDependency) -> List[BaseManifest
     return []
 
 
-def subtype_from_entity_schema_dependency(
+def _subtype_from_entity_schema_dependency(
     dependency: EntitySchemaDependency,
 ) -> Optional[SchemaDependencySubtypes]:
     """Safely return an entity schema dependency's subtype, if present."""
@@ -236,3 +150,8 @@ def subtype_from_entity_schema_dependency(
     except NotPresentError:
         pass
     return None
+
+
+def datetime_config_value_to_str(value: datetime) -> str:
+    """Convert a datetime value to a valid string accepted by a datetime app config item."""
+    return value.strftime("%Y-%m-%d %I:%M:%S %p")

benchling_sdk/apps/config/mock_config.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 import json
 import random
 import string
-from typing import Dict, get_args, List, Optional, Protocol, Type, Union
+from typing import cast, Dict, get_args, List, Optional, Protocol, Union
 
 from benchling_api_client.v2.beta.models.base_manifest_config import BaseManifestConfig
 from benchling_api_client.v2.beta.models.benchling_app_manifest import BenchlingAppManifest
@@ -34,29 +34,20 @@ from benchling_api_client.v2.extensions import UnknownType
 from benchling_api_client.v2.stable.types import UNSET, Unset
 
 from benchling_sdk.apps.config.decryption_provider import BaseDecryptionProvider
+from benchling_sdk.apps.config.errors import UnsupportedConfigItemError
 from benchling_sdk.apps.config.framework import _supported_config_item, ConfigItemStore, StaticConfigProvider
-from benchling_sdk.apps.config.scalars import (
-    BoolScalar,
-    DateScalar,
-    DateTimeScalar,
-    FloatScalar,
-    IntScalar,
-    JsonScalar,
-    JsonType,
-    ScalarDefinition,
-    ScalarType,
-    SecureTextScalar,
-    TextScalar,
+from benchling_sdk.apps.config.helpers import (
+    _element_definition_from_dependency,
+    _enum_from_dependency,
+    _field_definitions_from_dependency,
+    _options_from_dependency,
+    _subtype_from_entity_schema_dependency,
+    _workflow_task_schema_output_from_dependency,
+    datetime_config_value_to_str,
 )
 from benchling_sdk.apps.config.types import ConfigurationReference
-from benchling_sdk.apps.helpers.config_helpers import (
-    element_definition_from_dependency,
-    enum_from_dependency,
-    field_definitions_from_dependency,
-    options_from_dependency,
-    subtype_from_entity_schema_dependency,
-    workflow_task_schema_output_from_dependency,
-)
+from benchling_sdk.apps.types import JsonType
+from benchling_sdk.helpers.logging_helpers import log_stability_warning, StabilityLevel
 from benchling_sdk.models import (
     AppConfigItem,
     ArrayElementAppConfigItem,
@@ -98,6 +89,8 @@ ManifestDependencies = Union[
     UnknownType,
 ]
 
+log_stability_warning(StabilityLevel.BETA)
+
 
 class MockDecryptionFunction(Protocol):
     """Mock out a decryption function for use with secure text."""
@@ -296,7 +289,7 @@ def mock_datetime_app_config_item(path: List[str], value: Optional[datetime]) ->
     """Mock a datetime app config item with a path and specified value."""
     return DatetimeAppConfigItem(
         path=path,
-        value=value.strftime(DateTimeScalar.expected_format()) if isinstance(value, datetime) else value,
+        value=datetime_config_value_to_str(value) if value else None,
         type=DatetimeAppConfigItemType.DATETIME,
         id=_random_string("aci_"),
     )
@@ -354,9 +347,10 @@ def mock_text_app_config_item(path: List[str], value: Optional[str]) -> TextAppC
 
 def _mock_dependency(
     dependency: ManifestDependencies,
-    parent_path: List[str] = list(),
+    parent_path: Optional[List[str]] = None,
 ) -> List[AppConfigItem]:
     """Mock a dependency from its manifest definition."""
+    parent_path = parent_path if parent_path else []
     # MyPy has trouble inferring lists with [config_item] + sub_items so use the syntax like:
     # [*[config_item], *sub_items]
     # See https://github.com/python/mypy/issues/3933#issuecomment-808739063
@@ -371,12 +365,12 @@ def _mock_dependency(
         )
         sub_items = [
             _mock_subdependency(subdependency, dependency, parent_path=parent_path)
-            for subdependency in options_from_dependency(dependency)
+            for subdependency in _options_from_dependency(dependency)
         ]
         return [*[config_item], *sub_items]
     elif isinstance(dependency, EntitySchemaDependency):
         linked_resource_id = _random_string("val_")
-        subtype = subtype_from_entity_schema_dependency(dependency)
+        subtype = _subtype_from_entity_schema_dependency(dependency)
         optional_subtype: Union[SchemaDependencySubtypes, Unset] = (
             _convert_entity_subtype(subtype) if subtype is not None else UNSET
         )
@@ -390,7 +384,7 @@ def _mock_dependency(
         )
         sub_items = [
             _mock_subdependency(subdependency, dependency, parent_path=parent_path)
-            for subdependency in field_definitions_from_dependency(dependency)
+            for subdependency in _field_definitions_from_dependency(dependency)
         ]
         return [*[entity_item], *sub_items]
     elif isinstance(dependency, SchemaDependency):
@@ -404,7 +398,7 @@ def _mock_dependency(
         )
         sub_items = [
             _mock_subdependency(subdependency, dependency, parent_path=parent_path)
-            for subdependency in field_definitions_from_dependency(dependency)
+            for subdependency in _field_definitions_from_dependency(dependency)
         ]
         return [*[config_item], *sub_items]
     elif isinstance(dependency, WorkflowTaskSchemaDependency):
@@ -418,11 +412,11 @@ def _mock_dependency(
         )
         sub_items = [
             _mock_subdependency(subdependency, dependency, parent_path=parent_path)
-            for subdependency in field_definitions_from_dependency(dependency)
+            for subdependency in _field_definitions_from_dependency(dependency)
         ]
-        workflow_task_output = workflow_task_schema_output_from_dependency(dependency)
+        workflow_task_output = _workflow_task_schema_output_from_dependency(dependency)
         if workflow_task_output:
-            output_fields = field_definitions_from_dependency(workflow_task_output)
+            output_fields = _field_definitions_from_dependency(workflow_task_output)
             output_items = [
                 _mock_workflow_output_subdependency(subdependency, dependency, parent_path=parent_path)
                 for subdependency in output_fields
@@ -458,39 +452,40 @@ def _convert_entity_subtype(manifest_subtype: SchemaDependencySubtypesBeta) -> S
 
 
 def _mock_scalar_dependency(
-    dependency: ManifestScalarConfig, parent_path: List[str] = list()
+    dependency: ManifestScalarConfig, parent_path: Optional[List[str]] = None
 ) -> AppConfigItem:
+    parent_path = parent_path if parent_path else []
     if isinstance(dependency, ManifestBooleanScalarConfig):
-        bool_value = _mock_scalar_value_with_conversion(dependency, BoolScalar)
+        bool_value = cast(bool, _mock_scalar_value(dependency))
         bool_config = mock_bool_app_config_item([dependency.name], bool_value)
         return _append_config_item_path(bool_config, parent_path)
     elif isinstance(dependency, ManifestDateScalarConfig):
-        date_value = _mock_scalar_value_with_conversion(dependency, DateScalar)
+        date_value = cast(date, _mock_scalar_value(dependency))
         date_config = mock_date_app_config_item([dependency.name], date_value)
         return _append_config_item_path(date_config, parent_path)
     elif isinstance(dependency, ManifestDatetimeScalarConfig):
-        datetime_value = _mock_scalar_value_with_conversion(dependency, DateTimeScalar)
+        datetime_value = cast(datetime, _mock_scalar_value(dependency))
         datetime_config = mock_datetime_app_config_item([dependency.name], datetime_value)
         return _append_config_item_path(datetime_config, parent_path)
     elif isinstance(dependency, ManifestFloatScalarConfig):
-        float_value = _mock_scalar_value_with_conversion(dependency, FloatScalar)
+        float_value = cast(float, _mock_scalar_value(dependency))
         float_config = mock_float_app_config_item([dependency.name], float_value)
         return _append_config_item_path(float_config, parent_path)
     elif isinstance(dependency, ManifestIntegerScalarConfig):
-        int_value = _mock_scalar_value_with_conversion(dependency, IntScalar)
+        int_value = cast(int, _mock_scalar_value(dependency))
         int_config = mock_int_app_config_item([dependency.name], int_value)
         return _append_config_item_path(int_config, parent_path)
     elif isinstance(dependency, ManifestJsonScalarConfig):
-        json_value = _mock_scalar_value_with_conversion(dependency, JsonScalar)
+        json_value = cast(JsonType, _mock_scalar_value(dependency))
         json_config = mock_json_app_config_item([dependency.name], json_value)
         return _append_config_item_path(json_config, parent_path)
     elif isinstance(dependency, ManifestSecureTextScalarConfig):
-        secure_text_value = _mock_scalar_value_with_conversion(dependency, SecureTextScalar)
+        secure_text_value = cast(str, _mock_scalar_value(dependency))
         secure_text_config = mock_secure_text_app_config_item([dependency.name], secure_text_value)
         return _append_config_item_path(secure_text_config, parent_path)
     else:
         assert not isinstance(dependency, UnknownType), f"Unable to mock unknown type {dependency}"
-        text_value = _mock_scalar_value_with_conversion(dependency, TextScalar)
+        text_value = cast(str, _mock_scalar_value(dependency))
         text_config = mock_text_app_config_item([dependency.name], text_value)
         return _append_config_item_path(text_config, parent_path)
 
@@ -503,12 +498,13 @@ def _append_config_item_path(config_item: AppConfigItem, parent_path: List[str])
 
 
 def _mock_array_dependency(
-    dependency: ManifestArrayConfig, parent_path: List[str] = list(), rows: int = 1
+    dependency: ManifestArrayConfig, parent_path: Optional[List[str]] = None, rows: int = 1
 ) -> List[AppConfigItem]:
     config_rows = []
+    parent_path = parent_path if parent_path else []
     for i in range(rows):
         row = _mock_array_row(dependency, parent_path=parent_path)
-        elements = element_definition_from_dependency(dependency)
+        elements = _element_definition_from_dependency(dependency)
         element_configs = [_mock_dependency(element, row.path) for element in elements]
         flattened_configs = [element for sublist in element_configs for element in sublist]
         config_rows.append(row)
@@ -516,8 +512,9 @@ def _mock_array_dependency(
     return config_rows
 
 
-def _mock_array_row(dependency: ManifestArrayConfig, parent_path: List[str] = list()):
+def _mock_array_row(dependency: ManifestArrayConfig, parent_path: Optional[List[str]] = None):
     row_name = _random_string("Row ")
+    parent_path = parent_path if parent_path else []
     return ArrayElementAppConfigItem(
         id=_random_string("aci_"),
         path=parent_path + [dependency.name, row_name],
@@ -526,25 +523,16 @@ def _mock_array_row(dependency: ManifestArrayConfig, parent_path: List[str] = li
     )
 
 
-def _mock_scalar_value_with_conversion(
-    dependency: ManifestScalarConfig, scalar_definition_type: Type[ScalarDefinition[ScalarType]]
-) -> Optional[ScalarType]:
-    assert not isinstance(dependency, UnknownType), f"Unable to mock unknown type {dependency}"
-    # These types should be equivalent and this appeases MyPy
-    mocked_value_type = ScalarConfigTypes(dependency.type)
-    mocked_value_str = (
-        _mock_scalar_with_enum(dependency)
-        if _is_scalar_with_enum(dependency)
-        else _mock_scalar_value(mocked_value_type)
-    )
-    return scalar_definition_type.from_str(mocked_value_str)
-
-
-def _mock_scalar_with_enum(dependency: ManifestScalarConfig) -> str:
+def _mock_scalar_with_enum(dependency: ManifestScalarConfig) -> Union[float, int, str]:
     assert isinstance(
         dependency, (ManifestFloatScalarConfig, ManifestIntegerScalarConfig, ManifestTextScalarConfig)
     )
-    return str(random.choice(dependency.enum))
+    value = random.choice(dependency.enum)
+    if isinstance(dependency, ManifestFloatScalarConfig):
+        return cast(float, value)
+    elif isinstance(dependency, ManifestIntegerScalarConfig):
+        return cast(int, value)
+    return str(value)
 
 
 def _is_scalar_with_enum(dependency: ManifestScalarConfig) -> bool:
@@ -552,15 +540,16 @@ def _is_scalar_with_enum(dependency: ManifestScalarConfig) -> bool:
         dependency, (ManifestFloatScalarConfig, ManifestIntegerScalarConfig, ManifestTextScalarConfig)
     ):
         # MyPy doesn't find this to be truthy without a specific len check
-        return len(enum_from_dependency(dependency)) > 0
+        return len(_enum_from_dependency(dependency)) > 0
     return False
 
 
 def _mock_subdependency(
     subdependency: Union[BaseManifestConfig, FieldDefinitionsManifest],
     parent_config,
-    parent_path: List[str] = list(),
+    parent_path: Optional[List[str]] = None,
 ) -> AppConfigItem:
+    parent_path = parent_path if parent_path else []
     if isinstance(parent_config, DropdownDependency):
         linked_resource_id = _random_string("opt_")
         return GenericApiIdentifiedAppConfigItem(
@@ -587,8 +576,9 @@ def _mock_subdependency(
 def _mock_workflow_output_subdependency(
     subdependency: Union[BaseManifestConfig, FieldDefinitionsManifest],
     parent_config,
-    parent_path: List[str] = list(),
+    parent_path: Optional[List[str]] = None,
 ) -> AppConfigItem:
+    parent_path = parent_path if parent_path else []
     linked_resource_id = _random_string("tsf_")
     app_config = FieldAppConfigItem(
         id=_random_string("aci_"),
@@ -604,18 +594,28 @@ def _mock_linked_resource(id: str, name: Optional[str] = None) -> LinkedAppConfi
     return LinkedAppConfigResourceSummary(id=id, name=name if name else _random_string("Resource Name"))
 
 
-def _mock_scalar_value(scalar_type: ScalarConfigTypes) -> str:
+def _mock_scalar_value(
+    dependency: ManifestScalarConfig,
+) -> Union[bool, date, datetime, int, float, str, Dict[str, Union[str, float]]]:
     """Mock a scalar config value from its manifest definition."""
-    if scalar_type == scalar_type.BOOLEAN:
-        return "true"
+    if isinstance(dependency, UnknownType):
+        raise UnsupportedConfigItemError(
+            f"Unable to mock scalar value for unsupported dependency type {dependency}"
+        )
+    # These types should be equivalent and this appeases MyPy
+    scalar_type = ScalarConfigTypes(dependency.type)
+    if _is_scalar_with_enum(dependency):
+        return _mock_scalar_with_enum(dependency)
+    elif scalar_type == scalar_type.BOOLEAN:
+        return True
     elif scalar_type == scalar_type.DATE:
-        return date.today().strftime("%Y-%m-%d")
+        return date.today()
     elif scalar_type == scalar_type.DATETIME:
-        return datetime.now().strftime(DateTimeScalar.expected_format())
+        return datetime.now()
     elif scalar_type == scalar_type.FLOAT:
-        return str(random.random())
+        return random.random()
     elif scalar_type == scalar_type.INTEGER:
-        return str(random.randint(-1000, 1000))
+        return random.randint(-1000, 1000)
     elif scalar_type == scalar_type.JSON:
         return json.dumps(
             {_random_string(): [_random_string(), _random_string()], _random_string(): random.random()}

benchling_sdk/apps/status/framework.py

@@ -14,9 +14,8 @@ from benchling_sdk.apps.status.errors import (
     SessionClosedError,
     SessionContextClosedError,
 )
-from benchling_sdk.apps.status.types import _ReferencedSessionLinkType
 from benchling_sdk.errors import BenchlingError
-from benchling_sdk.helpers.logging_helpers import log_stability_warning, sdk_logger, StabilityLevel
+from benchling_sdk.helpers.logging_helpers import sdk_logger
 from benchling_sdk.models import (
     AppCanvasUpdate,
     AppSession,
@@ -35,8 +34,6 @@ if TYPE_CHECKING:
 
 _DEFAULT_APP_ERROR_MESSAGE = "An unexpected error occurred in the app"
 
-log_stability_warning(StabilityLevel.BETA)
-
 
 class SessionProvider(Protocol):
     """Provide a Benchling App Session to convey app status."""
@@ -685,20 +682,3 @@ def continue_session_context(
         context_enter_handler,
         context_exit_handler,
     )
-
-
-def ref(reference: _ReferencedSessionLinkType) -> str:
-    """
-    Ref.
-
-    Helper method for easily serializing a referenced object into a string embeddable in AppSessionMessageCreate
-    content.
-
-    Example:
-        dna_sequence = benchling.dna_sequences.get_by_id("seq_1234")
-        AppSessionMessageCreate(f"This is my DNA sequence {ref(dna_sequence)} for analysis"
-    """
-    # Not sure {} are possible in Benchling IDs, but the spec says we're escaping
-    unescape_id = reference.id
-    escaped_id = unescape_id.replace("{", "\\{").replace("}", "\\}")
-    return f"{{id:{escaped_id}}}"

benchling_sdk/apps/status/helpers.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from benchling_sdk.apps.status.types import ReferencedSessionLinkType
+
+
+def ref(reference: ReferencedSessionLinkType) -> str:
+    """
+    Ref.
+
+    Helper method for easily serializing a referenced object into a string embeddable in AppSessionMessageCreate
+    content.
+
+    Example:
+        dna_sequence = benchling.dna_sequences.get_by_id("seq_1234")
+        AppSessionMessageCreate(f"This is my DNA sequence {ref(dna_sequence)} for analysis"
+    """
+    # Not sure {} are possible in Benchling IDs, but the spec says we're escaping
+    unescape_id = reference.id
+    escaped_id = unescape_id.replace("{", "\\{").replace("}", "\\}")
+    return f"{{id:{escaped_id}}}"

benchling_sdk/apps/status/types.py

@@ -23,7 +23,7 @@ from benchling_sdk.models import (
 
 # Taken from CHIP_SUPPORTED_COLUMN_TYPES in Benchling server
 # Anything we miss, they can still embed the ID themselves in a message
-_ReferencedSessionLinkType = Union[
+ReferencedSessionLinkType = Union[
     AaSequence,
     Blob,
     Box,

benchling_sdk/apps/types.py

@@ -0,0 +1,3 @@
+from typing import Any, Dict, List, Union
+
+JsonType = Union[Dict[str, Any], List[Any], str, int, float, bool]

benchling_sdk/services/v2/stable/assay_result_service.py

@@ -3,6 +3,7 @@ from typing import Iterable, List, Optional, Union
 from benchling_api_client.v2.stable.api.assay_results import (
     abort_assay_results_transaction,
     archive_assay_results,
+    bulk_create_assay_results,
     bulk_get_assay_results,
     commit_assay_results_transaction,
     create_assay_results,
@@ -31,10 +32,12 @@ from benchling_sdk.models import (
     AssayResultIdsRequest,
     AssayResultIdsResponse,
     AssayResultsArchive,
+    AssayResultsBulkCreateInTableRequest,
     AssayResultsBulkCreateRequest,
     AssayResultsCreateResponse,
     AssayResultsPaginatedList,
     AssayResultTransactionCreateResponse,
+    AsyncTaskLink,
     ListAssayResultsSort,
 )
 from benchling_sdk.services.v2.base_service import BaseService
@@ -196,6 +199,21 @@ class AssayResultService(BaseService):
         response = create_assay_results.sync_detailed(client=self.client, json_body=create_results)
         return model_from_detailed(response)
 
+    @api_method
+    def bulk_create(
+        self, assay_results: Iterable[AssayResultCreate], table_id: Optional[str] = None
+    ) -> AsyncTaskLink:
+        """
+        Create 1 or more results.
+
+        See https://benchling.com/api/reference#/Assay%20Results/bulkCreateAssayResults
+        """
+        request_body = AssayResultsBulkCreateInTableRequest(
+            assay_results=list(assay_results), **({"table_id": table_id} if table_id else {})
+        )
+        response = bulk_create_assay_results.sync_detailed(client=self.client, json_body=request_body)
+        return model_from_detailed(response)
+
     @api_method
     def archive(self, assay_result_ids: Iterable[str]) -> AssayResultIdsResponse:
         """

{benchling_sdk-1.10.0a5.dist-info → benchling_sdk-1.10.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: benchling-sdk
-Version: 1.10.0a5
+Version: 1.10.0a7
 Summary: SDK for interacting with the Benchling Platform.
 License: Apache-2.0
 Author: Benchling Support
@@ -17,7 +17,7 @@ Provides-Extra: python-jose
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: attrs (>=20.1.0,<23)
 Requires-Dist: backoff (>=1.10.0,<2.0.0)
-Requires-Dist: benchling-api-client (==2.0.232)
+Requires-Dist: benchling-api-client (==2.0.243)
 Requires-Dist: certifi (>=2022.12.7)
 Requires-Dist: cryptography (>=41.0.3,<42.0.0) ; extra == "cryptography"
 Requires-Dist: dataclasses-json (>=0.5.2,<0.6.0)

{benchling_sdk-1.10.0a5.dist-info → benchling_sdk-1.10.0a7.dist-info}/RECORD

@@ -3,25 +3,26 @@ benchling_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchling_sdk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchling_sdk/apps/canvas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchling_sdk/apps/canvas/errors.py,sha256=5YTZOhSV-O0WqURjB1a676BIO429drCKfz5aQjsezms,358
-benchling_sdk/apps/canvas/framework.py,sha256=99Ox8V-CvPjxWNyJQ0eaJmP-O8wABVBumjmfw7UMH5U,22971
+benchling_sdk/apps/canvas/framework.py,sha256=a6XbCZIUsz4VmOCtu6kZnBQoQiLJtBk2Ndw94J0s4kM,24381
 benchling_sdk/apps/canvas/types.py,sha256=tmuU0kpzd1pXqxs3X6x5kjWpCZJrJMb6hnfN1CbtFG4,3613
-benchling_sdk/apps/config/__init__.py,sha256=8HK_CIvB57JMqDrQMQoMVauaeTqGg_dKgirIP4KjJRM,132
+benchling_sdk/apps/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchling_sdk/apps/config/cryptography_helpers.py,sha256=VCzgQURLAitYjcjdwFzMPSKZ7MOD6ghxFdbPGA_6RbY,1778
-benchling_sdk/apps/config/decryption_provider.py,sha256=70AHEglmIqpTixI69tmT_1eS6DXIn5QQ6N9Z7PJOzak,2325
+benchling_sdk/apps/config/decryption_provider.py,sha256=-HgjkBto8mYlooV0LXFenfaiP7PDhHRnKEHkK1P6gh4,2184
 benchling_sdk/apps/config/errors.py,sha256=-qkfLdcUTuuRD-V4L2l7nzQWnWTRuifDtkNDv8tfHoo,800
-benchling_sdk/apps/config/framework.py,sha256=539HphdYr6CdFpRtZsXeRaxxKFvsZfsIs7KPcIYgOe8,13320
-benchling_sdk/apps/config/mock_config.py,sha256=y48I41pp3MTaH9fM6v7KeKCwFM3DKzKzk60XP4ecKIA,26712
-benchling_sdk/apps/config/scalars.py,sha256=nxISpOn7GtEIkEtuLb4B4PkrYeRbG-QsS0AXRZLpZ00,5442
+benchling_sdk/apps/config/framework.py,sha256=a2cIkPugEVUfBNtHm2cbE3Qu326xb-SpMuM0Gi6U-3Q,13337
+benchling_sdk/apps/config/helpers.py,sha256=LTLDR0GCDoo_8Sx4kepQnMmgVEQT7MHfKAxIoAvV9TM,7077
+benchling_sdk/apps/config/mock_config.py,sha256=EPUCxWiUSsWxWilnHAJIq-_f1q6ckZkXoIFv1S25hnM,26967
 benchling_sdk/apps/config/types.py,sha256=XKfSGv-75CU-j1XwfXBGq8zbtnkF-PQnuY6Z2U47-Tg,953
 benchling_sdk/apps/framework.py,sha256=H51rAzwH4PQHMGTxx2MdYgHMW1oKa_FLnozzY8XGL2g,3308
 benchling_sdk/apps/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchling_sdk/apps/helpers/config_helpers.py,sha256=_t_ccSS53WpaNnwcSx3Mx5ranRJgxIQWcpBoUSWFKFA,9318
 benchling_sdk/apps/helpers/manifest_helpers.py,sha256=yidiKA5mwWdAFR1ZSUu40QoG0Us-bc6V8tYHYqheEtM,945
 benchling_sdk/apps/helpers/webhook_helpers.py,sha256=T-ZJLWb37nzSKMQFAQQ8FJU7al_QFBgNRhTfWDfCfYU,7077
 benchling_sdk/apps/status/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchling_sdk/apps/status/errors.py,sha256=E9PugMd0YwZQWweTztIZyqycECBuVvH6PcLfij0Cb3k,2279
-benchling_sdk/apps/status/framework.py,sha256=ZzH0vQMxVOPLkdkyzBbO9rUpW0HUJ1UhTmBFbGqEur0,27112
-benchling_sdk/apps/status/types.py,sha256=kmzA2PgUlodU5eP6QiryXm1vZHjjSx40K9zHZnDvOJ4,747
+benchling_sdk/apps/status/framework.py,sha256=CWPIlj8WhRZeIImCLka9LmhXvzbK0be9ekdLxiUKKJk,26358
+benchling_sdk/apps/status/helpers.py,sha256=o8jdgdxUYdGh2j0Gb3AYoeXI9Bu-ubyIkgWBuCGLKgE,705
+benchling_sdk/apps/status/types.py,sha256=vE7-_7ns3mvPRJoVv-GQxc3389dIIH4mcG0VDNWpVhQ,746
+benchling_sdk/apps/types.py,sha256=TBTfAB3IOoZjZqzTOK25kN3b6RTU9Z7tOMdBbq6u8lA,110
 benchling_sdk/auth/__init__.py,sha256=N4pJYVUnTLzg5HO9ZldHaI-Am97i6AOCdQS0M5QcVpA,120
 benchling_sdk/auth/api_key_auth.py,sha256=Ui-cnvGMjcwVPV_b2GdBaoTjEyHJIu9CjtZScVBEUvU,641
 benchling_sdk/auth/bearer_token_auth.py,sha256=nymI8V91evcnK-TWKkBXZwck8U1qSh4WaseyQbvF-Cg,1268
@@ -70,7 +71,7 @@ benchling_sdk/services/v2/stable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 benchling_sdk/services/v2/stable/aa_sequence_service.py,sha256=3RCNwyFBrryQowC9fbLoQHSSqKyGA6TQ0VQYBUyeg1U,11782
 benchling_sdk/services/v2/stable/api_service.py,sha256=e0RNp4Jne9UTaHOYMOxxXJpsyUO3WMSFPzN7hB8iliU,12371
 benchling_sdk/services/v2/stable/app_service.py,sha256=dy9FMVvMiJrkYbxZswKuB37EB9K_jCqQr9FfAa0BMgE,23126
-benchling_sdk/services/v2/stable/assay_result_service.py,sha256=hbptHLNbJFk5-2HBZJaSscKwSmVO4V9KcoruiMxnNKc,12659
+benchling_sdk/services/v2/stable/assay_result_service.py,sha256=_qtSpMznVrGHlB2VnHI87IPjVQHCX1pZbLPJ_LYuW7U,13362
 benchling_sdk/services/v2/stable/assay_run_service.py,sha256=tLpG1pAztEoaDatqlgYlRZ_LgwDly1_UeWt4G4UXvd4,9023
 benchling_sdk/services/v2/stable/blob_service.py,sha256=KwchH3FGzPLfZx85GEG3voQp_ZxyVL_dds_9awRWa0Q,17115
 benchling_sdk/services/v2/stable/box_service.py,sha256=M40smqG-jQlioyRfLBu9Cr9aQmdh06crsYbH1fiZ0BM,12359
@@ -114,7 +115,7 @@ benchling_sdk/services/v2/v2_alpha_service.py,sha256=vNfYK0Dheml9ozR_0tzTlA3blPD
 benchling_sdk/services/v2/v2_beta_service.py,sha256=7v9ngWH_XTinkVC7bIxxbaA1UeFQqkzR4ANGtQQN-fA,11521
 benchling_sdk/services/v2/v2_stable_service.py,sha256=YIc-_0p6x1NQqj7awnWgCTHxbxYO7ZOolePZyW90whc,35246
 benchling_sdk/services/v2_service.py,sha256=3eoIjYEmGLPdWCpBN0pl7q7_HNWCsUvfvTn3Hcz0wSM,2860
-benchling_sdk-1.10.0a5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchling_sdk-1.10.0a5.dist-info/METADATA,sha256=WCDWEH27AZkjMCbVkMrtlnTlmj6FwLY5s7wjnZgUZkc,2126
-benchling_sdk-1.10.0a5.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-benchling_sdk-1.10.0a5.dist-info/RECORD,,
+benchling_sdk-1.10.0a7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchling_sdk-1.10.0a7.dist-info/METADATA,sha256=GKfUuppZ9cw6GIv2w-jZQ_I4B5sm1I-2jXS2h_ccb4Q,2126
+benchling_sdk-1.10.0a7.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+benchling_sdk-1.10.0a7.dist-info/RECORD,,

benchling_sdk/apps/config/scalars.py

@@ -1,190 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC, abstractmethod
-from datetime import date, datetime
-import json
-from typing import Any, Dict, Generic, List, Optional, TypeVar, Union
-
-from benchling_sdk.models import (
-    BooleanAppConfigItemType,
-    DateAppConfigItemType,
-    DatetimeAppConfigItemType,
-    FloatAppConfigItemType,
-    IntegerAppConfigItemType,
-    JsonAppConfigItemType,
-    SecureTextAppConfigItemType,
-    TextAppConfigItemType,
-)
-
-JsonType = Union[Dict[str, Any], List[Any], str, int, float, bool]
-ScalarType = TypeVar("ScalarType", bool, date, datetime, float, int, JsonType, str)
-# JsonType support requires object to be unioned. Currently we do it inline.
-ScalarModelType = Union[bool, date, datetime, float, int, str]
-# Enum values cannot be used in literals, so copy the strings
-ScalarConfigItemType = Union[
-    BooleanAppConfigItemType,
-    DateAppConfigItemType,
-    DatetimeAppConfigItemType,
-    FloatAppConfigItemType,
-    IntegerAppConfigItemType,
-    JsonAppConfigItemType,
-    SecureTextAppConfigItemType,
-    TextAppConfigItemType,
-]
-
-
-# TODO BNCH-52772 We should probably consider moving all of these to a weakly _ internal scoped usage
-
-
-class ScalarDefinition(ABC, Generic[ScalarType]):
-    """
-    Scalar definition.
-
-    Map how ScalarConfigTypes values can be converted into corresponding Python types.
-    """
-
-    @classmethod
-    def init(cls):
-        """Init."""
-        return cls()
-
-    @classmethod
-    @abstractmethod
-    def from_str(cls, value: Optional[str]) -> Optional[ScalarType]:
-        """
-        From string.
-
-        Given an optional string value of scalar configuration, produce an Optional instance of the
-        specific ScalarType. For instance, converting str to int.
-
-        Used when coercing Python types from string values in API responses.
-        """
-        pass
-
-
-class BoolScalar(ScalarDefinition[bool]):
-    """
-    Bool Scalar.
-
-    Turn a Boolean-like string value into bool. Any permutation of "true" - case insensitive - is interpreted
-    as True. Any other non-empty string is False.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[bool]:
-        """Convert optional str to optional bool."""
-        # Though the spec declares str, this is actually being sent in JSON as a real Boolean
-        # So runtime check defensively
-        if value is not None:
-            if isinstance(value, bool):
-                return value
-            if value.lower() == "true":
-                return True
-            return False
-        return None
-
-
-class DateScalar(ScalarDefinition[date]):
-    """
-    Date Scalar.
-
-    Turn an ISO formatted date like YYYY-MM-dd into a date.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[date]:
-        """Convert optional str to optional date."""
-        return date.fromisoformat(value) if value is not None else None
-
-
-class DateTimeScalar(ScalarDefinition[datetime]):
-    """
-    Date Time Scalar.
-
-    Turn a date time string into datetime.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[datetime]:
-        """Convert optional str to optional datetime."""
-        return datetime.strptime(value, cls.expected_format()) if value is not None else None
-
-    @staticmethod
-    def expected_format() -> str:
-        """Return the expected date mask for parsing string to datetime."""
-        return "%Y-%m-%d %I:%M:%S %p"
-
-
-class IsoDateTimeScalar(ScalarDefinition[datetime]):
-    """
-    Iso Date Time Scalar.
-
-    Turn a ISO 8601 date time string into datetime. Benchling fields use RFC 3339, unlike app config date times.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[datetime]:
-        """Convert optional str to optional datetime."""
-        return datetime.fromisoformat(value) if value is not None else None
-
-
-class FloatScalar(ScalarDefinition[float]):
-    """
-    Float Scalar.
-
-    Turn a string into float. Assumes the string, if not empty, is a valid floating point.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[float]:
-        """Convert optional str to optional float."""
-        return float(value) if value is not None else None
-
-
-class IntScalar(ScalarDefinition[int]):
-    """
-    Int Scalar.
-
-    Turn a string into int. Assumes the string, if not empty, is a valid integer.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[int]:
-        """Convert optional str to optional int."""
-        return int(value) if value is not None else None
-
-
-class JsonScalar(ScalarDefinition[JsonType]):
-    """
-    Json Scalar.
-
-    Turn a string into JSON. Assumes the string is a valid JSON string.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[JsonType]:
-        """Convert optional str to optional JsonType."""
-        return json.loads(value) if value is not None else None
-
-
-class TextScalar(ScalarDefinition[str]):
-    """
-    Text Scalar.
-
-    Text is already a string, so no conversion is performed.
-    """
-
-    @classmethod
-    def from_str(cls, value: Optional[str]) -> Optional[str]:
-        """Convert optional str to optional str. Implemented to appease ScalarDefinition contract."""
-        return value
-
-
-class SecureTextScalar(TextScalar):
-    """
-    Secure Text Scalar.
-
-    Text is already a string, so no conversion is performed.
-    """
-
-    pass