Skip to content

Commit b05e376

Browse files
committed
reverting render_index -> index and making catch for outside of a request context
1 parent aabeeb7 commit b05e376

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

dash/dash.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,16 +1145,20 @@ def _generate_meta(self):
11451145

11461146
return meta_tags + self.config.meta_tags
11471147

1148-
def render_index(self, *_args, **_kwargs):
1148+
def index(self, *_args, **_kwargs):
11491149
scripts = self._generate_scripts_html()
11501150
css = self._generate_css_dist_html()
11511151
config = self._generate_config_html()
11521152
metas = self._generate_meta()
11531153
renderer = self._generate_renderer()
11541154
title = self.title
1155-
request = get_request_adapter()
1155+
try:
1156+
request = get_request_adapter()
1157+
except LookupError:
1158+
# no request context
1159+
request = None
11561160

1157-
if self.use_pages and self.config.include_pages_meta:
1161+
if self.use_pages and self.config.include_pages_meta and request:
11581162
metas = _page_meta_tags(self, request) + metas
11591163

11601164
if self._favicon:

dash/server_factories/fastapi_factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async def index(request: Request):
8888
adapter = FastAPIRequestAdapter()
8989
set_request_adapter(adapter)
9090
adapter.set_request(request)
91-
return Response(content=dash_app.render_index(), media_type="text/html")
91+
return Response(content=dash_app.index(), media_type="text/html")
9292

9393
# pylint: disable=protected-access
9494
dash_app._add_url("", index, methods=["GET"])
@@ -104,7 +104,7 @@ async def catchall(request: Request):
104104
adapter = FastAPIRequestAdapter()
105105
set_request_adapter(adapter)
106106
adapter.set_request(request)
107-
return Response(content=dash_app.render_index(), media_type="text/html")
107+
return Response(content=dash_app.index(), media_type="text/html")
108108

109109
# pylint: disable=protected-access
110110
dash_app._add_url("{path:path}", catchall, methods=["GET"])

dash/server_factories/flask_factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def setup_catchall(self, dash_app):
7676
def catchall(*args, **kwargs):
7777
adapter = FlaskRequestAdapter()
7878
set_request_adapter(adapter)
79-
return dash_app.render_index(*args, **kwargs)
79+
return dash_app.index(*args, **kwargs)
8080

8181
# pylint: disable=protected-access
8282
dash_app._add_url("<path:path>", catchall, methods=["GET"])
@@ -85,7 +85,7 @@ def setup_index(self, dash_app):
8585
def index(*args, **kwargs):
8686
adapter = FlaskRequestAdapter()
8787
set_request_adapter(adapter)
88-
return dash_app.render_index(*args, **kwargs)
88+
return dash_app.index(*args, **kwargs)
8989

9090
# pylint: disable=protected-access
9191
dash_app._add_url("", index, methods=["GET"])

0 commit comments

Comments
 (0)