UncountablePythonSDK 0.0.109__tar.gz → 0.0.110__tar.gz

{uncountablepythonsdk-0.0.109/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.110}/PKG-INFO

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

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

@@ -159,6 +159,8 @@ uncountable/types/client_config.py
 uncountable/types/client_config_t.py
 uncountable/types/curves.py
 uncountable/types/curves_t.py
+uncountable/types/data.py
+uncountable/types/data_t.py
 uncountable/types/entity.py
 uncountable/types/entity_t.py
 uncountable/types/experiment_groups.py

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/pkgs/type_spec/emit_open_api.py

@@ -7,6 +7,7 @@ WORK-IN-PROGRESS, DON'T USE!
 import dataclasses
 import json
 import re
+from enum import StrEnum
 from typing import Collection, assert_never, cast
 
 from pkgs.serialization import yaml
@@ -62,6 +63,10 @@ base_name_map = {
 }
 
 
+class OpenAPIDefaultBehavior(StrEnum):
+    OPTIONAL_WITH_DEFAULT = "optional_with_default"
+
+
 def _rewrite_with_notice(
     file_path: str, file_content: str, *, notice: str = MODIFY_NOTICE
 ) -> bool:
@@ -432,6 +437,18 @@ def _emit_namespace(
     _rewrite_with_notice(path, yaml.dumps(oa_namespace, sort_keys=False))
 
 
+def _get_openapi_default_behavior(
+    prop: builder.SpecProperty,
+) -> OpenAPIDefaultBehavior | None:
+    if prop.ext_info is None or prop.ext_info.get("open_api") is None:
+        return None
+    value_passed = prop.ext_info["open_api"].get("default_required_behavior")
+    if value_passed is None:
+        return None
+    assert isinstance(value_passed, str)
+    return OpenAPIDefaultBehavior(value_passed)
+
+
 def _emit_type(
     ctx: EmitOpenAPIContext,
     stype: builder.SpecType,
@@ -495,6 +512,16 @@ def _emit_type(
                 # arguments, thus treat like extant==missing
                 # IMPROVE: if we can decide they are meant as output instead, then
                 # they should be marked as required
+                openapi_default_beahvior = _get_openapi_default_behavior(prop)
+                match openapi_default_beahvior:
+                    case None:
+                        pass
+                    case OpenAPIDefaultBehavior.OPTIONAL_WITH_DEFAULT:
+                        ref_type.nullable = True
+                        assert prop.default is not None, (
+                            "optional_with_default requires default"
+                        )
+                        ref_type.default = prop.default
                 properties[prop_name] = ref_type
             elif prop.extant == builder.PropertyExtant.missing:
                 # Unlike optional below, missing does not imply null is possible. They

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/pkgs/type_spec/open_api_util.py

@@ -1,14 +1,23 @@
 from abc import ABC, abstractmethod
 from enum import StrEnum
 
+from pkgs.serialization_util import JsonValue
+
 
 class OpenAPIType(ABC):
     description: str | None = None
     nullable: bool = False
+    default: JsonValue
 
-    def __init__(self, description: str | None = None, nullable: bool = False) -> None:
+    def __init__(
+        self,
+        description: str | None = None,
+        nullable: bool = False,
+        default: JsonValue = None,
+    ) -> None:
         self.description = description
         self.nullable = nullable
+        self.default = default
 
     @abstractmethod
     def asdict(self) -> dict[str, object]:
@@ -19,6 +28,8 @@ class OpenAPIType(ABC):
             emitted["description"] = self.description
         if self.nullable:
             emitted["nullable"] = self.nullable
+        if self.default is not None:
+            emitted["default"] = self.default
         return emitted
 
 

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/pkgs/type_spec/type_info/emit_type_info.py

@@ -296,6 +296,21 @@ def _extract_and_validate_layout(
     return layout
 
 
+def _pull_property_from_type_recursively(
+    stype: builder.SpecTypeDefnObject,
+    property_name: str,
+) -> builder.SpecProperty | None:
+    assert stype.properties is not None
+    prop = stype.properties.get(property_name)
+    if prop is not None:
+        return prop
+
+    if stype.base is None:
+        return None
+
+    return _pull_property_from_type_recursively(stype.base, property_name)
+
+
 def _validate_type_ext_info(
     stype: builder.SpecTypeDefnObject,
 ) -> tuple[ExtInfoLayout | None, type_info_t.ExtInfo | None]:
@@ -306,7 +321,7 @@ def _validate_type_ext_info(
     if ext_info.label_fields is not None:
         assert stype.properties is not None
         for name in ext_info.label_fields:
-            prop = stype.properties.get(name)
+            prop = _pull_property_from_type_recursively(stype, name)
             assert prop is not None, f"missing-label-field:{name}"
 
     if not stype.is_base and isinstance(stype.base, builder.SpecTypeDefnObject):
@@ -416,6 +431,8 @@ def _parse_ext_info(in_ext: Any) -> type_info_t.ExtInfo | None:
             df["result_type"] = serialize_for_storage(converted)
             mod_ext["data_format"] = df
 
+    if "open_api" in mod_ext:
+        del mod_ext["open_api"]
     return ext_info_parser.parse_storage(mod_ext)
 
 

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/uncountable/types/__init__.py

@@ -25,6 +25,7 @@ from .api.recipes import create_recipe as create_recipe_t
 from .api.recipe_links import create_recipe_link as create_recipe_link_t
 from .api.recipes import create_recipes as create_recipes_t
 from . import curves_t as curves_t
+from . import data_t as data_t
 from .api.recipes import disassociate_recipe_as_input as disassociate_recipe_as_input_t
 from .api.files import download_file as download_file_t
 from .api.recipes import edit_recipe_inputs as edit_recipe_inputs_t
@@ -136,6 +137,7 @@ __all__: list[str] = [
     "create_recipe_link_t",
     "create_recipes_t",
     "curves_t",
+    "data_t",
     "disassociate_recipe_as_input_t",
     "download_file_t",
     "edit_recipe_inputs_t",

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/uncountable/types/api/recipes/edit_recipe_inputs.py

@@ -21,6 +21,7 @@ __all__: list[str] = [
     "Data",
     "ENDPOINT_METHOD",
     "ENDPOINT_PATH",
+    "MixStepMatchStrategy",
     "PlaceholderBase",
     "PlaceholderDisplayMode",
     "PlaceholderType",
@@ -58,6 +59,12 @@ class RecipeInputEditType(StrEnum):
     SET_PLACEHOLDER = "set_placeholder"
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+class MixStepMatchStrategy(StrEnum):
+    FIRST = "first"
+    LAST = "last"
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     named_type_path="sdk.api.recipes.edit_recipe_inputs.RecipeInputEditBase",
@@ -101,6 +108,7 @@ class RecipeInputEditInputBase(RecipeInputEditBase):
 @dataclasses.dataclass(kw_only=True)
 class RecipeInputEditChangeBasisViewed(RecipeInputEditInputBase):
     type: typing.Literal[RecipeInputEditType.CHANGE_BASIS] = RecipeInputEditType.CHANGE_BASIS
+    mix_step_match_strategy: MixStepMatchStrategy = MixStepMatchStrategy.FIRST
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -112,6 +120,7 @@ class RecipeInputEditChangeBasisViewed(RecipeInputEditInputBase):
 class RecipeInputEditUpsertInput(RecipeInputEditInputBase):
     type: typing.Literal[RecipeInputEditType.UPSERT_INPUT] = RecipeInputEditType.UPSERT_INPUT
     clear_first: bool
+    mix_step_match_strategy: MixStepMatchStrategy = MixStepMatchStrategy.FIRST
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -169,6 +178,7 @@ class RecipeInputEditUpdateAnnotations(RecipeInputEditInputBase):
     type: typing.Literal[RecipeInputEditType.UPDATE_ANNOTATIONS] = RecipeInputEditType.UPDATE_ANNOTATIONS
     clear_first: bool
     annotations: list[AnnotationEdit]
+    mix_step_match_strategy: MixStepMatchStrategy = MixStepMatchStrategy.FIRST
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -238,6 +248,7 @@ class RecipeInputEditPlaceholder(RecipeInputEditBase):
     type: typing.Literal[RecipeInputEditType.SET_PLACEHOLDER] = RecipeInputEditType.SET_PLACEHOLDER
     ingredient_key: identifier_t.IdentifierKey
     placeholder: RecipeInputPlaceholder
+    mix_step_match_strategy: MixStepMatchStrategy = MixStepMatchStrategy.FIRST
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/uncountable/types/api/recipes/set_recipe_outputs.py

@@ -10,6 +10,7 @@ from enum import StrEnum
 import dataclasses
 from pkgs.serialization import serial_class
 from ... import base_t
+from ... import data_t
 from ... import field_values_t
 from ... import recipes_t
 from ... import response_t
@@ -59,6 +60,7 @@ class RecipeOutputValue:
     value_numeric: Decimal | None = None
     value_str: str | None = None
     value_curve: CurveValues | None = None
+    value_color: data_t.RecipeOutputColor | None = None
     formatting: recipes_t.RecipeAttributeFormatting | None = None
     field_values: list[field_values_t.ArgumentValueRefName | field_values_t.ArgumentValueId] | None = None
 

{uncountablepythonsdk-0.0.109 → uncountablepythonsdk-0.0.110}/uncountable/types/async_batch_t.py

@@ -41,6 +41,7 @@ class AsyncBatchRequestPath(StrEnum):
     CREATE_OR_UPDATE_ENTITY = "entity/create_or_update_entity"
     ADD_TIME_SERIES_DATA = "recipes/add_time_series_data"
     LOOKUP_ENTITY = "entity/lookup_entity"
+    CREATE_RECIPE_LINK = "recipe_links/create_recipe_link"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.110/uncountable/types/data.py

@@ -0,0 +1,12 @@
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+# DO NOT MODIFY -- This file is generated by type_spec
+# Kept only for SDK backwards compatibility
+from .data_t import RgbColor as RgbColor
+from .data_t import CielabColor as CielabColor
+from .data_t import XyzColor as XyzColor
+from .data_t import LChColor as LChColor
+from .data_t import HslColor as HslColor
+from .data_t import RecipeOutputColor as RecipeOutputColor
+# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.110/uncountable/types/data_t.py

@@ -0,0 +1,93 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+import dataclasses
+from pkgs.serialization import serial_class
+
+__all__: list[str] = [
+    "CielabColor",
+    "HslColor",
+    "LChColor",
+    "RecipeOutputColor",
+    "RgbColor",
+    "XyzColor",
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.data.RgbColor",
+    unconverted_keys={"B", "G", "R"},
+)
+@dataclasses.dataclass(kw_only=True)
+class RgbColor:
+    R: int
+    G: int
+    B: int
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.data.CielabColor",
+    unconverted_keys={"L", "a", "b"},
+)
+@dataclasses.dataclass(kw_only=True)
+class CielabColor:
+    L: int
+    a: int
+    b: int
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.data.XyzColor",
+    unconverted_keys={"X", "Y", "Z"},
+)
+@dataclasses.dataclass(kw_only=True)
+class XyzColor:
+    X: int
+    Y: int
+    Z: int
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.data.LChColor",
+    unconverted_keys={"C", "L", "h"},
+)
+@dataclasses.dataclass(kw_only=True)
+class LChColor:
+    L: int
+    C: int
+    h: int
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.data.HslColor",
+    unconverted_keys={"L", "h", "s"},
+)
+@dataclasses.dataclass(kw_only=True)
+class HslColor:
+    h: int
+    s: int
+    L: int
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.data.RecipeOutputColor",
+    unconverted_keys={"CIELAB", "LCH", "RGB", "XYZ"},
+)
+@dataclasses.dataclass(kw_only=True)
+class RecipeOutputColor:
+    RGB: RgbColor
+    CIELAB: CielabColor
+    XYZ: XyzColor | None = None
+    LCH: LChColor | None = None
+# DO NOT MODIFY -- This file is generated by type_spec