adjust _add_assts_resource to use get_asset_url

Author: karosc

dash/dash.py

@@ -1100,10 +1100,7 @@ def _setup_server(self):
     def _add_assets_resource(self, url_path, file_path):
         res = {"asset_path": url_path, "filepath": file_path}
         if self.config.assets_external_path:
-            res["external_url"] = "/".join([
-                self.config.assets_external_path.rstrip('/'), self.config.assets_url_path.strip('/'), url_path.lstrip('/')
-            ]
-            )
+            res["external_url"] = self.get_asset_url(url_path.lstrip("/"))
         self._assets_files.append(file_path)
         return res
 
@@ -1193,11 +1190,7 @@ def get_asset_url(self, path):
         else:
             prefix = self.config.requests_pathname_prefix
 
-        asset = get_asset_path(
-            prefix,
-            path,
-            self.config.assets_url_path.lstrip("/")
-        )
+        asset = get_asset_path(prefix, path, self.config.assets_url_path.lstrip("/"))
 
         return asset
 

tests/unit/test_configs.py

@@ -108,22 +108,34 @@ def test_pathname_prefix_assets(empty_environ, req, expected):
 @pytest.mark.parametrize(
     "requests_pathname_prefix, assets_external_path, assets_url_path, expected",
     [
-        (None    , None                        , "assets" , "/assets/reset.css"),
-        ("/app/" , None                        , "assets" , '/app/assets/reset.css'),
-        (None    , None                        , "css"    , "/css/reset.css"),
-        ("/app/" , None                        , "css"    , "/app/css/reset.css"),
-        (None    , "http://external.com/", "assets" , "http://external.com/assets/reset.css"),
-        ("/app/" , "http://external.com/", "css"    , "http://external.com/css/reset.css"),
-
-    ],)
-def test_asset_url(empty_environ, requests_pathname_prefix, assets_external_path, assets_url_path, expected):
-    app = Dash('Dash',
-               requests_pathname_prefix=requests_pathname_prefix,
-               assets_external_path=assets_external_path,
-               assets_url_path=assets_url_path
-               )
-
-    path = app.get_asset_url('reset.css')
+        (None, None, "assets", "/assets/reset.css"),
+        ("/app/", None, "assets", "/app/assets/reset.css"),
+        (None, None, "css", "/css/reset.css"),
+        ("/app/", None, "css", "/app/css/reset.css"),
+        (
+            None,
+            "http://external.com/",
+            "assets",
+            "http://external.com/assets/reset.css",
+        ),
+        ("/app/", "http://external.com/", "css", "http://external.com/css/reset.css"),
+    ],
+)
+def test_asset_url(
+    empty_environ,
+    requests_pathname_prefix,
+    assets_external_path,
+    assets_url_path,
+    expected,
+):
+    app = Dash(
+        "Dash",
+        requests_pathname_prefix=requests_pathname_prefix,
+        assets_external_path=assets_external_path,
+        assets_url_path=assets_url_path,
+    )
+
+    path = app.get_asset_url("reset.css")
     assert path == expected