UncountablePythonSDK 0.0.33__py3-none-any.whl → 0.0.35__py3-none-any.whl

{UncountablePythonSDK-0.0.33.dist-info → UncountablePythonSDK-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.33
+Version: 0.0.35
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{UncountablePythonSDK-0.0.33.dist-info → UncountablePythonSDK-0.0.35.dist-info}/RECORD

@@ -16,6 +16,7 @@ docs/static/favicons/mstile-150x150.png,sha256=eAK4QdEofhdLtfmjuPTpnX3MJqYnvGXsH
 docs/static/favicons/safari-pinned-tab.svg,sha256=S84fRnz0ZxLnQrKtmmFZytiRyu1xLtMR_RVy5jmwU7k,1926
 examples/async_batch.py,sha256=CffQ8O9drJ-Mdd6S5DnMIOBsHv5aVkTZrD3l3xBnB4s,1094
 examples/create_entity.py,sha256=noZdtJ5f9Wfiob3zUH-8bDVbrCPJnFtXFk_W9pSjvUA,664
+examples/edit_recipe_inputs.py,sha256=f1zpK2T00JNQdbh7R01Sns1D_3TTgj-u8-YInoczRX8,1541
 examples/upload_files.py,sha256=tUfKFqiqwnw08OL5Y8_e4j5pSRhp94cFex8XTuVa_ig,487
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/argument_parser/__init__.py,sha256=CsQ6QoPKSLLRVl-z6URAmPkiUL9ZPZoV4rJHgy_-RjA,385
@@ -31,7 +32,7 @@ pkgs/serialization/serial_union.py,sha256=z8Ptj4bVHyb1ROfg0UPTwZ6Ef6iXLr0YJfAH5o
 pkgs/serialization_util/__init__.py,sha256=MVKqHTUl2YnWZAFG9xCxu1SgmkQ5xPofrAGlYg6h7rI,330
 pkgs/serialization_util/_get_type_for_serialization.py,sha256=dW5_W9MFd6wgWfW5qlWork-GBb-QFLtiOZkjk2Zqn2M,1177
 pkgs/serialization_util/convert_to_snakecase.py,sha256=H2BAo5ZdcCDN77RpLb-uP0s7-FQ5Ukwnsd3VYc1vD0M,583
-pkgs/serialization_util/serialization_helpers.py,sha256=byotZo00SVREW_aM0sbKQEzuI7O3zwjk_nB_OQ6S5M8,4999
+pkgs/serialization_util/serialization_helpers.py,sha256=B8W82-KT10nQYmDk5uhAqB5QNS-dsxzXMFhtTmooMqw,6365
 pkgs/strenum_compat/__init__.py,sha256=wXRFeNvBm8RU6dy1PFJ5sRLgUIEeH_DVR95Sv5qpGbk,59
 pkgs/strenum_compat/strenum_compat.py,sha256=uOUAgpYTjHs1MX8dG81jRlyTkt3KNbkV_25zp7xTX2s,36
 pkgs/type_spec/__init__.py,sha256=h5DmJTca4QVV10sZR1x0-MlkZfuGYDfapR3zHvXfzto,19
@@ -43,7 +44,7 @@ pkgs/type_spec/emit_open_api.py,sha256=Aw7Ct1itmAqhb_nsM9yDz87EoF0XWHM56MhKqtOLO
 pkgs/type_spec/emit_open_api_util.py,sha256=XAA6zH59aZWLVl0BvKAICXXl4sdBqx01QAtv5oB0bMI,2266
 pkgs/type_spec/emit_python.py,sha256=zP3AWJ5u0vzDcnvzSehCUgvXM0J9ZUtfLBVHerW6_wI,45164
 pkgs/type_spec/emit_typescript.py,sha256=cdr5h8N70PuwORcvhURUujzwH9r1LVwJB8V2EoipGkw,17917
-pkgs/type_spec/emit_typescript_util.py,sha256=93FzJnpYse4PKFzgdw4DGV4zFTi5tF4WR-CIi7cW498,873
+pkgs/type_spec/emit_typescript_util.py,sha256=sR7ys3Ilnh6SQiXJbfYk4pxfOu0bDjbUFTEYEW-ud6c,863
 pkgs/type_spec/load_types.py,sha256=xEHwdB_miR3vNs161Oy1luafE0VC-yk9-utAyCJmbEo,3629
 pkgs/type_spec/open_api_util.py,sha256=IGh-_snGPST_P_8FdYtO8MTEa9PUxRW6Rzg9X9EgQik,7114
 pkgs/type_spec/test.py,sha256=4ueujBq-pEgnX3Z69HyPmD-bullFXmpixcpVzfOkhP4,489
@@ -78,13 +79,13 @@ uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 uncountable/integration/db/connect.py,sha256=YtQHJ1DBGPhxKFRCfiXqohOYUceKSxMVOJ88aPI48Ug,181
 uncountable/integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/executors/script_executor.py,sha256=hM8E-aU8zyM6ZcBtqAqInKZ_BF93RLqEA0dU7y5FhWQ,841
-uncountable/types/__init__.py,sha256=0UllKeQhqDy1AD5UH6tMPx0QqIuW7KFlVe1SnJkD3ro,7197
+uncountable/types/__init__.py,sha256=fTUKIaZddDoFku6qycdhJkOZIBCypDGlmSWF8PV0WbA,7404
 uncountable/types/async_batch.py,sha256=aWiul1fK3-cXaCESUUJ_92FF-NuuwxSjn9n3jC9vY5o,1618
 uncountable/types/async_batch_processor.py,sha256=eNXKPOh-sCiarPvreLDEu4XbieWLe_5KXmiY984eZ5I,6083
 uncountable/types/base.py,sha256=w3BRf8SAvYPlKrcJtJcQ_WhCU3A9zy0VuRTRWRFKVUA,2709
 uncountable/types/calculations.py,sha256=16J-KKMp-I8ZQUkYNmKCHfAn6DGb99cFinALcDIdGHY,562
 uncountable/types/chemical_structure.py,sha256=zQKl53DGtQQONIUHFXuwjWLQaG7FPZY7x6SBSOzkGV0,758
-uncountable/types/client_base.py,sha256=UpIXr8JvrOuA9TNHeU1paqTNiE4KHsSpzA6RCAS7bO8,58694
+uncountable/types/client_base.py,sha256=nDxjHLF6F4Z4ZQWPdEEIX9JKw9A4NbTjYekNM-Vu0ys,60351
 uncountable/types/curves.py,sha256=qYyRntMmFNonEwTrGhquMLbgMqjyP1moQflNTP0FMec,1308
 uncountable/types/entity.py,sha256=NjMZrqBwQ7sZe_oUuJqy9IEG7dWZmFMkQQXJ0_odcnA,11637
 uncountable/types/experiment_groups.py,sha256=ZBEk06F4n98Jz3oEA09WaDmw5rqPs7iVAm_Ysr4gc_o,599
@@ -120,7 +121,7 @@ uncountable/types/api/entity/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8A
 uncountable/types/api/entity/create_entities.py,sha256=vzo5hS1qcmjQdfyCMarSu8MRcRGSiholOVSCfjXlA1k,1703
 uncountable/types/api/entity/create_entity.py,sha256=ausozCQ3qPM9YUQ87bOTCKOm-zkhn4CSLJr9jLc9n2U,1873
 uncountable/types/api/entity/get_entities_data.py,sha256=XjrJGZucIn1TYUlDLRnRA0JTQw-vXHIAT-m0H9hk37A,1170
-uncountable/types/api/entity/list_entities.py,sha256=Bd_Ppy2bzWve8RbplyMkEHkg07CxEIskeiTdb9Ntlfo,1673
+uncountable/types/api/entity/list_entities.py,sha256=nsOs5qsHNJFBDH1UK1Vk2IJGPY5rx764Xnn-FFLUg_A,1697
 uncountable/types/api/entity/lock_entity.py,sha256=SbRaKDbJfoPD9uVYiGlnrsPF_HZ_6m0hPAlalZwGyag,1029
 uncountable/types/api/entity/resolve_entity_ids.py,sha256=AidGpPmI9ATDv0E7vd9LDOl3n3beGxUlRojh5uZrkl4,1086
 uncountable/types/api/entity/set_values.py,sha256=LcYrKQm5ItYLK1Vx7rRq5i6jkMLDhfEBhF0FD1GowQs,958
@@ -130,7 +131,7 @@ uncountable/types/api/field_options/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKH
 uncountable/types/api/field_options/upsert_field_options.py,sha256=xYtC68AabmTrYn_yV19C91yZv9tfohaRxmvCjMQ5vy8,1144
 uncountable/types/api/id_source/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/id_source/list_id_source.py,sha256=S_NdAd1FIgMtCfpRK9bs4ZIJH7HdyHWImD1qiPuAKMg,1157
-uncountable/types/api/id_source/match_id_source.py,sha256=1Mlw0XGBw7UeWxmwelUEi7Co8Oy15jyhetfKG1BFpIM,1145
+uncountable/types/api/id_source/match_id_source.py,sha256=6aaAXcuOIy0FqKw0CK4xde8o9YmryDNhX46WUEnMrRk,1048
 uncountable/types/api/input_groups/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/input_groups/get_input_group_names.py,sha256=LdHWWEfVNGys6Tudienjich56Zz4bj7uXznpyYitCYA,1033
 uncountable/types/api/inputs/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
@@ -165,22 +166,24 @@ uncountable/types/api/recipes/associate_recipe_as_lot.py,sha256=bTYjbnY3B7GKz4MV
 uncountable/types/api/recipes/create_recipe.py,sha256=jizKdsc761zrJXOi0xlmge7-Z9QlzRQdbLNtUoVLQCI,1420
 uncountable/types/api/recipes/create_recipes.py,sha256=qwIYa8hfcjY7_VOFt9lxmVtJ-HOJqQN3GDNSbZsRCZU,1544
 uncountable/types/api/recipes/disassociate_recipe_as_input.py,sha256=L25fpiK1Y5PByPVVgsZy9t4podz3xSSLIwKHj8CUrSg,913
-uncountable/types/api/recipes/edit_recipe_inputs.py,sha256=_dLulVZLqi-CrFIVMRts8h0OHx-nUG3vFOSKS1juGUc,4568
+uncountable/types/api/recipes/edit_recipe_inputs.py,sha256=iUbbMASOVN2m7ywEeaLoEaJOkceoyjLzaRuMeoEFS_0,5513
 uncountable/types/api/recipes/get_curve.py,sha256=UIWfpqtU5sQokaxwYfQFNFl6HMyzWEF_Sjd8UMz0U88,939
 uncountable/types/api/recipes/get_recipe_calculations.py,sha256=eQmkdZzCEuq8S2f_kf_7GPvDLX1pTnY1CRmkK0SkMCI,1472
 uncountable/types/api/recipes/get_recipe_links.py,sha256=hk5dfQjv7yU2r-S9b8vwWEJLPHqU0-M6SFiTLMR3fVk,985
 uncountable/types/api/recipes/get_recipe_names.py,sha256=uCpXZq5oWjr9a_Vf-yYPaVS72XOlLHgAlju6KHeQ3UA,986
 uncountable/types/api/recipes/get_recipe_output_metadata.py,sha256=L9s2ykPP4pd02Pc98LDisY8bgV8CToS6t6fXKTWqGRw,1464
-uncountable/types/api/recipes/get_recipes_data.py,sha256=TbJo4pkp5ePgbeH1oldThpq9jWLDYRUbrYMAv8T_LsI,5518
+uncountable/types/api/recipes/get_recipes_data.py,sha256=nX4sCRY_RxztVqV-DGVpAvpayy6pn6cumS2pD1xmC5k,5429
+uncountable/types/api/recipes/lock_recipes.py,sha256=vxpc52TgFzKxw1fEuCNPpFLVwcWClVXCLtDwJZWvdG0,2271
 uncountable/types/api/recipes/remove_recipe_from_project.py,sha256=cr-VnqgBNek_WInmJln0UBn1GHMNQtRw3gsFTY_G91M,872
 uncountable/types/api/recipes/set_recipe_inputs.py,sha256=lFVfv-o_O5wHuMZdH63qlG4exFTlJM078oSAtb3XNxA,1426
 uncountable/types/api/recipes/set_recipe_metadata.py,sha256=Ba6ttd1JuS_Ypt-KpckSviWtOcQ-OTdTEJiaSYyoQL8,933
+uncountable/types/api/recipes/set_recipe_output_annotations.py,sha256=8JSWlHcPOJfqjjmIxNbJYlJipXaLNsmYqUXi6JM6uEo,2890
 uncountable/types/api/recipes/set_recipe_outputs.py,sha256=VfUL59O21qPrgD7qQ9t5OVSGcGZ2r17lW_yEzuUkrtw,1722
 uncountable/types/api/recipes/set_recipe_tags.py,sha256=U710hgq9-t6QZGRB-ZGHskpt4iXwYEjIRb67eh3P518,2453
 uncountable/types/api/recipes/unarchive_recipes.py,sha256=WcwFYbBsX2SKXnoBQ8locnRn7Bj1rHdtrURQVOfqgfU,814
 uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/triggers/run_trigger.py,sha256=9m9M8-nlGB_sAU2Qm2lWugp4h4Osqj6QpjNfU8osd1U,901
-UncountablePythonSDK-0.0.33.dist-info/METADATA,sha256=bPMG0vmoieJ8foThqNXZK5DRWNQO0mZz3ypltJAx6Ck,1577
-UncountablePythonSDK-0.0.33.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-UncountablePythonSDK-0.0.33.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.33.dist-info/RECORD,,
+UncountablePythonSDK-0.0.35.dist-info/METADATA,sha256=kcqCHmpipLKzLrLpPYjcDY58l99wCYxOVFO94JoJhTY,1577
+UncountablePythonSDK-0.0.35.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+UncountablePythonSDK-0.0.35.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.35.dist-info/RECORD,,

{UncountablePythonSDK-0.0.33.dist-info → UncountablePythonSDK-0.0.35.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

examples/edit_recipe_inputs.py

@@ -0,0 +1,45 @@
+import os
+from decimal import Decimal
+
+from uncountable.core import AsyncBatchProcessor, AuthDetailsApiKey, Client
+from uncountable.types import (
+    edit_recipe_inputs_t,
+    recipe_workflow_steps_t,
+)
+from uncountable.types.identifier import IdentifierKeyBatchReference, IdentifierKeyId
+from uncountable.types.recipe_identifiers import (
+    RecipeIdentifiers,
+)
+from uncountable.types.recipe_inputs import QuantityBasis
+
+client = Client(
+    base_url=os.environ["UNC_BASE_URL"],
+    auth_details=AuthDetailsApiKey(
+        api_id=os.environ["UNC_API_ID"], api_secret_key=os.environ["UNC_API_SECRET_KEY"]
+    ),
+)
+batch_loader = AsyncBatchProcessor(client=client)
+recipe_identifiers: RecipeIdentifiers = []
+req = batch_loader.create_recipe(
+    material_family_id=1, workflow_id=1, identifiers=recipe_identifiers
+)
+created_recipe_reference = req.batch_reference
+edits: list[edit_recipe_inputs_t.RecipeInputEdit] = []
+edits.append(
+    edit_recipe_inputs_t.RecipeInputEditAddInput(
+        quantity_basis=QuantityBasis.MASS,
+        ingredient_key=IdentifierKeyId(id=1),
+        value_numeric=Decimal(56.7),
+    )
+)
+edits.append(
+    edit_recipe_inputs_t.RecipeInputEditChangeBasisViewed(
+        quantity_basis=QuantityBasis.VOLUME, ingredient_key=IdentifierKeyId(id=1)
+    )
+)
+batch_loader.edit_recipe_inputs(
+    recipe_key=IdentifierKeyBatchReference(reference=created_recipe_reference),
+    edits=edits,
+    recipe_workflow_step_identifier=recipe_workflow_steps_t.RecipeWorkflowStepIdentifierDefault(),
+)
+job_id = batch_loader.send()

pkgs/serialization_util/serialization_helpers.py

@@ -1,5 +1,10 @@
+# warnings -- types here assume that keys to dictionaries are strings
+# this is true most of the time, but there are cases where we have integer indexes
+
+import dataclasses
 import datetime
 import enum
+import functools
 from collections.abc import Callable, Mapping, Sequence
 from decimal import Decimal
 from typing import (
@@ -39,14 +44,25 @@ def identity(x: T) -> T:
     return x
 
 
-def key_convert_to_camelcase(o: Any) -> str:
+@overload
+def key_convert_to_camelcase(o: str) -> str: ...
+
+
+@overload
+def key_convert_to_camelcase(o: int) -> int: ...
+
+
+def key_convert_to_camelcase(o: Any) -> str | int:
     if isinstance(o, OpaqueKey):
         return o
-    if isinstance(o, enum.Enum):
-        return o.value  # type: ignore[no-any-return]
+    if isinstance(o, enum.StrEnum):
+        return o.value
     if isinstance(o, str):
         return snake_to_camel_case(o)
-    return o  # type: ignore[no-any-return]
+    if isinstance(o, int):
+        # we allow dictionaries to use integer keys
+        return o
+    raise ValueError("Unexpected key type", o)
 
 
 def _convert_dict(d: dict[str, Any]) -> dict[str, JsonValue]:
@@ -61,27 +77,50 @@ def _serialize_dict(d: dict[str, Any]) -> dict[str, JsonValue]:
     return {k: serialize_for_storage(v) for k, v in d.items() if v != MISSING_SENTRY}
 
 
-def _convert_dataclass(d: Dataclass) -> dict[str, JsonValue]:
-    dct = type(d)
-    scd = get_serial_class_data(dct)
+def _to_string_value(value: Any) -> str:
+    assert isinstance(value, (Decimal, int))
+    return str(value)
 
-    def key_convert(key: str) -> str:
+
+@dataclasses.dataclass(kw_only=True)
+class DataclassConversions:
+    key_conversions: dict[str, str]
+    value_conversion_functions: dict[str, Callable[[Any], JsonValue]]
+
+
+@functools.lru_cache(maxsize=10000)
+def _get_dataclass_conversion_lookups(dataclass_type: Any) -> DataclassConversions:
+    scd = get_serial_class_data(dataclass_type)
+
+    key_conversions: dict[str, str] = {}
+    value_conversion_functions: dict[str, Callable[[Any], JsonValue]] = {}
+
+    for field in dataclasses.fields(dataclass_type):
+        key = field.name
         if scd.has_unconverted_key(key):
-            return key
-        return key_convert_to_camelcase(key)
+            key_conversions[key] = key
+        else:
+            key_conversions[key] = key_convert_to_camelcase(key)
 
-    def value_convert(key: str, value: Any) -> JsonValue:
         if scd.has_to_string_value(key):
-            # Limit to types we know we need to support to avoid surprises
-            # Generics, like List/Dict would need to be per-value stringified
-            assert isinstance(value, (Decimal, int))
-            return str(value)
-        if scd.has_unconverted_value(key):
-            return value  # type: ignore[no-any-return]
-        return serialize_for_api(value)  # type: ignore[no-any-return,unused-ignore]
+            value_conversion_functions[key] = _to_string_value
+        elif scd.has_unconverted_value(key):
+            value_conversion_functions[key] = identity
+        else:
+            value_conversion_functions[key] = serialize_for_api
+
+    return DataclassConversions(
+        key_conversions=key_conversions,
+        value_conversion_functions=value_conversion_functions,
+    )
+
 
+def _convert_dataclass(d: Any) -> dict[str, JsonValue]:
+    conversions = _get_dataclass_conversion_lookups(type(d))  # type: ignore[arg-type]
     return {
-        key_convert(k): (value_convert(k, v) if v is not None else None)
+        conversions.key_conversions[k]: (
+            conversions.value_conversion_functions[k](v) if v is not None else None
+        )
         for k, v in d.__dict__.items()
         if v != MISSING_SENTRY
     }
@@ -126,6 +165,10 @@ def serialize_for_api(obj: Any) -> JsonValue:
     Use the CachedParser.parse_api to parse this data.
     """
     serialization_type = get_serialization_type(type(obj))  # type: ignore
+    if (
+        serialization_type == SerializationType.UNKNOWN
+    ):  # performance optimization to not do function lookup
+        return obj  # type: ignore
     return _CONVERSION_SERIALIZATION_FUNCS[serialization_type](obj)
 
 
@@ -153,6 +196,10 @@ def serialize_for_storage(obj: Any) -> JsonValue:
     Use the CachedParser.parse_storage to parse this data.
     """
     serialization_type = get_serialization_type(type(obj))  # type: ignore
+    if (
+        serialization_type == SerializationType.UNKNOWN
+    ):  # performance optimization to not do function lookup
+        return obj  # type: ignore
     return _SERIALIZATION_FUNCS[serialization_type](obj)
 
 

pkgs/type_spec/emit_typescript_util.py

@@ -18,7 +18,7 @@ class EmitTypescriptContext:
 
 
 def ts_type_name(name: str) -> str:
-    return "".join([x.capitalize() for x in name.split("_")])
+    return "".join([x.title() for x in name.split("_")])
 
 
 def resolve_namespace_ref(namespace: builder.SpecNamespace) -> str:
@@ -29,4 +29,4 @@ def ts_name(name: str, name_case: builder.NameCase) -> str:
     if name_case == builder.NameCase.preserve:
         return name
     bits = util.split_any_name(name)
-    return "".join([bits[0], *[x.capitalize() for x in bits[1:]]])
+    return "".join([bits[0], *[x.title() for x in bits[1:]]])

uncountable/types/__init__.py

@@ -50,6 +50,7 @@ from . import inputs as inputs_t
 from .api.entity import list_entities as list_entities_t
 from .api.id_source import list_id_source as list_id_source_t
 from .api.entity import lock_entity as lock_entity_t
+from .api.recipes import lock_recipes as lock_recipes_t
 from .api.id_source import match_id_source as match_id_source_t
 from . import outputs as outputs_t
 from . import permissions as permissions_t
@@ -75,6 +76,7 @@ from .api.inputs import set_input_subcategories as set_input_subcategories_t
 from .api.inputs import set_intermediate_type as set_intermediate_type_t
 from .api.recipes import set_recipe_inputs as set_recipe_inputs_t
 from .api.recipes import set_recipe_metadata as set_recipe_metadata_t
+from .api.recipes import set_recipe_output_annotations as set_recipe_output_annotations_t
 from .api.recipes import set_recipe_outputs as set_recipe_outputs_t
 from .api.recipes import set_recipe_tags as set_recipe_tags_t
 from .api.entity import set_values as set_values_t
@@ -136,6 +138,7 @@ __all__: list[str] = [
     "list_entities_t",
     "list_id_source_t",
     "lock_entity_t",
+    "lock_recipes_t",
     "match_id_source_t",
     "outputs_t",
     "permissions_t",
@@ -161,6 +164,7 @@ __all__: list[str] = [
     "set_intermediate_type_t",
     "set_recipe_inputs_t",
     "set_recipe_metadata_t",
+    "set_recipe_output_annotations_t",
     "set_recipe_outputs_t",
     "set_recipe_tags_t",
     "set_values_t",

uncountable/types/api/entity/list_entities.py

@@ -32,8 +32,8 @@ ENDPOINT_PATH = "api/external/entity/external_list_entities"
 )
 @dataclass(kw_only=True)
 class Arguments:
-    entity_type: entity_t.EntityType
     config_reference: str
+    entity_type: typing.Optional[entity_t.EntityType] = None
     attributes: typing.Optional[dict[OpaqueKey, base_t.JsonValue]] = None
     offset: typing.Optional[typing.Optional[int]] = None
     limit: typing.Optional[typing.Optional[int]] = None

uncountable/types/api/id_source/match_id_source.py

@@ -8,7 +8,6 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from pkgs.serialization import serial_class
 from ... import base as base_t
 from ... import id_source as id_source_t
 
@@ -39,9 +38,6 @@ class Match:
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
-@serial_class(
-    unconverted_values={"results"},
-)
 @dataclass(kw_only=True)
 class Data:
     results: list[Match]

uncountable/types/api/recipes/edit_recipe_inputs.py

@@ -24,8 +24,10 @@ __all__: list[str] = [
     "RecipeInputEdit",
     "RecipeInputEditAddInput",
     "RecipeInputEditBase",
+    "RecipeInputEditChangeBasisViewed",
     "RecipeInputEditClearInputs",
     "RecipeInputEditInputBase",
+    "RecipeInputEditSetLot",
     "RecipeInputEditType",
     "RecipeInputEditUpdateAnnotations",
     "RecipeInputEditUpsertInput",
@@ -41,6 +43,8 @@ class RecipeInputEditType(StrEnum):
     UPSERT_INPUT = "upsert_input"
     ADD_INPUT = "add_input"
     UPDATE_ANNOTATIONS = "update_annotations"
+    SET_LOT = "set_lot"
+    CHANGE_BASIS = "change_basis"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -72,6 +76,15 @@ class RecipeInputEditInputBase(RecipeInputEditBase):
     calculation_key: typing.Optional[identifier_t.IdentifierKey] = None
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclass(kw_only=True)
+class RecipeInputEditChangeBasisViewed(RecipeInputEditInputBase):
+    type: typing.Literal[RecipeInputEditType.CHANGE_BASIS] = RecipeInputEditType.CHANGE_BASIS
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     parse_require={"type"},
@@ -91,6 +104,17 @@ class RecipeInputEditAddInput(RecipeInputEditInputBase):
     type: typing.Literal[RecipeInputEditType.ADD_INPUT] = RecipeInputEditType.ADD_INPUT
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclass(kw_only=True)
+class RecipeInputEditSetLot(RecipeInputEditBase):
+    type: typing.Literal[RecipeInputEditType.SET_LOT] = RecipeInputEditType.SET_LOT
+    ingredient_key: identifier_t.IdentifierKey
+    ingredient_lot_recipe_key: identifier_t.IdentifierKey
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     to_string_values={"lower_value", "upper_value"},
@@ -116,7 +140,7 @@ class RecipeInputEditUpdateAnnotations(RecipeInputEditInputBase):
 
 # DO NOT MODIFY -- This file is generated by type_spec
 RecipeInputEdit = typing.Annotated[
-    typing.Union[RecipeInputEditClearInputs, RecipeInputEditUpsertInput, RecipeInputEditAddInput, RecipeInputEditUpdateAnnotations],
+    typing.Union[RecipeInputEditClearInputs, RecipeInputEditUpsertInput, RecipeInputEditAddInput, RecipeInputEditUpdateAnnotations, RecipeInputEditSetLot, RecipeInputEditChangeBasisViewed],
     serial_union_annotation(
         discriminator="type",
         discriminator_map={
@@ -124,6 +148,8 @@ RecipeInputEdit = typing.Annotated[
             "upsert_input": RecipeInputEditUpsertInput,
             "add_input": RecipeInputEditAddInput,
             "update_annotations": RecipeInputEditUpdateAnnotations,
+            "set_lot": RecipeInputEditSetLot,
+            "change_basis": RecipeInputEditChangeBasisViewed,
         },
     ),
 ]

uncountable/types/api/recipes/get_recipes_data.py

@@ -15,7 +15,6 @@ from ... import inputs as inputs_t
 from ... import outputs as outputs_t
 from ... import recipe_metadata as recipe_metadata_t
 from ... import recipe_tags as recipe_tags_t
-from ... import users as users_t
 from ... import workflows as workflows_t
 
 __all__: list[str] = [
@@ -97,7 +96,6 @@ class RecipeInput:
     quantity_json: base_t.JsonValue
     curve_id: typing.Optional[base_t.ObjectId]
     actual_quantity_json: base_t.JsonValue
-    input_type: str
     behavior: str
     quantity_dec: typing.Optional[Decimal] = None
     actual_quantity_dec: typing.Optional[Decimal] = None
@@ -170,7 +168,6 @@ class Data:
     inputs: list[inputs_t.SimpleInput]
     outputs: list[outputs_t.SimpleOutput]
     output_conditions: list[SimpleOutputCondition]
-    users: list[users_t.SimpleUser]
     recipe_tags: list[recipe_tags_t.SimpleRecipeTag]
     experiment_groups: list[experiment_groups_t.SimpleExperimentGroup]
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/recipes/lock_recipes.py

@@ -0,0 +1,89 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# flake8: noqa: F821
+# ruff: noqa: E402
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+from pkgs.strenum_compat import StrEnum
+from dataclasses import dataclass
+from pkgs.serialization import serial_class
+from pkgs.serialization import serial_union_annotation
+from ... import identifier as identifier_t
+
+__all__: list[str] = [
+    "Arguments",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+    "RecipeLock",
+    "RecipeLockAll",
+    "RecipeLockBase",
+    "RecipeLockInputs",
+    "RecipeLockType",
+]
+
+ENDPOINT_METHOD = "POST"
+ENDPOINT_PATH = "api/external/recipes/lock_recipes"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+class RecipeLockType(StrEnum):
+    ALL = "all"
+    INPUTS_ONLY = "inputs_only"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class RecipeLockBase:
+    recipe: identifier_t.IdentifierKey
+    globally_removable: bool
+    type: RecipeLockType
+    lock_samples: typing.Optional[bool] = None
+    comments: typing.Optional[str] = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclass(kw_only=True)
+class RecipeLockAll(RecipeLockBase):
+    type: typing.Literal[RecipeLockType.ALL] = RecipeLockType.ALL
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclass(kw_only=True)
+class RecipeLockInputs(RecipeLockBase):
+    type: typing.Literal[RecipeLockType.INPUTS_ONLY] = RecipeLockType.INPUTS_ONLY
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+RecipeLock = typing.Annotated[
+    typing.Union[RecipeLockAll, RecipeLockInputs],
+    serial_union_annotation(
+        discriminator="type",
+        discriminator_map={
+            "all": RecipeLockAll,
+            "inputs_only": RecipeLockInputs,
+        },
+    ),
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class Arguments:
+    locks: list[RecipeLock]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class Data:
+    pass
+# DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/recipes/set_recipe_output_annotations.py

@@ -0,0 +1,102 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# flake8: noqa: F821
+# ruff: noqa: E402
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+from pkgs.strenum_compat import StrEnum
+from dataclasses import dataclass
+from pkgs.serialization import serial_class
+from pkgs.serialization import serial_union_annotation
+from ... import base as base_t
+from ... import identifier as identifier_t
+
+__all__: list[str] = [
+    "AnnotationEdit",
+    "AnnotationUpdateType",
+    "Arguments",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+    "RecipeOutputEditBase",
+    "RecipeOutputMergeAnnotations",
+    "RecipeOutputReplaceAnnotations",
+    "RecipeOutputUpdateAnnotations",
+]
+
+ENDPOINT_METHOD = "POST"
+ENDPOINT_PATH = "api/external/recipes/set_recipe_output_annotations"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    to_string_values={"lower_value", "upper_value"},
+)
+@dataclass(kw_only=True)
+class AnnotationEdit:
+    annotation_type_key: identifier_t.IdentifierKey
+    lower_value: typing.Optional[Decimal] = None
+    upper_value: typing.Optional[Decimal] = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+class AnnotationUpdateType(StrEnum):
+    MERGE = "merge"
+    REPLACE = "replace"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class RecipeOutputEditBase:
+    recipe_id: base_t.ObjectId
+    output_id: base_t.ObjectId
+    experiment_num: int
+    annotations: list[AnnotationEdit]
+    condition_id: typing.Optional[base_t.ObjectId] = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclass(kw_only=True)
+class RecipeOutputMergeAnnotations(RecipeOutputEditBase):
+    type: typing.Literal[AnnotationUpdateType.MERGE] = AnnotationUpdateType.MERGE
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclass(kw_only=True)
+class RecipeOutputReplaceAnnotations(RecipeOutputEditBase):
+    type: typing.Literal[AnnotationUpdateType.REPLACE] = AnnotationUpdateType.REPLACE
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+RecipeOutputUpdateAnnotations = typing.Annotated[
+    typing.Union[RecipeOutputMergeAnnotations, RecipeOutputReplaceAnnotations],
+    serial_union_annotation(
+        discriminator="type",
+        discriminator_map={
+            "merge": RecipeOutputMergeAnnotations,
+            "replace": RecipeOutputReplaceAnnotations,
+        },
+    ),
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class Arguments:
+    updates: list[RecipeOutputUpdateAnnotations]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class Data:
+    pass
+# DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/client_base.py

@@ -49,6 +49,7 @@ from uncountable.types import identifier as identifier_t
 import uncountable.types.api.entity.list_entities as list_entities_t
 import uncountable.types.api.id_source.list_id_source as list_id_source_t
 import uncountable.types.api.entity.lock_entity as lock_entity_t
+import uncountable.types.api.recipes.lock_recipes as lock_recipes_t
 import uncountable.types.api.id_source.match_id_source as match_id_source_t
 from uncountable.types import permissions as permissions_t
 from uncountable.types import post_base as post_base_t
@@ -67,6 +68,7 @@ import uncountable.types.api.inputs.set_input_subcategories as set_input_subcate
 import uncountable.types.api.inputs.set_intermediate_type as set_intermediate_type_t
 import uncountable.types.api.recipes.set_recipe_inputs as set_recipe_inputs_t
 import uncountable.types.api.recipes.set_recipe_metadata as set_recipe_metadata_t
+import uncountable.types.api.recipes.set_recipe_output_annotations as set_recipe_output_annotations_t
 import uncountable.types.api.recipes.set_recipe_outputs as set_recipe_outputs_t
 import uncountable.types.api.recipes.set_recipe_tags as set_recipe_tags_t
 import uncountable.types.api.entity.set_values as set_values_t
@@ -826,15 +828,15 @@ class ClientMethods(ABC):
     def list_entities(
         self,
         *,
-        entity_type: entity_t.EntityType,
         config_reference: str,
+        entity_type: typing.Optional[entity_t.EntityType] = None,
         attributes: typing.Optional[dict[OpaqueKey, base_t.JsonValue]] = None,
         offset: typing.Optional[typing.Optional[int]] = None,
         limit: typing.Optional[typing.Optional[int]] = None,
     ) -> list_entities_t.Data:
         """Uses a structured loading configuration to list entities in the system
 
-        :param entity_type: The type of the entities requested, e.g. lab_request, recipe
+        :param entity_type: DEPRECATED: The type of the entities requested, e.g. lab_request, recipe
         :param config_reference: The configuration reference name for the listing config
         :param attributes: Attributes to pass to the configuration for parameterizing filters
         :param offset: Used for pagination. Pagination is done based on the sorting of the config. [Pagination More Info](#pagination)
@@ -906,6 +908,25 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=lock_entity_t.Data)
 
+    def lock_recipes(
+        self,
+        *,
+        locks: list[lock_recipes_t.RecipeLock],
+    ) -> lock_recipes_t.Data:
+        """Lock experiments. Experiments will require unlocking to be editable. Edits to the experiments are blocked while they are locked.
+
+        :param locks: The recipe locks to apply, a maximum of 100 can be sent
+        """
+        args = lock_recipes_t.Arguments(
+            locks=locks,
+        )
+        api_request = APIRequest(
+            method=lock_recipes_t.ENDPOINT_METHOD,
+            endpoint=lock_recipes_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=lock_recipes_t.Data)
+
     def match_id_source(
         self,
         *,
@@ -1172,6 +1193,25 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=set_recipe_metadata_t.Data)
 
+    def set_recipe_output_annotations(
+        self,
+        *,
+        updates: list[set_recipe_output_annotations_t.RecipeOutputUpdateAnnotations],
+    ) -> set_recipe_output_annotations_t.Data:
+        """Update annotations for an experiments outputs
+
+        :param updates: The output edits to perform. Must be at most 100 entries long
+        """
+        args = set_recipe_output_annotations_t.Arguments(
+            updates=updates,
+        )
+        api_request = APIRequest(
+            method=set_recipe_output_annotations_t.ENDPOINT_METHOD,
+            endpoint=set_recipe_output_annotations_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=set_recipe_output_annotations_t.Data)
+
     def set_recipe_outputs(
         self,
         *,