UncountablePythonSDK 0.0.33__tar.gz → 0.0.34__tar.gz

{uncountablepythonsdk-0.0.33/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.34}/PKG-INFO

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

{uncountablepythonsdk-0.0.33 → uncountablepythonsdk-0.0.34/UncountablePythonSDK.egg-info}/PKG-INFO

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

{uncountablepythonsdk-0.0.33 → uncountablepythonsdk-0.0.34}/pkgs/serialization_util/serialization_helpers.py

@@ -1,5 +1,7 @@
+import dataclasses
 import datetime
 import enum
+import functools
 from collections.abc import Callable, Mapping, Sequence
 from decimal import Decimal
 from typing import (
@@ -12,6 +14,11 @@ from typing import (
     overload,
 )
 
+try:
+    import flask
+except Exception:
+    pass
+
 from pkgs.argument_parser import snake_to_camel_case
 from pkgs.serialization import (
     MISSING_SENTRY,
@@ -42,10 +49,26 @@ def identity(x: T) -> T:
 def key_convert_to_camelcase(o: Any) -> str:
     if isinstance(o, OpaqueKey):
         return o
+    if isinstance(o, enum.StrEnum):
+        return o.value
     if isinstance(o, enum.Enum):
+        try:
+            print(
+                "DEPRECATED_SERIALIZATION--non-string-enum-used-as-key",
+                flask.request.path,
+            )
+        except Exception:
+            pass
         return o.value  # type: ignore[no-any-return]
     if isinstance(o, str):
         return snake_to_camel_case(o)
+    if isinstance(o, int):
+        # temporary bypass to maintain behavior
+        return o  # type: ignore[return-value]
+    try:
+        print("DEPRECATED_SERIALIZATION--non-string-used-as-key", o, flask.request.path)
+    except Exception:
+        pass
     return o  # type: ignore[no-any-return]
 
 
@@ -61,30 +84,73 @@ def _serialize_dict(d: dict[str, Any]) -> dict[str, JsonValue]:
     return {k: serialize_for_storage(v) for k, v in d.items() if v != MISSING_SENTRY}
 
 
-def _convert_dataclass(d: Dataclass) -> dict[str, JsonValue]:
-    dct = type(d)
-    scd = get_serial_class_data(dct)
+def _to_string_value(value: Any) -> str:
+    assert isinstance(value, (Decimal, int))
+    return str(value)
+
+
+@dataclasses.dataclass(kw_only=True)
+class DataclassConversions:
+    key_conversions: dict[str, str]
+    value_conversion_functions: dict[str, Callable[[Any], JsonValue]]
+
+
+@functools.lru_cache(maxsize=10000)
+def _get_dataclass_conversion_lookups(dataclass_type: Any) -> DataclassConversions:
+    scd = get_serial_class_data(dataclass_type)
 
-    def key_convert(key: str) -> str:
+    key_conversions: dict[str, str] = {}
+    value_conversion_functions: dict[str, Callable[[Any], JsonValue]] = {}
+
+    for field in dataclasses.fields(dataclass_type):
+        key = field.name
         if scd.has_unconverted_key(key):
-            return key
-        return key_convert_to_camelcase(key)
+            key_conversions[key] = key
+        else:
+            key_conversions[key] = key_convert_to_camelcase(key)
 
-    def value_convert(key: str, value: Any) -> JsonValue:
         if scd.has_to_string_value(key):
-            # Limit to types we know we need to support to avoid surprises
-            # Generics, like List/Dict would need to be per-value stringified
-            assert isinstance(value, (Decimal, int))
-            return str(value)
-        if scd.has_unconverted_value(key):
-            return value  # type: ignore[no-any-return]
-        return serialize_for_api(value)  # type: ignore[no-any-return,unused-ignore]
-
-    return {
-        key_convert(k): (value_convert(k, v) if v is not None else None)
-        for k, v in d.__dict__.items()
-        if v != MISSING_SENTRY
-    }
+            value_conversion_functions[key] = _to_string_value
+        elif scd.has_unconverted_value(key):
+            value_conversion_functions[key] = identity
+        else:
+            value_conversion_functions[key] = serialize_for_api
+
+    return DataclassConversions(
+        key_conversions=key_conversions,
+        value_conversion_functions=value_conversion_functions,
+    )
+
+
+def _convert_dataclass(d: Any) -> dict[str, JsonValue]:
+    conversions = _get_dataclass_conversion_lookups(type(d))  # type: ignore[arg-type]
+    # return {
+    #     conversions.key_conversions[k]: (
+    #         conversions.value_conversion_functions[k](v) if v is not None else None
+    #     )
+    #     for k, v in d.__dict__.items()
+    #     if v != MISSING_SENTRY
+    # }
+
+    serialized_data_class: dict[str, JsonValue] = {}
+    for k, v in d.__dict__.items():
+        if v == MISSING_SENTRY:
+            continue
+        if k not in conversions.key_conversions:
+            try:
+                print(
+                    "DEPRECATED_SERIALIZATION--missing-dataclass-key",
+                    k,
+                    flask.request.path,
+                )
+            except Exception:
+                pass
+            continue
+        serialized_data_class[conversions.key_conversions[k]] = (
+            conversions.value_conversion_functions[k](v) if v is not None else None
+        )
+
+    return serialized_data_class
 
 
 _SERIALIZATION_FUNCS_STANDARD = {

{uncountablepythonsdk-0.0.33 → uncountablepythonsdk-0.0.34}/uncountable/types/api/id_source/match_id_source.py

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

{uncountablepythonsdk-0.0.33 → uncountablepythonsdk-0.0.34}/uncountable/types/api/recipes/get_recipes_data.py

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