arize-phoenix 5.5.1__py3-none-any.whl → 5.6.0__py3-none-any.whl

phoenix/server/api/mutations/export_events_mutations.py

@@ -1,7 +1,7 @@
 import asyncio
 from collections import defaultdict
 from datetime import datetime
-from typing import Dict, List, Optional, Tuple
+from typing import Optional
 
 import strawberry
 from strawberry import ID, UNSET
@@ -29,7 +29,7 @@ class ExportEventsMutationMixin:
     async def export_events(
         self,
         info: Info[Context, None],
-        event_ids: List[ID],
+        event_ids: list[ID],
         file_name: Optional[str] = UNSET,
     ) -> ExportedFile:
         if not isinstance(file_name, str):
@@ -61,7 +61,7 @@ class ExportEventsMutationMixin:
     async def export_clusters(
         self,
         info: Info[Context, None],
-        clusters: List[ClusterInput],
+        clusters: list[ClusterInput],
         file_name: Optional[str] = UNSET,
     ) -> ExportedFile:
         if not isinstance(file_name, str):
@@ -81,10 +81,10 @@ class ExportEventsMutationMixin:
 
 
 def _unpack_clusters(
-    clusters: List[ClusterInput],
-) -> Tuple[Dict[ms.InferencesRole, List[int]], Dict[ms.InferencesRole, Dict[int, str]]]:
-    row_numbers: Dict[ms.InferencesRole, List[int]] = defaultdict(list)
-    cluster_ids: Dict[ms.InferencesRole, Dict[int, str]] = defaultdict(dict)
+    clusters: list[ClusterInput],
+) -> tuple[dict[ms.InferencesRole, list[int]], dict[ms.InferencesRole, dict[int, str]]]:
+    row_numbers: dict[ms.InferencesRole, list[int]] = defaultdict(list)
+    cluster_ids: dict[ms.InferencesRole, dict[int, str]] = defaultdict(dict)
     for i, cluster in enumerate(clusters):
         for row_number, inferences_role in map(unpack_event_id, cluster.event_ids):
             if isinstance(inferences_role, AncillaryInferencesRole):

phoenix/server/api/mutations/span_annotations_mutations.py

@@ -1,4 +1,4 @@
-from typing import List, Sequence
+from collections.abc import Sequence
 
 import strawberry
 from sqlalchemy import delete, insert, update
@@ -19,7 +19,7 @@ from phoenix.server.dml_event import SpanAnnotationDeleteEvent, SpanAnnotationIn
 
 @strawberry.type
 class SpanAnnotationMutationPayload:
-    span_annotations: List[SpanAnnotation]
+    span_annotations: list[SpanAnnotation]
     query: Query
 
 
@@ -27,7 +27,7 @@ class SpanAnnotationMutationPayload:
 class SpanAnnotationMutationMixin:
     @strawberry.mutation(permission_classes=[IsNotReadOnly])  # type: ignore
     async def create_span_annotations(
-        self, info: Info[Context, None], input: List[CreateSpanAnnotationInput]
+        self, info: Info[Context, None], input: list[CreateSpanAnnotationInput]
     ) -> SpanAnnotationMutationPayload:
         inserted_annotations: Sequence[models.SpanAnnotation] = []
         async with info.context.db() as session:
@@ -61,7 +61,7 @@ class SpanAnnotationMutationMixin:
 
     @strawberry.mutation(permission_classes=[IsNotReadOnly])  # type: ignore
     async def patch_span_annotations(
-        self, info: Info[Context, None], input: List[PatchAnnotationInput]
+        self, info: Info[Context, None], input: list[PatchAnnotationInput]
     ) -> SpanAnnotationMutationPayload:
         patched_annotations = []
         async with info.context.db() as session:

phoenix/server/api/mutations/trace_annotations_mutations.py

@@ -1,4 +1,4 @@
-from typing import List, Sequence
+from collections.abc import Sequence
 
 import strawberry
 from sqlalchemy import delete, insert, update
@@ -19,7 +19,7 @@ from phoenix.server.dml_event import TraceAnnotationDeleteEvent, TraceAnnotation
 
 @strawberry.type
 class TraceAnnotationMutationPayload:
-    trace_annotations: List[TraceAnnotation]
+    trace_annotations: list[TraceAnnotation]
     query: Query
 
 
@@ -27,7 +27,7 @@ class TraceAnnotationMutationPayload:
 class TraceAnnotationMutationMixin:
     @strawberry.mutation(permission_classes=[IsNotReadOnly])  # type: ignore
     async def create_trace_annotations(
-        self, info: Info[Context, None], input: List[CreateTraceAnnotationInput]
+        self, info: Info[Context, None], input: list[CreateTraceAnnotationInput]
     ) -> TraceAnnotationMutationPayload:
         inserted_annotations: Sequence[models.TraceAnnotation] = []
         async with info.context.db() as session:
@@ -61,7 +61,7 @@ class TraceAnnotationMutationMixin:
 
     @strawberry.mutation(permission_classes=[IsNotReadOnly])  # type: ignore
     async def patch_trace_annotations(
-        self, info: Info[Context, None], input: List[PatchAnnotationInput]
+        self, info: Info[Context, None], input: list[PatchAnnotationInput]
     ) -> TraceAnnotationMutationPayload:
         patched_annotations = []
         async with info.context.db() as session:

phoenix/server/api/mutations/user_mutations.py

@@ -1,7 +1,7 @@
 import secrets
 from contextlib import AsyncExitStack
 from datetime import datetime, timezone
-from typing import List, Literal, Optional, Tuple
+from typing import Literal, Optional
 
 import strawberry
 from sqlalchemy import Boolean, Select, and_, case, cast, delete, distinct, func, select
@@ -71,7 +71,7 @@ class PatchUserInput:
 
 @strawberry.input
 class DeleteUsersInput:
-    user_ids: List[GlobalID]
+    user_ids: list[GlobalID]
 
 
 @strawberry.type
@@ -302,11 +302,11 @@ class UserMutationMixin:
         )
 
 
-def _select_role_id_by_name(role_name: str) -> Select[Tuple[int]]:
+def _select_role_id_by_name(role_name: str) -> Select[tuple[int]]:
     return select(models.UserRole.id).where(models.UserRole.name == role_name)
 
 
-def _select_user_by_id(user_id: int) -> Select[Tuple[models.User]]:
+def _select_user_by_id(user_id: int) -> Select[tuple[models.User]]:
     return (
         select(models.User).where(models.User.id == user_id).options(joinedload(models.User.role))
     )

phoenix/server/api/openapi/schema.py

@@ -1,11 +1,11 @@
-from typing import Any, Dict
+from typing import Any
 
 from fastapi.openapi.utils import get_openapi
 
 from phoenix.server.api.routers.v1 import REST_API_VERSION, create_v1_router
 
 
-def get_openapi_schema() -> Dict[str, Any]:
+def get_openapi_schema() -> dict[str, Any]:
     v1_router = create_v1_router(authentication_enabled=False)
     return get_openapi(
         title="Arize-Phoenix REST API",

phoenix/server/api/queries.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from datetime import datetime
-from typing import DefaultDict, Dict, List, Optional, Set, Union
+from typing import Optional, Union
 
 import numpy as np
 import numpy.typing as npt
@@ -89,7 +89,7 @@ class ModelsInput:
 @strawberry.type
 class Query:
     @strawberry.field
-    async def model_providers(self) -> List[GenerativeProvider]:
+    async def model_providers(self) -> list[GenerativeProvider]:
         return [
             GenerativeProvider(
                 name="OpenAI",
@@ -106,7 +106,7 @@ class Query:
         ]
 
     @strawberry.field
-    async def models(self, input: Optional[ModelsInput] = None) -> List[GenerativeModel]:
+    async def models(self, input: Optional[ModelsInput] = None) -> list[GenerativeModel]:
         openai_models = [
             "o1-preview",
             "o1-preview-2024-09-12",
@@ -183,7 +183,7 @@ class Query:
     async def user_roles(
         self,
         info: Info[Context, None],
-    ) -> List[UserRole]:
+    ) -> list[UserRole]:
         async with info.context.db() as session:
             roles = await session.scalars(
                 select(models.UserRole).where(models.UserRole.name != enums.UserRole.SYSTEM.value)
@@ -197,7 +197,7 @@ class Query:
         ]
 
     @strawberry.field(permission_classes=[IsAdmin])  # type: ignore
-    async def user_api_keys(self, info: Info[Context, None]) -> List[UserApiKey]:
+    async def user_api_keys(self, info: Info[Context, None]) -> list[UserApiKey]:
         stmt = (
             select(models.ApiKey)
             .join(models.User)
@@ -209,7 +209,7 @@ class Query:
         return [to_gql_api_key(api_key) for api_key in api_keys]
 
     @strawberry.field(permission_classes=[IsAdmin])  # type: ignore
-    async def system_api_keys(self, info: Info[Context, None]) -> List[SystemApiKey]:
+    async def system_api_keys(self, info: Info[Context, None]) -> list[SystemApiKey]:
         stmt = (
             select(models.ApiKey)
             .join(models.User)
@@ -304,8 +304,8 @@ class Query:
     async def compare_experiments(
         self,
         info: Info[Context, None],
-        experiment_ids: List[GlobalID],
-    ) -> List[ExperimentComparison]:
+        experiment_ids: list[GlobalID],
+    ) -> list[ExperimentComparison]:
         experiment_ids_ = [
             from_global_id_with_expected_type(experiment_id, OrmExperiment.__name__)
             for experiment_id in experiment_ids
@@ -369,7 +369,7 @@ class Query:
 
             ExampleID: TypeAlias = int
             ExperimentID: TypeAlias = int
-            runs: DefaultDict[ExampleID, DefaultDict[ExperimentID, List[OrmRun]]] = defaultdict(
+            runs: defaultdict[ExampleID, defaultdict[ExperimentID, list[OrmRun]]] = defaultdict(
                 lambda: defaultdict(list)
             )
             async for run in await session.stream_scalars(
@@ -576,9 +576,9 @@ class Query:
     @strawberry.field
     def clusters(
         self,
-        clusters: List[ClusterInput],
-    ) -> List[Cluster]:
-        clustered_events: Dict[str, Set[ID]] = defaultdict(set)
+        clusters: list[ClusterInput],
+    ) -> list[Cluster]:
+        clustered_events: dict[str, set[ID]] = defaultdict(set)
         for i, cluster in enumerate(clusters):
             clustered_events[cluster.id or str(i)].update(cluster.event_ids)
         return to_gql_clusters(
@@ -590,19 +590,19 @@ class Query:
         self,
         info: Info[Context, None],
         event_ids: Annotated[
-            List[ID],
+            list[ID],
             strawberry.argument(
                 description="Event ID of the coordinates",
             ),
         ],
         coordinates_2d: Annotated[
-            Optional[List[InputCoordinate2D]],
+            Optional[list[InputCoordinate2D]],
             strawberry.argument(
                 description="Point coordinates. Must be either 2D or 3D.",
             ),
         ] = UNSET,
         coordinates_3d: Annotated[
-            Optional[List[InputCoordinate3D]],
+            Optional[list[InputCoordinate3D]],
             strawberry.argument(
                 description="Point coordinates. Must be either 2D or 3D.",
             ),
@@ -625,7 +625,7 @@ class Query:
                 description="HDBSCAN cluster selection epsilon",
             ),
         ] = DEFAULT_CLUSTER_SELECTION_EPSILON,
-    ) -> List[Cluster]:
+    ) -> list[Cluster]:
         coordinates_3d = ensure_list(coordinates_3d)
         coordinates_2d = ensure_list(coordinates_2d)
 
@@ -661,13 +661,13 @@ class Query:
         if len(event_ids) == 0:
             return []
 
-        grouped_event_ids: Dict[
+        grouped_event_ids: dict[
             Union[InferencesRole, AncillaryInferencesRole],
-            List[ID],
+            list[ID],
         ] = defaultdict(list)
-        grouped_coordinates: Dict[
+        grouped_coordinates: dict[
             Union[InferencesRole, AncillaryInferencesRole],
-            List[npt.NDArray[np.float64]],
+            list[npt.NDArray[np.float64]],
         ] = defaultdict(list)
 
         for event_id, coordinate in zip(event_ids, coordinates):

phoenix/server/api/routers/oauth2.py

@@ -2,7 +2,7 @@ import re
 from dataclasses import dataclass
 from datetime import timedelta
 from random import randrange
-from typing import Any, Dict, Optional, Tuple, TypedDict
+from typing import Any, Optional, TypedDict
 from urllib.parse import unquote, urlparse
 
 from authlib.common.security import generate_token
@@ -192,7 +192,7 @@ class UserInfo:
     profile_picture_url: Optional[str]
 
 
-def _validate_token_data(token_data: Dict[str, Any]) -> None:
+def _validate_token_data(token_data: dict[str, Any]) -> None:
     """
     Performs basic validations on the token data returned by the IDP.
     """
@@ -201,7 +201,7 @@ def _validate_token_data(token_data: Dict[str, Any]) -> None:
     assert token_type.lower() == "bearer"
 
 
-def _parse_user_info(user_info: Dict[str, Any]) -> UserInfo:
+def _parse_user_info(user_info: dict[str, Any]) -> UserInfo:
     """
     Parses user info from the IDP's ID token.
     """
@@ -321,7 +321,7 @@ async def _update_user_email(session: AsyncSession, /, *, user_id: int, email: s
 
 async def _email_and_username_exist(
     session: AsyncSession, /, *, email: str, username: Optional[str]
-) -> Tuple[bool, bool]:
+) -> tuple[bool, bool]:
     """
     Checks whether the email and username are already in use.
     """

phoenix/server/api/routers/v1/datasets.py

@@ -6,25 +6,11 @@ import logging
 import zlib
 from asyncio import QueueFull
 from collections import Counter
+from collections.abc import Awaitable, Callable, Coroutine, Iterator, Mapping, Sequence
 from datetime import datetime
 from enum import Enum
 from functools import partial
-from typing import (
-    Any,
-    Awaitable,
-    Callable,
-    Coroutine,
-    Dict,
-    FrozenSet,
-    Iterator,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Tuple,
-    Union,
-    cast,
-)
+from typing import Any, Optional, Union, cast
 
 import pandas as pd
 import pyarrow as pa
@@ -83,7 +69,7 @@ class Dataset(V1RoutesBaseModel):
     id: str
     name: str
     description: Optional[str]
-    metadata: Dict[str, Any]
+    metadata: dict[str, Any]
     created_at: datetime
     updated_at: datetime
 
@@ -246,7 +232,7 @@ async def get_dataset(
 class DatasetVersion(V1RoutesBaseModel):
     version_id: str
     description: Optional[str]
-    metadata: Dict[str, Any]
+    metadata: dict[str, Any]
     created_at: datetime
 
 
@@ -522,16 +508,16 @@ class FileContentEncoding(Enum):
 
 Name: TypeAlias = str
 Description: TypeAlias = Optional[str]
-InputKeys: TypeAlias = FrozenSet[str]
-OutputKeys: TypeAlias = FrozenSet[str]
-MetadataKeys: TypeAlias = FrozenSet[str]
+InputKeys: TypeAlias = frozenset[str]
+OutputKeys: TypeAlias = frozenset[str]
+MetadataKeys: TypeAlias = frozenset[str]
 DatasetId: TypeAlias = int
 Examples: TypeAlias = Iterator[ExampleContent]
 
 
 def _process_json(
     data: Mapping[str, Any],
-) -> Tuple[Examples, DatasetAction, Name, Description]:
+) -> tuple[Examples, DatasetAction, Name, Description]:
     name = data.get("name")
     if not name:
         raise ValueError("Dataset name is required")
@@ -547,7 +533,7 @@ def _process_json(
             raise ValueError(
                 f"{k} should be a list of same length as input containing only dictionary objects"
             )
-    examples: List[ExampleContent] = []
+    examples: list[ExampleContent] = []
     for i, obj in enumerate(inputs):
         example = ExampleContent(
             input=obj,
@@ -623,7 +609,7 @@ async def _check_table_exists(session: AsyncSession, name: str) -> bool:
 
 
 def _check_keys_exist(
-    column_headers: FrozenSet[str],
+    column_headers: frozenset[str],
     input_keys: InputKeys,
     output_keys: OutputKeys,
     metadata_keys: MetadataKeys,
@@ -639,7 +625,7 @@ def _check_keys_exist(
 
 async def _parse_form_data(
     form: FormData,
-) -> Tuple[
+) -> tuple[
     DatasetAction,
     Name,
     Description,
@@ -656,9 +642,9 @@ async def _parse_form_data(
     if not isinstance(file, UploadFile):
         raise ValueError("Malformed file in form data.")
     description = cast(Optional[str], form.get("description")) or file.filename
-    input_keys = frozenset(filter(bool, cast(List[str], form.getlist("input_keys[]"))))
-    output_keys = frozenset(filter(bool, cast(List[str], form.getlist("output_keys[]"))))
-    metadata_keys = frozenset(filter(bool, cast(List[str], form.getlist("metadata_keys[]"))))
+    input_keys = frozenset(filter(bool, cast(list[str], form.getlist("input_keys[]"))))
+    output_keys = frozenset(filter(bool, cast(list[str], form.getlist("output_keys[]"))))
+    metadata_keys = frozenset(filter(bool, cast(list[str], form.getlist("metadata_keys[]"))))
     return (
         action,
         name,
@@ -672,16 +658,16 @@ async def _parse_form_data(
 
 class DatasetExample(V1RoutesBaseModel):
     id: str
-    input: Dict[str, Any]
-    output: Dict[str, Any]
-    metadata: Dict[str, Any]
+    input: dict[str, Any]
+    output: dict[str, Any]
+    metadata: dict[str, Any]
     updated_at: datetime
 
 
 class ListDatasetExamplesData(V1RoutesBaseModel):
     dataset_id: str
     version_id: str
-    examples: List[DatasetExample]
+    examples: list[DatasetExample]
 
 
 class ListDatasetExamplesResponseBody(ResponseBody[ListDatasetExamplesData]):
@@ -914,7 +900,7 @@ async def get_dataset_jsonl_openai_evals(
     return content
 
 
-def _get_content_csv(examples: List[models.DatasetExampleRevision]) -> bytes:
+def _get_content_csv(examples: list[models.DatasetExampleRevision]) -> bytes:
     records = [
         {
             "example_id": GlobalID(
@@ -930,7 +916,7 @@ def _get_content_csv(examples: List[models.DatasetExampleRevision]) -> bytes:
     return str(pd.DataFrame.from_records(records).to_csv(index=False)).encode()
 
 
-def _get_content_jsonl_openai_ft(examples: List[models.DatasetExampleRevision]) -> bytes:
+def _get_content_jsonl_openai_ft(examples: list[models.DatasetExampleRevision]) -> bytes:
     records = io.BytesIO()
     for ex in examples:
         records.write(
@@ -951,7 +937,7 @@ def _get_content_jsonl_openai_ft(examples: List[models.DatasetExampleRevision])
     return records.read()
 
 
-def _get_content_jsonl_openai_evals(examples: List[models.DatasetExampleRevision]) -> bytes:
+def _get_content_jsonl_openai_evals(examples: list[models.DatasetExampleRevision]) -> bytes:
     records = io.BytesIO()
     for ex in examples:
         records.write(
@@ -980,7 +966,7 @@ def _get_content_jsonl_openai_evals(examples: List[models.DatasetExampleRevision
 
 async def _get_db_examples(
     *, session: Any, id: str, version_id: Optional[str]
-) -> Tuple[str, List[models.DatasetExampleRevision]]:
+) -> tuple[str, list[models.DatasetExampleRevision]]:
     dataset_id = from_global_id_with_expected_type(GlobalID.from_id(id), DATASET_NODE_NAME)
     dataset_version_id: Optional[int] = None
     if version_id:

phoenix/server/api/routers/v1/evaluations.py

@@ -1,6 +1,7 @@
 import gzip
+from collections.abc import Callable
 from itertools import chain
-from typing import Any, Callable, Iterator, Optional, Tuple, Union, cast
+from typing import Any, Iterator, Optional, Union, cast
 
 import pandas as pd
 import pyarrow as pa
@@ -208,7 +209,7 @@ async def _add_evaluations(state: State, evaluations: Evaluations) -> None:
         )
         for index, row in dataframe.iterrows():
             score, label, explanation = _get_annotation_result(row)
-            document_annotation = cls(cast(Union[Tuple[str, int], Tuple[int, str]], index))(
+            document_annotation = cls(cast(Union[tuple[str, int], tuple[int, str]], index))(
                 name=eval_name,
                 annotator_kind="LLM",
                 score=score,
@@ -245,7 +246,7 @@ async def _add_evaluations(state: State, evaluations: Evaluations) -> None:
 
 def _get_annotation_result(
     row: "pd.Series[Any]",
-) -> Tuple[Optional[float], Optional[str], Optional[str]]:
+) -> tuple[Optional[float], Optional[str], Optional[str]]:
     return (
         cast(Optional[float], row.get("score")),
         cast(Optional[str], row.get("label")),
@@ -257,7 +258,7 @@ def _document_annotation_factory(
     span_id_idx: int,
     document_position_idx: int,
 ) -> Callable[
-    [Union[Tuple[str, int], Tuple[int, str]]],
+    [Union[tuple[str, int], tuple[int, str]]],
     Callable[..., Precursors.DocumentAnnotation],
 ]:
     return lambda index: lambda **kwargs: Precursors.DocumentAnnotation(
@@ -356,6 +357,6 @@ def _read_sql_document_evaluations_into_dataframe(
 
 def _groupby_eval_name(
     evals_dataframe: DataFrame,
-) -> Iterator[Tuple[EvaluationName, DataFrame]]:
+) -> Iterator[tuple[EvaluationName, DataFrame]]:
     for eval_name, evals_dataframe_for_name in evals_dataframe.groupby("name", as_index=False):
         yield str(eval_name), evals_dataframe_for_name

phoenix/server/api/routers/v1/experiment_evaluations.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, Literal, Optional
+from typing import Any, Literal, Optional
 
 from fastapi import APIRouter, HTTPException
 from pydantic import Field
@@ -39,7 +39,7 @@ class UpsertExperimentEvaluationRequestBody(V1RoutesBaseModel):
     error: Optional[str] = Field(
         None, description="Optional error message if the evaluation encountered an error"
     )
-    metadata: Optional[Dict[str, Any]] = Field(
+    metadata: Optional[dict[str, Any]] = Field(
         default=None, description="Metadata for the evaluation"
     )
     trace_id: Optional[str] = Field(default=None, description="Optional trace ID for tracking")

phoenix/server/api/routers/v1/experiment_runs.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, List, Optional
+from typing import Any, Optional
 
 from fastapi import APIRouter, HTTPException
 from pydantic import Field
@@ -113,7 +113,7 @@ class ExperimentRunResponse(ExperimentRun):
     experiment_id: str = Field(description="The ID of the experiment")
 
 
-class ListExperimentRunsResponseBody(ResponseBody[List[ExperimentRunResponse]]):
+class ListExperimentRunsResponseBody(ResponseBody[list[ExperimentRunResponse]]):
     pass
 
 

phoenix/server/api/routers/v1/experiments.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from random import getrandbits
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from fastapi import APIRouter, HTTPException, Path
 from pydantic import Field
@@ -40,7 +40,7 @@ class Experiment(V1RoutesBaseModel):
         description="The ID of the dataset version associated with the experiment"
     )
     repetitions: int = Field(description="Number of times the experiment is repeated")
-    metadata: Dict[str, Any] = Field(description="Metadata of the experiment")
+    metadata: dict[str, Any] = Field(description="Metadata of the experiment")
     project_name: Optional[str] = Field(
         description="The name of the project associated with the experiment"
     )
@@ -60,7 +60,7 @@ class CreateExperimentRequestBody(V1RoutesBaseModel):
     description: Optional[str] = Field(
         default=None, description="An optional description of the experiment"
     )
-    metadata: Optional[Dict[str, Any]] = Field(
+    metadata: Optional[dict[str, Any]] = Field(
         default=None, description="Metadata for the experiment"
     )
     version_id: Optional[str] = Field(
@@ -254,7 +254,7 @@ async def get_experiment(request: Request, experiment_id: str) -> GetExperimentR
     )
 
 
-class ListExperimentsResponseBody(ResponseBody[List[Experiment]]):
+class ListExperimentsResponseBody(ResponseBody[list[Experiment]]):
     pass
 
 

phoenix/server/api/routers/v1/spans.py

@@ -1,5 +1,6 @@
+from collections.abc import AsyncIterator
 from datetime import datetime, timezone
-from typing import Any, AsyncIterator, Dict, List, Literal, Optional
+from typing import Any, Literal, Optional
 
 from fastapi import APIRouter, HTTPException, Query
 from pydantic import Field
@@ -28,16 +29,16 @@ router = APIRouter(tags=["spans"])
 
 
 class SpanQuery(V1RoutesBaseModel):
-    select: Optional[Dict[str, Any]] = None
-    filter: Optional[Dict[str, Any]] = None
-    explode: Optional[Dict[str, Any]] = None
-    concat: Optional[Dict[str, Any]] = None
-    rename: Optional[Dict[str, Any]] = None
-    index: Optional[Dict[str, Any]] = None
+    select: Optional[dict[str, Any]] = None
+    filter: Optional[dict[str, Any]] = None
+    explode: Optional[dict[str, Any]] = None
+    concat: Optional[dict[str, Any]] = None
+    rename: Optional[dict[str, Any]] = None
+    index: Optional[dict[str, Any]] = None
 
 
 class QuerySpansRequestBody(V1RoutesBaseModel):
-    queries: List[SpanQuery]
+    queries: list[SpanQuery]
     start_time: Optional[datetime] = None
     end_time: Optional[datetime] = None
     limit: int = DEFAULT_SPAN_LIMIT
@@ -153,7 +154,7 @@ class SpanAnnotation(V1RoutesBaseModel):
     result: Optional[SpanAnnotationResult] = Field(
         default=None, description="The result of the annotation"
     )
-    metadata: Optional[Dict[str, Any]] = Field(
+    metadata: Optional[dict[str, Any]] = Field(
         default=None, description="Metadata for the annotation"
     )
 
@@ -171,15 +172,15 @@ class SpanAnnotation(V1RoutesBaseModel):
         )
 
 
-class AnnotateSpansRequestBody(RequestBody[List[SpanAnnotation]]):
-    data: List[SpanAnnotation]
+class AnnotateSpansRequestBody(RequestBody[list[SpanAnnotation]]):
+    data: list[SpanAnnotation]
 
 
 class InsertedSpanAnnotation(V1RoutesBaseModel):
     id: str = Field(description="The ID of the inserted span annotation")
 
 
-class AnnotateSpansResponseBody(ResponseBody[List[InsertedSpanAnnotation]]):
+class AnnotateSpansResponseBody(ResponseBody[list[InsertedSpanAnnotation]]):
     pass