Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/src/advanced/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ In titiler `Factories`, we use the dependencies to define the inputs for each en

Example:
```python
from typing import Annotated

from dataclasses import dataclass
from fastapi import Depends, FastAPI, Query
from titiler.core.dependencies import DefaultDependency
from typing_extensions import Annotated
from rio_tiler.io import Reader

@dataclass
Expand Down
3 changes: 1 addition & 2 deletions docs/src/examples/code/tiler_with_custom_colormap.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ app/dependencies.py

import json

from typing import Dict, Optional, Literal
from typing_extensions import Annotated
from typing import Annotated, Dict, Optional, Literal

import numpy
import matplotlib
Expand Down
3 changes: 1 addition & 2 deletions docs/src/examples/code/tiler_with_custom_stac+xarray.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ Custom `MultiBaseTilerFactory` which removes some endpoints (`/preview`) and ada
```python title="factory.py"
"""Custom MultiBaseTilerFactory."""
from dataclasses import dataclass
from typing import Type, Union, Optional, List
from typing_extensions import Annotated
from typing import Annotated, Type, Union, Optional, List
from attrs import define, field
from geojson_pydantic.features import Feature, FeatureCollection
from fastapi import Body, Depends, Query
Expand Down
2 changes: 1 addition & 1 deletion src/titiler/core/tests/test_CustomPath.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import os
import re
from typing import Annotated

from fastapi import FastAPI, HTTPException, Query
from starlette.testclient import TestClient
from typing_extensions import Annotated

from titiler.core.factory import TilerFactory

Expand Down
3 changes: 2 additions & 1 deletion src/titiler/core/tests/test_cache_middleware.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
"""Test titiler.core.CacheControlMiddleware."""

from typing import Annotated

from fastapi import FastAPI, Path
from starlette.responses import Response
from starlette.testclient import TestClient
from typing_extensions import Annotated

from titiler.core.middleware import CacheControlMiddleware

Expand Down
3 changes: 1 addition & 2 deletions src/titiler/core/tests/test_case_middleware.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
"""Test titiler.core.middleware.LowerCaseQueryStringMiddleware."""

from typing import List
from typing import Annotated, List

from fastapi import FastAPI, Query
from starlette.testclient import TestClient
from typing_extensions import Annotated

from titiler.core.middleware import LowerCaseQueryStringMiddleware

Expand Down
3 changes: 1 addition & 2 deletions src/titiler/core/tests/test_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

import json
from dataclasses import dataclass
from typing import Literal, Optional
from typing import Annotated, Literal, Optional

import pytest
from fastapi import Depends, FastAPI, Path
from morecantile import tms
from rio_tiler.types import ColorMapType
from starlette.testclient import TestClient
from typing_extensions import Annotated

from titiler.core import dependencies, errors
from titiler.core.resources.responses import JSONResponse
Expand Down
3 changes: 1 addition & 2 deletions src/titiler/core/titiler/core/algorithm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

import json
from copy import copy
from typing import Dict, List, Literal, Optional, Type
from typing import Annotated, Dict, List, Literal, Optional, Type

import attr
from fastapi import HTTPException, Query
from pydantic import ValidationError
from typing_extensions import Annotated

from titiler.core.algorithm.base import ( # noqa
AlgorithmMetadata,
Expand Down
13 changes: 11 additions & 2 deletions src/titiler/core/titiler/core/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
import json
import warnings
from dataclasses import dataclass, field
from typing import Callable, Dict, List, Literal, Optional, Sequence, Tuple, Union
from typing import (
Annotated,
Callable,
Dict,
List,
Literal,
Optional,
Sequence,
Tuple,
Union,
)

import numpy
from fastapi import HTTPException, Query
Expand All @@ -15,7 +25,6 @@
from rio_tiler.errors import MissingAssets, MissingBands
from rio_tiler.types import RIOResampling, WarpResampling
from starlette.requests import Request
from typing_extensions import Annotated

from titiler.core.resources.enums import ImageType, MediaType
from titiler.core.utils import accept_media_type
Expand Down
2 changes: 1 addition & 1 deletion src/titiler/core/titiler/core/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import warnings
from typing import (
Annotated,
Any,
Callable,
Dict,
Expand Down Expand Up @@ -46,7 +47,6 @@
from starlette.routing import Route as APIRoute
from starlette.routing import compile_path, replace_params
from starlette.templating import Jinja2Templates
from typing_extensions import Annotated

from titiler.core.algorithm import (
AlgorithmMetadata,
Expand Down
3 changes: 1 addition & 2 deletions src/titiler/core/titiler/core/models/OGC.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"""OGC models."""

from datetime import datetime
from typing import Dict, List, Literal, Optional, Set, Union
from typing import Annotated, Dict, List, Literal, Optional, Set, Union

from morecantile.models import CRSType
from pydantic import AnyUrl, BaseModel, Field, RootModel
from typing_extensions import Annotated

from titiler.core.models.common import Link

Expand Down
4 changes: 1 addition & 3 deletions src/titiler/core/titiler/core/telemetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import functools
import inspect
from contextlib import contextmanager
from typing import Any, Callable, Dict, Iterator, Optional, TypeVar

from typing_extensions import ParamSpec
from typing import Any, Callable, Dict, Iterator, Optional, ParamSpec, TypeVar

from titiler.core import __version__

Expand Down
3 changes: 2 additions & 1 deletion src/titiler/extensions/titiler/extensions/cogeo.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"""rio-cogeo Extension."""

from typing import Annotated

from attrs import define
from fastapi import Depends, Query
from typing_extensions import Annotated

from titiler.core.factory import FactoryExtension, TilerFactory
from titiler.core.resources.responses import JSONResponse
Expand Down
3 changes: 1 addition & 2 deletions src/titiler/extensions/titiler/extensions/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
See: https://github.com/stac-extensions/render
"""

from typing import Dict, List, Optional
from typing import Annotated, Dict, List, Optional
from urllib.parse import urlencode

from attrs import define
from fastapi import Depends, HTTPException, Path, Request
from pydantic import BaseModel
from typing_extensions import Annotated

from titiler.core.factory import FactoryExtension, MultiBaseTilerFactory
from titiler.core.models.OGC import Link
Expand Down
4 changes: 2 additions & 2 deletions src/titiler/extensions/titiler/extensions/stac.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""rio-stac Extension."""

from typing import Any, Dict, List, Literal, Optional
from typing import Annotated, Any, Dict, List, Literal, Optional

from attrs import define
from fastapi import Depends, Query
from typing_extensions import Annotated, TypedDict
from typing_extensions import TypedDict

from titiler.core.factory import FactoryExtension, TilerFactory

Expand Down
3 changes: 1 addition & 2 deletions src/titiler/mosaic/tests/test_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from contextlib import contextmanager
from dataclasses import dataclass
from io import BytesIO
from typing import List, Optional
from typing import Annotated, List, Optional
from unittest.mock import patch

import attr
Expand All @@ -16,7 +16,6 @@
from fastapi import FastAPI, Query
from rio_tiler.mosaic.methods import PixelSelectionMethod
from starlette.testclient import TestClient
from typing_extensions import Annotated

from titiler.core.dependencies import DefaultDependency
from titiler.core.resources.enums import OptionalHeader
Expand Down
15 changes: 13 additions & 2 deletions src/titiler/mosaic/titiler/mosaic/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,19 @@

import logging
import os
from typing import Any, Callable, Dict, List, Literal, Optional, Set, Tuple, Type, Union
from typing import (
Annotated,
Any,
Callable,
Dict,
List,
Literal,
Optional,
Set,
Tuple,
Type,
Union,
)
from urllib.parse import urlencode

import rasterio
Expand All @@ -25,7 +37,6 @@
from starlette.requests import Request
from starlette.responses import HTMLResponse, Response
from starlette.routing import NoMatchFound
from typing_extensions import Annotated

from titiler.core.algorithm import BaseAlgorithm
from titiler.core.algorithm import algorithms as available_algorithms
Expand Down
3 changes: 1 addition & 2 deletions src/titiler/xarray/titiler/xarray/dependencies.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
"""titiler.xarray dependencies."""

from dataclasses import dataclass
from typing import List, Literal, Optional, Union
from typing import Annotated, List, Literal, Optional, Union

import numpy
from fastapi import Query
from pydantic import Field
from pydantic.types import StringConstraints
from rio_tiler.types import RIOResampling, WarpResampling
from typing_extensions import Annotated

from titiler.core.dependencies import DefaultDependency

Expand Down
4 changes: 2 additions & 2 deletions src/titiler/xarray/titiler/xarray/extensions.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""titiler.xarray Extensions."""

import warnings
from typing import Callable, Dict, List, Optional, Type
from typing import Annotated, Callable, Dict, List, Optional, Type

import xarray
from attrs import define
from fastapi import Depends, Query
from rio_tiler.constants import WGS84_CRS
from starlette.responses import HTMLResponse
from typing_extensions import Annotated, TypedDict
from typing_extensions import TypedDict

from titiler.core.dependencies import DefaultDependency
from titiler.core.factory import FactoryExtension
Expand Down
3 changes: 1 addition & 2 deletions src/titiler/xarray/titiler/xarray/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import logging
import warnings
from typing import Any, Callable, Optional, Type, Union
from typing import Annotated, Any, Callable, Optional, Type, Union

import rasterio
from attrs import define
Expand All @@ -11,7 +11,6 @@
from rio_tiler.constants import WGS84_CRS
from rio_tiler.io import XarrayReader
from rio_tiler.models import Info
from typing_extensions import Annotated

from titiler.core.dependencies import (
BidxParams,
Expand Down