dstack 0.18.38__py3-none-any.whl → 0.18.40rc1__py3-none-any.whl

tests/_internal/server/services/proxy/routers/test_service_proxy.py

@@ -4,6 +4,7 @@ from unittest.mock import patch
 import httpx
 import pytest
 from fastapi import FastAPI
+from fastapi.responses import PlainTextResponse
 
 from dstack._internal.proxy.gateway.repo.repo import GatewayProxyRepo
 from dstack._internal.proxy.lib.auth import BaseProxyAuthProvider
@@ -25,6 +26,8 @@ ProxyTestRepo = GatewayProxyRepo
 
 @pytest.fixture
 def mock_replica_client_httpbin(httpbin) -> Generator[None, None, None]:
+    """Mocks deployed services. Replaces them with httpbin"""
+
     with patch(
         "dstack._internal.proxy.lib.services.service_connection.ServiceConnectionPool.get_or_add"
     ) as add_connection_mock:
@@ -34,6 +37,20 @@ def mock_replica_client_httpbin(httpbin) -> Generator[None, None, None]:
         yield
 
 
+@pytest.fixture
+def mock_replica_client_path_reporter() -> Generator[None, None, None]:
+    """Mocks deployed services. Replaces them with an app that returns the requested path"""
+
+    app = FastAPI()
+    app.get("{path:path}")(lambda path: PlainTextResponse(path))
+    client = ServiceClient(base_url="http://test/", transport=httpx.ASGITransport(app))
+    with patch(
+        "dstack._internal.proxy.lib.services.service_connection.ServiceConnectionPool.get_or_add"
+    ) as add_connection_mock:
+        add_connection_mock.return_value.client.return_value = client
+        yield
+
+
 def make_app(
     repo: BaseProxyRepo, auth: BaseProxyAuthProvider = ProxyTestAuthProvider()
 ) -> FastAPI:
@@ -200,3 +217,25 @@ async def test_auth(mock_replica_client_httpbin, token: Optional[str], status: i
     url = "http://test-host/proxy/services/test-proj/httpbin/"
     resp = await client.get(url, headers=headers)
     assert resp.status_code == status
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("strip", "downstream_path", "upstream_path"),
+    [
+        (True, "/proxy/services/my-proj/my-run/", "/"),
+        (True, "/proxy/services/my-proj/my-run/a/b", "/a/b"),
+        (False, "/proxy/services/my-proj/my-run/", "/proxy/services/my-proj/my-run/"),
+        (False, "/proxy/services/my-proj/my-run/a/b", "/proxy/services/my-proj/my-run/a/b"),
+    ],
+)
+async def test_strip_prefix(
+    mock_replica_client_path_reporter, strip: bool, downstream_path: str, upstream_path: str
+) -> None:
+    repo = ProxyTestRepo()
+    await repo.set_project(make_project("my-proj"))
+    await repo.set_service(make_service("my-proj", "my-run", strip_prefix=strip))
+    _, client = make_app_client(repo)
+    resp = await client.get(f"http://test-host{downstream_path}")
+    assert resp.status_code == 200
+    assert resp.text == upstream_path

tests/_internal/server/services/runner/test_client.py

@@ -175,7 +175,9 @@ class TestShimClientV1(BaseShimClientTest):
                     "device_name": "/dev/sdv",
                 }
             ],
-            "instance_mounts": [{"instance_path": "/mnt/nfs/home", "path": "/home"}],
+            "instance_mounts": [
+                {"instance_path": "/mnt/nfs/home", "path": "/home", "optional": False}
+            ],
         }
         self.assert_request(adapter, 0, "POST", "/api/submit", expected_request)
 
@@ -341,7 +343,9 @@ class TestShimClientV2(BaseShimClientTest):
                 }
             ],
             "volume_mounts": [{"name": "vol", "path": "/vol"}],
-            "instance_mounts": [{"instance_path": "/mnt/nfs/home", "path": "/home"}],
+            "instance_mounts": [
+                {"instance_path": "/mnt/nfs/home", "path": "/home", "optional": False}
+            ],
             "host_ssh_user": "dstack",
             "host_ssh_keys": ["host_key"],
             "container_ssh_keys": ["project_key", "user_key"],