UncountablePythonSDK 0.0.39__tar.gz → 0.0.41__tar.gz

{uncountablepythonsdk-0.0.39/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.39
+Version: 0.0.41
 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.39 → uncountablepythonsdk-0.0.41/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.39
+Version: 0.0.41
 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.39 → uncountablepythonsdk-0.0.41}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ pkgs/serialization/missing_sentry.py
 pkgs/serialization/opaque_key.py
 pkgs/serialization/serial_class.py
 pkgs/serialization/serial_union.py
+pkgs/serialization/yaml.py
 pkgs/serialization_util/__init__.py
 pkgs/serialization_util/_get_type_for_serialization.py
 pkgs/serialization_util/convert_to_snakecase.py
@@ -92,35 +93,64 @@ uncountable/integration/executors/script_executor.py
 uncountable/types/__init__.py
 uncountable/types/async_batch.py
 uncountable/types/async_batch_processor.py
+uncountable/types/async_batch_t.py
 uncountable/types/base.py
+uncountable/types/base_t.py
 uncountable/types/calculations.py
+uncountable/types/calculations_t.py
 uncountable/types/chemical_structure.py
+uncountable/types/chemical_structure_t.py
 uncountable/types/client_base.py
 uncountable/types/curves.py
+uncountable/types/curves_t.py
 uncountable/types/entity.py
+uncountable/types/entity_t.py
 uncountable/types/experiment_groups.py
+uncountable/types/experiment_groups_t.py
 uncountable/types/field_values.py
+uncountable/types/field_values_t.py
 uncountable/types/fields.py
+uncountable/types/fields_t.py
 uncountable/types/id_source.py
+uncountable/types/id_source_t.py
 uncountable/types/identifier.py
+uncountable/types/identifier_t.py
 uncountable/types/input_attributes.py
+uncountable/types/input_attributes_t.py
 uncountable/types/inputs.py
+uncountable/types/inputs_t.py
 uncountable/types/outputs.py
+uncountable/types/outputs_t.py
 uncountable/types/permissions.py
+uncountable/types/permissions_t.py
 uncountable/types/phases.py
+uncountable/types/phases_t.py
 uncountable/types/post_base.py
+uncountable/types/post_base_t.py
 uncountable/types/recipe_identifiers.py
+uncountable/types/recipe_identifiers_t.py
 uncountable/types/recipe_inputs.py
+uncountable/types/recipe_inputs_t.py
 uncountable/types/recipe_links.py
+uncountable/types/recipe_links_t.py
 uncountable/types/recipe_metadata.py
+uncountable/types/recipe_metadata_t.py
 uncountable/types/recipe_output_metadata.py
+uncountable/types/recipe_output_metadata_t.py
 uncountable/types/recipe_tags.py
+uncountable/types/recipe_tags_t.py
 uncountable/types/recipe_workflow_steps.py
+uncountable/types/recipe_workflow_steps_t.py
 uncountable/types/recipes.py
+uncountable/types/recipes_t.py
 uncountable/types/response.py
+uncountable/types/response_t.py
 uncountable/types/units.py
+uncountable/types/units_t.py
 uncountable/types/users.py
+uncountable/types/users_t.py
 uncountable/types/workflows.py
+uncountable/types/workflows_t.py
 uncountable/types/api/__init__.py
 uncountable/types/api/batch/__init__.py
 uncountable/types/api/batch/execute_batch.py

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/argument_parser/argument_parser.py

@@ -8,13 +8,13 @@ from decimal import Decimal
 from importlib import resources
 
 import dateutil.parser
-import yaml
 
 from pkgs.serialization import (
     MissingSentryType,
     OpaqueKey,
     get_serial_class_data,
     get_serial_union_data,
+    yaml,
 )
 
 from ._is_enum import is_string_enum_class

uncountablepythonsdk-0.0.41/pkgs/serialization/yaml.py

@@ -0,0 +1,54 @@
+from decimal import Decimal
+from typing import TYPE_CHECKING, Any
+
+import yaml
+
+if TYPE_CHECKING:
+    from _typeshed import SupportsRead as SupportsReadT
+    from _typeshed import SupportsWrite as SupportsWriteT
+
+    SupportsRead = SupportsReadT[Any]
+    SupportsWrite = SupportsWriteT[Any]
+else:
+    SupportsRead = object
+    SupportsWrite = object
+
+
+def _decimal_constructor(loader, node):  # type:ignore
+    value = loader.construct_scalar(node)
+    return Decimal(value)
+
+
+# A semi-acceptable patch to force a number to be parsed as a decimal, since pyyaml
+# parses them as lossy floats otherwise. Though a bit ugly, at least this way we have
+# support for decimal constants
+yaml.SafeLoader.add_constructor("!decimal", _decimal_constructor)
+
+
+class YAMLError(BaseException):
+    pass
+
+
+def dumps(obj: Any, sort_keys: bool = False) -> str:
+    return yaml.dump(obj, sort_keys=sort_keys)
+
+
+def dump(obj: Any, f: SupportsWrite, sort_keys: bool = False) -> None:
+    yaml.dump(obj, f, sort_keys=sort_keys)
+
+
+def safe_load(src: str | bytes | SupportsRead) -> Any:
+    try:
+        return yaml.safe_load(src)
+    except yaml.YAMLError as e:
+        raise YAMLError() from e
+
+
+def safe_dump(
+    obj: Any, sort_keys: bool = False, indent: int | None = None, width: int | None = None
+) -> str:
+    return yaml.safe_dump(obj, sort_keys=sort_keys, indent=indent, width=width)
+
+
+def c_load(f: SupportsRead) -> Any:
+    return yaml.load(f, Loader=yaml.CLoader)

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/type_spec/config.py

@@ -1,10 +1,9 @@
 import os
 from collections.abc import Callable, Mapping
 from dataclasses import dataclass
-from decimal import Decimal
 from typing import Self, TypeVar
 
-import yaml
+from pkgs.serialization import yaml
 
 ConfigValueType = str | None | Mapping[str, str | None] | list[str]
 
@@ -103,17 +102,6 @@ def _parse_language(config_class: type[_T], raw_value: ConfigValueType) -> _T:
     return config_class(**raw_value)
 
 
-def _decimal_constructor(loader, node):  # type:ignore
-    value = loader.construct_scalar(node)
-    return Decimal(value)
-
-
-# A semi-acceptable patch to force a number to be parsed as a decimal, since pyyaml
-# parses them as lossy floats otherwise. Though a bit ugly, at least this way we have
-# support for decimal constants
-yaml.SafeLoader.add_constructor("!decimal", _decimal_constructor)
-
-
 def parse_yaml_config(config_file: str) -> Config:
     with open(config_file, encoding="utf-8") as input:
         raw_config: dict[str, ConfigValueType] = yaml.safe_load(input)

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/type_spec/emit_open_api.py

@@ -9,7 +9,7 @@ import json
 import re
 from typing import Collection, cast
 
-import yaml
+from pkgs.serialization import yaml
 
 from . import builder, util
 from .builder import EndpointGuideKey, RootGuideKey
@@ -169,7 +169,7 @@ def _serialize_global_context(ctx: EmitOpenAPIGlobalContext) -> str:
         oa_paths[path.path] = {"$ref": path.ref}
     oa_root["paths"] = oa_paths
 
-    return yaml.dump(oa_root, sort_keys=False)
+    return yaml.dumps(oa_root, sort_keys=False)
 
 
 def _is_empty_object_type(typ: OpenAPIType) -> bool:
@@ -413,7 +413,7 @@ def _emit_namespace(
 
     path = f"{config.types_output}/common/{'/'.join(namespace.path)}.yaml"
     oa_namespace = {"components": oa_components}
-    _rewrite_with_notice(path, yaml.dump(oa_namespace, sort_keys=False))
+    _rewrite_with_notice(path, yaml.dumps(oa_namespace, sort_keys=False))
 
 
 def _emit_type(

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/type_spec/emit_python.py

@@ -23,7 +23,7 @@ __all__: list[str] = [
 """
 END_ALL_EXPORTS = "]\n"
 
-ASYNC_BATCH_TYPE_NAMESPACE = builder.SpecNamespace(name="uncountable.types.async_batch")
+ASYNC_BATCH_TYPE_NAMESPACE = builder.SpecNamespace(name="async_batch")
 ASYNC_BATCH_REQUEST_PATH_STYPE = builder.SpecTypeDefnStringEnum(
     namespace=ASYNC_BATCH_TYPE_NAMESPACE, name="AsyncBatchRequestPath"
 )
@@ -57,7 +57,9 @@ class Context(TrackingContext):
 
 
 def _resolve_namespace_name(namespace: builder.SpecNamespace) -> str:
-    return namespace.name
+    if len(namespace.path) > 1:
+        return namespace.name
+    return f"{namespace.name}_t"
 
 
 def _resolve_namespace_ref(namespace: builder.SpecNamespace) -> str:
@@ -294,17 +296,22 @@ def _emit_types(*, builder: builder.SpecBuilder, config: PythonConfig) -> None:
             full.write(f"# === END section from {namespace.name}.part.py ===\n")
 
         basename = "/".join(namespace.path)
-        filename = f"{config.types_output}/{basename}.py"
+        filename = f"{config.types_output}/{basename}{'' if len(namespace.path) > 1 else '_t'}.py"
         util.rewrite_file(filename, full.getvalue())
 
+        # Deprecated SDK support
+        if config.all_named_type_exports and len(namespace.path) == 1:
+            compat_out = _create_sdk_compat_namespace(namespace)
+            compat_filename = f"{config.types_output}/{basename}.py"
+            util.rewrite_file(compat_filename, compat_out.getvalue())
+
         path_to = os.path.dirname(basename)
         while path_to != "":
             all_dirs.add(path_to)
             path_to = os.path.dirname(path_to)
 
-        if len(namespace.path) == 1 or (
-            config.all_named_type_exports and len(namespace.path) > 1
-        ):
+        # Deprecated SDK support
+        if config.all_named_type_exports:
             index_out.write("from ")
             if len(namespace.path) == 1:
                 index_out.write(".")
@@ -354,6 +361,32 @@ def _emit_namespace(ctx: Context, namespace: builder.SpecNamespace) -> None:
         _emit_constant(ctx, sconst)
 
 
+def _create_sdk_compat_namespace(namespace: builder.SpecNamespace) -> io.StringIO:
+    compat_out = io.StringIO()
+    compat_out.write(LINT_HEADER)
+    compat_out.write(MODIFY_NOTICE)
+    compat_out.write("# Kept only for SDK backwards compatibility\n")
+
+    # This mostly an prepart import, thus has no high-level knowledge. Since this onl
+    # needs backwards copmatibiltiy from when written we can just hardcode what was there
+    # (only those in __all__ assuming that worked, which it might not)
+    if namespace.name == "base":
+        compat_out.write("""
+from .base_t import JsonScalar as JsonScalar
+from .base_t import JsonValue as JsonValue
+from .base_t import ObjectId as ObjectId
+""")
+    else:
+        for stype in namespace.types.values():
+            compat_out.write(
+                f"from .{namespace.path[-1]}_t import {stype.name} as {stype.name}\n"
+            )
+
+    compat_out.write(MODIFY_NOTICE)
+
+    return compat_out
+
+
 def _validate_supports_handler_generation(
     stype: builder.SpecTypeDefn, name: str, supports_inheritance: bool = False
 ) -> builder.SpecTypeDefnObject:
@@ -994,7 +1027,7 @@ def _emit_namespace_imports(
         else:
             from_path = config.types_package
 
-        out.write(f"from {from_path} import {resolved} as {ref}\n")
+        out.write(f"from {from_path} import {resolved}\n")
 
 
 def _emit_id_source(*, builder: builder.SpecBuilder, config: PythonConfig) -> None:

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/type_spec/load_types.py

@@ -3,9 +3,10 @@ from collections.abc import Callable
 from io import StringIO
 from typing import Optional
 
-import yaml
 from shelljob import fs
 
+from pkgs.serialization import yaml
+
 from .builder import SpecBuilder
 from .config import Config
 

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/type_spec/type_info/emit_type_info.py

@@ -6,7 +6,7 @@ import json
 from typing import Any, Optional, TypeAlias, Union, cast
 
 from main.base.types import data_t
-from main.base.types.base import PureJsonValue
+from main.base.types.base_t import PureJsonValue
 from pkgs.argument_parser import CachedParser
 from pkgs.serialization_util import (
     serialize_for_api,

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/pkgs/type_spec/value_spec/__main__.py

@@ -20,9 +20,9 @@ import sys
 from typing import TypeVar, cast
 
 import regex as re
-import yaml
 
 from main.base.types import base_t, value_spec_t
+from pkgs.serialization import yaml
 
 from ..util import parse_type_str, rewrite_file
 from .convert_type import convert_to_value_spec_type

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/integration/cron.py

@@ -27,4 +27,6 @@ def cron_job_executor(**kwargs: dict) -> None:
         args_passed.definition.executor, args_passed.profile_metadata
     )
 
+    print(f"running job {args_passed.definition.name}")
+
     job.run(args=args)

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/integration/entrypoint.py

@@ -9,10 +9,9 @@ from uncountable.integration.types import ProfileDefinition
 profile_parser = CachedParser(ProfileDefinition)
 
 
-def main() -> None:
+def main(blocking: bool) -> None:
     profiles_module = os.environ["UNC_PROFILES_MODULE"]
     with IntegrationServer(create_db_engine()) as server:
-        # TODO: Loop through all job spec yaml files and call server.add_job
         profiles = [
             entry
             for entry in resources.files(profiles_module).iterdir()
@@ -26,7 +25,7 @@ def main() -> None:
                     resource="profile.yaml",
                 )
             except FileNotFoundError as e:
-                print("WARN: profile.yaml not found", e)
+                print(f"WARN: profile.yaml not found for {profile_name}", e)
                 continue
             server.register_profile(
                 profile_name=profile_name,
@@ -35,8 +34,8 @@ def main() -> None:
                 jobs=profile.jobs,
             )
 
-        server.serve_forever()
+        if blocking:
+            server.serve_forever()
 
 
-if __name__ == "__main__":
-    main()
+main(__name__ == "__main__")

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/integration/job.py

@@ -37,6 +37,6 @@ class CronJob(Job):
     def run(self, args: CronJobArguments) -> JobResult: ...
 
 
-def register_job(cls: Job) -> Job:
+def register_job(cls: type[Job]) -> type[Job]:
     cls._unc_job_registered = True
     return cls

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/__init__.py

@@ -8,10 +8,10 @@ from .api.recipes import archive_recipes as archive_recipes_t
 from .api.equipment import associate_equipment_input as associate_equipment_input_t
 from .api.recipes import associate_recipe_as_input as associate_recipe_as_input_t
 from .api.recipes import associate_recipe_as_lot as associate_recipe_as_lot_t
-from . import async_batch as async_batch_t
-from . import base as base_t
-from . import calculations as calculations_t
-from . import chemical_structure as chemical_structure_t
+from . import async_batch_t as async_batch_t
+from . import base_t as base_t
+from . import calculations_t as calculations_t
+from . import chemical_structure_t as chemical_structure_t
 from .api.chemical import convert_chemical_formats as convert_chemical_formats_t
 from .api.entity import create_entities as create_entities_t
 from .api.entity import create_entity as create_entity_t
@@ -19,15 +19,15 @@ from .api.inputs import create_inputs as create_inputs_t
 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 as curves_t
+from . import curves_t as curves_t
 from .api.recipes import disassociate_recipe_as_input as disassociate_recipe_as_input_t
 from .api.recipes import edit_recipe_inputs as edit_recipe_inputs_t
-from . import entity as entity_t
+from . import entity_t as entity_t
 from .api.batch import execute_batch as execute_batch_t
 from .api.batch import execute_batch_load_async as execute_batch_load_async_t
-from . import experiment_groups as experiment_groups_t
-from . import field_values as field_values_t
-from . import fields as fields_t
+from . import experiment_groups_t as experiment_groups_t
+from . import field_values_t as field_values_t
+from . import fields_t as fields_t
 from .api.recipes import get_curve as get_curve_t
 from .api.entity import get_entities_data as get_entities_data_t
 from .api.inputs import get_input_data as get_input_data_t
@@ -44,32 +44,32 @@ from .api.recipe_metadata import get_recipe_metadata_data as get_recipe_metadata
 from .api.recipes import get_recipe_names as get_recipe_names_t
 from .api.recipes import get_recipe_output_metadata as get_recipe_output_metadata_t
 from .api.recipes import get_recipes_data as get_recipes_data_t
-from . import id_source as id_source_t
-from . import identifier as identifier_t
-from . import input_attributes as input_attributes_t
-from . import inputs as inputs_t
+from . import id_source_t as id_source_t
+from . import identifier_t as identifier_t
+from . import input_attributes_t as input_attributes_t
+from . import inputs_t as inputs_t
 from .api.entity import list_entities as list_entities_t
 from .api.id_source import list_id_source as list_id_source_t
 from .api.entity import lock_entity as lock_entity_t
 from .api.recipes import lock_recipes as lock_recipes_t
 from .api.id_source import match_id_source as match_id_source_t
-from . import outputs as outputs_t
-from . import permissions as permissions_t
-from . import phases as phases_t
-from . import post_base as post_base_t
-from . import recipe_identifiers as recipe_identifiers_t
-from . import recipe_inputs as recipe_inputs_t
-from . import recipe_links as recipe_links_t
-from . import recipe_metadata as recipe_metadata_t
-from . import recipe_output_metadata as recipe_output_metadata_t
-from . import recipe_tags as recipe_tags_t
-from . import recipe_workflow_steps as recipe_workflow_steps_t
-from . import recipes as recipes_t
+from . import outputs_t as outputs_t
+from . import permissions_t as permissions_t
+from . import phases_t as phases_t
+from . import post_base_t as post_base_t
+from . import recipe_identifiers_t as recipe_identifiers_t
+from . import recipe_inputs_t as recipe_inputs_t
+from . import recipe_links_t as recipe_links_t
+from . import recipe_metadata_t as recipe_metadata_t
+from . import recipe_output_metadata_t as recipe_output_metadata_t
+from . import recipe_tags_t as recipe_tags_t
+from . import recipe_workflow_steps_t as recipe_workflow_steps_t
+from . import recipes_t as recipes_t
 from .api.recipes import remove_recipe_from_project as remove_recipe_from_project_t
 from .api.recipe_links import remove_recipe_link as remove_recipe_link_t
 from .api.entity import resolve_entity_ids as resolve_entity_ids_t
 from .api.outputs import resolve_output_conditions as resolve_output_conditions_t
-from . import response as response_t
+from . import response_t as response_t
 from .api.triggers import run_trigger as run_trigger_t
 from .api.permissions import set_core_permissions as set_core_permissions_t
 from .api.inputs import set_input_attribute_values as set_input_attribute_values_t
@@ -84,13 +84,13 @@ from .api.recipes import set_recipe_tags as set_recipe_tags_t
 from .api.entity import set_values as set_values_t
 from .api.entity import transition_entity_phase as transition_entity_phase_t
 from .api.recipes import unarchive_recipes as unarchive_recipes_t
-from . import units as units_t
+from . import units_t as units_t
 from .api.entity import unlock_entity as unlock_entity_t
 from .api.recipes import unlock_recipes as unlock_recipes_t
 from .api.material_families import update_entity_material_families as update_entity_material_families_t
 from .api.field_options import upsert_field_options as upsert_field_options_t
-from . import users as users_t
-from . import workflows as workflows_t
+from . import users_t as users_t
+from . import workflows_t as workflows_t
 
 
 __all__: list[str] = [

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/batch/execute_batch.py

@@ -10,7 +10,7 @@ from decimal import Decimal  # noqa: F401
 from pkgs.strenum_compat import StrEnum
 from dataclasses import dataclass
 from pkgs.serialization import serial_class
-from ... import base as base_t
+from ... import base_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/batch/execute_batch_load_async.py

@@ -8,8 +8,8 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import async_batch as async_batch_t
-from ... import base as base_t
+from ... import async_batch_t
+from ... import base_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/chemical/convert_chemical_formats.py

@@ -9,7 +9,7 @@ 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 base_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/create_entities.py

@@ -8,9 +8,9 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import base as base_t
-from ... import entity as entity_t
-from ... import field_values as field_values_t
+from ... import base_t
+from ... import entity_t
+from ... import field_values_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/create_entity.py

@@ -9,9 +9,9 @@ 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 entity as entity_t
-from ... import field_values as field_values_t
+from ... import base_t
+from ... import entity_t
+from ... import field_values_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/get_entities_data.py

@@ -8,9 +8,9 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import base as base_t
-from ... import entity as entity_t
-from ... import field_values as field_values_t
+from ... import base_t
+from ... import entity_t
+from ... import field_values_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/list_entities.py

@@ -10,8 +10,8 @@ from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
 from pkgs.serialization import serial_class
 from pkgs.serialization import OpaqueKey
-from ... import base as base_t
-from ... import entity as entity_t
+from ... import base_t
+from ... import entity_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/lock_entity.py

@@ -8,9 +8,9 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import async_batch as async_batch_t
-from ... import entity as entity_t
-from ... import identifier as identifier_t
+from ... import async_batch_t
+from ... import entity_t
+from ... import identifier_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/resolve_entity_ids.py

@@ -8,8 +8,8 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import base as base_t
-from ... import entity as entity_t
+from ... import base_t
+from ... import entity_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/set_values.py

@@ -8,9 +8,9 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import entity as entity_t
-from ... import field_values as field_values_t
-from ... import response as response_t
+from ... import entity_t
+from ... import field_values_t
+from ... import response_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/transition_entity_phase.py

@@ -9,9 +9,9 @@ import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
 from pkgs.serialization import serial_class
-from ... import entity as entity_t
-from ... import identifier as identifier_t
-from ... import response as response_t
+from ... import entity_t
+from ... import identifier_t
+from ... import response_t
 
 __all__: list[str] = [
     "Arguments",

{uncountablepythonsdk-0.0.39 → uncountablepythonsdk-0.0.41}/uncountable/types/api/entity/unlock_entity.py

@@ -8,9 +8,9 @@ import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
 from dataclasses import dataclass
-from ... import async_batch as async_batch_t
-from ... import entity as entity_t
-from ... import identifier as identifier_t
+from ... import async_batch_t
+from ... import entity_t
+from ... import identifier_t
 
 __all__: list[str] = [
     "Arguments",