[App] Update app URLs to latest format (#16568)

(cherry picked from commit 0ec93f2)

Author: ethanwharris

src/lightning_app/runners/cloud.py

@@ -24,6 +24,7 @@
 from functools import partial
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union
+from urllib.parse import quote
 
 import click
 import rich
@@ -201,7 +202,7 @@ def open(self, name: str, cluster_id: Optional[str] = None):
                 )
 
             if "PYTEST_CURRENT_TEST" not in os.environ:
-                click.launch(self._get_app_url(run_instance, "code", needs_credits))
+                click.launch(self._get_app_url(project, run_instance, "code", needs_credits))
 
         except ApiException as e:
             logger.error(e.body)
@@ -320,7 +321,9 @@ def dispatch(
 
             # TODO: Remove testing dependency, but this would open a tab for each test...
             if open_ui and "PYTEST_CURRENT_TEST" not in os.environ:
-                click.launch(self._get_app_url(run_instance, "logs" if run.is_headless else "web-ui", needs_credits))
+                click.launch(
+                    self._get_app_url(project, run_instance, "logs" if run.is_headless else "web-ui", needs_credits)
+                )
         except ApiException as e:
             logger.error(e.body)
             sys.exit(1)
@@ -915,10 +918,27 @@ def _print_specs(run_body: CloudspaceIdRunsBody, print_format: str) -> None:
 
     def _get_app_url(
         self,
+        project: V1Membership,
         run_instance: Externalv1LightningappInstance,
         tab: str,
         need_credits: bool = False,
     ) -> str:
         user = self.backend.client.auth_service_get_user()
         action = "?action=add_credits" if need_credits else ""
-        return f"{get_lightning_cloud_url()}/{user.username}/apps/{run_instance.id}/{tab}{action}"
+        if user.features.project_selector:
+            paths = [
+                user.username,
+                project.name,
+                "apps",
+                run_instance.name,
+                tab,
+            ]
+        else:
+            paths = [
+                user.username,
+                "apps",
+                run_instance.id,
+                tab,
+            ]
+        path = quote("/".join([path.replace(" ", "_").replace("/", "~") for path in paths]))
+        return f"{get_lightning_cloud_url()}/{path}{action}"

tests/tests_app/runners/test_cloud.py

@@ -1968,25 +1968,47 @@ def run(self):
 
 
 @pytest.mark.parametrize(
-    "run_instance, tab, lightning_cloud_url, expected_url",
+    "project, run_instance, user, tab, lightning_cloud_url, expected_url",
     [
+        # Old style
         (
+            V1Membership(),
             Externalv1LightningappInstance(id="test-app-id"),
+            V1GetUserResponse(username="tester", features=V1UserFeatures()),
             "logs",
-            "https://b975913c4b22eca5f0f9e8eff4c4b1c315340a0d.staging.lightning.ai",
-            "https://b975913c4b22eca5f0f9e8eff4c4b1c315340a0d.staging.lightning.ai/tester/apps/test-app-id/logs",
+            "https://lightning.ai",
+            "https://lightning.ai/tester/apps/test-app-id/logs",
         ),
         (
+            V1Membership(),
             Externalv1LightningappInstance(id="test-app-id"),
+            V1GetUserResponse(username="tester", features=V1UserFeatures()),
             "logs",
             "http://localhost:9800",
             "http://localhost:9800/tester/apps/test-app-id/logs",
         ),
+        # New style
+        (
+            V1Membership(name="tester's project"),
+            Externalv1LightningappInstance(name="test/app"),
+            V1GetUserResponse(username="tester", features=V1UserFeatures(project_selector=True)),
+            "logs",
+            "https://lightning.ai",
+            "https://lightning.ai/tester/tester%27s_project/apps/test~app/logs",
+        ),
+        (
+            V1Membership(name="tester's project"),
+            Externalv1LightningappInstance(name="test/app"),
+            V1GetUserResponse(username="tester", features=V1UserFeatures(project_selector=True)),
+            "logs",
+            "http://localhost:9800",
+            "http://localhost:9800/tester/tester%27s_project/apps/test~app/logs",
+        ),
     ],
 )
-def test_get_app_url(monkeypatch, run_instance, tab, lightning_cloud_url, expected_url):
+def test_get_app_url(monkeypatch, project, run_instance, user, tab, lightning_cloud_url, expected_url):
     mock_client = mock.MagicMock()
-    mock_client.auth_service_get_user.return_value = V1GetUserResponse(username="tester")
+    mock_client.auth_service_get_user.return_value = user
     cloud_backend = mock.MagicMock(client=mock_client)
     monkeypatch.setattr(backends, "CloudBackend", mock.MagicMock(return_value=cloud_backend))
 
@@ -1995,4 +2017,4 @@ def test_get_app_url(monkeypatch, run_instance, tab, lightning_cloud_url, expect
     with mock.patch(
         "lightning_app.runners.cloud.get_lightning_cloud_url", mock.MagicMock(return_value=lightning_cloud_url)
     ):
-        assert runtime._get_app_url(run_instance, tab) == expected_url
+        assert runtime._get_app_url(project, run_instance, tab) == expected_url