diff --git a/src/c3nav/api/schema.py b/src/c3nav/api/schema.py index b8f7cace..6e1899ba 100644 --- a/src/c3nav/api/schema.py +++ b/src/c3nav/api/schema.py @@ -53,4 +53,3 @@ GeometrySchema = Annotated[ PointSchema,], Discriminator("type"), ] - diff --git a/src/c3nav/mapdata/newapi/map.py b/src/c3nav/mapdata/newapi/map.py index a06ae9b5..a5a01e9a 100644 --- a/src/c3nav/mapdata/newapi/map.py +++ b/src/c3nav/mapdata/newapi/map.py @@ -1,5 +1,4 @@ import json -from typing import Annotated, Union from django.core.cache import cache from django.core.serializers.json import DjangoJSONEncoder @@ -9,7 +8,6 @@ from ninja import Query from ninja import Router as APIRouter from ninja import Schema from pydantic import Field as APIField -from pydantic import PositiveInt from c3nav.api.exceptions import API404 from c3nav.api.newauth import auth_responses, validate_responses diff --git a/src/c3nav/mapdata/schemas/model_base.py b/src/c3nav/mapdata/schemas/model_base.py index 304f9a77..dae3c108 100644 --- a/src/c3nav/mapdata/schemas/model_base.py +++ b/src/c3nav/mapdata/schemas/model_base.py @@ -1,4 +1,4 @@ -from typing import Annotated, Any, ClassVar, Optional, Union +from typing import Annotated, Any, Optional, Union from ninja import Schema from pydantic import Field as APIField diff --git a/src/c3nav/mapdata/schemas/models.py b/src/c3nav/mapdata/schemas/models.py index 8f48b72d..cc7c9d19 100644 --- a/src/c3nav/mapdata/schemas/models.py +++ b/src/c3nav/mapdata/schemas/models.py @@ -606,13 +606,13 @@ class LocationDisplay(SerializableSchema): ) display: list[ tuple[ - Annotated[NonEmptyStr, APIField(name="field title")], + Annotated[NonEmptyStr, APIField(title="field title")], Annotated[Union[ - Annotated[str, APIField(name="a simple string value")], - Annotated[DisplayLink, APIField(namen="a link value")], - Annotated[list[DisplayLink], APIField(name="a list of link values")], - Annotated[Literal[None], APIField(name="no value")] - ], APIField(name="field value", union_mode='left_to_right')] + Annotated[str, APIField(title="a simple string value")], + Annotated[DisplayLink, APIField(title="a link value")], + Annotated[list[DisplayLink], APIField(title="a list of link values")], + Annotated[Literal[None], APIField(title="no value")] + ], APIField(title="field value", union_mode='left_to_right')] ] ] = APIField(description="a list of human-readable display values") geometry: Optional[GeometrySchema] = APIField(