Allow directory with template overrides

tifeatures/dependencies.py

@@ -61,7 +61,7 @@ def bbox_query(
             raise Exception("Invalid BBOX.")
 
         bounds = tuple(map(float, split_bbox))
-        return Polygon.from_bounds(*bounds)
+        return Polygon.from_bounds(*bounds)  # type: ignore
 
     return None
 

tifeatures/factory.py

@@ -3,8 +3,10 @@
 import json
 import pathlib
 from dataclasses import dataclass, field
-from typing import Any, Callable, Optional
+from os import PathLike
+from typing import Any, Callable, List, Optional, Union
 
+import jinja2
 from geojson_pydantic.geometries import Polygon
 
 from tifeatures import model
@@ -16,20 +18,65 @@
 from tifeatures.settings import APISettings
 
 from fastapi import APIRouter, Depends, Path, Query
-from fastapi.templating import Jinja2Templates
 
 from starlette.datastructures import QueryParams
 from starlette.requests import Request
-from starlette.responses import HTMLResponse
+from starlette.templating import Jinja2Templates, _TemplateResponse
+
+if hasattr(jinja2, "pass_context"):
+    pass_context = jinja2.pass_context  # type: ignore
+else:  # pragma: nocover
+    pass_context = jinja2.contextfunction  # type: ignore[attr-defined]
 
-template_dir = str(pathlib.Path(__file__).parent.joinpath("templates"))
-templates = Jinja2Templates(directory=template_dir)
 settings = APISettings()
 
 
+class SearchPathTemplates(Jinja2Templates):
+    """
+    templates = DefaultTemplates("templates")
+    return templates.TemplateResponse("index.html", {"request": request})
+    """
+
+    def __init__(
+        self,
+        directory: Union[str, PathLike, List[Union[str, None, PathLike]]],
+        **env_options: Any,
+    ) -> None:
+        """Initialize Search Path Template."""
+        assert jinja2 is not None, "jinja2 must be installed to use Jinja2Templates"
+        self.env = self._create_env(directory, **env_options)
+
+    def _create_env(
+        self,
+        directory: Union[str, PathLike, List[Union[str, None, PathLike]]],
+        **env_options: Any,
+    ) -> "jinja2.Environment":
+        @pass_context
+        def url_for(context: dict, name: str, **path_params: Any) -> str:
+            request = context["request"]
+            return request.url_for(name, **path_params)
+
+        if isinstance(directory, list):
+            loader = jinja2.FileSystemLoader([d for d in directory if d])
+        else:
+            loader = jinja2.FileSystemLoader(directory)
+        env_options.setdefault("loader", loader)
+        env_options.setdefault("autoescape", True)
+
+        env = jinja2.Environment(**env_options)
+        env.globals["url_for"] = url_for
+        return env
+
+
+default_template_dir = str(pathlib.Path(__file__).parent.joinpath("templates"))
+templates = SearchPathTemplates(
+    directory=[settings.template_directory, default_template_dir]
+)
+
+
 def create_html_response(
     request: Request, data: str, template_name: str
-) -> HTMLResponse:
+) -> _TemplateResponse:
     """Create Template response."""
     urlpath = request.url.path
     crumbs = []
@@ -480,9 +527,8 @@ async def items(
 
             if (matched_items - items_returned) > offset:
                 next_offset = offset + items_returned
-                query_params = QueryParams(
-                    {**request.query_params, "offset": next_offset}
-                )
+                query_params = {**request.query_params, "offset": next_offset}
+
                 url = (
                     self.url_for(request, "items", collectionId=collection.id)
                     + f"?{query_params}"
@@ -496,13 +542,13 @@ async def items(
                 query_params.pop("offset")
                 prev_offset = max(offset - items_returned, 0)
                 if prev_offset:
-                    query_params = QueryParams({**query_params, "offset": prev_offset})
+                    query_params = {**query_params, "offset": prev_offset}
                 else:
-                    query_params = QueryParams({**query_params})
+                    query_params = {**query_params}
 
                 url = self.url_for(request, "items", collectionId=collection.id)
                 if query_params:
-                    url += f"?{query_params}"
+                    url += f"?{QueryParams(**query_params)}"
 
                 links.append(
                     model.Link(href=url, rel="prev", type=MediaType.geojson),

tifeatures/layer.py

@@ -8,7 +8,7 @@
 from buildpg import asyncpg, clauses
 from buildpg import funcs as pg_funcs
 from buildpg import render
-from geojson_pydantic import Feature, FeatureCollection
+from geojson_pydantic.features import Feature, FeatureCollection
 from pydantic import BaseModel, Field, root_validator
 
 
@@ -41,7 +41,7 @@ async def features(
         limit: int = None,
         offset: int = None,
         **kwargs: Any,
-    ) -> Items:
+    ) -> FeatureCollection:
         """Return a FeatureCollection."""
         ...
 
@@ -85,7 +85,7 @@ async def features(
         limit: int = None,
         offset: int = None,
         **kwargs: Any,
-    ) -> Items:
+    ) -> FeatureCollection:
         """Return a FeatureCollection."""
 
         limit = limit or 10

tifeatures/model.py

@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from geojson_pydantic import Feature, FeatureCollection
+from geojson_pydantic.features import Feature, FeatureCollection
 from pydantic import BaseModel
 
 from tifeatures.resources.enums import MediaType

tifeatures/settings.py

@@ -12,6 +12,7 @@ class _APISettings(pydantic.BaseSettings):
     name: str = "TiFeatures"
     cors_origins: str = "*"
     cachecontrol: str = "public, max-age=3600"
+    template_directory: Optional[str] = None
 
     @pydantic.validator("cors_origins")
     def parse_cors_origin(cls, v):