post-#1043 type hints

Author: DiamondJoseph

tiled/client/base.py

@@ -2,7 +2,7 @@
 from copy import copy, deepcopy
 from dataclasses import asdict
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Dict, List, Optional, Union
 from urllib.parse import parse_qs, urlparse
 
 import json_merge_patch
@@ -11,6 +11,7 @@
 from httpx import URL
 
 from tiled.client.context import Context
+from tiled.structures.root import Structure
 
 from ..structures.core import STRUCTURE_TYPES, Spec, StructureFamily
 from ..structures.data_source import DataSource
@@ -131,8 +132,8 @@ def __init__(
         *,
         item,
         structure_clients,
-        structure=None,
-        include_data_sources=False,
+        structure: Optional[Structure] = None,
+        include_data_sources: bool = False,
     ):
         self._context = context
         self._item = item

tiled/server/schemas.py

@@ -10,6 +10,8 @@
 from pydantic_core import PydanticCustomError
 from typing_extensions import Annotated, TypedDict
 
+from tiled.structures.root import Structure
+
 from ..structures.array import ArrayStructure
 from ..structures.awkward import AwkwardStructure
 from ..structures.core import STRUCTURE_TYPES, StructureFamily
@@ -24,7 +26,7 @@
 DataT = TypeVar("DataT")
 LinksT = TypeVar("LinksT")
 MetaT = TypeVar("MetaT")
-StructureT = TypeVar("StructureT")
+StructureT = TypeVar("StructureT", bound=Structure)
 
 
 MAX_ALLOWED_SPECS = 20

tiled/structures/core.py

@@ -9,6 +9,8 @@
 from dataclasses import asdict, dataclass
 from typing import Dict, Optional
 
+from tiled.structures.root import Structure
+
 from ..utils import OneShotCachedMap
 
 
@@ -47,8 +49,7 @@ def dict(self) -> Dict[str, Optional[str]]:
     model_dump = dict  # For easy interoperability with pydantic 2.x models
 
 
-# TODO: make type[Structure] after #1036
-STRUCTURE_TYPES = OneShotCachedMap[StructureFamily, type](
+STRUCTURE_TYPES = OneShotCachedMap[StructureFamily, type[Structure]](
     {
         StructureFamily.array: lambda: importlib.import_module(
             "...structures.array", StructureFamily.__module__