UncountablePythonSDK 0.0.91__py3-none-any.whl → 0.0.93__py3-none-any.whl

pkgs/type_spec/type_info/emit_type_info.py

@@ -3,7 +3,7 @@ import dataclasses
 import decimal
 import io
 import json
-from typing import Any, Optional, Union, cast
+from typing import Any, cast
 
 from main.base.types import data_t, type_info_t
 from main.base.types.base_t import PureJsonValue
@@ -134,7 +134,7 @@ class MapStringEnum(MapTypeBase):
     values: dict[str, str]
 
 
-type MapType = Union[MapTypeObject, MapTypeAlias, MapStringEnum]
+type MapType = MapTypeObject | MapTypeAlias | MapStringEnum
 
 
 @dataclasses.dataclass
@@ -172,9 +172,9 @@ class InheritablePropertyParts:
     at that level, but that needs to be done in builder. When that is done, the
     "label" and "desc" could probably be removed from this list."""
 
-    label: Optional[str] = None
-    desc: Optional[str] = None
-    ext_info: Optional[type_info_t.ExtInfo] = None
+    label: str | None = None
+    desc: str | None = None
+    ext_info: type_info_t.ExtInfo | None = None
 
 
 def _extract_inheritable_property_parts(
@@ -269,7 +269,7 @@ def _extract_and_validate_layout(
 
 def _validate_type_ext_info(
     stype: builder.SpecTypeDefnObject,
-) -> tuple[ExtInfoLayout | None, Optional[type_info_t.ExtInfo]]:
+) -> tuple[ExtInfoLayout | None, type_info_t.ExtInfo | None]:
     ext_info = _parse_ext_info(stype.ext_info)
     if ext_info is None:
         return None, None
@@ -369,7 +369,7 @@ def _build_map_type(
     return None
 
 
-def _parse_ext_info(in_ext: Any) -> Optional[type_info_t.ExtInfo]:
+def _parse_ext_info(in_ext: Any) -> type_info_t.ExtInfo | None:
     if in_ext is None:
         return None
     assert isinstance(in_ext, dict)
@@ -390,7 +390,7 @@ def _parse_ext_info(in_ext: Any) -> Optional[type_info_t.ExtInfo]:
     return ext_info_parser.parse_storage(mod_ext)
 
 
-def _convert_ext_info(in_ext: Any) -> Optional[PureJsonValue]:
+def _convert_ext_info(in_ext: Any) -> PureJsonValue | None:
     # we need to convert this to API storage since it'll be used as-is in the UI
     parsed = _parse_ext_info(in_ext)
     return cast(PureJsonValue, serialize_for_api(parsed))

pkgs/type_spec/util.py

@@ -1,12 +1,10 @@
 import json
 import os
 from dataclasses import dataclass
-from typing import Optional, TypeVar, Union
+from typing import Union
 
 import regex as re
 
-T = TypeVar("T")
-
 
 def rewrite_file(filename: str, content: str) -> bool:
     os.makedirs(os.path.dirname(filename), exist_ok=True)
@@ -29,8 +27,8 @@ LiteralTypeValue = Union[str, bool]
 class ParsedTypePart:
     name: str
     # An empty list is distinct from None
-    parameters: Optional[list["ParsedTypePath"]] = None
-    literal_value: Optional[LiteralTypeValue] = None
+    parameters: list["ParsedTypePath"] | None = None
+    literal_value: LiteralTypeValue | None = None
 
 
 ParsedTypePath = list[ParsedTypePart]
@@ -156,7 +154,7 @@ def is_valid_property_name(name: str) -> bool:
     return re_pattern_property_name.match(name) is not None
 
 
-def check_fields(data: dict[str, T], allowed: list[str]) -> None:
+def check_fields[T](data: dict[str, T], allowed: list[str]) -> None:
     for key in data:
         if key not in allowed:
             raise Exception(f"unexpected-field: {key}. Allowed: {allowed}")
@@ -180,7 +178,7 @@ def encode_common_string(value: str) -> str:
     return rep
 
 
-def unused(_arg: T) -> None:
+def unused[T](_arg: T) -> None:
     """
     Identifies that an argument is intended not be used, as opposed to
     simply forgotten, or a remnant. This can happen in patterned calls

pkgs/type_spec/value_spec/__main__.py

@@ -13,7 +13,10 @@ One of the following can be specified on the name of a argument:
 After that you can also specify a `!` indicating the argument may not be null.
 If this is not specified, then a null input on this argument should produce a null output.
 We prefer not to use `!` as we want to encourage null pass-through where possible.
-If null is allowed as a legitimate value, such as in conditionals like `if`, then `!` must be specified.
+
+If null is allowed as a legitimate value, such as in conditionals like `is_null`,
+then `!usenull` must be specified, this distinguishes it from the pass-through case.
+The accepted argument type must accept "None", it is not implied.
 """
 
 import sys
@@ -84,7 +87,7 @@ class Source:
         return self._text[start : self._at]
 
 
-_re_argument_name = re.compile(r"([a-z_]+)(\?|\+)?(!)?:")
+_re_argument_name = re.compile(r"([a-z_]+)(\?|\+)?(!|!usenull)?:")
 
 
 def parse_function_signature(text: str) -> ParsedFunctionSignature:
@@ -103,9 +106,16 @@ def parse_function_signature(text: str) -> ParsedFunctionSignature:
         ref_name = arg_group.group(1)
         is_missing = arg_group.group(2) == "?"
         is_repeating = arg_group.group(2) == "+"
-        pass_null = arg_group.group(3) is None
         type_path = parse_type_str(type_str)
 
+        match arg_group.group(3):
+            case "!":
+                on_null = value_spec_t.OnNull.DISALLOW
+            case "!usenull":
+                on_null = value_spec_t.OnNull.USE
+            case _:
+                on_null = value_spec_t.OnNull.PASS
+
         extant = value_spec_t.ArgumentExtant.REQUIRED
         extant_marker = arg_group.group(2)
         if extant_marker == "?":
@@ -116,7 +126,7 @@ def parse_function_signature(text: str) -> ParsedFunctionSignature:
         arguments.append(
             ParsedFunctionArgument(
                 ref_name=ref_name,
-                pass_null=pass_null,
+                on_null=on_null,
                 extant=extant,
                 type_path=type_path,
             )
@@ -208,7 +218,7 @@ def main() -> None:
                         name=arg_name,
                         description=arg_description,
                         type=convert_to_value_spec_type(in_argument.type_path),
-                        pass_null=in_argument.pass_null,
+                        on_null=in_argument.on_null,
                         extant=in_argument.extant,
                     )
                 )

pkgs/type_spec/value_spec/emit_python.py

@@ -70,7 +70,7 @@ def _emit_function_wrapper(function: value_spec_t.Function) -> str:
         else:
             python_type = _emit_python_type(argument.type)
             if (
-                argument.pass_null
+                argument.on_null == value_spec_t.OnNull.PASS
                 or argument.extant == value_spec_t.ArgumentExtant.MISSING
             ):
                 python_type += " | None"
@@ -189,7 +189,10 @@ def _emit_argument(argument: value_spec_t.FunctionArgument, indent: str) -> str:
     out.write(
         f"{sub_indent}description={encode_common_string(argument.description)},\n"
     )
-    out.write(f"{sub_indent}pass_null={str(argument.pass_null)},\n")
+    # Quick enum emit since we have only one such type here
+    out.write(
+        f"{sub_indent}on_null=value_spec_t.OnNull.{str(argument.on_null).upper()},\n"
+    )
     out.write(
         f"{sub_indent}extant=value_spec_t.ArgumentExtant.{argument.extant.name},\n"
     )

pkgs/type_spec/value_spec/types.py

@@ -8,7 +8,7 @@ from ..util import ParsedTypePath
 @dataclass(kw_only=True, frozen=True)
 class ParsedFunctionArgument:
     ref_name: str
-    pass_null: bool
+    on_null: value_spec_t.OnNull
     extant: value_spec_t.ArgumentExtant
     type_path: ParsedTypePath
 

uncountable/core/client.py

@@ -14,10 +14,9 @@ from opentelemetry.sdk.resources import Attributes
 from requests.exceptions import JSONDecodeError
 
 from pkgs.argument_parser import CachedParser
-from pkgs.serialization_util import serialize_for_api
-from pkgs.serialization_util.serialization_helpers import JsonValue
+from pkgs.serialization_util import JsonValue, serialize_for_api
 from uncountable.core.environment import get_version
-from uncountable.integration.telemetry import JobLogger
+from uncountable.integration.telemetry import Logger, push_scope_optional
 from uncountable.types import download_file_t
 from uncountable.types.client_base import APIRequest, ClientMethods
 from uncountable.types.client_config import ClientConfigOptions
@@ -51,7 +50,7 @@ class HTTPGetRequest(HTTPRequestBase):
 @dataclass(kw_only=True)
 class HTTPPostRequest(HTTPRequestBase):
     method = EndpointMethod.POST
-    body: typing.Union[str, dict[str, str]]
+    body: str | dict[str, str]
 
 
 HTTPRequest = HTTPPostRequest | HTTPGetRequest
@@ -62,7 +61,7 @@ class ClientConfig(ClientConfigOptions):
     transform_request: typing.Callable[[requests.Request], requests.Request] | None = (
         None
     )
-    job_logger: typing.Optional[JobLogger] = None
+    logger: Logger | None = None
 
 
 OAUTH_REFRESH_WINDOW_SECONDS = 60 * 5
@@ -192,7 +191,10 @@ class Client(ClientMethods):
         self._session = requests.Session()
         self._session.verify = not self._cfg.allow_insecure_tls
         self._file_uploader = FileUploader(
-            self._base_url, self._auth_details, self._cfg.allow_insecure_tls
+            self._base_url,
+            self._auth_details,
+            self._cfg.allow_insecure_tls,
+            logger=self._cfg.logger,
         )
 
     def _get_response_json(
@@ -241,14 +243,13 @@ class Client(ClientMethods):
             case _:
                 typing.assert_never(http_request)
         request.headers = http_request.headers
-        if self._cfg.job_logger is not None:
-            attributes: Attributes = {
-                "method": http_request.method,
-                "endpoint": api_request.endpoint,
-            }
-            with self._cfg.job_logger.push_scope("api_call", attributes=attributes):
-                response = self._send_request(request)
-        else:
+        attributes: Attributes = {
+            "method": http_request.method,
+            "endpoint": api_request.endpoint,
+        }
+        with push_scope_optional(self._cfg.logger, "api_call", attributes=attributes):
+            if self._cfg.logger is not None:
+                self._cfg.logger.log_info(api_request.endpoint, attributes=attributes)
             response = self._send_request(request)
         response_data = self._get_response_json(response, request_id=request_id)
         cached_parser = self._get_cached_parser(return_type)
@@ -326,7 +327,7 @@ class Client(ClientMethods):
             case _:
                 raise ValueError(f"unsupported request method: {method}")
 
-    def _get_downloaded_filename(self, *, cd: typing.Optional[str]) -> str:
+    def _get_downloaded_filename(self, *, cd: str | None) -> str:
         if not cd:
             return "Unknown"
 

uncountable/core/file_upload.py

@@ -4,11 +4,13 @@ from dataclasses import dataclass
 from enum import StrEnum
 from io import BytesIO
 from pathlib import Path
-from typing import Generator, Literal, Self
+from typing import Generator, Literal, Self, assert_never
 
 import aiohttp
 import aiotus
 
+from uncountable.integration.telemetry import Logger, push_scope_optional
+
 from .types import AuthDetailsAll, AuthDetailsApiKey
 
 _CHUNK_SIZE = 5 * 1024 * 1024  # s3 requires 5MiB minimum
@@ -75,10 +77,12 @@ class FileUploader:
         base_url: str,
         auth_details: AuthDetailsAll,
         allow_insecure_tls: bool = False,
+        logger: Logger | None = None,
     ) -> None:
         self._base_url = base_url
         self._auth_details = auth_details
         self._allow_insecure_tls = allow_insecure_tls
+        self._logger = logger
 
     async def _upload_file(self: Self, file_upload: FileUpload) -> UploadedFile:
         creation_url = f"{self._base_url}/api/external/file_upload/files"
@@ -93,20 +97,40 @@ class FileUploader:
                 auth=auth, headers={"Origin": self._base_url}
             ) as session,
         ):
-            with file_upload_data(file_upload) as file_bytes:
-                location = await aiotus.upload(
-                    creation_url,
-                    file_bytes.bytes_data,
-                    {"filename": file_bytes.name.encode()},
-                    client_session=session,
-                    config=aiotus.RetryConfiguration(ssl=not self._allow_insecure_tls),
-                    chunksize=_CHUNK_SIZE,
-                )
-                if location is None:
-                    raise UploadFailed(f"Failed to upload: {file_bytes.name}")
-                return UploadedFile(
-                    name=file_bytes.name, file_id=int(location.path.split("/")[-1])
-                )
+            attributes = {}
+            match file_upload:
+                case MediaFileUpload():
+                    attributes["file_path"] = file_upload.path
+                case DataFileUpload():
+                    attributes["file_name"] = file_upload.name
+                case _:
+                    assert_never(file_upload)
+            with push_scope_optional(
+                self._logger, "upload_file", attributes=attributes
+            ):
+                if self._logger is not None:
+                    self._logger.log_info("Uploading file", attributes=attributes)
+                with file_upload_data(file_upload) as file_bytes:
+                    if file_bytes.bytes_data.read(1) == b"":
+                        raise UploadFailed(
+                            f"Failed to upload empty file: {file_bytes.name}"
+                        )
+                    file_bytes.bytes_data.seek(0)
+                    location = await aiotus.upload(
+                        creation_url,
+                        file_bytes.bytes_data,
+                        {"filename": file_bytes.name.encode()},
+                        client_session=session,
+                        config=aiotus.RetryConfiguration(
+                            ssl=not self._allow_insecure_tls
+                        ),
+                        chunksize=_CHUNK_SIZE,
+                    )
+                    if location is None:
+                        raise UploadFailed(f"Failed to upload: {file_bytes.name}")
+                    return UploadedFile(
+                        name=file_bytes.name, file_id=int(location.path.split("/")[-1])
+                    )
 
     def upload_files(
         self: Self, *, file_uploads: list[FileUpload]

uncountable/integration/construct_client.py

@@ -37,15 +37,15 @@ def _construct_client_config(
     return ClientConfig(
         allow_insecure_tls=profile_meta.client_options.allow_insecure_tls,
         extra_headers=profile_meta.client_options.extra_headers,
-        job_logger=job_logger,
+        logger=job_logger,
     )
 
 
 def construct_uncountable_client(
-    profile_meta: ProfileMetadata, job_logger: JobLogger
+    profile_meta: ProfileMetadata, logger: JobLogger
 ) -> Client:
     return Client(
         base_url=profile_meta.base_url,
         auth_details=_construct_auth_details(profile_meta),
-        config=_construct_client_config(profile_meta, job_logger),
+        config=_construct_client_config(profile_meta, logger),
     )

uncountable/integration/executors/generic_upload_executor.py

@@ -10,12 +10,12 @@ from pkgs.filesystem_utils import (
     FileSystemFileReference,
     FileSystemObject,
     FileSystemS3Config,
+    FileSystemSession,
     FileSystemSFTPConfig,
     FileTransfer,
     S3Session,
     SFTPSession,
 )
-from pkgs.filesystem_utils.filesystem_session import FileSystemSession
 from uncountable.core.file_upload import DataFileUpload, FileUpload
 from uncountable.integration.job import Job, JobArguments
 from uncountable.integration.secret_retrieval import retrieve_secret

uncountable/integration/job.py

@@ -28,7 +28,7 @@ CronJobArguments = JobArguments
 PT = typing.TypeVar("PT")
 
 
-class Job(ABC, typing.Generic[PT]):
+class Job[PT](ABC):
     _unc_job_registered: bool = False
 
     @property
@@ -62,7 +62,7 @@ class CronJob(Job):
 WPT = typing.TypeVar("WPT")
 
 
-class WebhookJob(Job[webhook_job_t.WebhookEventPayload], typing.Generic[WPT]):
+class WebhookJob[WPT](Job[webhook_job_t.WebhookEventPayload]):
     @property
     def payload_type(self) -> type[webhook_job_t.WebhookEventPayload]:
         return webhook_job_t.WebhookEventPayload

uncountable/integration/queue_runner/command_server/types.py

@@ -14,7 +14,7 @@ RT = typing.TypeVar("RT")
 
 
 @dataclass(kw_only=True)
-class CommandBase(typing.Generic[RT]):
+class CommandBase[RT]:
     type: CommandType
     response_queue: asyncio.Queue[RT]
 

uncountable/integration/queue_runner/worker.py

@@ -90,7 +90,7 @@ def run_queued_job(
         )
         try:
             client = construct_uncountable_client(
-                profile_meta=job_details.profile_metadata, job_logger=job_logger
+                profile_meta=job_details.profile_metadata, logger=job_logger
             )
             batch_processor = AsyncBatchProcessor(client=client)
 

uncountable/integration/server.py

@@ -1,7 +1,7 @@
 import signal
 from dataclasses import asdict
 from types import TracebackType
-from typing import Optional, assert_never
+from typing import assert_never
 
 from apscheduler.executors.pool import ThreadPoolExecutor
 from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
@@ -110,8 +110,8 @@ class IntegrationServer:
 
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         self._stop_apscheduler()

uncountable/integration/telemetry.py

@@ -196,3 +196,14 @@ class JobLogger(Logger):
             case _:
                 assert_never(self.job_definition.executor)
         return _cast_attributes(patched_attributes)
+
+
+@contextmanager
+def push_scope_optional(
+    logger: Logger | None, scope_name: str, *, attributes: Attributes | None = None
+) -> Generator[None, None, None]:
+    if logger is None:
+        yield
+    else:
+        with logger.push_scope(scope_name, attributes=attributes):
+            yield

uncountable/types/__init__.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file

uncountable/types/api/batch/execute_batch.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -7,7 +6,7 @@ from __future__ import annotations
 import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
-from pkgs.strenum_compat import StrEnum
+from enum import StrEnum
 import dataclasses
 from pkgs.serialization import serial_class
 from ... import base_t

uncountable/types/api/batch/execute_batch_load_async.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file

uncountable/types/api/chemical/convert_chemical_formats.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file

uncountable/types/api/entity/create_entities.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -32,7 +31,7 @@ ENDPOINT_PATH = "api/external/entity/external_create_entities"
 )
 @dataclasses.dataclass(kw_only=True)
 class EntityToCreate:
-    field_values: typing.Optional[typing.Optional[list[field_values_t.FieldRefNameValue]]] = None
+    field_values: list[field_values_t.FieldRefNameValue] | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -43,8 +42,8 @@ class EntityToCreate:
 class Arguments:
     entity_type: entity_t.LimitedEntityType
     entities_to_create: list[EntityToCreate]
-    definition_id: typing.Optional[base_t.ObjectId] = None
-    definition_key: typing.Optional[identifier_t.IdentifierKey] = None
+    definition_id: base_t.ObjectId | None = None
+    definition_key: identifier_t.IdentifierKey | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/create_entity.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -35,7 +34,7 @@ ENDPOINT_PATH = "api/external/entity/external_create_entity"
 class EntityFieldInitialValue:
     field_ref_name: str
     value: base_t.JsonValue
-    row_index: typing.Optional[typing.Optional[int]] = None
+    row_index: int | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -45,9 +44,9 @@ class EntityFieldInitialValue:
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
     entity_type: entity_t.LimitedEntityType
-    definition_id: typing.Optional[base_t.ObjectId] = None
-    definition_key: typing.Optional[identifier_t.IdentifierKey] = None
-    field_values: typing.Optional[typing.Optional[list[field_values_t.FieldRefNameValue]]] = None
+    definition_id: base_t.ObjectId | None = None
+    definition_key: identifier_t.IdentifierKey | None = None
+    field_values: list[field_values_t.FieldRefNameValue] | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/get_entities_data.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file

uncountable/types/api/entity/grant_entity_permissions.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -33,9 +32,9 @@ class Arguments:
     entity_type: entity_t.LimitedEntityType
     entity_key: identifier_t.IdentifierKey
     permission_types: list[entity_t.GrantableEntityPermissionType]
-    user_keys: typing.Optional[list[identifier_t.IdentifierKey]] = None
-    user_group_keys: typing.Optional[list[identifier_t.IdentifierKey]] = None
-    all_users: typing.Optional[bool] = None
+    user_keys: list[identifier_t.IdentifierKey] | None = None
+    user_group_keys: list[identifier_t.IdentifierKey] | None = None
+    all_users: bool | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/list_entities.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -34,10 +33,10 @@ ENDPOINT_PATH = "api/external/entity/external_list_entities"
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
     config_reference: str
-    entity_type: typing.Optional[entity_t.EntityType] = None
-    attributes: typing.Optional[dict[OpaqueKey, base_t.JsonValue]] = None
-    offset: typing.Optional[typing.Optional[int]] = None
-    limit: typing.Optional[typing.Optional[int]] = None
+    entity_type: entity_t.EntityType | None = None
+    attributes: dict[OpaqueKey, base_t.JsonValue] | None = None
+    offset: int | None = None
+    limit: int | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -58,7 +57,7 @@ class EntityResult:
 @dataclasses.dataclass(kw_only=True)
 class ColumnAccess:
     name: str
-    table_label: typing.Optional[str]
+    table_label: str | None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/lock_entity.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -32,7 +31,7 @@ ENDPOINT_PATH = "api/external/entity/external_lock_entity"
 class Arguments:
     entity_key: identifier_t.IdentifierKey
     entity_type: entity_t.EntityType
-    globally_removable: typing.Optional[bool] = None
+    globally_removable: bool | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/resolve_entity_ids.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file
@@ -30,7 +29,7 @@ ENDPOINT_PATH = "api/external/entity/external_resolve_entity_ids"
 )
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
-    entity_ids: list[typing.Union[str, base_t.ObjectId]]
+    entity_ids: list[str | base_t.ObjectId]
     entity_type: entity_t.EntityType
 
 
@@ -40,7 +39,7 @@ class Arguments:
 )
 @dataclasses.dataclass(kw_only=True)
 class EntityNames:
-    id: typing.Union[str, int]
+    id: str | int
     name: str
 
 

uncountable/types/api/entity/set_entity_field_values.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file

uncountable/types/api/entity/set_values.py

@@ -1,5 +1,4 @@
 # DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
 # ruff: noqa: E402 Q003
 # fmt: off
 # isort: skip_file