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

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

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

@@ -58,8 +58,8 @@ pkgs/type_spec/emit_io_ts.py,sha256=U03sQBpgRqYOaMKrPCRnYb70YboiCgaZfseCXSzW5NY,
 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=eBct7PMYgcv35POo2JU089lLggPrgLfTOrKpqAukn1E,47370
-pkgs/type_spec/emit_typescript.py,sha256=w9DUpksc4QP0CatUU9NYSZN4IBNNXVXkMnKMCFQmL58,18274
-pkgs/type_spec/emit_typescript_util.py,sha256=StCDbJ5mU23MBb2LGu847yJN2fuiogjoQqZu6q3E6FY,797
+pkgs/type_spec/emit_typescript.py,sha256=PL1h2UvTp1PRMkTXH893ZYS3cPUrrupjnLg_9ndZGDQ,8838
+pkgs/type_spec/emit_typescript_util.py,sha256=e2rGSs9OTD-iXwcHfU4V9E35jwMc5qVshhOKMknGrJ8,10319
 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
@@ -105,7 +105,7 @@ uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 uncountable/integration/queue_runner/job_scheduler.py,sha256=n6bM6ZqVOPD0PoJuZV5Y5tuhmw2gI-_p6JbnVlK42uI,5016
 uncountable/integration/queue_runner/queue_runner.py,sha256=0BmYu5zHdothTevGsB-nXg6MBd1UD-WkP3h1WCKMdQg,710
 uncountable/integration/queue_runner/types.py,sha256=8qTq29BTSa5rmW6CBlBntP0pNIiDcwu1wHa78pjroS0,219
-uncountable/integration/queue_runner/worker.py,sha256=wS_Mv12MtG9ULz2K4nUdivUAxJdZmd6B6GEUhqysG2A,4403
+uncountable/integration/queue_runner/worker.py,sha256=Bwp7_OD4AughY01QQtZxlmZ5yrDmDk1GuijH09xhUkk,4455
 uncountable/integration/queue_runner/command_server/__init__.py,sha256=gQPVILGpWzCr2i5GJyoqna7AOSFvtn4tav69gB78mTQ,571
 uncountable/integration/queue_runner/command_server/command_client.py,sha256=DJb0TUVFkiiLBEQzHSN94sTRnuEbutNEgdN39XmnOXI,2046
 uncountable/integration/queue_runner/command_server/command_server.py,sha256=yyXryhiEC2eGS0yFElLGsVzSKwOuYvj-zp22jQorkv0,2138
@@ -132,7 +132,7 @@ 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=16W0EnH7kyy_sRL_fNn4NBvNhE8NCmmrSad-grKhLus,67489
+uncountable/types/client_base.py,sha256=qTifyQNBOwlspjWccQXg4gOhuwyQDy5z77rlreDynBU,67603
 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
@@ -204,8 +204,8 @@ uncountable/types/api/batch/execute_batch_load_async.py,sha256=j5a5dk0_lTJ-YslrB
 uncountable/types/api/chemical/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/chemical/convert_chemical_formats.py,sha256=xLpma1W1O9MzgxM4CCl5GPnpj3dpqRHhKcXr3b_ToAo,1589
 uncountable/types/api/entity/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
-uncountable/types/api/entity/create_entities.py,sha256=3zBPO3_CM9fU2R1EFWQcFcXxCVCNNU2NIsnJLYnojzI,2219
-uncountable/types/api/entity/create_entity.py,sha256=elMRdi8VT7CTrPhypQsL9P5gvCLlk5_D_1CUxulnXzA,2331
+uncountable/types/api/entity/create_entities.py,sha256=hG81k_nKD4orTtb5jKIkCarkSbUa3fXAxES6IZVkhL0,2276
+uncountable/types/api/entity/create_entity.py,sha256=BV99ZfkxPfMEGD0YvuMizK25Nll0o0GFho8_Mzb0Clk,2388
 uncountable/types/api/entity/get_entities_data.py,sha256=gTEZ7Z7T-DWP8BZPNDF4c__EHtf9kAb1sGtHmiGOgnM,1454
 uncountable/types/api/entity/list_entities.py,sha256=ykbdq4DD31uiRz4i8LH-8LLeA2Lpp_5fWfb5fdyx248,2000
 uncountable/types/api/entity/lock_entity.py,sha256=mMZx2tWOtuYg0sIftdPsFWgZO5LCav2ubqTw97dCtDU,1197
@@ -277,7 +277,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 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=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.75.dist-info/METADATA,sha256=__fXg5O7uTKPPzAFToY3pOV8EHnNl6uX7UWCNat0E8Y,2051
+UncountablePythonSDK-0.0.75.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+UncountablePythonSDK-0.0.75.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.75.dist-info/RECORD,,

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

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

pkgs/type_spec/emit_typescript.py

@@ -1,106 +1,26 @@
 import io
 import os
-from typing import Any
 
 from . import builder, util
-from .builder import SpecTypeDefnObject
 from .config import TypeScriptConfig
 from .emit_io_ts import emit_type_io_ts
 from .emit_typescript_util import (
-    INDENT,
     MODIFY_NOTICE,
     EmitTypescriptContext,
+    emit_namespace_imports_ts,
+    emit_type_ts,
+    emit_value_ts,
+    resolve_namespace_name,
     resolve_namespace_ref,
-    ts_name,
     ts_type_name,
 )
 
 
-def ts_enum_name(name: str, name_case: builder.NameCase) -> str:
-    if name_case == builder.NameCase.js_upper:
-        return name.upper()
-    return ts_name(name, name_case)
-
-
-def _resolve_namespace_name(namespace: builder.SpecNamespace) -> str:
-    return namespace.name
-
-
-def _emit_value(ctx: EmitTypescriptContext, stype: builder.SpecType, value: Any) -> str:
-    """Mimics emit_python even if not all types are used in TypeScript yet"""
-    literal = builder.unwrap_literal_type(stype)
-    if literal is not None:
-        return _emit_value(ctx, literal.value_type, literal.value)
-
-    if stype.is_base_type(builder.BaseTypeName.s_string):
-        assert isinstance(value, str)
-        return util.encode_common_string(value)
-    elif stype.is_base_type(builder.BaseTypeName.s_integer):
-        assert isinstance(value, int)
-        return str(value)
-    elif stype.is_base_type(builder.BaseTypeName.s_boolean):
-        assert isinstance(value, bool)
-        return "true" if value else "false"
-    elif stype.is_base_type(builder.BaseTypeName.s_lossy_decimal):
-        return str(value)
-    elif stype.is_base_type(builder.BaseTypeName.s_decimal):
-        return f"'{value}'"
-    elif isinstance(stype, builder.SpecTypeInstance):
-        if stype.defn_type.is_base_type(builder.BaseTypeName.s_list):
-            sub_type = stype.parameters[0]
-            return "[" + ", ".join([_emit_value(ctx, sub_type, x) for x in value]) + "]"
-
-        if stype.defn_type.is_base_type(builder.BaseTypeName.s_dict):
-            key_type = stype.parameters[0]
-            value_type = stype.parameters[1]
-            return (
-                "{\n\t"
-                + ",\n\t".join(
-                    "["
-                    + _emit_value(ctx, key_type, dkey)
-                    + "]: "
-                    + _emit_value(ctx, value_type, dvalue)
-                    for dkey, dvalue in value.items()
-                )
-                + "\n}"
-            )
-
-        if stype.defn_type.is_base_type(builder.BaseTypeName.s_optional):
-            sub_type = stype.parameters[0]
-            if value is None:
-                return "null"
-            return _emit_value(ctx, sub_type, value)
-
-    elif isinstance(stype, builder.SpecTypeDefnStringEnum):
-        return f"{refer_to(ctx, stype)}.{ts_enum_name(value, stype.name_case)}"
-
-    raise Exception("invalid constant type", value, stype)
-
-
 def emit_typescript(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
     _emit_types(builder, config)
     _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)
@@ -109,7 +29,7 @@ def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
 
     for namespace in sorted(
         builder.namespaces.values(),
-        key=lambda ns: _resolve_namespace_name(ns),
+        key=lambda ns: resolve_namespace_name(ns),
     ):
         ctx = EmitTypescriptContext(out=io.StringIO(), namespace=namespace)
 
@@ -160,7 +80,7 @@ def _emit_types(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
 
         if len(namespace.path) == 1:
             index_out.write(
-                f"import * as {resolve_namespace_ref(namespace)} from './{_resolve_namespace_name(namespace)}'\n"
+                f"import * as {resolve_namespace_ref(namespace)} from './{resolve_namespace_name(namespace)}'\n"
             )  # noqa: E501
             index_out_end.write(f"export {{{resolve_namespace_ref(namespace)}}}\n")
 
@@ -297,164 +217,14 @@ export const apiCall = {wrap_call}(
             index.write(f"export {{ {api_name} }}\n")
 
 
-def emit_type_ts(ctx: EmitTypescriptContext, stype: builder.SpecType) -> None:
-    if not isinstance(stype, builder.SpecTypeDefn):
-        return
-
-    if stype.is_base or stype.is_predefined:
-        return
-
-    ctx.out.write("\n")
-    ctx.out.write(MODIFY_NOTICE)
-
-    if isinstance(stype, builder.SpecTypeDefnExternal):
-        assert not stype.is_exported, "expecting private names"
-        ctx.out.write(stype.external_map["ts"])
-        ctx.out.write("\n")
-        return
-
-    assert stype.is_exported, "expecting exported names"
-    if isinstance(stype, builder.SpecTypeDefnAlias):
-        ctx.out.write(f"export type {stype.name} = {refer_to(ctx, stype.alias)}\n")
-        return
-
-    if isinstance(stype, builder.SpecTypeDefnUnion):
-        ctx.out.write(
-            f"export type {stype.name} = {refer_to(ctx, stype.get_backing_type())}\n"
-        )
-        return
-
-    if isinstance(stype, builder.SpecTypeDefnStringEnum):
-        ctx.out.write(f"export enum {stype.name} {{\n")
-        assert stype.values
-        for name, entry in stype.values.items():
-            ctx.out.write(
-                f'{INDENT}{ts_enum_name(name, stype.name_case)} = "{entry.value}",\n'
-            )
-        ctx.out.write("}\n")
-        return
-
-    assert isinstance(stype, builder.SpecTypeDefnObject)
-    assert stype.base is not None
-
-    base_type = ""
-    if not stype.base.is_base:
-        base_type = f"{refer_to(ctx, stype.base)} & "
-
-    if stype.properties is None and base_type == "":
-        ctx.out.write(f"export type {stype.name} = TEmpty\n")
-    elif stype.properties is None:
-        ctx.out.write(f"export type {stype.name} = {base_type}{{}}\n")
-    else:
-        if isinstance(stype, SpecTypeDefnObject) and len(stype.parameters) > 0:
-            full_type_name = f'{stype.name}<{", ".join(stype.parameters)}>'
-        else:
-            full_type_name = stype.name
-        ctx.out.write(f"export type {full_type_name} = {base_type}{{")
-        ctx.out.write("\n")
-        for prop in stype.properties.values():
-            ref_type = refer_to(ctx, prop.spec_type)
-            prop_name = ts_name(prop.name, prop.name_case)
-            if prop.has_default and not prop.parse_require:
-                # For now, we'll assume the generated types with defaults are meant as
-                # arguments, thus treat like extant==missing
-                # IMPROVE: if we can decide they are meant as output instead, then
-                # they should be marked as required
-                ctx.out.write(f"{INDENT}{prop_name}?: {ref_type}")
-            elif prop.extant == builder.PropertyExtant.missing:
-                # Unlike optional below, missing does not imply null is possible. They
-                # treated distinctly.
-                ctx.out.write(f"{INDENT}{prop_name}?: {ref_type}")
-            elif prop.extant == builder.PropertyExtant.optional:
-                # Need to add in |null since Python side can produce null's right now
-                # IMPROVE: It would be better if the serializer could instead omit the None's
-                # Dropping the null should be forward compatible
-                ctx.out.write(f"{INDENT}{prop_name}?: {ref_type} | null")
-            else:
-                ctx.out.write(f"{INDENT}{prop_name}: {ref_type}")
-            ctx.out.write("\n")
-        ctx.out.write("}\n")
-
-
 def _emit_constant(ctx: EmitTypescriptContext, sconst: builder.SpecConstant) -> None:
     ctx.out.write("\n\n")
     ctx.out.write(MODIFY_NOTICE)
-    value = _emit_value(ctx, sconst.value_type, sconst.value)
+    value = emit_value_ts(ctx, sconst.value_type, sconst.value)
     const_name = sconst.name.upper()
     ctx.out.write(f"export const {const_name} = {value}\n")
 
 
-base_name_map = {
-    builder.BaseTypeName.s_boolean: "boolean",
-    builder.BaseTypeName.s_date: "string",  # IMPROVE: Aliased DateStr
-    builder.BaseTypeName.s_date_time: "string",  # IMPROVE: Aliased DateTimeStr
-    # Decimal's are marked as to_string_values thus are strings in the front-end
-    builder.BaseTypeName.s_decimal: "string",
-    builder.BaseTypeName.s_dict: "PartialRecord",
-    builder.BaseTypeName.s_integer: "number",
-    builder.BaseTypeName.s_lossy_decimal: "number",
-    builder.BaseTypeName.s_opaque_key: "string",
-    builder.BaseTypeName.s_none: "null",
-    builder.BaseTypeName.s_string: "string",
-    # UNC: global types
-    builder.BaseTypeName.s_json_value: "JsonValue",
-}
-
-
-def refer_to(ctx: EmitTypescriptContext, stype: builder.SpecType) -> str:
-    return refer_to_impl(ctx, stype)[0]
-
-
-def refer_to_impl(
-    ctx: EmitTypescriptContext, stype: builder.SpecType
-) -> tuple[str, bool]:
-    """
-    @return (string-specific, multiple-types)
-    """
-    if isinstance(stype, builder.SpecTypeInstance):
-        if stype.defn_type.name == builder.BaseTypeName.s_list:
-            spec, multi = refer_to_impl(ctx, stype.parameters[0])
-            return f"({spec})[]" if multi else f"{spec}[]", False
-        if stype.defn_type.name == builder.BaseTypeName.s_readonly_array:
-            spec, multi = refer_to_impl(ctx, stype.parameters[0])
-            return f"readonly ({spec})[]" if multi else f"readonly {spec}[]", False
-        if stype.defn_type.name == builder.BaseTypeName.s_union:
-            return (
-                f'({" | ".join([refer_to(ctx, p) for p in stype.parameters])})',
-                False,
-            )
-        if stype.defn_type.name == builder.BaseTypeName.s_literal:
-            parts = []
-            for parameter in stype.parameters:
-                assert isinstance(parameter, builder.SpecTypeLiteralWrapper)
-                parts.append(refer_to(ctx, parameter))
-            return f'({" | ".join(parts)})', False
-        if stype.defn_type.name == builder.BaseTypeName.s_optional:
-            return f"{refer_to(ctx, stype.parameters[0])} | null", True
-        if stype.defn_type.name == builder.BaseTypeName.s_tuple:
-            return f"[{", ".join([refer_to(ctx, p) for p in stype.parameters])}]", False
-        params = ", ".join([refer_to(ctx, p) for p in stype.parameters])
-        return f"{refer_to(ctx, stype.defn_type)}<{params}>", False
-
-    if isinstance(stype, builder.SpecTypeLiteralWrapper):
-        return _emit_value(ctx, stype.value_type, stype.value), False
-
-    if isinstance(stype, builder.SpecTypeGenericParameter):
-        return stype.name, False
-
-    assert isinstance(stype, builder.SpecTypeDefn)
-    if stype.is_base:  # assume correct namespace
-        if stype.name == builder.BaseTypeName.s_list:
-            return "any[]", False  # TODO: generic type
-        return base_name_map[builder.BaseTypeName(stype.name)], False
-
-    if stype.namespace == ctx.namespace:
-        return stype.name, False
-
-    ctx.namespaces.add(stype.namespace)
-    return f"{resolve_namespace_ref(stype.namespace)}.{stype.name}", False
-
-
 def _emit_id_source(builder: builder.SpecBuilder, config: TypeScriptConfig) -> None:
     id_source_output = config.id_source_output
     if id_source_output is None:

pkgs/type_spec/emit_typescript_util.py

@@ -1,4 +1,5 @@
 import io
+import typing
 from dataclasses import dataclass, field
 
 from . import builder, util
@@ -8,6 +9,23 @@ INDENT = "  "
 MODIFY_NOTICE = "// DO NOT MODIFY -- This file is generated by type_spec\n"
 
 
+base_name_map = {
+    builder.BaseTypeName.s_boolean: "boolean",
+    builder.BaseTypeName.s_date: "string",  # IMPROVE: Aliased DateStr
+    builder.BaseTypeName.s_date_time: "string",  # IMPROVE: Aliased DateTimeStr
+    # Decimal's are marked as to_string_values thus are strings in the front-end
+    builder.BaseTypeName.s_decimal: "string",
+    builder.BaseTypeName.s_dict: "PartialRecord",
+    builder.BaseTypeName.s_integer: "number",
+    builder.BaseTypeName.s_lossy_decimal: "number",
+    builder.BaseTypeName.s_opaque_key: "string",
+    builder.BaseTypeName.s_none: "null",
+    builder.BaseTypeName.s_string: "string",
+    # UNC: global types
+    builder.BaseTypeName.s_json_value: "JsonValue",
+}
+
+
 @dataclass(kw_only=True)
 class EmitTypescriptContext:
     out: io.StringIO
@@ -28,3 +46,220 @@ def ts_name(name: str, name_case: builder.NameCase) -> str:
         return name
     bits = util.split_any_name(name)
     return "".join([bits[0], *[x.title() for x in bits[1:]]])
+
+
+def emit_value_ts(
+    ctx: EmitTypescriptContext, stype: builder.SpecType, value: typing.Any
+) -> str:
+    """Mimics emit_python even if not all types are used in TypeScript yet"""
+    literal = builder.unwrap_literal_type(stype)
+    if literal is not None:
+        return emit_value_ts(ctx, literal.value_type, literal.value)
+
+    if stype.is_base_type(builder.BaseTypeName.s_string):
+        assert isinstance(value, str)
+        return util.encode_common_string(value)
+    elif stype.is_base_type(builder.BaseTypeName.s_integer):
+        assert isinstance(value, int)
+        return str(value)
+    elif stype.is_base_type(builder.BaseTypeName.s_boolean):
+        assert isinstance(value, bool)
+        return "true" if value else "false"
+    elif stype.is_base_type(builder.BaseTypeName.s_lossy_decimal):
+        return str(value)
+    elif stype.is_base_type(builder.BaseTypeName.s_decimal):
+        return f"'{value}'"
+    elif isinstance(stype, builder.SpecTypeInstance):
+        if stype.defn_type.is_base_type(builder.BaseTypeName.s_list):
+            sub_type = stype.parameters[0]
+            return (
+                "[" + ", ".join([emit_value_ts(ctx, sub_type, x) for x in value]) + "]"
+            )
+
+        if stype.defn_type.is_base_type(builder.BaseTypeName.s_dict):
+            key_type = stype.parameters[0]
+            value_type = stype.parameters[1]
+            return (
+                "{\n\t"
+                + ",\n\t".join(
+                    "["
+                    + emit_value_ts(ctx, key_type, dkey)
+                    + "]: "
+                    + emit_value_ts(ctx, value_type, dvalue)
+                    for dkey, dvalue in value.items()
+                )
+                + "\n}"
+            )
+
+        if stype.defn_type.is_base_type(builder.BaseTypeName.s_optional):
+            sub_type = stype.parameters[0]
+            if value is None:
+                return "null"
+            return emit_value_ts(ctx, sub_type, value)
+
+    elif isinstance(stype, builder.SpecTypeDefnStringEnum):
+        return f"{refer_to(ctx, stype)}.{ts_enum_name(value, stype.name_case)}"
+
+    raise Exception("invalid constant type", value, stype)
+
+
+def emit_type_ts(ctx: EmitTypescriptContext, stype: builder.SpecType) -> None:
+    if not isinstance(stype, builder.SpecTypeDefn):
+        return
+
+    if stype.is_base or stype.is_predefined:
+        return
+
+    ctx.out.write("\n")
+    ctx.out.write(MODIFY_NOTICE)
+
+    if isinstance(stype, builder.SpecTypeDefnExternal):
+        assert not stype.is_exported, "expecting private names"
+        ctx.out.write(stype.external_map["ts"])
+        ctx.out.write("\n")
+        return
+
+    assert stype.is_exported, "expecting exported names"
+    if isinstance(stype, builder.SpecTypeDefnAlias):
+        ctx.out.write(f"export type {stype.name} = {refer_to(ctx, stype.alias)}\n")
+        return
+
+    if isinstance(stype, builder.SpecTypeDefnUnion):
+        ctx.out.write(
+            f"export type {stype.name} = {refer_to(ctx, stype.get_backing_type())}\n"
+        )
+        return
+
+    if isinstance(stype, builder.SpecTypeDefnStringEnum):
+        ctx.out.write(f"export enum {stype.name} {{\n")
+        assert stype.values
+        for name, entry in stype.values.items():
+            ctx.out.write(
+                f'{INDENT}{ts_enum_name(name, stype.name_case)} = "{entry.value}",\n'
+            )
+        ctx.out.write("}\n")
+        return
+
+    assert isinstance(stype, builder.SpecTypeDefnObject)
+    assert stype.base is not None
+
+    base_type = ""
+    if not stype.base.is_base:
+        base_type = f"{refer_to(ctx, stype.base)} & "
+
+    if stype.properties is None and base_type == "":
+        ctx.out.write(f"export type {stype.name} = TEmpty\n")
+    elif stype.properties is None:
+        ctx.out.write(f"export type {stype.name} = {base_type}{{}}\n")
+    else:
+        if isinstance(stype, builder.SpecTypeDefnObject) and len(stype.parameters) > 0:
+            full_type_name = f'{stype.name}<{", ".join(stype.parameters)}>'
+        else:
+            full_type_name = stype.name
+        ctx.out.write(f"export type {full_type_name} = {base_type}{{")
+        ctx.out.write("\n")
+        for prop in stype.properties.values():
+            ref_type = refer_to(ctx, prop.spec_type)
+            prop_name = ts_name(prop.name, prop.name_case)
+            if prop.has_default and not prop.parse_require:
+                # For now, we'll assume the generated types with defaults are meant as
+                # arguments, thus treat like extant==missing
+                # IMPROVE: if we can decide they are meant as output instead, then
+                # they should be marked as required
+                ctx.out.write(f"{INDENT}{prop_name}?: {ref_type}")
+            elif prop.extant == builder.PropertyExtant.missing:
+                # Unlike optional below, missing does not imply null is possible. They
+                # treated distinctly.
+                ctx.out.write(f"{INDENT}{prop_name}?: {ref_type}")
+            elif prop.extant == builder.PropertyExtant.optional:
+                # Need to add in |null since Python side can produce null's right now
+                # IMPROVE: It would be better if the serializer could instead omit the None's
+                # Dropping the null should be forward compatible
+                ctx.out.write(f"{INDENT}{prop_name}?: {ref_type} | null")
+            else:
+                ctx.out.write(f"{INDENT}{prop_name}: {ref_type}")
+            ctx.out.write("\n")
+        ctx.out.write("}\n")
+
+
+def refer_to(ctx: EmitTypescriptContext, stype: builder.SpecType) -> str:
+    return refer_to_impl(ctx, stype)[0]
+
+
+def refer_to_impl(
+    ctx: EmitTypescriptContext, stype: builder.SpecType
+) -> tuple[str, bool]:
+    """
+    @return (string-specific, multiple-types)
+    """
+    if isinstance(stype, builder.SpecTypeInstance):
+        if stype.defn_type.name == builder.BaseTypeName.s_list:
+            spec, multi = refer_to_impl(ctx, stype.parameters[0])
+            return f"({spec})[]" if multi else f"{spec}[]", False
+        if stype.defn_type.name == builder.BaseTypeName.s_readonly_array:
+            spec, multi = refer_to_impl(ctx, stype.parameters[0])
+            return f"readonly ({spec})[]" if multi else f"readonly {spec}[]", False
+        if stype.defn_type.name == builder.BaseTypeName.s_union:
+            return (
+                f'({" | ".join([refer_to(ctx, p) for p in stype.parameters])})',
+                False,
+            )
+        if stype.defn_type.name == builder.BaseTypeName.s_literal:
+            parts = []
+            for parameter in stype.parameters:
+                assert isinstance(parameter, builder.SpecTypeLiteralWrapper)
+                parts.append(refer_to(ctx, parameter))
+            return f'({" | ".join(parts)})', False
+        if stype.defn_type.name == builder.BaseTypeName.s_optional:
+            return f"{refer_to(ctx, stype.parameters[0])} | null", True
+        if stype.defn_type.name == builder.BaseTypeName.s_tuple:
+            return f"[{", ".join([refer_to(ctx, p) for p in stype.parameters])}]", False
+        params = ", ".join([refer_to(ctx, p) for p in stype.parameters])
+        return f"{refer_to(ctx, stype.defn_type)}<{params}>", False
+
+    if isinstance(stype, builder.SpecTypeLiteralWrapper):
+        return emit_value_ts(ctx, stype.value_type, stype.value), False
+
+    if isinstance(stype, builder.SpecTypeGenericParameter):
+        return stype.name, False
+
+    assert isinstance(stype, builder.SpecTypeDefn)
+    if stype.is_base:  # assume correct namespace
+        if stype.name == builder.BaseTypeName.s_list:
+            return "any[]", False  # TODO: generic type
+        return base_name_map[builder.BaseTypeName(stype.name)], False
+
+    if stype.namespace == ctx.namespace:
+        return stype.name, False
+
+    ctx.namespaces.add(stype.namespace)
+    return f"{resolve_namespace_ref(stype.namespace)}.{stype.name}", False
+
+
+def ts_enum_name(name: str, name_case: builder.NameCase) -> str:
+    if name_case == builder.NameCase.js_upper:
+        return name.upper()
+    return ts_name(name, name_case)
+
+
+def resolve_namespace_name(namespace: builder.SpecNamespace) -> str:
+    return namespace.name
+
+
+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

uncountable/integration/queue_runner/worker.py

@@ -86,23 +86,23 @@ def run_queued_job(
             profile_metadata=job_details.profile_metadata,
             job_definition=job_details.job_definition,
         )
-        client = construct_uncountable_client(
-            profile_meta=job_details.profile_metadata, job_logger=job_logger
-        )
-        batch_processor = AsyncBatchProcessor(client=client)
+        try:
+            client = construct_uncountable_client(
+                profile_meta=job_details.profile_metadata, job_logger=job_logger
+            )
+            batch_processor = AsyncBatchProcessor(client=client)
 
-        payload = _resolve_queued_job_payload(queued_job)
+            payload = _resolve_queued_job_payload(queued_job)
 
-        args = JobArguments(
-            job_definition=job_details.job_definition,
-            client=client,
-            batch_processor=batch_processor,
-            profile_metadata=job_details.profile_metadata,
-            logger=job_logger,
-            payload=payload,
-        )
+            args = JobArguments(
+                job_definition=job_details.job_definition,
+                client=client,
+                batch_processor=batch_processor,
+                profile_metadata=job_details.profile_metadata,
+                logger=job_logger,
+                payload=payload,
+            )
 
-        try:
             return execute_job(
                 args=args,
                 profile_metadata=job_details.profile_metadata,

uncountable/types/api/entity/create_entities.py

@@ -41,7 +41,7 @@ class EntityToCreate:
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
     definition_id: base_t.ObjectId
-    entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.OUTPUT]]
+    entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.CONDITION_PARAMETER], typing.Literal[entity_t.EntityType.OUTPUT]]
     entities_to_create: list[EntityToCreate]
 
 

uncountable/types/api/entity/create_entity.py

@@ -44,7 +44,7 @@ class EntityFieldInitialValue:
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
     definition_id: base_t.ObjectId
-    entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.OUTPUT]]
+    entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.CONDITION_PARAMETER], typing.Literal[entity_t.EntityType.OUTPUT]]
     field_values: typing.Optional[typing.Optional[list[field_values_t.FieldRefNameValue]]] = None
 
 

uncountable/types/client_base.py

@@ -257,7 +257,7 @@ class ClientMethods(ABC):
         self,
         *,
         definition_id: base_t.ObjectId,
-        entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.OUTPUT]],
+        entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.CONDITION_PARAMETER], typing.Literal[entity_t.EntityType.OUTPUT]],
         entities_to_create: list[create_entities_t.EntityToCreate],
     ) -> create_entities_t.Data:
         """Creates new Uncountable entities
@@ -282,7 +282,7 @@ class ClientMethods(ABC):
         self,
         *,
         definition_id: base_t.ObjectId,
-        entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.OUTPUT]],
+        entity_type: typing.Union[typing.Literal[entity_t.EntityType.LAB_REQUEST], typing.Literal[entity_t.EntityType.APPROVAL], typing.Literal[entity_t.EntityType.CUSTOM_ENTITY], typing.Literal[entity_t.EntityType.INVENTORY_AMOUNT], typing.Literal[entity_t.EntityType.TASK], typing.Literal[entity_t.EntityType.PROJECT], typing.Literal[entity_t.EntityType.EQUIPMENT], typing.Literal[entity_t.EntityType.INV_LOCAL_LOCATIONS], typing.Literal[entity_t.EntityType.FIELD_OPTION_SET], typing.Literal[entity_t.EntityType.WEBHOOK], typing.Literal[entity_t.EntityType.SPECS], typing.Literal[entity_t.EntityType.GOAL], typing.Literal[entity_t.EntityType.INGREDIENT_TAG_MAP], typing.Literal[entity_t.EntityType.INGREDIENT_TAG], typing.Literal[entity_t.EntityType.CONDITION_PARAMETER], typing.Literal[entity_t.EntityType.OUTPUT]],
         field_values: typing.Optional[typing.Optional[list[field_values_t.FieldRefNameValue]]] = None,
     ) -> create_entity_t.Data:
         """Creates a new Uncountable entity