UncountablePythonSDK 0.0.127__tar.gz → 0.0.129__tar.gz

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/.github/workflows/documentation.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
       - uses: extractions/setup-crate@4993624604c307fbca528d28a3c8b60fa5ecc859 # v1
         with:
           repo: casey/just@0.10

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.127
+Version: 0.0.129
 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.127 → uncountablepythonsdk-0.0.129}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.127
+Version: 0.0.129
 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.127 → uncountablepythonsdk-0.0.129}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ examples/integration-server/jobs/materials_auto/concurrent_cron.py
 examples/integration-server/jobs/materials_auto/example_cron.py
 examples/integration-server/jobs/materials_auto/example_http.py
 examples/integration-server/jobs/materials_auto/example_instrument.py
+examples/integration-server/jobs/materials_auto/example_parse.py
 examples/integration-server/jobs/materials_auto/example_predictions.py
 examples/integration-server/jobs/materials_auto/example_runsheet_wh.py
 examples/integration-server/jobs/materials_auto/example_wh.py
@@ -81,6 +82,7 @@ pkgs/strenum_compat/strenum_compat.py
 pkgs/type_spec/__init__.py
 pkgs/type_spec/__main__.py
 pkgs/type_spec/builder.py
+pkgs/type_spec/builder_types.py
 pkgs/type_spec/config.py
 pkgs/type_spec/cross_output_links.py
 pkgs/type_spec/emit_io_ts.py
@@ -267,6 +269,7 @@ uncountable/types/api/entity/create_or_update_entity.py
 uncountable/types/api/entity/export_entities.py
 uncountable/types/api/entity/get_entities_data.py
 uncountable/types/api/entity/grant_entity_permissions.py
+uncountable/types/api/entity/list_aggregate.py
 uncountable/types/api/entity/list_entities.py
 uncountable/types/api/entity/lock_entity.py
 uncountable/types/api/entity/lookup_entity.py

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/examples/integration-server/jobs/materials_auto/example_instrument.py

@@ -3,8 +3,6 @@ import time
 from dataclasses import dataclass
 from decimal import Decimal
 
-from pkgs.argument_parser.argument_parser import CachedParser
-from pkgs.serialization_util import serialize_for_api
 from uncountable.integration.job import JobArguments, WebhookJob, register_job
 from uncountable.types import (
     base_t,
@@ -16,6 +14,9 @@ from uncountable.types.integration_session_t import IntegrationSessionInstrument
 from websockets.sync.client import connect
 from websockets.typing import Data
 
+from pkgs.argument_parser.argument_parser import CachedParser
+from pkgs.serialization_util import serialize_for_api
+
 
 @dataclass(kw_only=True)
 class InstrumentPayload:
@@ -34,7 +35,7 @@ class InstrumentExample(WebhookJob[InstrumentPayload]):
         def parse_message(message: Data) -> sockets_t.SocketEventData | None:
             try:
                 return parser.parse_api(json.loads(message)).data
-            except ValueError as e:
+            except ValueError:
                 return None
 
         integration_session = IntegrationSessionInstrument(

uncountablepythonsdk-0.0.129/examples/integration-server/jobs/materials_auto/example_parse.py

@@ -0,0 +1,130 @@
+from dataclasses import dataclass
+from decimal import Decimal
+
+from uncountable.integration.job import JobArguments, WebhookJob, register_job
+from uncountable.types import (
+    base_t,
+    entity_t,
+    generic_upload_t,
+    identifier_t,
+    job_definition_t,
+    notifications_t,
+    uploader_t,
+)
+
+
+@dataclass(kw_only=True)
+class ParsePayload:
+    async_job_id: base_t.ObjectId
+
+
+@register_job
+class ParseExample(WebhookJob[ParsePayload]):
+    def run(
+        self, args: JobArguments, payload: ParsePayload
+    ) -> job_definition_t.JobResult:
+        dummy_parsed_file_data: list[uploader_t.ParsedFileData] = [
+            uploader_t.ParsedFileData(
+                file_name="my_file_to_upload.xlsx",
+                file_structures=[
+                    uploader_t.DataChannel(
+                        type=uploader_t.StructureElementType.CHANNEL,
+                        channel=uploader_t.TextChannelData(
+                            name="column1",
+                            type=uploader_t.ChannelType.TEXT_CHANNEL,
+                            data=[
+                                uploader_t.StringValue(value="value1"),
+                                uploader_t.StringValue(value="value4"),
+                                uploader_t.StringValue(value="value7"),
+                            ],
+                        ),
+                    ),
+                    uploader_t.DataChannel(
+                        type=uploader_t.StructureElementType.CHANNEL,
+                        channel=uploader_t.TextChannelData(
+                            name="column2",
+                            type=uploader_t.ChannelType.TEXT_CHANNEL,
+                            data=[
+                                uploader_t.StringValue(value="value2"),
+                                uploader_t.StringValue(value="value5"),
+                                uploader_t.StringValue(value="value8"),
+                            ],
+                        ),
+                    ),
+                    uploader_t.DataChannel(
+                        type=uploader_t.StructureElementType.CHANNEL,
+                        channel=uploader_t.TextChannelData(
+                            name="column3",
+                            type=uploader_t.ChannelType.TEXT_CHANNEL,
+                            data=[
+                                uploader_t.StringValue(value="value3"),
+                                uploader_t.StringValue(value="value6"),
+                                uploader_t.StringValue(value="value9"),
+                            ],
+                        ),
+                    ),
+                    uploader_t.HeaderEntry(
+                        type=uploader_t.StructureElementType.HEADER,
+                        value=uploader_t.TextHeaderData(
+                            name="file_source",
+                            type=uploader_t.HeaderType.TEXT_HEADER,
+                            data=uploader_t.StringValue(value="my_file_to_upload.xlsx"),
+                        ),
+                    ),
+                    uploader_t.HeaderEntry(
+                        type=uploader_t.StructureElementType.HEADER,
+                        value=uploader_t.NumericHeaderData(
+                            name="file structure number",
+                            data=uploader_t.DecimalValue(value=Decimal(99)),
+                        ),
+                    ),
+                ],
+            )
+        ]
+
+        user_id: base_t.ObjectId | None = None
+        recipe_id: base_t.ObjectId | None = None
+        data = args.client.get_entities_data(
+            entity_ids=[payload.async_job_id], entity_type=entity_t.EntityType.ASYNC_JOB
+        )
+        for field_value in data.entity_details[0].field_values:
+            if field_value.field_ref_name == "core_async_job_jobData":
+                assert isinstance(field_value.value, dict)
+                assert isinstance(field_value.value["user_id"], int)
+                user_id = field_value.value["user_id"]
+            if (
+                field_value.field_ref_name
+                == "unc_async_job_custom_parser_recipe_ids_in_view"
+            ):
+                assert isinstance(field_value.value, list)
+                assert isinstance(field_value.value[0], int)
+                recipe_id = field_value.value[0]
+
+        assert user_id is not None
+        assert recipe_id is not None
+
+        complete_async_parse_req = args.batch_processor.complete_async_parse(
+            parsed_file_data=dummy_parsed_file_data,
+            async_job_key=identifier_t.IdentifierKeyId(id=payload.async_job_id),
+            upload_destination=generic_upload_t.UploadDestinationRecipe(
+                recipe_key=identifier_t.IdentifierKeyId(id=recipe_id)
+            ),
+        )
+
+        args.batch_processor.push_notification(
+            depends_on=[complete_async_parse_req.batch_reference],
+            notification_targets=[
+                notifications_t.NotificationTargetUser(
+                    user_key=identifier_t.IdentifierKeyId(id=user_id)
+                )
+            ],
+            subject="Upload complete",
+            message="Your file has been uploaded",
+            display_notice=True,
+        )
+
+        return job_definition_t.JobResult(success=True)
+
+    @property
+    def webhook_payload_type(self) -> type:
+        return ParsePayload

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/examples/integration-server/jobs/materials_auto/example_predictions.py

@@ -1,6 +1,6 @@
 import random
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import UTC, datetime
 from decimal import Decimal
 
 from uncountable.integration.job import JobArguments, WebhookJob, register_job
@@ -25,7 +25,7 @@ class PredictionsExample(WebhookJob[PredictionsPayload]):
         self, args: JobArguments, payload: PredictionsPayload
     ) -> job_definition_t.JobResult:
         recipe_data = args.client.get_recipes_data(recipe_ids=payload.recipe_ids)
-        formatted_datetime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        formatted_datetime = datetime.now(UTC).strftime("%Y-%m-%d %H:%M:%S")
 
         for recipe in recipe_data.recipes:
             test_sample_name = f"Predictions Model ({formatted_datetime})"

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/examples/integration-server/jobs/materials_auto/example_runsheet_wh.py

@@ -2,7 +2,7 @@ from io import BytesIO
 
 from uncountable.core.file_upload import DataFileUpload, FileUpload
 from uncountable.integration.job import JobArguments, RunsheetWebhookJob, register_job
-from uncountable.types import entity_t
+from uncountable.types import webhook_job_t
 
 
 @register_job
@@ -11,8 +11,9 @@ class StandardRunsheetGenerator(RunsheetWebhookJob):
         self,
         *,
         args: JobArguments,
-        entities: list[entity_t.Entity],
+        payload: webhook_job_t.RunsheetWebhookPayload,
     ) -> FileUpload:
+        entities = payload.entities
         args.logger.log_info(f"Generating runsheet for {len(entities)} entities")
 
         content = []

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/examples/integration-server/jobs/materials_auto/profile.yaml

@@ -93,3 +93,12 @@ jobs:
     executor:
       type: script
       import_path: example_predictions
+  - id: example_parse
+    type: webhook
+    name: Webhook Parse
+    signature_key_secret:
+      type: env
+      env_key: WH_PARSE_SIGNATURE_KEY
+    executor:
+      type: script
+      import_path: example_parse

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/examples/integration-server/pyproject.toml

@@ -115,7 +115,6 @@ lint.ignore = [
     "PD010", # .pivottable.  Should add
     "PD011", # use .to_numpy.  Skip
     "PD015", # use .merge.  Should add
-    "PD901", # avoid generic df name.  Skip
     "PERF203", # avoid try except in loop. Skip
     "PERF401", # use list comprehension. Skip
     "PERF402", # use list.copy.  Skip
@@ -213,6 +212,7 @@ exclude = [
 
 [tool.ruff.lint.isort]
 split-on-trailing-comma = true
+known-first-party = ["pkgs"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 130 # goal would be to bring this down to ~50 or so

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/serialization_util/serialization_helpers.py

@@ -85,7 +85,9 @@ def _serialize_dataclass(d: Any) -> dict[str, JsonValue]:
 
 
 def _to_string_value(value: Any) -> str:
-    assert isinstance(value, (Decimal, int))
+    assert isinstance(value, (Decimal, int)), (
+        f"Expecting decimal or int, received: {value} (type={type(value)})"
+    )
     return str(value)
 
 

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/builder.py

@@ -13,7 +13,7 @@ from enum import Enum, StrEnum, auto
 from typing import Any, Self
 
 from . import util
-from .cross_output_links import CrossOutputPaths
+from .builder_types import CrossOutputPaths
 from .non_discriminated_union_exceptions import NON_DISCRIMINATED_UNION_EXCEPTIONS
 from .util import parse_type_str
 
@@ -1101,7 +1101,7 @@ def _parse_const(
         elif const_type.defn_type.name == BaseTypeName.s_dict:
             assert isinstance(value, dict)
             builder.ensure(
-                len(const_type.parameters) == 2, "constant-dict-expects-one-type"
+                len(const_type.parameters) == 2, "constant-dict-expects-two-types"
             )
             key_type = const_type.parameters[0]
             value_type = const_type.parameters[1]
@@ -1150,6 +1150,11 @@ def _parse_const(
             )
             return value
 
+        if not const_type.is_base:
+            # IMPROVE: validate the object type properties before emission stage
+            builder.ensure(isinstance(value, dict), "invalid value for object constant")
+            return value
+
     raise Exception("unsupported-const-scalar-type", const_type)
 
 
@@ -1271,7 +1276,8 @@ class SpecNamespace:
 
             assert util.is_valid_type_name(name), f"{name} is not a valid type name"
             assert name not in self.types, f"{name} is duplicate"
-            defn_type = defn["type"]
+            defn_type = defn.get("type")
+            assert isinstance(defn_type, str), f"{name} requires a string type"
             spec_type: SpecTypeDefn
             if defn_type == DefnTypeName.s_alias:
                 spec_type = SpecTypeDefnAlias(self, name)

uncountablepythonsdk-0.0.129/pkgs/type_spec/builder_types.py

@@ -0,0 +1,9 @@
+from dataclasses import dataclass
+
+
+@dataclass(kw_only=True, frozen=True)
+class CrossOutputPaths:
+    python_types_output: str
+    typescript_types_output: str
+    typescript_routes_output_by_endpoint: dict[str, str]
+    typespec_files_input: list[str]

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/cross_output_links.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import os
-from dataclasses import dataclass
 
-from pkgs.type_spec import builder
+from . import builder
+from .builder_types import CrossOutputPaths
 
 
 def get_python_stub_file_path(
@@ -17,14 +17,6 @@ def get_python_stub_file_path(
     return api_stub_file
 
 
-@dataclass(kw_only=True, frozen=True)
-class CrossOutputPaths:
-    python_types_output: str
-    typescript_types_output: str
-    typescript_routes_output_by_endpoint: dict[str, str]
-    typespec_files_input: list[str]
-
-
 def get_python_api_file_path(
     cross_output_paths: CrossOutputPaths,
     namespace: builder.SpecNamespace,

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/emit_open_api.py

@@ -610,18 +610,6 @@ def _emit_type(
     ctx.types[stype.name] = final_type
 
 
-def _emit_constant(ctx: EmitOpenAPIContext, sconst: builder.SpecConstant) -> None:
-    if sconst.value_type.is_base_type(builder.BaseTypeName.s_string):
-        value = util.encode_common_string(cast(str, sconst.value))
-    elif sconst.value_type.is_base_type(builder.BaseTypeName.s_integer):
-        value = str(sconst.value)
-    else:
-        raise Exception("invalid constant type", sconst.name)
-
-    const_name = sconst.name.upper()
-    print("_emit_constant", value, const_name)
-
-
 def _emit_endpoint(
     gctx: EmitOpenAPIGlobalContext,
     ctx: EmitOpenAPIContext,

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/emit_python.py

@@ -35,6 +35,11 @@ QUEUED_BATCH_REQUEST_STYPE = builder.SpecTypeDefnObject(
     namespace=ASYNC_BATCH_TYPE_NAMESPACE, name="QueuedAsyncBatchRequest"
 )
 
+CLIENT_CONFIG_TYPE_NAMESPACE = builder.SpecNamespace(name="client_config")
+REQUEST_OPTIONS_STYPE = builder.SpecTypeDefnObject(
+    namespace=CLIENT_CONFIG_TYPE_NAMESPACE, name="RequestOptions"
+)
+
 
 @dataclasses.dataclass(kw_only=True)
 class TrackingContext:
@@ -117,26 +122,36 @@ def _check_type_match(stype: builder.SpecType, value: Any) -> bool:
     raise Exception("invalid type", stype, value)
 
 
-def _emit_value(ctx: TrackingContext, stype: builder.SpecType, value: Any) -> str:
+def _emit_value(
+    ctx: TrackingContext, stype: builder.SpecType, value: Any, indent: int = 0
+) -> str:
     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)
+        assert isinstance(value, str), (
+            f"Expected str value for {stype.name} but got {value}"
+        )
         return util.encode_common_string(value)
     elif stype.is_base_type(builder.BaseTypeName.s_integer):
-        assert isinstance(value, int)
+        assert isinstance(value, int), (
+            f"Expected int value for {stype.name} but got {value}"
+        )
         return str(value)
     elif stype.is_base_type(builder.BaseTypeName.s_boolean):
-        assert isinstance(value, bool)
+        assert isinstance(value, bool), (
+            f"Expected bool value for {stype.name} but got {value}"
+        )
         return "True" if value else "False"
     elif stype.is_base_type(builder.BaseTypeName.s_decimal) or stype.is_base_type(
         builder.BaseTypeName.s_lossy_decimal
     ):
         # Note that decimal requires the `!decimal 123.12` style notation in the YAML
         # file since PyYaml parses numbers as float, unfortuantely
-        assert isinstance(value, (Decimal, int))
+        assert isinstance(value, (Decimal, int)), (
+            f"Expected decimal value for {stype.name} but got {value} (type: {type(value)})"
+        )
         if isinstance(value, int):
             # skip quotes for integers
             return f"Decimal({value})"
@@ -151,14 +166,14 @@ def _emit_value(ctx: TrackingContext, stype: builder.SpecType, value: Any) -> st
             key_type = stype.parameters[0]
             value_type = stype.parameters[1]
             return (
-                "{\n    "
-                + ",\n    ".join(
+                f"{{\n{INDENT * (indent + 1)}"
+                + f",\n{INDENT * (indent + 1)}".join(
                     _emit_value(ctx, key_type, dkey)
                     + ": "
-                    + _emit_value(ctx, value_type, dvalue)
+                    + _emit_value(ctx, value_type, dvalue, indent=indent + 1)
                     for dkey, dvalue in value.items()
                 )
-                + "\n}"
+                + f"\n{INDENT * indent}}}"
             )
 
         if stype.defn_type.is_base_type(builder.BaseTypeName.s_optional):
@@ -184,6 +199,34 @@ def _emit_value(ctx: TrackingContext, stype: builder.SpecType, value: Any) -> st
         return f"{refer_to(ctx, stype)}.{_resolve_enum_name(value, stype.name_case)}"
     elif isinstance(stype, builder.SpecTypeDefnAlias):
         return _emit_value(ctx, stype.alias, value)
+    elif isinstance(stype, builder.SpecTypeDefnObject):
+        assert isinstance(value, dict), (
+            f"Expected dict value for {stype.name} but got {value}"
+        )
+        if not stype.is_hashable:
+            raise Exception("invalid constant object type, non-hashable", value, stype)
+        obj_out = f"{refer_to(ctx, stype)}("
+        emitted_fields: set[str] = set()
+        for prop_name, prop in (stype.properties or {}).items():
+            if prop_name not in value:
+                continue
+            else:
+                value_to_emit = value[prop_name]
+            emitted_fields.add(prop_name)
+            py_name = python_field_name(prop.name, prop.name_case)
+            obj_out += f"\n{INDENT * (indent + 1)}{py_name}={_emit_value(ctx, prop.spec_type, value_to_emit, indent=indent + 1)},"
+        whitespace = f"\n{INDENT * indent}" if len(emitted_fields) > 0 else ""
+        obj_out += f"{whitespace})"
+
+        if emitted_fields != set(value.keys()):
+            raise Exception(
+                "invalid object type, extra fields found:",
+                value,
+                stype,
+                set(value.keys()) - emitted_fields,
+            )
+
+        return obj_out
 
     raise Exception("invalid constant type", value, stype)
 
@@ -471,6 +514,19 @@ def _emit_endpoint_invocation_function_signature(
         else []
     ) + (extra_params if extra_params is not None else [])
 
+    request_options_property = builder.SpecProperty(
+        name="_request_options",
+        label="_request_options",
+        spec_type=REQUEST_OPTIONS_STYPE,
+        extant=builder.PropertyExtant.optional,
+        convert_value=builder.PropertyConvertValue.auto,
+        name_case=builder.NameCase.convert,
+        default=None,
+        has_default=True,
+        desc=None,
+    )
+    all_arguments.append(request_options_property)
+
     # All endpoints share a function name
     function = endpoint.path_per_api_endpoint[endpoint.default_endpoint_key].function
     assert function is not None
@@ -641,6 +697,7 @@ def _emit_endpoint_invocation_function(
             method={refer_to(ctx=ctx, stype=endpoint_method_stype)},
             endpoint={refer_to(ctx=ctx, stype=endpoint_path_stype)},
             args=args,
+            request_options=_request_options,
         )
         return self.do_request(api_request=api_request, return_type={refer_to(ctx=ctx, stype=data_type)})"""
     )
@@ -1396,7 +1453,7 @@ CLIENT_CLASS_IMPORTS = [
     "import dataclasses",
 ]
 ASYNC_BATCH_PROCESSOR_FILENAME = "async_batch_processor"
-ASYNC_BATCH_PROCESSOR_IMPORTS = [
+ASYNC_BATCH_PROCESSOR_BASE_IMPORTS = [
     "import uuid",
     "from abc import ABC, abstractmethod",
     "from pkgs.serialization_util import serialize_for_api",
@@ -1434,8 +1491,11 @@ def _emit_async_batch_processor(
         config=config,
     )
 
+    imports = ASYNC_BATCH_PROCESSOR_BASE_IMPORTS.copy()
+    if ctx.use_dataclass:
+        imports.append("import dataclasses")
     async_batch_processor_out.write(
-        f"""{LINE_BREAK.join(ASYNC_BATCH_PROCESSOR_IMPORTS)}
+        f"""{LINE_BREAK.join(imports)}
 
 
 class AsyncBatchProcessorBase(ABC):
@@ -1498,6 +1558,7 @@ class APIRequest:
     method: str
     endpoint: str
     args: typing.Any
+    request_options: {refer_to(ctx=ctx, stype=REQUEST_OPTIONS_STYPE)} | None = None
 
 
 class ClientMethods(ABC):

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/emit_typescript_util.py

@@ -3,7 +3,7 @@ import typing
 from dataclasses import dataclass, field
 
 from . import builder, util
-from .cross_output_links import CrossOutputPaths
+from .builder_types import CrossOutputPaths
 
 INDENT = "  "
 
@@ -51,7 +51,10 @@ def ts_name(name: str, name_case: builder.NameCase) -> str:
 
 
 def emit_value_ts(
-    ctx: EmitTypescriptContext, stype: builder.SpecType, value: typing.Any
+    ctx: EmitTypescriptContext,
+    stype: builder.SpecType,
+    value: typing.Any,
+    indent: int = 0,
 ) -> str:
     """Mimics emit_python even if not all types are used in TypeScript yet"""
     literal = builder.unwrap_literal_type(stype)
@@ -88,17 +91,17 @@ def emit_value_ts(
                 raise Exception("invalid dict keys -- dict keys must be string or enum")
 
             return (
-                "{\n\t"
-                + ",\n\t".join(
+                f"{{\n{INDENT * (indent + 1)}"
+                + f",\n{INDENT * (indent + 1)}".join(
                     (
                         f"[{emit_value_ts(ctx, key_type, dkey)}]: "
                         if not key_type.is_base_type(builder.BaseTypeName.s_string)
                         else f"{dkey}: "
                     )
-                    + emit_value_ts(ctx, value_type, dvalue)
+                    + emit_value_ts(ctx, value_type, dvalue, indent=indent + 1)
                     for dkey, dvalue in value.items()
                 )
-                + "\n}"
+                + f"\n{INDENT * (indent)}}}"
             )
 
         if stype.defn_type.is_base_type(builder.BaseTypeName.s_optional):
@@ -109,6 +112,25 @@ def emit_value_ts(
 
     elif isinstance(stype, builder.SpecTypeDefnStringEnum):
         return f"{refer_to(ctx, stype)}.{ts_enum_name(value, stype.name_case)}"
+    elif isinstance(stype, builder.SpecTypeDefnObject):
+        assert isinstance(value, dict), (
+            f"Expected dict value for {stype.name} but got {value}"
+        )
+        obj_out = "{"
+        did_emit = False
+        for prop_name, prop in (stype.properties or {}).items():
+            if prop_name not in value and prop.has_default:
+                value_to_emit = prop.default
+            elif prop_name not in value:
+                continue
+            else:
+                value_to_emit = value[prop_name]
+            did_emit = True
+            typescript_name = ts_name(prop.name, prop.name_case)
+            obj_out += f"\n{INDENT * (indent + 1)}{typescript_name}: {emit_value_ts(ctx, prop.spec_type, value_to_emit, indent=indent + 1)},"
+        whitespace = f"\n{INDENT * indent}" if did_emit else ""
+        obj_out += f"{whitespace}}} as const"
+        return obj_out
 
     raise Exception("invalid constant type", value, stype, type(stype))
 

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/load_types.py

@@ -7,8 +7,8 @@ from shelljob import fs
 from pkgs.serialization import yaml
 
 from .builder import SpecBuilder
+from .builder_types import CrossOutputPaths
 from .config import Config
-from .cross_output_links import CrossOutputPaths
 
 ext_map = {
     ".ts": "typescript",

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.129}/pkgs/type_spec/type_info/emit_type_info.py

@@ -171,9 +171,16 @@ class MapTypeAlias(MapTypeBase):
     discriminator: str | None
 
 
+@dataclasses.dataclass
+class StringEnumValue:
+    value: str
+    label: str
+    deprecated: bool = False
+
+
 @dataclasses.dataclass
 class MapStringEnum(MapTypeBase):
-    values: dict[str, str]
+    values: dict[str, StringEnumValue]
 
 
 MapType = MapTypeObject | MapTypeAlias | MapStringEnum
@@ -436,7 +443,11 @@ def _build_map_type(
             # IMPROVE: We probably want the label here, but this requires a change
             # to the front-end type-info and form code to handle
             values={
-                entry.value: (entry.label or entry.name)
+                entry.value: StringEnumValue(
+                    value=entry.value,
+                    label=entry.label or entry.name,
+                    deprecated=entry.deprecated,
+                )
                 for entry in stype.values.values()
             },
         )