Merge pull request #29 from developmentseed/templatesinEndpointsFactory

add template configuration in Endpoint Factory

Author: vincentsarago

tifeatures/factory.py

@@ -30,7 +30,6 @@
     JSONResponse,
     SchemaJSONResponse,
 )
-from tifeatures.settings import APISettings
 
 from fastapi import APIRouter, Depends, Path, Query
 
@@ -39,20 +38,9 @@
 from starlette.responses import StreamingResponse
 from starlette.templating import Jinja2Templates, _TemplateResponse
 
-settings = APISettings()
-
-# custom template directory
-templates_location: List[Any] = (
-    [jinja2.FileSystemLoader(settings.template_directory)]
-    if settings.template_directory
-    else []
-)
-# default template directory
-templates_location.append(jinja2.PackageLoader(__package__, "templates"))
-
-templates = Jinja2Templates(
-    directory="",  # we need to set a dummy directory variable, see https://github.com/encode/starlette/issues/1214
-    loader=jinja2.ChoiceLoader(templates_location),
+DEFAULT_TEMPLATES = Jinja2Templates(
+    directory="",
+    loader=jinja2.ChoiceLoader([jinja2.PackageLoader(__package__, "templates")]),
 )
 
 
@@ -96,6 +84,10 @@ class Endpoints:
     # e.g if you mount the route with `/foo` prefix, set router_prefix to foo
     router_prefix: str = ""
 
+    title: str = "TiFeatures"
+
+    templates: Jinja2Templates = DEFAULT_TEMPLATES
+
     def __post_init__(self):
         """Post Init: register route and configure specific options."""
         self.register_landing()
@@ -135,7 +127,7 @@ def _create_html_response(
         if self.router_prefix:
             baseurl += self.router_prefix
 
-        return templates.TemplateResponse(
+        return self.templates.TemplateResponse(
             f"{template_name}.html",
             {
                 "request": request,
@@ -173,7 +165,7 @@ def landing(
         ):
             """Get conformance."""
             data = model.Landing(
-                title=settings.name,
+                title=self.title,
                 links=[
                     model.Link(
                         title="Landing Page",

tifeatures/main.py

@@ -1,5 +1,9 @@
 """tifeatures app."""
 
+from typing import Any, List
+
+import jinja2
+
 from tifeatures import __version__ as tifeatures_version
 from tifeatures.db import close_db_connection, connect_to_db, register_table_catalog
 from tifeatures.errors import DEFAULT_STATUS_CODES, add_exception_handlers
@@ -11,6 +15,7 @@
 from fastapi import FastAPI
 
 from starlette.middleware.cors import CORSMiddleware
+from starlette.templating import Jinja2Templates
 from starlette_cramjam.middleware import CompressionMiddleware
 
 settings = APISettings()
@@ -22,8 +27,22 @@
     docs_url="/api.html",
 )
 
+# custom template directory
+templates_location: List[Any] = (
+    [jinja2.FileSystemLoader(settings.template_directory)]
+    if settings.template_directory
+    else []
+)
+# default template directory
+templates_location.append(jinja2.PackageLoader(__package__, "templates"))
+
+templates = Jinja2Templates(
+    directory="",  # we need to set a dummy directory variable, see https://github.com/encode/starlette/issues/1214
+    loader=jinja2.ChoiceLoader(templates_location),
+)
+
 # Register endpoints.
-endpoints = Endpoints()
+endpoints = Endpoints(title=settings.name, templates=templates)
 app.include_router(endpoints.router)
 
 # We add the function registry to the application state