Skip to content

Commit 4fe0ae4

Browse files
use typing.Annotated (#1271)
1 parent 4df3d46 commit 4fe0ae4

20 files changed

Lines changed: 47 additions & 36 deletions

File tree

docs/src/advanced/dependencies.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ In titiler `Factories`, we use the dependencies to define the inputs for each en
55

66
Example:
77
```python
8+
from typing import Annotated
9+
810
from dataclasses import dataclass
911
from fastapi import Depends, FastAPI, Query
1012
from titiler.core.dependencies import DefaultDependency
11-
from typing_extensions import Annotated
1213
from rio_tiler.io import Reader
1314

1415
@dataclass

docs/src/examples/code/tiler_with_custom_colormap.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ app/dependencies.py
3434

3535
import json
3636

37-
from typing import Dict, Optional, Literal
38-
from typing_extensions import Annotated
37+
from typing import Annotated, Dict, Optional, Literal
3938

4039
import numpy
4140
import matplotlib

docs/src/examples/code/tiler_with_custom_stac+xarray.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ Custom `MultiBaseTilerFactory` which removes some endpoints (`/preview`) and ada
167167
```python title="factory.py"
168168
"""Custom MultiBaseTilerFactory."""
169169
from dataclasses import dataclass
170-
from typing import Type, Union, Optional, List
171-
from typing_extensions import Annotated
170+
from typing import Annotated, Type, Union, Optional, List
172171
from attrs import define, field
173172
from geojson_pydantic.features import Feature, FeatureCollection
174173
from fastapi import Body, Depends, Query

src/titiler/core/tests/test_CustomPath.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import os
44
import re
5+
from typing import Annotated
56

67
from fastapi import FastAPI, HTTPException, Query
78
from starlette.testclient import TestClient
8-
from typing_extensions import Annotated
99

1010
from titiler.core.factory import TilerFactory
1111

src/titiler/core/tests/test_cache_middleware.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
"""Test titiler.core.CacheControlMiddleware."""
22

3+
from typing import Annotated
4+
35
from fastapi import FastAPI, Path
46
from starlette.responses import Response
57
from starlette.testclient import TestClient
6-
from typing_extensions import Annotated
78

89
from titiler.core.middleware import CacheControlMiddleware
910

src/titiler/core/tests/test_case_middleware.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
"""Test titiler.core.middleware.LowerCaseQueryStringMiddleware."""
22

3-
from typing import List
3+
from typing import Annotated, List
44

55
from fastapi import FastAPI, Query
66
from starlette.testclient import TestClient
7-
from typing_extensions import Annotated
87

98
from titiler.core.middleware import LowerCaseQueryStringMiddleware
109

src/titiler/core/tests/test_dependencies.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
import json
44
from dataclasses import dataclass
5-
from typing import Literal, Optional
5+
from typing import Annotated, Literal, Optional
66

77
import pytest
88
from fastapi import Depends, FastAPI, Path
99
from morecantile import tms
1010
from rio_tiler.types import ColorMapType
1111
from starlette.testclient import TestClient
12-
from typing_extensions import Annotated
1312

1413
from titiler.core import dependencies, errors
1514
from titiler.core.resources.responses import JSONResponse

src/titiler/core/titiler/core/algorithm/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import json
44
from copy import copy
5-
from typing import Dict, List, Literal, Optional, Type
5+
from typing import Annotated, Dict, List, Literal, Optional, Type
66

77
import attr
88
from fastapi import HTTPException, Query
99
from pydantic import ValidationError
10-
from typing_extensions import Annotated
1110

1211
from titiler.core.algorithm.base import ( # noqa
1312
AlgorithmMetadata,

src/titiler/core/titiler/core/dependencies.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@
33
import json
44
import warnings
55
from dataclasses import dataclass, field
6-
from typing import Callable, Dict, List, Literal, Optional, Sequence, Tuple, Union
6+
from typing import (
7+
Annotated,
8+
Callable,
9+
Dict,
10+
List,
11+
Literal,
12+
Optional,
13+
Sequence,
14+
Tuple,
15+
Union,
16+
)
717

818
import numpy
919
from fastapi import HTTPException, Query
@@ -15,7 +25,6 @@
1525
from rio_tiler.errors import MissingAssets, MissingBands
1626
from rio_tiler.types import RIOResampling, WarpResampling
1727
from starlette.requests import Request
18-
from typing_extensions import Annotated
1928

2029
from titiler.core.resources.enums import ImageType, MediaType
2130
from titiler.core.utils import accept_media_type

src/titiler/core/titiler/core/factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import os
77
import warnings
88
from typing import (
9+
Annotated,
910
Any,
1011
Callable,
1112
Dict,
@@ -46,7 +47,6 @@
4647
from starlette.routing import Route as APIRoute
4748
from starlette.routing import compile_path, replace_params
4849
from starlette.templating import Jinja2Templates
49-
from typing_extensions import Annotated
5050

5151
from titiler.core.algorithm import (
5252
AlgorithmMetadata,

0 commit comments

Comments
 (0)