update fastapi

Author: vincentsarago

.github/workflows/ci.yml

@@ -16,19 +16,19 @@ on:
       - 'dockerfiles/**'
   pull_request:
 env:
-  LATEST_PY_VERSION: '3.9'
+  LATEST_PY_VERSION: '3.19'
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -67,9 +67,9 @@ jobs:
     needs: [tests]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ env.LATEST_PY_VERSION }}
 
@@ -109,9 +109,9 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.ref, 'tags') && github.event_name == 'push'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ env.LATEST_PY_VERSION }}
 
@@ -144,7 +144,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/deploy_mkdocs.yml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 

CHANGES.md

@@ -12,7 +12,9 @@
 * add `TIMVT_FUNCTIONS_DIRECTORY` environment variable to look for function SQL files
 * switch viewer to Maplibre
 * add `Point` and `LineString` feature support in viewer
-* Update dockerfiles to python3.10 and postgres14-postgis3.2
+* Update dockerfiles to python3.10 and postgres14-postgis3.3
+* update FastAPI requirement to >0.87
+* remove endpoint Tags
 
 **breaking changes**
 

dockerfiles/Dockerfile.db

@@ -1,3 +1,3 @@
-FROM ghcr.io/vincentsarago/postgis:14-3.2
+FROM ghcr.io/vincentsarago/postgis:14-3.3
 
 COPY data/*.sql /docker-entrypoint-initdb.d/

pyproject.toml

@@ -22,7 +22,7 @@ dynamic = ["version"]
 dependencies = [
     "asyncpg>=0.23.0",
     "buildpg>=0.3",
-    "fastapi>=0.73",
+    "fastapi>=0.87",
     "jinja2>=2.11.2,<4.0.0",
     "morecantile>=3.1,<4.0",
     "starlette-cramjam>=0.3,<0.4",
@@ -38,7 +38,7 @@ test = [
     "pytest-cov",
     "pytest-asyncio",
     "pytest-benchmark",
-    "requests",
+    "httpx",
     "psycopg2",
     "pytest-pgsql",
     "mapbox-vector-tile",

timvt/factory.py

@@ -86,8 +86,6 @@ def __post_init__(self):
 
     def register_routes(self):
         """Register Routes."""
-        self.register_tiles()
-
         if self.with_tables_metadata:
             self.register_tables_metadata()
 
@@ -97,6 +95,8 @@ def register_routes(self):
         if self.with_viewer:
             self.register_viewer()
 
+        self.register_tiles()
+
     def url_for(self, request: Request, name: str, **path_params: Any) -> str:
         """Return full url (with prefix) for a specific endpoint."""
         url_path = self.router.url_path_for(name, **path_params)
@@ -109,15 +109,9 @@ def register_tiles(self):
         """Register /tiles endpoints."""
 
         @self.router.get(
-            "/tiles/{layer}/{z}/{x}/{y}",
-            **TILE_RESPONSE_PARAMS,
-            tags=["Tiles"],
-        )
-        @self.router.get(
-            "/tiles/{TileMatrixSetId}/{layer}/{z}/{x}/{y}",
-            **TILE_RESPONSE_PARAMS,
-            tags=["Tiles"],
+            "/tiles/{TileMatrixSetId}/{layer}/{z}/{x}/{y}", **TILE_RESPONSE_PARAMS
         )
+        @self.router.get("/tiles/{layer}/{z}/{x}/{y}", **TILE_RESPONSE_PARAMS)
         async def tile(
             request: Request,
             tile: Tile = Depends(TileParams),
@@ -135,18 +129,16 @@ async def tile(
             return Response(bytes(content), media_type=MimeTypes.pbf.value)
 
         @self.router.get(
-            "/{layer}/tilejson.json",
+            "/{TileMatrixSetId}/{layer}/tilejson.json",
             response_model=TileJSON,
             responses={200: {"description": "Return a tilejson"}},
             response_model_exclude_none=True,
-            tags=["Tiles"],
         )
         @self.router.get(
-            "/{TileMatrixSetId}/{layer}/tilejson.json",
+            "/{layer}/tilejson.json",
             response_model=TileJSON,
             responses={200: {"description": "Return a tilejson"}},
             response_model_exclude_none=True,
-            tags=["Tiles"],
         )
         async def tilejson(
             request: Request,
@@ -202,7 +194,6 @@ def register_tables_metadata(self):
             "/tables.json",
             response_model=List[Table],
             response_model_exclude_none=True,
-            tags=["Tables"],
         )
         async def tables_index(request: Request):
             """Index of tables."""
@@ -226,7 +217,6 @@ def _get_tiles_url(id) -> Optional[str]:
             response_model=Table,
             responses={200: {"description": "Return table metadata"}},
             response_model_exclude_none=True,
-            tags=["Tables"],
         )
         async def table_metadata(
             request: Request,
@@ -253,7 +243,6 @@ def register_functions_metadata(self):  # noqa
             response_model=List[Function],
             response_model_exclude_none=True,
             response_model_exclude={"sql"},
-            tags=["Functions"],
         )
         async def functions_index(request: Request):
             """Index of functions."""
@@ -280,7 +269,6 @@ def _get_tiles_url(id) -> Optional[str]:
             responses={200: {"description": "Return Function metadata"}},
             response_model_exclude_none=True,
             response_model_exclude={"sql"},
-            tags=["Functions"],
         )
         async def function_metadata(
             request: Request,
@@ -302,9 +290,7 @@ def _get_tiles_url(id) -> Optional[str]:
     def register_viewer(self):
         """Register viewer."""
 
-        @self.router.get(
-            "/{layer}/viewer", response_class=HTMLResponse, tags=["Viewer"]
-        )
+        @self.router.get("/{layer}/viewer", response_class=HTMLResponse)
         async def demo(request: Request, layer=Depends(LayerParams)):
             """Demo for each table."""
             tile_url = self.url_for(request, "tilejson", layer=layer.id)