fixing issue with apps overwriting other paths

Author: BSd3v

dash/dash.py

@@ -742,7 +742,7 @@ def _add_url(self, name: str, view_func: RouteCallable, methods=("GET",)) -> Non
         self.routes.append(full_name)
 
     def _setup_routes(self):
-        self.server_factory.setup_component_suites(self.server, self)
+        self.server_factory.setup_component_suites(self)
         self._add_url("_dash-layout", self.serve_layout)
         self._add_url("_dash-dependencies", self.dependencies)
         self._add_url(
@@ -755,8 +755,8 @@ def _setup_routes(self):
             "_favicon.ico",
             self.server_factory._serve_default_favicon,  # pylint: disable=protected-access
         )
-        self.server_factory.setup_index(self.server, self)
-        self.server_factory.setup_catchall(self.server, self)
+        self.server_factory.setup_index(self)
+        self.server_factory.setup_catchall(self)
 
         if jupyter_dash.active:
             self._add_url(

dash/server_factories/fastapi_factory.py

@@ -83,16 +83,17 @@ async def wrapped(*_args, **_kwargs):
 
         return wrapped
 
-    def setup_index(self, app, dash_app):
+    def setup_index(self, dash_app):
         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"])
+        # pylint: disable=protected-access
+        dash_app._add_url("", index, methods=["GET"])
 
-    def setup_catchall(self, app, dash_app):
+    def setup_catchall(self, dash_app):
         @dash_app.server.on_event("startup")
         def _setup_catchall():
             dash_app.enable_dev_tools(
@@ -105,9 +106,8 @@ async def catchall(request: Request):
                 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"]
-            )
+            # pylint: disable=protected-access
+            dash_app._add_url("{path:path}", catchall, methods=["GET"])
 
     def add_url_rule(self, app, rule, view_func, endpoint=None, methods=None):
         if rule == "":
@@ -213,15 +213,15 @@ def serve_component_suites(
             return StarletteResponse(status_code=304)
         return StarletteResponse(content=data, media_type=mimetype, headers=headers)
 
-    def setup_component_suites(self, app, dash_app):
+    def setup_component_suites(self, dash_app):
         async def serve(request: Request, package_name: str, fingerprinted_path: str):
             return self.serve_component_suites(
                 dash_app, package_name, fingerprinted_path, request
             )
 
         # pylint: disable=protected-access
         dash_app._add_url(
-            "/_dash-component-suites/<string:package_name>/<path:fingerprinted_path>",
+            "_dash-component-suites/<string:package_name>/<path:fingerprinted_path>",
             serve,
         )
 

dash/server_factories/flask_factory.py

@@ -50,6 +50,7 @@ def _wrap_errors(error):
             return tb, 500
 
     def add_url_rule(self, app, rule, view_func, endpoint=None, methods=None):
+        print(rule, endpoint, methods)
         app.add_url_rule(
             rule, view_func=view_func, endpoint=endpoint, methods=methods or ["GET"]
         )
@@ -72,23 +73,23 @@ def jsonify(self, obj):
     def get_request_adapter(self):
         return FlaskRequestAdapter
 
-    def setup_catchall(self, app, dash_app):
+    def setup_catchall(self, dash_app):
         def catchall(*args, **kwargs):
             adapter = FlaskRequestAdapter()
             set_request_adapter(adapter)
             return dash_app.render_index(*args, **kwargs)
 
-        self.add_url_rule(
-            app, "/<path:path>", catchall, endpoint="catchall", methods=["GET"]
-        )
+        # pylint: disable=protected-access
+        dash_app._add_url("<path:path>", catchall, methods=["GET"])
 
-    def setup_index(self, app, dash_app):
+    def setup_index(self, dash_app):
         def index(*args, **kwargs):
             adapter = FlaskRequestAdapter()
             set_request_adapter(adapter)
             return dash_app.render_index(*args, **kwargs)
 
-        self.add_url_rule(app, "/", index, endpoint="/", methods=["GET"])
+        # pylint: disable=protected-access
+        dash_app._add_url("", index, methods=["GET"])
 
     def serve_component_suites(self, dash_app, package_name, fingerprinted_path):
         path_in_pkg, has_fingerprint = check_fingerprint(fingerprinted_path)
@@ -115,15 +116,15 @@ def serve_component_suites(self, dash_app, package_name, fingerprinted_path):
                 response = flask.Response(None, status=304)
         return response
 
-    def setup_component_suites(self, app, dash_app):
+    def setup_component_suites(self, dash_app):
         def serve(package_name, fingerprinted_path):
             return self.serve_component_suites(
                 dash_app, package_name, fingerprinted_path
             )
 
         # pylint: disable=protected-access
         dash_app._add_url(
-            "/_dash-component-suites/<string:package_name>/<path:fingerprinted_path>",
+            "_dash-component-suites/<string:package_name>/<path:fingerprinted_path>",
             serve,
         )