gemd 2.3.2__tar.gz → 3.0.0__tar.gz

{gemd-2.3.2 → gemd-3.0.0}/PKG-INFO

@@ -1,21 +1,19 @@
 Metadata-Version: 2.4
 Name: gemd
-Version: 2.3.2
+Version: 3.0.0
 Summary: Python binding for Citrine's GEMD data model
 Author: Citrine Informatics
 Project-URL: Homepage, http://github.com/CitrineInformatics/gemd-python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pint<0.25,>=0.24.4
 Requires-Dist: deprecation<3,>=2.1.0
-Requires-Dist: typing_extensions<5,>=4.8; python_version < "3.10"
 Dynamic: license-file
 
 # GEMD-python 

gemd-3.0.0/gemd/__version__.py

@@ -0,0 +1 @@
+__version__ = "3.0.0"

{gemd-2.3.2 → gemd-3.0.0}/gemd/builders/impl.py

@@ -1,5 +1,4 @@
 # Tools to help build GEMD objects
-from typing import List, Union
 
 from gemd.entity.attribute import Condition, Parameter, Property, PropertyAndConditions
 from gemd.entity.attribute.base_attribute import BaseAttribute
@@ -104,10 +103,10 @@ def add_edge(
     output_material: MaterialRun,
     *,
     name: str = None,
-    mass_fraction: Union[float, ContinuousValue] = None,
-    number_fraction: Union[float, ContinuousValue] = None,
-    volume_fraction: Union[float, ContinuousValue] = None,
-    absolute_quantity: Union[int, float, ContinuousValue] = None,
+    mass_fraction: float | ContinuousValue = None,
+    number_fraction: float | ContinuousValue = None,
+    volume_fraction: float | ContinuousValue = None,
+    absolute_quantity: int | float | ContinuousValue = None,
     absolute_units: str = None,
 ) -> IngredientRun:
     """Connect two material-process spec-run quadruples with ingredients.
@@ -209,7 +208,7 @@ def add_measurement(
     *,
     name: str = None,
     template: MeasurementTemplate = None,
-    attributes: List[BaseAttribute] = None,
+    attributes: list[BaseAttribute] = None,
 ) -> MeasurementRun:
     """Add a measurement run-spec set to a :class:`~gemd.entity.object.material_run.MaterialRun`.
 
@@ -264,10 +263,10 @@ def add_measurement(
 
 
 def add_attribute(
-    target: Union[HasProperties, HasConditions, HasParameters],
-    template: Union[PropertyTemplate, ConditionTemplate, ParameterTemplate],
-    value: Union[BaseValue, str, float, int],
-) -> Union[Property, Condition, Parameter]:
+    target: HasProperties | HasConditions | HasParameters,
+    template: PropertyTemplate | ConditionTemplate | ParameterTemplate,
+    value: BaseValue | str | float | int,
+) -> Property | Condition | Parameter:
     """Generate an attribute, and then add it attribute to a GEMD object.
 
     Parameters
@@ -314,9 +313,9 @@ def add_attribute(
 
 
 def make_attribute(
-    template: Union[PropertyTemplate, ConditionTemplate, ParameterTemplate],
-    value: Union[BaseValue, str, float, int],
-) -> Union[Property, Condition, Parameter]:
+    template: PropertyTemplate | ConditionTemplate | ParameterTemplate,
+    value: BaseValue | str | float | int,
+) -> Property | Condition | Parameter:
     """Generate an Attribute and the contained Value.
 
     Parameters
@@ -350,7 +349,7 @@ def make_attribute(
     return attribute
 
 
-def make_value(value: Union[str, float, int], bounds: BaseBounds) -> BaseValue:
+def make_value(value: str | float | int, bounds: BaseBounds) -> BaseValue:
     """Generate a Value object based upon a number or string and a particular bounds.
 
     Parameters

{gemd-2.3.2 → gemd-3.0.0}/gemd/demo/strehlow_and_cook.py

@@ -1,6 +1,6 @@
 """Demo representing Strehlow & Cook bandgap data with data concepts."""
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from gemd.entity.attribute.condition import Condition
 from gemd.entity.attribute.property import Property

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/attribute/base_attribute.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod
-from typing import Iterable, List, Optional, Type, Union
+from collections.abc import Iterable
 
 from gemd.entity.bounds_validation import WarningLevel, get_validation_level
 from gemd.entity.dict_serializable import DictSerializable, logger
@@ -37,11 +37,11 @@ class BaseAttribute(DictSerializable):
         self,
         name: str,
         *,
-        template: Union[AttributeTemplate, LinkByUID, None] = None,
-        origin: Union[Origin, str] = Origin.UNKNOWN,
+        template: AttributeTemplate | LinkByUID | None = None,
+        origin: Origin | str = Origin.UNKNOWN,
         value: BaseValue = None,
         notes: str = None,
-        file_links: Optional[Union[Iterable[FileLink], FileLink]] = None,
+        file_links: Iterable[FileLink] | FileLink | None = None,
     ):
         self.name = name
         self.notes = notes
@@ -85,12 +85,12 @@ class BaseAttribute(DictSerializable):
             raise TypeError(f"value must be a BaseValue: {value}")
 
     @property
-    def template(self) -> Optional[Union[AttributeTemplate, LinkByUID]]:
+    def template(self) -> AttributeTemplate | LinkByUID | None:
         """Get the template."""
         return self._template
 
     @template.setter
-    def template(self, template: Optional[Union[AttributeTemplate, LinkByUID]]):
+    def template(self, template: AttributeTemplate | LinkByUID | None):
         """Set the template."""
         if template is None:
             self._template = None
@@ -103,7 +103,7 @@ class BaseAttribute(DictSerializable):
 
     @staticmethod
     @abstractmethod
-    def _template_type() -> Type:
+    def _template_type() -> type:
         """Get the expected type of template for this object (property of child)."""
 
     @property
@@ -112,18 +112,18 @@ class BaseAttribute(DictSerializable):
         return self._origin
 
     @origin.setter
-    def origin(self, origin: Union[Origin, str]):
+    def origin(self, origin: Origin | str):
         """Set the origin."""
         if origin is None:
             raise ValueError("origin must be specified (but may be `unknown`)")
         self._origin = Origin.from_str(origin, exception=True)
 
     @property
-    def file_links(self) -> List[FileLink]:
+    def file_links(self) -> list[FileLink]:
         """Get the file links."""
         return self._file_links
 
     @file_links.setter
-    def file_links(self, file_links: Optional[Union[Iterable[FileLink], FileLink]]):
+    def file_links(self, file_links: Iterable[FileLink] | FileLink | None):
         """Set the file links."""
         self._file_links = validate_list(file_links, FileLink)

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/attribute/condition.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from gemd.entity.attribute.base_attribute import BaseAttribute
 from gemd.entity.template import ConditionTemplate
 
@@ -32,5 +30,5 @@ class Condition(BaseAttribute, typ="condition"):
     """
 
     @staticmethod
-    def _template_type() -> Type:
+    def _template_type() -> type:
         return ConditionTemplate

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/attribute/parameter.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from gemd.entity.attribute.base_attribute import BaseAttribute
 from gemd.entity.template import ParameterTemplate
 
@@ -33,5 +31,5 @@ class Parameter(BaseAttribute, typ="parameter"):
     """
 
     @staticmethod
-    def _template_type() -> Type:
+    def _template_type() -> type:
         return ParameterTemplate

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/attribute/property.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from gemd.entity.attribute.base_attribute import BaseAttribute
 from gemd.entity.template import PropertyTemplate
 
@@ -32,5 +30,5 @@ class Property(BaseAttribute, typ="property"):
     """
 
     @staticmethod
-    def _template_type() -> Type:
+    def _template_type() -> type:
         return PropertyTemplate

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/attribute/property_and_conditions.py

@@ -1,4 +1,4 @@
-from typing import Iterable, List, Optional, Union
+from collections.abc import Iterable
 
 from gemd.entity.attribute.condition import Condition
 from gemd.entity.attribute.property import Property
@@ -26,7 +26,7 @@ class PropertyAndConditions(DictSerializable, typ="property_and_conditions"):
     """
 
     def __init__(
-        self, property: Property = None, conditions: Union[Iterable[Condition], Condition] = None
+        self, property: Property = None, conditions: Iterable[Condition] | Condition = None
     ):
         self._property = None
         self.property = property
@@ -34,7 +34,7 @@ class PropertyAndConditions(DictSerializable, typ="property_and_conditions"):
         self.conditions = conditions
 
     @property
-    def conditions(self) -> List[Condition]:
+    def conditions(self) -> list[Condition]:
         """Get conditions."""
         return self._conditions
 
@@ -49,7 +49,7 @@ class PropertyAndConditions(DictSerializable, typ="property_and_conditions"):
         return self.property.name
 
     @property
-    def template(self) -> Optional[Union[PropertyTemplate, LinkByUID]]:
+    def template(self) -> PropertyTemplate | LinkByUID | None:
         """Get template of attribute (use template of property)."""
         return self.property.template
 

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/base_entity.py

@@ -1,6 +1,7 @@
 """Base class for all entities."""
 
-from typing import Dict, FrozenSet, Iterable, List, MutableMapping, Optional, Set, TypeVar, Union
+from collections.abc import Iterable, MutableMapping
+from typing import TypeVar
 
 from gemd.entity.case_insensitive_dict import CaseInsensitiveDict
 from gemd.entity.dict_serializable import DictSerializable
@@ -28,7 +29,7 @@ class BaseEntity(DictSerializable):
         self.uids = uids
 
     @property
-    def tags(self) -> List[str]:
+    def tags(self) -> list[str]:
         """A collection of structured labels.
 
         `Tags <https://citrineinformatics.github.io/gemd-documentation/specification/tags/>`_
@@ -43,7 +44,7 @@ class BaseEntity(DictSerializable):
         self._tags = validate_list(tags, str)
 
     @property
-    def uids(self) -> Dict[str, str]:
+    def uids(self) -> dict[str, str]:
         """A collection of unique IDs.
 
         Requirements for and the value of unique IDs are discussed
@@ -76,9 +77,7 @@ class BaseEntity(DictSerializable):
         """
         self.uids[scope] = uid
 
-    def to_link(
-        self, scope: Optional[str] = None, *, allow_fallback: bool = False
-    ) -> LinkByUIDType:
+    def to_link(self, scope: str | None = None, *, allow_fallback: bool = False) -> LinkByUIDType:
         """Generate a ~gemd.entity.link_by_uid.LinkByUID for this object.
 
         Parameters
@@ -107,7 +106,7 @@ class BaseEntity(DictSerializable):
 
         return LinkByUID(scope=scope, id=uid)
 
-    def all_dependencies(self) -> Set[Union[BaseEntityType, LinkByUIDType]]:
+    def all_dependencies(self) -> set[BaseEntityType | LinkByUIDType]:
         """Return a set of all immediate dependencies (no recursion)."""
         result = set()
         queue = [type(self)]
@@ -121,8 +120,8 @@ class BaseEntity(DictSerializable):
 
     @staticmethod
     def _cached_equals(
-        this: "BaseEntity", that: "BaseEntity", *, cache: Dict[FrozenSet, Optional[bool]] = None
-    ) -> Optional[bool]:
+        this: "BaseEntity", that: "BaseEntity", *, cache: dict[frozenset, bool | None] = None
+    ) -> bool | None:
         """Compute and stash whether two Base Entities are equal in a recursive sense.
 
         The cache uses ternary logic to communicate state.  True or False indicate a completed

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/bounds/base_bounds.py

@@ -1,7 +1,7 @@
 """Base class for all bounds."""
 
 from abc import abstractmethod
-from typing import TypeVar, Union
+from typing import TypeVar
 
 from gemd.entity.dict_serializable import DictSerializable
 
@@ -14,7 +14,7 @@ class BaseBounds(DictSerializable):
     """Base class for bounds, including RealBounds and CategoricalBounds."""
 
     @abstractmethod
-    def contains(self, bounds: Union[BaseBoundsType, BaseValueType]):
+    def contains(self, bounds: BaseBoundsType | BaseValueType):
         """Check if another bounds is contained within this bounds.
 
         Parameters
@@ -41,7 +41,7 @@ class BaseBounds(DictSerializable):
         raise TypeError(f"{bounds} is not a Bounds object")
 
     @abstractmethod
-    def union(self, *others: Union[BaseBoundsType, BaseValueType]) -> BaseBoundsType:
+    def union(self, *others: BaseBoundsType | BaseValueType) -> BaseBoundsType:
         """Return the union of this bounds and other bounds.
 
         The others list must also be the same class (e.g., categorical, real...).
@@ -61,7 +61,7 @@ class BaseBounds(DictSerializable):
         """
 
     @abstractmethod
-    def update(self, *others: Union[BaseBoundsType, BaseValueType]):
+    def update(self, *others: BaseBoundsType | BaseValueType):
         """Update this bounds to include other bounds.
 
         The others list must also be the same class (e.g., categorical, real...).

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/bounds/categorical_bounds.py

@@ -1,4 +1,5 @@
-from typing import Any, Dict, Iterable, Optional, Set, TypeVar, Union
+from collections.abc import Iterable
+from typing import Any, TypeVar
 
 from gemd.entity.bounds.base_bounds import BaseBounds
 from gemd.entity.util import array_like
@@ -19,17 +20,17 @@ class CategoricalBounds(BaseBounds, typ="categorical_bounds"):
 
     """
 
-    def __init__(self, categories: Optional[Iterable[str]] = None):
+    def __init__(self, categories: Iterable[str] | None = None):
         self._categories = None
         self.categories = categories
 
     @property
-    def categories(self) -> Set[str]:
+    def categories(self) -> set[str]:
         """The collection of allowed categories."""
         return self._categories
 
     @categories.setter
-    def categories(self, categories: Optional[Iterable[str]]):
+    def categories(self, categories: Iterable[str] | None):
         if categories is None:
             self._categories = set()
         elif isinstance(categories, array_like()):
@@ -42,7 +43,7 @@ class CategoricalBounds(BaseBounds, typ="categorical_bounds"):
         if not all(isinstance(x, str) for x in self.categories):
             raise ValueError("All the categories must be strings")
 
-    def contains(self, bounds: Union[BaseBounds, BaseValueType]) -> bool:
+    def contains(self, bounds: BaseBounds | BaseValueType) -> bool:
         """Check if another bounds object or value object is contained by this bounds.
 
         The other object must also be Categorical and its allowed categories must be a
@@ -74,7 +75,7 @@ class CategoricalBounds(BaseBounds, typ="categorical_bounds"):
         return bounds.categories.issubset(self.categories)
 
     def union(
-        self, *others: Union[CategoricalBoundsType, CategoricalValueType]
+        self, *others: CategoricalBoundsType | CategoricalValueType
     ) -> CategoricalBoundsType:
         """Return the union of this bounds and other bounds.
 
@@ -111,7 +112,7 @@ class CategoricalBounds(BaseBounds, typ="categorical_bounds"):
             result.update(bounds.categories)
         return CategoricalBounds(result)
 
-    def update(self, *others: Union[CategoricalBoundsType, CategoricalValueType]):
+    def update(self, *others: CategoricalBoundsType | CategoricalValueType):
         """Update this bounds to include other bounds.
 
         The others list must also be Categorical Bounds or Values.
@@ -126,7 +127,7 @@ class CategoricalBounds(BaseBounds, typ="categorical_bounds"):
         """
         self.categories = self.union(*others).categories
 
-    def as_dict(self) -> Dict[str, Any]:
+    def as_dict(self) -> dict[str, Any]:
         """Convert bounds to a dictionary.
 
         Returns

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/bounds/composition_bounds.py

@@ -1,6 +1,7 @@
 """Bounds a composition to have a specified set of components."""
 
-from typing import Iterable, Set, TypeVar, Union
+from collections.abc import Iterable
+from typing import TypeVar
 
 from gemd.entity.bounds.base_bounds import BaseBounds
 from gemd.entity.util import array_like
@@ -26,7 +27,7 @@ class CompositionBounds(BaseBounds, typ="composition_bounds"):
         self.components = components
 
     @property
-    def components(self) -> Set[str]:
+    def components(self) -> set[str]:
         """Get the collection of the components that are allowed in the composition."""
         return self._components
 
@@ -45,7 +46,7 @@ class CompositionBounds(BaseBounds, typ="composition_bounds"):
         if not all(isinstance(x, str) for x in self.components):
             raise ValueError("All the components must be strings")
 
-    def contains(self, bounds: Union[BaseBounds, BaseValueType]) -> bool:
+    def contains(self, bounds: BaseBounds | BaseValueType) -> bool:
         """Check if another bounds or value object is contained by this bounds.
 
         The other object must also be a Composition and its components must be a subset of
@@ -76,7 +77,7 @@ class CompositionBounds(BaseBounds, typ="composition_bounds"):
         return bounds.components.issubset(self.components)
 
     def union(
-        self, *others: Union[CompositionBoundsType, CompositionValueType]
+        self, *others: CompositionBoundsType | CompositionValueType
     ) -> CompositionBoundsType:
         """Return the union of this bounds and other bounds.
 
@@ -113,7 +114,7 @@ class CompositionBounds(BaseBounds, typ="composition_bounds"):
             result.update(bounds.components)
         return CompositionBounds(result)
 
-    def update(self, *others: Union[CompositionBoundsType, CompositionValueType]):
+    def update(self, *others: CompositionBoundsType | CompositionValueType):
         """Update this bounds to include other bounds.
 
         The others list must also be Composition Bounds or Values.

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/bounds/integer_bounds.py

@@ -1,7 +1,7 @@
 """Bounds an integer to be between two values."""
 
 from math import isfinite
-from typing import TypeVar, Union
+from typing import TypeVar
 
 from gemd.entity.bounds.base_bounds import BaseBounds
 
@@ -64,7 +64,7 @@ class IntegerBounds(BaseBounds, typ="integer_bounds"):
             )
         self._upper_bound = int(value)
 
-    def contains(self, bounds: Union[BaseBounds, BaseValueType]) -> bool:
+    def contains(self, bounds: BaseBounds | BaseValueType) -> bool:
         """Check if another bounds or value object is a subset of this range.
 
         The other object must also be an Integer and its lower and upper bound must *both*
@@ -94,7 +94,7 @@ class IntegerBounds(BaseBounds, typ="integer_bounds"):
 
         return bounds.lower_bound >= self.lower_bound and bounds.upper_bound <= self.upper_bound
 
-    def union(self, *others: Union[IntegerBoundsType, IntegerValueType]) -> IntegerBoundsType:
+    def union(self, *others: IntegerBoundsType | IntegerValueType) -> IntegerBoundsType:
         """Return the union of this bounds and other bounds.
 
         The others list must also be Integer Bounds or Values.
@@ -132,7 +132,7 @@ class IntegerBounds(BaseBounds, typ="integer_bounds"):
                 upper = bounds.upper_bound
         return IntegerBounds(lower_bound=lower, upper_bound=upper)
 
-    def update(self, *others: Union[IntegerBoundsType, IntegerValueType]):
+    def update(self, *others: IntegerBoundsType | IntegerValueType):
         """Update this bounds to include other bounds.
 
         The others list must also be Integer Bounds or Values.

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/bounds/molecular_structure_bounds.py

@@ -3,7 +3,7 @@
 In the future, this may include substructural restrictions.
 """
 
-from typing import TypeVar, Union
+from typing import TypeVar
 
 from gemd.entity.bounds.base_bounds import BaseBounds
 
@@ -16,7 +16,7 @@ MolecularValueType = TypeVar("MolecularValueType", bound="MolecularValue")  # no
 class MolecularStructureBounds(BaseBounds, typ="molecular_structure_bounds"):
     """Molecular bounds, with no component or substructural restrictions (yet)."""
 
-    def contains(self, bounds: Union[BaseBounds, BaseValueType]) -> bool:
+    def contains(self, bounds: BaseBounds | BaseValueType) -> bool:
         """Check if another bounds or value object is contained by this bounds.
 
         The other object must also be or type Molecular.  There are no other
@@ -46,9 +46,7 @@ class MolecularStructureBounds(BaseBounds, typ="molecular_structure_bounds"):
 
         return True
 
-    def union(
-        self, *others: Union[MolecularBoundsType, MolecularValueType]
-    ) -> MolecularBoundsType:
+    def union(self, *others: MolecularBoundsType | MolecularValueType) -> MolecularBoundsType:
         """Return the union of this bounds and other bounds.
 
         The others list must also be Molecular Structure Bounds or Values.
@@ -79,7 +77,7 @@ class MolecularStructureBounds(BaseBounds, typ="molecular_structure_bounds"):
             )
         return MolecularStructureBounds()
 
-    def update(self, *others: Union[MolecularBoundsType, MolecularValueType]):
+    def update(self, *others: MolecularBoundsType | MolecularValueType):
         """Update this bounds to include other bounds.
 
         The others list must also be Molecular Structure Bounds or Values.

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/bounds/real_bounds.py

@@ -1,7 +1,7 @@
 """Bound a real number to be between two values."""
 
 from math import isfinite
-from typing import TypeVar, Union
+from typing import TypeVar
 
 import gemd.units as units
 from gemd.entity.bounds.base_bounds import BaseBounds
@@ -85,7 +85,7 @@ class RealBounds(BaseBounds, typ="real_bounds"):
             )
         self._default_units = units.parse_units(default_units, return_unit=False)
 
-    def contains(self, bounds: Union[BaseBounds, BaseValueType]) -> bool:
+    def contains(self, bounds: BaseBounds | BaseValueType) -> bool:
         """Check if another bounds or value object is a subset of this range.
 
         The other object must also be Real and its lower and upper bound must *both*
@@ -121,7 +121,7 @@ class RealBounds(BaseBounds, typ="real_bounds"):
 
         return bounds.lower_bound >= lower and bounds.upper_bound <= upper
 
-    def union(self, *others: Union[RealBoundsType, ContinuousValueType]) -> RealBoundsType:
+    def union(self, *others: RealBoundsType | ContinuousValueType) -> RealBoundsType:
         """Return the union of this bounds and other bounds.
 
         The others list must also be Real Bounds or Values.
@@ -163,7 +163,7 @@ class RealBounds(BaseBounds, typ="real_bounds"):
                 upper = bnd_hi
         return RealBounds(lower_bound=lower, upper_bound=upper, default_units=unit_)
 
-    def update(self, *others: Union[RealBoundsType, ContinuousValueType]):
+    def update(self, *others: RealBoundsType | ContinuousValueType):
         """Update this bounds to include other bounds.
 
         The others list must also be Real Bounds or Values.

{gemd-2.3.2 → gemd-3.0.0}/gemd/entity/case_insensitive_dict.py

@@ -1,11 +1,15 @@
-from typing import Any, Mapping, Optional, Sequence, Tuple
+from collections.abc import Mapping, Sequence
+from typing import Any, TypeVar, overload
 
 __all__ = ["CaseInsensitiveDict"]
 
-_RaiseKeyError = object()  # singleton for no-default behavior
+_VT = TypeVar("_VT")
+_T = TypeVar("_T")
 
+_RaiseKeyError: Any = object()  # singleton for no-default behavior
 
-class CaseInsensitiveDict(dict):
+
+class CaseInsensitiveDict(dict[str, _VT]):
     """A dictionary in which the keys are case-insensitive.
 
     It is initialized the same way as a typical dict, but the values can be accessed without
@@ -29,10 +33,19 @@ class CaseInsensitiveDict(dict):
         for key in self:
             self._register_key(key)
 
-    def __getitem__(self, key: str) -> Any:
+    def __getitem__(self, key: str) -> _VT:
         return super().__getitem__(self.lowercase_dict[key.lower()])
 
-    def get(self, key: str, default: Any = None) -> Any:
+    @overload
+    def get(self, key: str, default: None = None, /) -> _VT | None: ...
+
+    @overload
+    def get(self, key: str, default: _VT, /) -> _VT: ...
+
+    @overload
+    def get(self, key: str, default: _T, /) -> _VT | _T: ...
+
+    def get(self, key: str, default: Any = None, /) -> Any:
         """Get the value for a given case-insensitive key.
 
         Parameters
@@ -55,7 +68,7 @@ class CaseInsensitiveDict(dict):
         else:
             return default
 
-    def __setitem__(self, key: str, value: Any) -> None:
+    def __setitem__(self, key: str, value: _VT) -> None:
         self._register_key(key)
         super().__setitem__(key, value)
 
@@ -72,7 +85,16 @@ class CaseInsensitiveDict(dict):
         super().clear()
         self.lowercase_dict.clear()
 
-    def pop(self, key: str, default=_RaiseKeyError) -> Any:
+    @overload
+    def pop(self, key: str, /) -> _VT: ...
+
+    @overload
+    def pop(self, key: str, default: _VT, /) -> _VT: ...
+
+    @overload
+    def pop(self, key: str, default: _T, /) -> _VT | _T: ...
+
+    def pop(self, key: str, default: Any = _RaiseKeyError, /) -> Any:
         """Remove and return the value for a given key from the dictionary.
 
         If key is in the dictionary, remove it and return its value, else return default.
@@ -103,7 +125,7 @@ class CaseInsensitiveDict(dict):
             del self.lowercase_dict[key.lower()]
         return val
 
-    def popitem(self) -> Tuple:
+    def popitem(self) -> tuple[str, _VT]:
         """Remove and return a (key, value) pair from the dictionary.
 
         popitem() is useful to destructively iterate over a dictionary, as often used
@@ -115,7 +137,7 @@ class CaseInsensitiveDict(dict):
 
         Returns
         -------
-        Tuple(str, Any)
+        tuple[str, Any]
             The key-value pair
 
         """
@@ -123,7 +145,7 @@ class CaseInsensitiveDict(dict):
         del self.lowercase_dict[result[0].lower()]
         return result
 
-    def copy(self) -> "CaseInsensitiveDict":
+    def copy(self) -> "CaseInsensitiveDict[_VT]":
         """Return a shallow copy of the dictionary.
 
         Returns
@@ -134,7 +156,7 @@ class CaseInsensitiveDict(dict):
         """
         return CaseInsensitiveDict(super().copy())
 
-    def update(self, mapping: Optional[Mapping[str, Any]] = None, **kwargs) -> None:
+    def update(self, mapping: Mapping[str, Any] | None = None, **kwargs) -> None:
         """Update the dictionary with the key/value pairs from other, overwriting existing keys.
 
         update() accepts either another dictionary object or an iterable of