Replace conint etc. with Annotated. Remove obsolete TYPE_CHECKING con…

…ditionals.

shared-data/python/opentrons_shared_data/gripper/gripper_definition.py

@@ -1,8 +1,8 @@
 """Gripper configurations."""
 
 from typing_extensions import Annotated, Literal
-from typing import TYPE_CHECKING, List, Dict, Tuple, Any, NewType
-from pydantic import ConfigDict, BaseModel, Field, conlist
+from typing import List, Dict, Tuple, Any, NewType
+from pydantic import ConfigDict, BaseModel, Field
 from enum import Enum
 
 
@@ -42,20 +42,12 @@ def __str__(self) -> str:
 GripperSchema = Dict[str, Any]
 
 
-if TYPE_CHECKING:
-    _StrictNonNegativeInt = int
-    _StrictNonNegativeFloat = float
-else:
-    _StrictNonNegativeInt = Annotated[int, Field(strict=True, ge=0)]
-    _StrictNonNegativeFloat = Annotated[float, Field(strict=True, ge=0.0)]
+_StrictNonNegativeInt = Annotated[int, Field(strict=True, ge=0)]
+_StrictNonNegativeFloat = Annotated[float, Field(strict=True, ge=0.0)]
 
 
 PolynomialTerm = Tuple[_StrictNonNegativeInt, float]
-
-if TYPE_CHECKING:
-    _Polynomial = List[PolynomialTerm]
-else:
-    _Polynomial = conlist(PolynomialTerm, min_length=1)
+_Polynomial = Annotated[List[PolynomialTerm], Field(min_length=1)]
 
 
 class GripperBaseModel(BaseModel):

shared-data/python/opentrons_shared_data/labware/models.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import TYPE_CHECKING, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 from math import sqrt, asin
 from numpy import pi, trapz
 from functools import cached_property
@@ -34,12 +34,8 @@
 SAFE_STRING_REGEX = "^[a-z0-9._]+$"
 
 
-if TYPE_CHECKING:
-    _StrictNonNegativeInt = int
-    _StrictNonNegativeFloat = float
-else:
-    _StrictNonNegativeInt = Annotated[int, Field(strict=True, ge=0)]
-    _StrictNonNegativeFloat = Annotated[float, Field(strict=True, ge=0.0)]
+_StrictNonNegativeInt = Annotated[int, Field(strict=True, ge=0)]
+_StrictNonNegativeFloat = Annotated[float, Field(strict=True, ge=0.0)]
 
 
 _Number = Union[StrictInt, StrictFloat]

shared-data/python/opentrons_shared_data/liquid_classes/liquid_class_definition.py

@@ -1,27 +1,22 @@
 """Python shared data models for liquid class definitions."""
 
 from enum import Enum
-from typing import TYPE_CHECKING, Literal, Union, Optional, Sequence, Tuple, Any
+from typing import Literal, Union, Optional, Sequence, Tuple, Any
 
 from pydantic import (
     BaseModel,
     field_validator,
     ValidationInfo,
     Field,
-    conint,
-    confloat,
     StrictInt,
     StrictFloat,
 )
 from pydantic.json_schema import SkipJsonSchema
+from typing_extensions import Annotated
 
 
-if TYPE_CHECKING:
-    _StrictNonNegativeInt = int
-    _StrictNonNegativeFloat = float
-else:
-    _StrictNonNegativeInt = conint(strict=True, ge=0)
-    _StrictNonNegativeFloat = confloat(strict=True, ge=0.0)
+_StrictNonNegativeInt = Annotated[int, Field(strict=True, ge=0)]
+_StrictNonNegativeFloat = Annotated[float, Field(strict=True, ge=0.0)]
 
 
 _Number = Union[StrictInt, StrictFloat]