UncountablePythonSDK 0.0.30__tar.gz → 0.0.33__tar.gz

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/.github/workflows/documentation.yml

@@ -9,9 +9,9 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
-      - uses: extractions/setup-just@v1
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
+      - uses: extractions/setup-just@dd310ad5a97d8e7b41793f8ef055398d51ad4de6 # v2
         with:
             just-version: '1.8.0'
             github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -25,7 +25,7 @@ jobs:
         run: |
           just -f docs/justfile docs-build
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         with:
           publish_branch: gh-pages

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/.github/workflows/publish.yml

@@ -19,10 +19,10 @@ jobs:
     name: Build distribution packages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
         with:
           python-version: '3.11'
       - name: Install build dependencies
@@ -31,7 +31,7 @@ jobs:
       - name: Build distributions and wheels
         run: |
           python3 -m build
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         with:
           name: package-distributions
           path: dist/
@@ -45,9 +45,9 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4
       with:
         name: package-distributions
         path: dist/
     - name: Publish package distributions to PyPI
-      uses: pypa/gh-action-pypi-publish@e53eb8b103ffcb59469888563dc324e3c8ba6f06
+      uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.30
+Version: 0.0.33
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: aiotus==0.*
 Requires-Dist: aiohttp==3.*
 Requires-Dist: requests==2.*
-Requires-Dist: SQLAlchemy==1.4.*
+Requires-Dist: SQLAlchemy>=1.4.0
 Requires-Dist: APScheduler==3.*
 Requires-Dist: python-dateutil==2.*
 Requires-Dist: shelljob==0.*
@@ -28,7 +28,7 @@ Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"
 Requires-Dist: pytest==8.*; extra == "test"
-Requires-Dist: coverage[toml]==6.*; extra == "test"
+Requires-Dist: coverage[toml]==7.*; extra == "test"
 Requires-Dist: pytest-cov==5.*; extra == "test"
 Requires-Dist: pytest-xdist==3.*; extra == "test"
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.30
+Version: 0.0.33
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: aiotus==0.*
 Requires-Dist: aiohttp==3.*
 Requires-Dist: requests==2.*
-Requires-Dist: SQLAlchemy==1.4.*
+Requires-Dist: SQLAlchemy>=1.4.0
 Requires-Dist: APScheduler==3.*
 Requires-Dist: python-dateutil==2.*
 Requires-Dist: shelljob==0.*
@@ -28,7 +28,7 @@ Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"
 Requires-Dist: pytest==8.*; extra == "test"
-Requires-Dist: coverage[toml]==6.*; extra == "test"
+Requires-Dist: coverage[toml]==7.*; extra == "test"
 Requires-Dist: pytest-cov==5.*; extra == "test"
 Requires-Dist: pytest-xdist==3.*; extra == "test"
 

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -37,8 +37,10 @@ pkgs/serialization/__init__.py
 pkgs/serialization/missing_sentry.py
 pkgs/serialization/opaque_key.py
 pkgs/serialization/serial_class.py
+pkgs/serialization/serial_union.py
 pkgs/serialization_util/__init__.py
 pkgs/serialization_util/_get_type_for_serialization.py
+pkgs/serialization_util/convert_to_snakecase.py
 pkgs/serialization_util/serialization_helpers.py
 pkgs/strenum_compat/__init__.py
 pkgs/strenum_compat/strenum_compat.py
@@ -113,6 +115,7 @@ uncountable/types/recipe_metadata.py
 uncountable/types/recipe_output_metadata.py
 uncountable/types/recipe_tags.py
 uncountable/types/recipe_workflow_steps.py
+uncountable/types/recipes.py
 uncountable/types/response.py
 uncountable/types/units.py
 uncountable/types/users.py
@@ -148,6 +151,7 @@ uncountable/types/api/inputs/get_inputs_data.py
 uncountable/types/api/inputs/set_input_attribute_values.py
 uncountable/types/api/inputs/set_input_category.py
 uncountable/types/api/inputs/set_input_subcategories.py
+uncountable/types/api/inputs/set_intermediate_type.py
 uncountable/types/api/material_families/__init__.py
 uncountable/types/api/material_families/update_entity_material_families.py
 uncountable/types/api/outputs/__init__.py
@@ -164,6 +168,7 @@ uncountable/types/api/recipe_links/create_recipe_link.py
 uncountable/types/api/recipe_metadata/__init__.py
 uncountable/types/api/recipe_metadata/get_recipe_metadata_data.py
 uncountable/types/api/recipes/__init__.py
+uncountable/types/api/recipes/add_recipe_to_project.py
 uncountable/types/api/recipes/archive_recipes.py
 uncountable/types/api/recipes/associate_recipe_as_input.py
 uncountable/types/api/recipes/associate_recipe_as_lot.py
@@ -177,6 +182,7 @@ uncountable/types/api/recipes/get_recipe_links.py
 uncountable/types/api/recipes/get_recipe_names.py
 uncountable/types/api/recipes/get_recipe_output_metadata.py
 uncountable/types/api/recipes/get_recipes_data.py
+uncountable/types/api/recipes/remove_recipe_from_project.py
 uncountable/types/api/recipes/set_recipe_inputs.py
 uncountable/types/api/recipes/set_recipe_metadata.py
 uncountable/types/api/recipes/set_recipe_outputs.py

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/UncountablePythonSDK.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiotus==0.*
 aiohttp==3.*
 requests==2.*
-SQLAlchemy==1.4.*
+SQLAlchemy>=1.4.0
 APScheduler==3.*
 python-dateutil==2.*
 shelljob==0.*
@@ -11,6 +11,6 @@ PyYAML==6.*
 mypy==1.*
 ruff==0.*
 pytest==8.*
-coverage[toml]==6.*
+coverage[toml]==7.*
 pytest-cov==5.*
 pytest-xdist==3.*

uncountablepythonsdk-0.0.33/docs/requirements.txt

@@ -0,0 +1,7 @@
+furo==2024.5.6
+myst-parser==3.0.1
+sphinx-autoapi==3.1.0
+sphinx-copybutton==0.5.2
+Sphinx==7.3.7
+sphinx_design==0.6.0
+sphinx-favicon==1.0.1

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/pkgs/argument_parser/argument_parser.py

@@ -10,7 +10,12 @@ from importlib import resources
 import dateutil.parser
 import yaml
 
-from pkgs.serialization import MissingSentryType, OpaqueKey, get_serial_class_data
+from pkgs.serialization import (
+    MissingSentryType,
+    OpaqueKey,
+    get_serial_class_data,
+    get_serial_union_data,
+)
 
 from ._is_enum import is_string_enum_class
 from ._is_namedtuple import is_namedtuple_type
@@ -112,6 +117,23 @@ def _invoke_membership_parser(
     raise ValueError(f"Expected value from {expected_values} but got value {value}")
 
 
+def _build_parser_discriminated_union(
+    discriminator: str, discriminator_map: dict[str, ParserFunction[T]]
+) -> ParserFunction[T]:
+    def parse(value: typing.Any) -> typing.Any:
+        discriminant = value.get(discriminator)
+        if discriminant is None:
+            raise ValueError("missing-union-discriminant")
+        if not isinstance(discriminant, str):
+            raise ValueError("union-discriminant-is-not-string")
+        parser = discriminator_map.get(discriminant)
+        if parser is None:
+            raise ValueError("missing-type-for-union-discriminant", discriminant)
+        return parser(value)
+
+    return parse
+
+
 def _build_parser_inner(
     parsed_type: type[T],
     context: ParserContext,
@@ -130,6 +152,23 @@ def _build_parser_inner(
     are cached now, as they don't use the argument, and they're known to be safe.
     This is also enough to support some recursion.
     """
+
+    serial_union = get_serial_union_data(parsed_type)
+    if serial_union is not None:
+        discriminator = serial_union.discriminator
+        discriminator_map = serial_union.discriminator_map
+        if discriminator is None or discriminator_map is None:
+            # fallback to standard union parsing
+            parsed_type = serial_union.get_union_underlying()
+        else:
+            return _build_parser_discriminated_union(
+                discriminator,
+                {
+                    key: _build_parser_inner(value, context)
+                    for key, value in discriminator_map.items()
+                },
+            )
+
     if dataclasses.is_dataclass(parsed_type):
         return _build_parser_dataclass(parsed_type, context)  # type: ignore[arg-type]
 
@@ -341,7 +380,7 @@ def _build_parser_dataclass(
 
             except Exception as e:
                 raise ValueError(
-                    f"unable to parse field:{field.name}", field_raw_value
+                    f"unable-to-parse-field:{field.name}", field_raw_value
                 ) from e
 
         if context.options.strict_property_parsing:

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/pkgs/argument_parser/case_convert.py

@@ -4,9 +4,10 @@ import re
 
 @functools.lru_cache(maxsize=500000)
 def snake_to_camel_case(o: str) -> str:
-    return "".join([
-        part.title() if i > 0 else part for i, part in enumerate(o.split("_"))
-    ])
+    tokens = o.split("_")
+    if len(tokens) < 2:
+        return o
+    return "".join([part.title() if i > 0 else part for i, part in enumerate(tokens)])
 
 
 def kebab_to_pascal_case(o: str) -> str:

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/pkgs/serialization/__init__.py

@@ -8,3 +8,5 @@ from .serial_class import get_serial_class_data as get_serial_class_data
 from .serial_class import get_serial_string_enum_data as get_serial_string_enum_data
 from .serial_class import serial_class as serial_class
 from .serial_class import serial_string_enum as serial_string_enum
+from .serial_union import serial_union_annotation as serial_union_annotation
+from .serial_union import get_serial_union_data as get_serial_union_data

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/pkgs/serialization/serial_class.py

@@ -16,6 +16,9 @@ class _SerialClassData:
     parse_require: set[str] = dataclasses.field(default_factory=set)
 
 
+EMPTY_SERIAL_CLASS_DATA = _SerialClassData()
+
+
 def serial_class(
     *,
     unconverted_keys: Optional[set[str]] = None,
@@ -57,58 +60,49 @@ def serial_class(
 
 
 class SerialClassDataInspector:
-    bases: list[SerialClassDataInspector]
-
     def __init__(
-        self, bases: list[SerialClassDataInspector], current: _SerialClassData
+        self,
+        current: _SerialClassData,
     ) -> None:
-        self.bases = bases
         self.current = current
 
     def has_unconverted_key(self, key: str) -> bool:
-        if key in self.current.unconverted_keys:
-            return True
-        for base in self.bases:
-            if base.has_unconverted_key(key):
-                return True
-        return False
+        return key in self.current.unconverted_keys
 
     def has_unconverted_value(self, key: str) -> bool:
-        if key in self.current.unconverted_values:
-            return True
-        for base in self.bases:
-            if base.has_unconverted_value(key):
-                return True
-        return False
+        return key in self.current.unconverted_values
 
     def has_to_string_value(self, key: str) -> bool:
-        if key in self.current.to_string_values:
-            return True
-        for base in self.bases:
-            if base.has_to_string_value(key):
-                return True
-        return False
+        return key in self.current.to_string_values
 
     def has_parse_require(self, key: str) -> bool:
-        if key in self.current.parse_require:
-            return True
-        for base in self.bases:
-            if base.has_parse_require(key):
-                return True
-        return False
+        return key in self.current.parse_require
 
 
-def get_serial_class_data(type_class: type[Any]) -> SerialClassDataInspector:
-    bases = (
-        [get_serial_class_data(base) for base in type_class.__bases__]
-        if type_class.__bases__ is not None
-        else []
-    )
-    return SerialClassDataInspector(
-        bases,
+def _get_merged_serial_class_data(type_class: type[Any]) -> _SerialClassData | None:
+    base_class_data = (
         cast(_SerialClassData, type_class.__unc_serial_data)
         if hasattr(type_class, "__unc_serial_data")
-        else _SerialClassData(),
+        else None
+    )
+    if type_class.__bases__ is not None:
+        for base in type_class.__bases__:
+            curr_base_class_data = _get_merged_serial_class_data(base)
+            if curr_base_class_data is not None:
+                if base_class_data is None:
+                    base_class_data = _SerialClassData()
+                base_class_data.unconverted_keys |= curr_base_class_data.unconverted_keys
+                base_class_data.unconverted_values |= (
+                    curr_base_class_data.unconverted_values
+                )
+                base_class_data.to_string_values |= curr_base_class_data.to_string_values
+                base_class_data.parse_require |= curr_base_class_data.parse_require
+    return base_class_data
+
+
+def get_serial_class_data(type_class: type[Any]) -> SerialClassDataInspector:
+    return SerialClassDataInspector(
+        _get_merged_serial_class_data(type_class) or EMPTY_SERIAL_CLASS_DATA
     )
 
 

uncountablepythonsdk-0.0.33/pkgs/serialization/serial_union.py

@@ -0,0 +1,81 @@
+import dataclasses
+import typing
+
+T = typing.TypeVar("T")
+
+
+class IdentityHashWrapper(typing.Generic[T]):
+    """This allows unhashable types to be used in the SerialUnion, like dict.
+    Since we have only one copy of the types themselves, we rely on
+    object identity for the hashing."""
+
+    def __init__(self, inner: T) -> None:
+        self.inner = inner
+
+    def __hash__(self) -> int:
+        return id(self.inner)
+
+
+@dataclasses.dataclass(kw_only=True, frozen=True, eq=True)
+class _SerialUnion:
+    """
+    This class is to be kept private, to provide flexibility in registration/lookup.
+    Places that need the data should access it via help classes/methods.
+    """
+
+    # If specified, indicates the Union has a discriminator which should be used to
+    # determine which type to parse.
+    discriminator: typing.Optional[str] = None
+    discriminator_map: typing.Optional[IdentityHashWrapper[dict[str, type]]] = None
+
+
+def serial_union_annotation(
+    *,
+    discriminator: typing.Optional[str] = None,
+    discriminator_map: typing.Optional[dict[str, type]] = None,
+) -> _SerialUnion:
+    return _SerialUnion(
+        discriminator=discriminator,
+        discriminator_map=IdentityHashWrapper(discriminator_map)
+        if discriminator_map is not None
+        else None,
+    )
+
+
+def _get_serial_union(parsed_type: type[T]) -> _SerialUnion | None:
+    if not hasattr(parsed_type, "__metadata__"):
+        return None
+    metadata = parsed_type.__metadata__  # type:ignore[attr-defined]
+    if not isinstance(metadata, tuple) or len(metadata) != 1:
+        return None
+    serial = metadata[0]
+    if not isinstance(serial, _SerialUnion):
+        return None
+    return serial
+
+
+class SerialClassInspector(typing.Generic[T]):
+    def __init__(self, parsed_type: type[T], serial_union: _SerialUnion) -> None:
+        self._parsed_type = parsed_type
+        self._serial_union = serial_union
+
+    def get_union_underlying(self) -> type[T]:
+        return typing.get_args(self._parsed_type)[0]  # type:ignore[no-any-return]
+
+    @property
+    def discriminator(self) -> typing.Optional[str]:
+        return self._serial_union.discriminator
+
+    @property
+    def discriminator_map(self) -> typing.Optional[dict[str, type]]:
+        if self._serial_union.discriminator_map is None:
+            return None
+        return self._serial_union.discriminator_map.inner
+
+
+def get_serial_union_data(parsed_type: type[T]) -> SerialClassInspector[T] | None:
+    serial = _get_serial_union(parsed_type)
+    if serial is None:
+        return None
+
+    return SerialClassInspector(parsed_type, serial)

{uncountablepythonsdk-0.0.30 → uncountablepythonsdk-0.0.33}/pkgs/serialization_util/__init__.py

@@ -1,8 +1,5 @@
+from .convert_to_snakecase import convert_dict_to_snake_case
 from .serialization_helpers import (
-    convert_dict_to_snake_case,
-    convert_to_camelcase,
-    resolve_missing_to_none,
-    serialize,
     serialize_for_api,
     serialize_for_storage,
     serialize_for_storage_dict,
@@ -10,9 +7,6 @@ from .serialization_helpers import (
 
 __all__: list[str] = [
     "convert_dict_to_snake_case",
-    "convert_to_camelcase",
-    "resolve_missing_to_none",
-    "serialize",
     "serialize_for_api",
     "serialize_for_storage",
     "serialize_for_storage_dict",

uncountablepythonsdk-0.0.33/pkgs/serialization_util/convert_to_snakecase.py

@@ -0,0 +1,27 @@
+from typing import (
+    Any,
+)
+
+from pkgs.argument_parser import camel_to_snake_case
+from pkgs.serialization import (
+    MISSING_SENTRY,
+    OpaqueKey,
+)
+
+
+def _key_convert_to_snake_case(o: Any) -> Any:
+    if isinstance(o, OpaqueKey):
+        return o
+    if isinstance(o, str):
+        return camel_to_snake_case(o)
+    return o
+
+
+def convert_dict_to_snake_case(data: Any) -> Any:
+    return {
+        _key_convert_to_snake_case(k): convert_dict_to_snake_case(v)
+        if isinstance(v, dict)
+        else v
+        for k, v in data.items()
+        if v != MISSING_SENTRY
+    }