Merge pull request #482 from lona-web-org/fscherf/templating-fixes

templating fixes

lona/default_views.py

@@ -1,5 +1,6 @@
 import logging
 
+from lona.responses import TemplateResponse
 from lona.view import View
 
 logger = logging.getLogger('lona.views')
@@ -12,11 +13,13 @@ class FallbackView(View):
  def render_default_template(self, request, **extra_context):
  template_setting = request.server.settings.get(self.TEMPLATE_SETTING)
 
- return {
- 'template': template_setting,
- 'request': request,
- **extra_context,
- }
+ return TemplateResponse(
+ name=template_setting,
+ context={
+ 'request': request,
+ **extra_context,
+ },
+ )
 
  def handle_request(self, request, **extra_context):
  view_setting = request.server.settings.get(self.VIEW_SETTING, '')

lona/responses.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from dataclasses import dataclass, field
 from typing import Union, Dict, Any
-from dataclasses import dataclass
 
 from lona.html.abstract_node import AbstractNode
 from lona.events.input_event import InputEvent
@@ -55,7 +55,7 @@ def interactive(self) -> bool:
 @dataclass
 class TemplateResponse(AbstractResponse):
  name: str
- context: dict | None
+ context: dict = field(default_factory=dict)
  status: int | None = None
  content_type: str | None = None
  headers: dict | None = None
@@ -71,7 +71,7 @@ def interactive(self) -> bool:
 @dataclass
 class TemplateStringResponse(AbstractResponse):
  string: str
- context: dict | None = None
+ context: dict = field(default_factory=dict)
  status: int | None = None
  content_type: str | None = None
  headers: dict | None = None

tests/test_template_filters.py

@@ -1,4 +1,4 @@
-from lona import View
+from lona import TemplateResponse, View
 
 
 def setup_app(app):
@@ -11,9 +11,7 @@ def setup_app(app):
  @app.route('/')
  class TemplateFiltersView(View):
  def handle_request(self, request):
- return {
- 'template': 'template_filters.html',
- }
+ return TemplateResponse('template_filters.html')
 
 
 async def test_template_filters(lona_app_context):