UncountablePythonSDK 0.0.73__py3-none-any.whl → 0.0.74__py3-none-any.whl

{UncountablePythonSDK-0.0.73.dist-info → UncountablePythonSDK-0.0.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.73
+Version: 0.0.74
 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.73.dist-info → UncountablePythonSDK-0.0.74.dist-info}/RECORD

@@ -26,10 +26,10 @@ examples/integration-server/jobs/materials_auto/example_cron.py,sha256=7VVQ-UJsq
 examples/integration-server/jobs/materials_auto/profile.yaml,sha256=MiqT9AHWoFz-rcpAHfiFTXuCP-18DaFipUaceati0-0,365
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkgs/argument_parser/__init__.py,sha256=CsQ6QoPKSLLRVl-z6URAmPkiUL9ZPZoV4rJHgy_-RjA,385
+pkgs/argument_parser/__init__.py,sha256=JRfZkC0-q6axr8F5_TKrjSprJ7d7chfcPvf-iMQqFg0,447
 pkgs/argument_parser/_is_enum.py,sha256=Gw6jJa8nBwYGqXwwCZbSnWL8Rvr5alkg5lSVAqXtOZM,257
 pkgs/argument_parser/_is_namedtuple.py,sha256=Rjc1bKanIPPogl3qG5JPBxglG1TqWYOo1nxxhBASQWY,265
-pkgs/argument_parser/argument_parser.py,sha256=uI_fSs7XmiQf9kt4ztWqqF9v8w4dZmQRy3tssPYVRDE,17330
+pkgs/argument_parser/argument_parser.py,sha256=Z8lR_2L_N0zuxdOsK91D_9mjlsCcR_FJwtCLIfJz5oI,17713
 pkgs/argument_parser/case_convert.py,sha256=NuJLJUJRbyVb6_Slen4uqaStEHbcOS1d-hBBfDrrw-c,605
 pkgs/filesystem_utils/__init__.py,sha256=NSsQrUCoGISBCqCCyq6_583sYHTVEQeDjDO8hvZn3ag,1261
 pkgs/filesystem_utils/_gdrive_session.py,sha256=GJuZYJq1W4QQ_7OLvZIMK99FgRq8FxJHg6cMUx9prtA,11077
@@ -41,7 +41,7 @@ pkgs/filesystem_utils/filesystem_session.py,sha256=BQ2Go8Mu9-GcnaWh2Pm4x7ugLVsre
 pkgs/serialization/__init__.py,sha256=LifasRW0a50A3qRFmo2bf3FQ6TXhZWOTz2-CVTgPjcQ,753
 pkgs/serialization/missing_sentry.py,sha256=aM_9KxbCk9dVvXvcOKgkIQBqFWvLhv8QlIUCiuFEXMo,806
 pkgs/serialization/opaque_key.py,sha256=FIfXEE0DA1U8R_taFbQ1RCoTSgehrPjP06-qvo-GeNQ,177
-pkgs/serialization/serial_class.py,sha256=tD9kNotc6BOzkGi8yew89Wp_fSIA3a0VW7I8cSS_jHI,5607
+pkgs/serialization/serial_class.py,sha256=D7vSnfJw4rWEDFbDd07pxgzyfTFZT5SKeQEv4C1c4H0,6057
 pkgs/serialization/serial_union.py,sha256=xpdeqCrRd0sNCaUwBQRzje6V40ndCbJpZrLX2K0d5xo,2741
 pkgs/serialization/yaml.py,sha256=yoJtu7_ixnJV6uTxA_U1PpK5F_ixT08AKVh5ocyYwXM,1466
 pkgs/serialization_util/__init__.py,sha256=MVKqHTUl2YnWZAFG9xCxu1SgmkQ5xPofrAGlYg6h7rI,330
@@ -52,25 +52,25 @@ pkgs/strenum_compat/__init__.py,sha256=wXRFeNvBm8RU6dy1PFJ5sRLgUIEeH_DVR95Sv5qpG
 pkgs/strenum_compat/strenum_compat.py,sha256=uOUAgpYTjHs1MX8dG81jRlyTkt3KNbkV_25zp7xTX2s,36
 pkgs/type_spec/__init__.py,sha256=h5DmJTca4QVV10sZR1x0-MlkZfuGYDfapR3zHvXfzto,19
 pkgs/type_spec/__main__.py,sha256=5bJaX9Y_-FavP0qwzhk-z-V97UY7uaezJTa1zhO_HHQ,1048
-pkgs/type_spec/builder.py,sha256=EUMEc0Mj0p9vb5QYojpe7Eu1UQB0Mg0p3oGzqTrtWZA,46888
+pkgs/type_spec/builder.py,sha256=nuHdVNOmwbHbHV5_8nqtsrxOfzIII6jcQO7eLOljT4c,48856
 pkgs/type_spec/config.py,sha256=ZUmPWCzTwjesAqlqeL1_E_yoIUZE_8g0kI2yXtbU0Zc,4811
 pkgs/type_spec/emit_io_ts.py,sha256=U03sQBpgRqYOaMKrPCRnYb70YboiCgaZfseCXSzW5NY,5707
 pkgs/type_spec/emit_open_api.py,sha256=5a0iAHBbgFD4wfKuyjPvxCYYHNTjKxEHA0aYjMGSqe4,24596
 pkgs/type_spec/emit_open_api_util.py,sha256=x4GCiZSGdypJ9Qtm6I5W_3UvwdJyMs8_OGhJ8_THznA,2401
-pkgs/type_spec/emit_python.py,sha256=u09ueuF5ypUsyNkxnBFGsS8tivVsjvmUCkPLM_RIask,47466
-pkgs/type_spec/emit_typescript.py,sha256=Tv8EbXBQewZN9q3zRKfTy9lWwElBmIV6fprIjA4RmJQ,18010
-pkgs/type_spec/emit_typescript_util.py,sha256=sR7ys3Ilnh6SQiXJbfYk4pxfOu0bDjbUFTEYEW-ud6c,863
+pkgs/type_spec/emit_python.py,sha256=eBct7PMYgcv35POo2JU089lLggPrgLfTOrKpqAukn1E,47370
+pkgs/type_spec/emit_typescript.py,sha256=w9DUpksc4QP0CatUU9NYSZN4IBNNXVXkMnKMCFQmL58,18274
+pkgs/type_spec/emit_typescript_util.py,sha256=StCDbJ5mU23MBb2LGu847yJN2fuiogjoQqZu6q3E6FY,797
 pkgs/type_spec/load_types.py,sha256=vO8VLI7aTKzzHQIla-WO-5Z_mfTuwUqH4ZSKN9E9n5U,3688
 pkgs/type_spec/open_api_util.py,sha256=IGh-_snGPST_P_8FdYtO8MTEa9PUxRW6Rzg9X9EgQik,7114
 pkgs/type_spec/test.py,sha256=4ueujBq-pEgnX3Z69HyPmD-bullFXmpixcpVzfOkhP4,489
-pkgs/type_spec/util.py,sha256=6m6MPfY-SwjyZf2FWQKclswWB5o7gcdd-3tdpViPYOQ,4844
+pkgs/type_spec/util.py,sha256=79SLJsSPVnBe2_3CTF6J-7-QD9nRr6o8MKvfjyx53eI,4864
 pkgs/type_spec/actions_registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/type_spec/actions_registry/__main__.py,sha256=JGwKxcAmrQdbpVR2vwknoimN1Q-r5h4SADw1cYLYzgk,4331
 pkgs/type_spec/actions_registry/emit_typescript.py,sha256=Z1ZM4zOw26tvLspvW6Emg79-jxjhNBse-8yaionbmeo,6066
 pkgs/type_spec/parts/base.py.prepart,sha256=wGNoDyQnLolHRZGRwHQX5TrPfKnu558NXCocYvqyroc,2174
 pkgs/type_spec/parts/base.ts.prepart,sha256=2FJJvpg2olCcavxj0nbYWdwKl6KeScour2JjSvN42l8,1001
 pkgs/type_spec/type_info/__main__.py,sha256=pmVjVqXyVh8vKTNCTFgz80Sg74C5BKToP3E6GS-X_So,857
-pkgs/type_spec/type_info/emit_type_info.py,sha256=1R1ygKbGBIrKDCh3NDiBB6w9ofRCoCjujhHZx9A4_Wc,13289
+pkgs/type_spec/type_info/emit_type_info.py,sha256=C4Rq5z22c3IJTyQriNkQWgGV7I3ZgTDjwKm_JM_sOYI,13362
 pkgs/type_spec/value_spec/__init__.py,sha256=Z-grlcZtxAfEXhPHsK0nD7PFLGsv4eqvunaPN7_TA84,83
 pkgs/type_spec/value_spec/__main__.py,sha256=6bzP85p_Cm4bPp5tXz8D_4p64wMn5SKsXC7SqSZquYc,8318
 pkgs/type_spec/value_spec/convert_type.py,sha256=Tg5YsYOwvmf_EqbCAtCmqy3-dud8OwdbEOzAaRN7cCs,2286
@@ -124,7 +124,7 @@ uncountable/integration/secret_retrieval/retrieve_secret.py,sha256=eoPWbkUtCn_63
 uncountable/integration/webhook_server/entrypoint.py,sha256=hgbEtdVo3QU3odlHSygxmrsxR9g7rgU0yKt-o9nVAHE,5686
 uncountable/types/__init__.py,sha256=KSsSEBnGhn88NPex5q9MZtY4kj8PRqVTbaKtko4hxUU,8561
 uncountable/types/async_batch.py,sha256=_OhT25_dEVts_z_n1kqfJH3xlZg3btLqR6TNkfFLlXE,609
-uncountable/types/async_batch_processor.py,sha256=obVzN-PcYLV2pHScszfCGjSq6-Xc34WM1ysx6Fv6tZk,11293
+uncountable/types/async_batch_processor.py,sha256=esKBP56RiRH-VjAFBr8wgfcgKsRkUfiLBmQmYGx4XXY,11462
 uncountable/types/async_batch_t.py,sha256=CZ-rltFUiKVowvL5BhMfWaFxgf-Z0KPsghvjsg-PweY,2493
 uncountable/types/base.py,sha256=xVSjWvA_fUUnkCg83EjoYEFvAfmskinKFMeYFOxNc9E,359
 uncountable/types/base_t.py,sha256=XXjZXexx0xWFUxMMhW8i9nIL6n8dsZVsHwdgnhZ0zJ4,2714
@@ -132,13 +132,13 @@ uncountable/types/calculations.py,sha256=FFO_D3BbKoGDZnqWvTKpW4KF359i2vrKjpdFCLY
 uncountable/types/calculations_t.py,sha256=157qD0VqijD5kNDF5BRsfGli3WaPGnNjoo2o2CPX-Ik,669
 uncountable/types/chemical_structure.py,sha256=E-LnikTFDoVQ1b2zKaVUIO_PAKm-7aZZYJi8I8SDSic,302
 uncountable/types/chemical_structure_t.py,sha256=zDJ6WkeT3YwWZRZT21znQn2ZYelv3L7yv7kJiGoNZCw,824
-uncountable/types/client_base.py,sha256=KfeZ_PrfHO0U-4cUDXA9Kfy7slHfuxsANakKQJaFHV8,67320
+uncountable/types/client_base.py,sha256=16W0EnH7kyy_sRL_fNn4NBvNhE8NCmmrSad-grKhLus,67489
 uncountable/types/client_config.py,sha256=4h5Liko9uKCo9_0gdbPhoK6Jr2Kv7tioLiQ8iKeq-_4,301
 uncountable/types/client_config_t.py,sha256=6dStfR0IEHiPW8f9_aF3DD_tHmXXw2rEVrgpebzq8Fg,747
 uncountable/types/curves.py,sha256=W6uMpG5SyW1MS82szNpxkFEn1MnxNpBFyFbQb2Ysfng,366
 uncountable/types/curves_t.py,sha256=lKhRM-2cZ_sFaW7pa_I_Ipz_pJhm3_yTFehRXI79pKk,1416
 uncountable/types/entity.py,sha256=3XhLteFDRDZvHejDuYh-KvB65hpwrBygljFfiUcOAM8,315
-uncountable/types/entity_t.py,sha256=2F6zIxffc6l0hgjPtNUr3X0LKC4lxRMJZCT6T788GlI,14929
+uncountable/types/entity_t.py,sha256=8OkFVgvrItdA1ysyWB21mLL85JTPdcdzAmb6CNBUVI0,15003
 uncountable/types/experiment_groups.py,sha256=_0OXcPzSAbkE-rfKt5tPx178YJ4pcEKZvrCxUHgDnvw,309
 uncountable/types/experiment_groups_t.py,sha256=qEs8YW0eJOJ_sCOObT5v9QRx9wsjLYpJqJhCJXa-vNA,721
 uncountable/types/field_values.py,sha256=uuIWX-xmfvcinYPdfkWJeb56zzQY01mc9rmotMPMh24,503
@@ -276,8 +276,8 @@ uncountable/types/api/recipes/unlock_recipes.py,sha256=RaC5N5rz6f3FAIaQM3NgLuXEM
 uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/triggers/run_trigger.py,sha256=-oZgPyn43xEKSCs81DVNzwaYMCdRJxbM9GY6fsqKwf4,1090
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
-uncountable/types/api/uploader/invoke_uploader.py,sha256=EMtTBwcFXDde5Y2LpubyjAcXcDpBp8yT4HAPR4o95JE,1230
-UncountablePythonSDK-0.0.73.dist-info/METADATA,sha256=P9sk2jp7gGaHwQv7hTMwFDdszfZDNnlYOes3gpcMPIM,2051
-UncountablePythonSDK-0.0.73.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-UncountablePythonSDK-0.0.73.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.73.dist-info/RECORD,,
+uncountable/types/api/uploader/invoke_uploader.py,sha256=6mwVG136oLp9JcbB2I-kZnrcm3aeZzYZB-SFjEImY2o,1314
+UncountablePythonSDK-0.0.74.dist-info/METADATA,sha256=cvY7ALGHYsY6rqK3qLdaXGE_8joz1ouiGFKtbPaOsFw,2051
+UncountablePythonSDK-0.0.74.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+UncountablePythonSDK-0.0.74.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.74.dist-info/RECORD,,

{UncountablePythonSDK-0.0.73.dist-info → UncountablePythonSDK-0.0.74.dist-info}/WHEEL

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

pkgs/argument_parser/__init__.py

@@ -1,4 +1,5 @@
 from .argument_parser import CachedParser as CachedParser
+from .argument_parser import ParserFunction as ParserFunction
 from .argument_parser import ParserOptions as ParserOptions
 from .argument_parser import build_parser as build_parser
 from .case_convert import camel_to_snake_case as camel_to_snake_case

pkgs/argument_parser/argument_parser.py

@@ -1,4 +1,5 @@
 import dataclasses
+import math
 import types
 import typing
 from collections import defaultdict
@@ -299,7 +300,18 @@ def _build_parser_inner(
 
         return parse_str
 
-    if parsed_type in (float, dict, bool, Decimal) or is_string_enum_class(parsed_type):
+    if parsed_type in (float, Decimal):
+
+        def parse_as_numeric_type(value: typing.Any) -> T:
+            numeric_value: Decimal | float = parsed_type(value)  # type: ignore
+            if math.isnan(numeric_value):
+                raise ValueError(f"Invalid numeric value: {numeric_value}")
+
+            return numeric_value  # type: ignore
+
+        return parse_as_numeric_type
+
+    if parsed_type in (dict, bool) or is_string_enum_class(parsed_type):
         return lambda value: parsed_type(value)  # type: ignore
 
     if parsed_type is MissingSentryType:

pkgs/serialization/serial_class.py

@@ -15,6 +15,10 @@ class _SerialClassData:
     to_string_values: set[str] = dataclasses.field(default_factory=set)
     parse_require: set[str] = dataclasses.field(default_factory=set)
     named_type_path: Optional[str] = None
+    # Tracks if this data was provided as a decorator to the type.
+    # This is used to track "proper types" which are appropriate
+    # for serialization and/or dynamic discovery
+    from_decorator: bool = False
 
 
 EMPTY_SERIAL_CLASS_DATA = _SerialClassData()
@@ -58,6 +62,7 @@ def serial_class(
             to_string_values=to_string_values or set(),
             parse_require=parse_require or set(),
             named_type_path=named_type_path,
+            from_decorator=True,
         )
         return orig_class
 
@@ -83,6 +88,14 @@ class SerialClassDataInspector:
     def has_parse_require(self, key: str) -> bool:
         return key in self.current.parse_require
 
+    @property
+    def from_decorator(self) -> bool:
+        return self.current.from_decorator
+
+    @property
+    def named_type_path(self) -> Optional[str]:
+        return self.current.named_type_path
+
 
 def _get_merged_serial_class_data(type_class: type[Any]) -> _SerialClassData | None:
     base_class_data = (

pkgs/type_spec/builder.py

@@ -307,6 +307,9 @@ class SpecTypeDefn(SpecType):
     def is_base_type(self, type_: BaseTypeName) -> bool:
         return self.is_base and self.name == type_
 
+    def can_process(self, builder: SpecBuilder, data: RawDict) -> bool:
+        return True
+
     @abc.abstractmethod
     def process(self, builder: SpecBuilder, data: RawDict) -> None: ...
 
@@ -666,15 +669,30 @@ class SpecTypeDefnStringEnum(SpecTypeDefn):
         self.desc: str | None = None
         self.sql_type_name: Optional[str] = None
         self.emit_id_source = False
+        self.source_enums: list[SpecType] = []
+
+    def can_process(self, builder: SpecBuilder, data: dict[Any, Any]) -> bool:
+        source_enums = data.get("source_enums")
+        try:
+            for sub_type_str in source_enums or []:
+                sub_type = builder.parse_type(self.namespace, sub_type_str)
+                assert isinstance(sub_type, SpecTypeDefnStringEnum)
+                assert len(sub_type.values) > 0
+        except AssertionError:
+            return False
+        return super().can_process(builder, data)
 
     def process(self, builder: SpecBuilder, data: RawDict) -> None:
         super().base_process(
-            builder, data, ["type", "desc", "values", "name_case", "sql", "emit"]
+            builder,
+            data,
+            ["type", "desc", "values", "name_case", "sql", "emit", "source_enums"],
         )
         self.name_case = NameCase(data.get("name_case", "convert"))
         self.values = {}
-        data_values = data["values"]
+        data_values = data.get("values")
         self.desc = data.get("desc", None)
+        source_enums = data.get("source_enums", None)
         if isinstance(data_values, dict):
             for name, value in data_values.items():
                 builder.push_where(name)
@@ -717,7 +735,8 @@ class SpecTypeDefnStringEnum(SpecTypeDefn):
                     )
                 self.values[value] = StringEnumEntry(name=value, value=value)
         else:
-            raise Exception("unsupported values type")
+            if source_enums is None or data_values is not None:
+                raise Exception("unsupported values type")
 
         sql_data = data.get("sql")
         if sql_data is not None:
@@ -739,9 +758,18 @@ class SpecTypeDefnStringEnum(SpecTypeDefn):
                 builder.ensure(
                     entry.label is not None, f"need-label-for-id-source:{entry.name}"
                 )
+        for sub_type_str in source_enums or []:
+            sub_type = builder.parse_type(self.namespace, sub_type_str)
+            self.source_enums.append(sub_type)
+
+        for sub_type in self.source_enums:
+            builder.push_where(sub_type.name)
+            if isinstance(sub_type, SpecTypeDefnStringEnum):
+                self.values.update(sub_type.values)
+            builder.pop_where()
 
     def get_referenced_types(self) -> list[SpecType]:
-        return []
+        return self.source_enums
 
 
 TOKEN_ENDPOINT = "$endpoint"
@@ -1122,28 +1150,41 @@ class SpecNamespace:
         Complete the definition of each type.
         """
         builder.push_where(self.name)
-        for full_name, defn in data.items():
-            parsed_name = parse_type_str(full_name)[0]
-            name = parsed_name.name
+        items_to_process: list[NameDataPair] = [
+            NameDataPair(full_name=full_name, data=defn)
+            for full_name, defn in data.items()
+        ]
+        while len(items_to_process) > 0:
+            deferred_items: list[NameDataPair] = []
+            for item in items_to_process:
+                full_name = item.full_name
+                defn = item.data
+                parsed_name = parse_type_str(full_name)[0]
+                name = parsed_name.name
+
+                if name in [TOKEN_EMIT_IO_TS, TOKEN_EMIT_TYPE_INFO, TOKEN_IMPORT]:
+                    continue
 
-            if name in [TOKEN_EMIT_IO_TS, TOKEN_EMIT_TYPE_INFO, TOKEN_IMPORT]:
-                continue
+                builder.push_where(name)
 
-            builder.push_where(name)
+                if "value" in defn:
+                    spec_constant = self.constants[name]
+                    spec_constant.process(builder, defn)
 
-            if "value" in defn:
-                spec_constant = self.constants[name]
-                spec_constant.process(builder, defn)
+                elif name == TOKEN_ENDPOINT:
+                    assert self.endpoint
+                    self.endpoint.process(builder, defn)
 
-            elif name == TOKEN_ENDPOINT:
-                assert self.endpoint
-                self.endpoint.process(builder, defn)
-
-            else:
-                spec_type = self.types[name]
-                spec_type.process(builder, defn)
+                else:
+                    spec_type = self.types[name]
+                    if spec_type.can_process(builder, defn):
+                        spec_type.process(builder, defn)
+                    else:
+                        deferred_items.append(item)
 
-            builder.pop_where()
+                builder.pop_where()
+            assert len(deferred_items) < len(items_to_process)
+            items_to_process = [deferred for deferred in deferred_items]
 
         builder.pop_where()
 
@@ -1158,6 +1199,12 @@ class NamespaceDataPair:
     data: RawDict
 
 
+@dataclass(kw_only=True)
+class NameDataPair:
+    full_name: str
+    data: RawDict
+
+
 class SpecBuilder:
     def __init__(self, *, api_endpoints: dict[str, str], top_namespace: str) -> None:
         self.top_namespace = top_namespace

pkgs/type_spec/emit_python.py

@@ -44,7 +44,6 @@ class TrackingContext:
     use_enum: bool = False
     use_serial_string_enum: bool = False
     use_dataclass: bool = False
-    use_serial_class: bool = False
     use_serial_union: bool = False
     use_missing: bool = False
     use_opaque_key: bool = False
@@ -223,7 +222,6 @@ def _emit_types_imports(*, out: io.StringIO, ctx: Context) -> None:
         out.write("from pkgs.strenum_compat import StrEnum\n")
     if ctx.use_dataclass:
         out.write("import dataclasses\n")
-    if ctx.use_serial_class:
         out.write("from pkgs.serialization import serial_class\n")
     if ctx.use_serial_union:
         out.write("from pkgs.serialization import serial_union_annotation\n")
@@ -834,7 +832,6 @@ def _emit_type(ctx: Context, stype: builder.SpecType) -> None:
     _emit_generic(ctx, stype.get_generic())
 
     # Emit serial_class decorator
-    ctx.use_serial_class = True
     ctx.out.write("@serial_class(\n")
     ctx.out.write(
         f"{INDENT}named_type_path={util.encode_common_string(_named_type_path(ctx, stype))},\n"

pkgs/type_spec/emit_typescript.py

@@ -82,6 +82,25 @@ def emit_typescript(builder: builder.SpecBuilder, config: TypeScriptConfig) -> N
     _emit_id_source(builder, config)
 
 
+def emit_namespace_imports_ts(
+    namespaces: set[builder.SpecNamespace],
+    out: io.StringIO,
+    current_namespace: builder.SpecNamespace,
+) -> None:
+    for ns in sorted(
+        namespaces,
+        key=lambda name: _resolve_namespace_name(name),
+    ):
+        import_as = resolve_namespace_ref(ns)
+        import_path = (
+            "./"
+            if len(current_namespace.path) == 1
+            else "../" * (len(current_namespace.path) - 1)
+        )
+        import_from = f"{import_path}{_resolve_namespace_name(ns)}"
+        out.write(f'import * as {import_as} from "{import_from}"\n')  # noqa: E501
+
+
 def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
     index_out = io.StringIO()
     index_out.write(MODIFY_NOTICE)
@@ -92,11 +111,9 @@ def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
         builder.namespaces.values(),
         key=lambda ns: _resolve_namespace_name(ns),
     ):
-        ctx = EmitTypescriptContext(
-            out=io.StringIO(), namespace=namespace, config=config
-        )
+        ctx = EmitTypescriptContext(out=io.StringIO(), namespace=namespace)
 
-        _emit_namespace(ctx, namespace)
+        _emit_namespace(ctx, config, namespace)
 
         prepart = builder.preparts["typescript"].get(namespace.name)
         part = builder.parts["typescript"].get(namespace.name)
@@ -123,16 +140,7 @@ def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
             full.write(f"// === END section from {namespace.name}.ts.prepart ===\n")
             full.write("\n")
 
-        for ns in sorted(
-            ctx.namespaces,
-            key=lambda name: _resolve_namespace_name(name),
-        ):
-            import_as = resolve_namespace_ref(ns)
-            import_path = (
-                "./" if len(namespace.path) == 1 else "../" * (len(namespace.path) - 1)
-            )
-            import_from = f"{import_path}{_resolve_namespace_name(ns)}"
-            full.write(f'import * as {import_as} from "{import_from}"\n')  # noqa: E501
+        emit_namespace_imports_ts(ctx.namespaces, out=full, current_namespace=namespace)
         if namespace.emit_io_ts:
             full.write("import * as IO from 'io-ts';")
         full.write(ctx.out.getvalue())
@@ -164,23 +172,26 @@ def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
 
 
 def _emit_namespace(
-    ctx: EmitTypescriptContext, namespace: builder.SpecNamespace
+    ctx: EmitTypescriptContext,
+    config: TypeScriptConfig,
+    namespace: builder.SpecNamespace,
 ) -> None:
     for stype in namespace.types.values():
         if namespace.emit_io_ts:
             emit_type_io_ts(ctx, stype, namespace.derive_types_from_io_ts)
         if not namespace.emit_io_ts or not namespace.derive_types_from_io_ts:
-            _emit_type(ctx, stype)
+            emit_type_ts(ctx, stype)
 
     for sconst in namespace.constants.values():
         _emit_constant(ctx, sconst)
 
     if namespace.endpoint is not None:
-        _emit_endpoint(ctx, namespace, namespace.endpoint)
+        _emit_endpoint(ctx, config, namespace, namespace.endpoint)
 
 
 def _emit_endpoint(
     ctx: EmitTypescriptContext,
+    config: TypeScriptConfig,
     namespace: builder.SpecNamespace,
     endpoint: builder.SpecEndpoint,
 ) -> None:
@@ -265,14 +276,12 @@ export const apiCall = {wrap_call}(
 )
 {data_loader_body}"""
 
-    output = f"{ctx.config.routes_output}/{"/".join(namespace.path)}.tsx"
+    output = f"{config.routes_output}/{"/".join(namespace.path)}.tsx"
     util.rewrite_file(output, tsx_api)
 
     # Hacky index support, until enough is migrated to regen entirely
     # Emits the import into the UI API index file
-    index_path = (
-        f"{ctx.config.routes_output}/{"/".join(namespace.path[0:-1])}/index.tsx"
-    )
+    index_path = f"{config.routes_output}/{"/".join(namespace.path[0:-1])}/index.tsx"
     api_name = f"Api{ts_type_name(namespace.path[0 - 1])}"
     if os.path.exists(index_path):
         with open(index_path) as index:
@@ -288,7 +297,7 @@ export const apiCall = {wrap_call}(
             index.write(f"export {{ {api_name} }}\n")
 
 
-def _emit_type(ctx: EmitTypescriptContext, stype: builder.SpecType) -> None:
+def emit_type_ts(ctx: EmitTypescriptContext, stype: builder.SpecType) -> None:
     if not isinstance(stype, builder.SpecTypeDefn):
         return
 

pkgs/type_spec/emit_typescript_util.py

@@ -2,7 +2,6 @@ import io
 from dataclasses import dataclass, field
 
 from . import builder, util
-from .config import TypeScriptConfig
 
 INDENT = "  "
 
@@ -11,7 +10,6 @@ MODIFY_NOTICE = "// DO NOT MODIFY -- This file is generated by type_spec\n"
 
 @dataclass(kw_only=True)
 class EmitTypescriptContext:
-    config: TypeScriptConfig
     out: io.StringIO
     namespace: builder.SpecNamespace
     namespaces: set[builder.SpecNamespace] = field(default_factory=set)

pkgs/type_spec/type_info/emit_type_info.py

@@ -5,7 +5,7 @@ import io
 import json
 from typing import Any, Optional, Union, cast
 
-from main.base.types import data_t
+from main.base.types import data_t, type_info_t
 from main.base.types.base_t import PureJsonValue
 from pkgs.argument_parser import CachedParser
 from pkgs.serialization_util import (
@@ -17,7 +17,7 @@ from .. import builder, util
 from ..emit_typescript_util import MODIFY_NOTICE, ts_name
 from ..value_spec import convert_to_value_spec_type
 
-ext_info_parser = CachedParser(data_t.ExtInfo)
+ext_info_parser = CachedParser(type_info_t.ExtInfo, strict_property_parsing=True)
 
 
 def type_path_of(stype: builder.SpecType) -> object:  # NamePath
@@ -174,7 +174,7 @@ class InheritablePropertyParts:
 
     label: Optional[str] = None
     desc: Optional[str] = None
-    ext_info: Optional[data_t.ExtInfo] = None
+    ext_info: Optional[type_info_t.ExtInfo] = None
 
 
 def _extract_inheritable_property_parts(
@@ -201,7 +201,7 @@ def _extract_inheritable_property_parts(
     elif base_parts.ext_info is None:
         ext_info = local_ext_info
     else:
-        ext_info = data_t.ExtInfo(
+        ext_info = type_info_t.ExtInfo(
             **(local_ext_info.__dict__ | base_parts.ext_info.__dict__)
         )
 
@@ -214,7 +214,7 @@ ALL_FIELDS_GROUP = "*all_fields"
 
 def _extract_and_validate_layout(
     stype: builder.SpecTypeDefnObject,
-    ext_info: data_t.ExtInfo,
+    ext_info: type_info_t.ExtInfo,
     base_layout: ExtInfoLayout | None,
 ) -> ExtInfoLayout:
     """
@@ -264,7 +264,7 @@ def _extract_and_validate_layout(
 
 def _validate_type_ext_info(
     stype: builder.SpecTypeDefnObject,
-) -> tuple[ExtInfoLayout | None, Optional[data_t.ExtInfo]]:
+) -> tuple[ExtInfoLayout | None, Optional[type_info_t.ExtInfo]]:
     ext_info = _parse_ext_info(stype.ext_info)
     if ext_info is None:
         return None, None
@@ -364,7 +364,7 @@ def _build_map_type(
     return None
 
 
-def _parse_ext_info(in_ext: Any) -> Optional[data_t.ExtInfo]:
+def _parse_ext_info(in_ext: Any) -> Optional[type_info_t.ExtInfo]:
     if in_ext is None:
         return None
     assert isinstance(in_ext, dict)

pkgs/type_spec/util.py

@@ -159,7 +159,7 @@ def is_valid_property_name(name: str) -> bool:
 def check_fields(data: dict[str, T], allowed: list[str]) -> None:
     for key in data:
         if key not in allowed:
-            raise Exception(f"unexpected-field: {key}")
+            raise Exception(f"unexpected-field: {key}. Allowed: {allowed}")
 
 
 def split_any_name(name: str) -> list[str]:

uncountable/types/api/uploader/invoke_uploader.py

@@ -31,9 +31,10 @@ ENDPOINT_PATH = "api/external/uploader/invoke_uploader"
 )
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
-    file_id: base_t.ObjectId
     uploader_key: identifier_t.IdentifierKey
     destination: generic_upload_t.UploadDestination
+    file_id: typing.Optional[base_t.ObjectId] = None
+    file_ids: typing.Optional[list[base_t.ObjectId]] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/async_batch_processor.py

@@ -233,17 +233,20 @@ class AsyncBatchProcessorBase(ABC):
     def invoke_uploader(
         self,
         *,
-        file_id: base_t.ObjectId,
         uploader_key: identifier_t.IdentifierKey,
         destination: generic_upload_t.UploadDestination,
+        file_id: typing.Optional[base_t.ObjectId] = None,
+        file_ids: typing.Optional[list[base_t.ObjectId]] = None,
         depends_on: typing.Optional[list[str]] = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Runs a file through an uploader.
 
+        :param file_id: DEPRECATED: use file_ids
         :param depends_on: A list of batch reference keys to process before processing this request
         """
         args = invoke_uploader_t.Arguments(
             file_id=file_id,
+            file_ids=file_ids,
             uploader_key=uploader_key,
             destination=destination,
         )

uncountable/types/client_base.py

@@ -876,15 +876,18 @@ class ClientMethods(ABC):
     def invoke_uploader(
         self,
         *,
-        file_id: base_t.ObjectId,
         uploader_key: identifier_t.IdentifierKey,
         destination: generic_upload_t.UploadDestination,
+        file_id: typing.Optional[base_t.ObjectId] = None,
+        file_ids: typing.Optional[list[base_t.ObjectId]] = None,
     ) -> invoke_uploader_t.Data:
         """Runs a file through an uploader.
 
+        :param file_id: DEPRECATED: use file_ids
         """
         args = invoke_uploader_t.Arguments(
             file_id=file_id,
+            file_ids=file_ids,
             uploader_key=uploader_key,
             destination=destination,
         )

uncountable/types/entity_t.py

@@ -111,6 +111,7 @@ __all__: list[str] = [
         "recipe_calculation": "Recipe Calculation",
         "recipe_check": "Experiment Check",
         "recipe_export": "Recipe Export",
+        "recipe_goal": "Experiment Goal",
         "recipe_ingredient": "Recipe Ingredient",
         "recipe_ingredient_actual": "Recipe Ingredient Actual",
         "recipe_ingredients_compounded": "Recipe Ingredients Compounded",
@@ -265,6 +266,7 @@ class EntityType(StrEnum):
     RECIPE_CALCULATION = "recipe_calculation"
     RECIPE_CHECK = "recipe_check"
     RECIPE_EXPORT = "recipe_export"
+    RECIPE_GOAL = "recipe_goal"
     RECIPE_INGREDIENT = "recipe_ingredient"
     RECIPE_INGREDIENT_ACTUAL = "recipe_ingredient_actual"
     RECIPE_INGREDIENTS_COMPOUNDED = "recipe_ingredients_compounded"