fixing pages for use with fastapi

Author: BSd3v

dash/_pages.py

@@ -389,15 +389,15 @@ def _path_to_page(path_id):
     return {}, None
 
 
-def _page_meta_tags(app):
-    start_page, path_variables = _path_to_page(flask.request.path.strip("/"))
+def _page_meta_tags(app, request):
+    request_url = request.get_path()
+    start_page, path_variables = _path_to_page(request_url.strip("/"))
 
-    # use the supplied image_url or create url based on image in the assets folder
     image = start_page.get("image", "")
     if image:
         image = app.get_asset_url(image)
     assets_image_url = (
-        "".join([flask.request.url_root, image.lstrip("/")]) if image else None
+        "".join([request.url_root, image.lstrip("/")]) if image else None
     )
     supplied_image_url = start_page.get("image_url")
     image_url = supplied_image_url if supplied_image_url else assets_image_url
@@ -413,7 +413,7 @@ def _page_meta_tags(app):
     return [
         {"name": "description", "content": description},
         {"property": "twitter:card", "content": "summary_large_image"},
-        {"property": "twitter:url", "content": flask.request.url},
+        {"property": "twitter:url", "content": request_url},
         {"property": "twitter:title", "content": title},
         {"property": "twitter:description", "content": description},
         {"property": "twitter:image", "content": image_url or ""},

dash/dash.py

@@ -44,6 +44,7 @@
     ProxyError,
     DuplicateCallback,
 )
+from .server_factories import get_request_adapter
 from .version import __version__
 from ._configs import get_combined_config, pathname_configs, pages_folder_config
 from ._utils import (
@@ -1141,9 +1142,10 @@ def render_index(self, *args, **kwargs):
         metas = self._generate_meta()
         renderer = self._generate_renderer()
         title = self.title
+        request = get_request_adapter()
 
         if self.use_pages and self.config.include_pages_meta:
-            metas = _page_meta_tags(self) + metas
+            metas = _page_meta_tags(self, request) + metas
 
         if self._favicon:
             favicon_mod_time = os.path.getmtime(
@@ -2331,7 +2333,7 @@ def enable_pages(self) -> None:
         if self.pages_folder:
             _import_layouts_from_pages(self.config.pages_folder)
 
-        @self.server.before_request
+
         def router():
             if self._got_first_request["pages"]:
                 return
@@ -2487,5 +2489,6 @@ def update(pathname_, search_, **states):
                 Input(_ID_STORE, "data"),
             )
 
+        self.server_factory.before_request(self.server, router)
     def __call__(self, *args, **kwargs):
         return self.server_factory.__call__(self.server, *args, **kwargs)

dash/server_factories/fastapi_factory.py

@@ -55,15 +55,27 @@ async def wrapped(*args, **kwargs):
         return wrapped
 
     def setup_index(self, app, dash_app):
-        async def index():
+        async def index(request: Request):
+            adapter = FastAPIRequestAdapter()
+            set_request_adapter(adapter)
+            adapter.set_request(request)
             return Response(content=dash_app.render_index(), media_type="text/html")
         self.add_url_rule(app, "/", index, endpoint="index", methods=["GET"])
 
     def setup_catchall(self, app, dash_app):
-        async def catchall(path: str):
-            return Response(content=dash_app.render_index(), media_type="text/html")
+        @dash_app.server.on_event("startup")
+        def _setup_catchall():
+            from fastapi import Request, Response
 
-        # self.add_url_rule(app, "/{path:path}", catchall, endpoint="catchall", methods=["GET"])
+            async def catchall(path: str, request: Request):
+                adapter = FastAPIRequestAdapter()
+                set_request_adapter(adapter)
+                adapter.set_request(request)
+                return Response(content=dash_app.render_index(), media_type="text/html")
+
+            self.add_url_rule(app, "/{path:path}", catchall, endpoint="catchall", methods=["GET"])
+
+        pass # catchall needs to be last to not override other routes
 
     def add_url_rule(self, app, rule, view_func, endpoint=None, methods=None):
         if rule == "":
@@ -228,3 +240,6 @@ def get_remote_addr(self):
 
     def get_origin(self):
         return self._request.headers.get("origin")
+
+    def get_path(self):
+        return self._request.url.path  # <-- Add this method

dash/server_factories/flask_factory.py

@@ -58,11 +58,17 @@ def get_request_adapter(self):
 
     def setup_catchall(self, app, dash_app):
         def catchall(path, *args, **kwargs):
+            adapter = FlaskRequestAdapter()
+            set_request_adapter(adapter)
+            adapter.set_request(flask.request)
             return dash_app.render_index(*args, **kwargs)
         self.add_url_rule(app, "/<path:path>", catchall, endpoint="catchall", methods=["GET"])
 
     def setup_index(self, app, dash_app):
         def index(*args, **kwargs):
+            adapter = FlaskRequestAdapter()
+            set_request_adapter(adapter)
+            adapter.set_request(flask.request)
             return dash_app.render_index(dash_app, *args, **kwargs)
 
         self.add_url_rule(app, "/", index, endpoint="index", methods=["GET"])
@@ -186,3 +192,7 @@ def get_remote_addr():
     @staticmethod
     def get_origin():
         return getattr(flask.request, 'origin', None)
+
+    @staticmethod
+    def get_path():
+        return flask.request.path