Do not load ProjectModel.default_gateway by default

Author: r4victor

src/dstack/_internal/server/services/gateways/__init__.py

@@ -86,15 +86,6 @@ async def get_gateway_by_name(
     return gateway_model_to_gateway(gateway)
 
 
-async def get_project_default_gateway(
-    session: AsyncSession, project: ProjectModel
-) -> Optional[Gateway]:
-    gateway: Optional[GatewayModel] = project.default_gateway
-    if gateway is None:
-        return None
-    return gateway_model_to_gateway(gateway)
-
-
 async def create_gateway_compute(
     project_name: str,
     backend_compute: Compute,
@@ -181,9 +172,9 @@ async def create_gateway(
         session.add(gateway)
         await session.commit()
 
-        if project.default_gateway is None or configuration.default:
+        default_gateway = await get_project_default_gateway_model(session=session, project=project)
+        if default_gateway is None or configuration.default:
             await set_default_gateway(session=session, project=project, name=configuration.name)
-
         return gateway_model_to_gateway(gateway)
 
 
@@ -349,6 +340,15 @@ async def get_project_gateway_model_by_name(
     return res.scalar()
 
 
+async def get_project_default_gateway_model(
+    session: AsyncSession, project: ProjectModel
+) -> Optional[GatewayModel]:
+    res = await session.execute(
+        select(GatewayModel).where(GatewayModel.id == project.default_gateway_id)
+    )
+    return res.scalar_one_or_none()
+
+
 async def generate_gateway_name(session: AsyncSession, project: ProjectModel) -> str:
     gateways = await list_project_gateway_models(session=session, project=project)
     names = {g.name for g in gateways}

src/dstack/_internal/server/services/projects.py

@@ -435,7 +435,6 @@ async def get_project_model_by_name(
         .where(*filters)
         .options(joinedload(ProjectModel.backends))
         .options(joinedload(ProjectModel.members))
-        .options(joinedload(ProjectModel.default_gateway))
     )
     return res.unique().scalar()
 
@@ -452,7 +451,6 @@ async def get_project_model_by_name_or_error(
         )
         .options(joinedload(ProjectModel.backends))
         .options(joinedload(ProjectModel.members))
-        .options(joinedload(ProjectModel.default_gateway))
     )
     return res.unique().scalar_one()
 
@@ -469,7 +467,6 @@ async def get_project_model_by_id_or_error(
         )
         .options(joinedload(ProjectModel.backends))
         .options(joinedload(ProjectModel.members))
-        .options(joinedload(ProjectModel.default_gateway))
     )
     return res.unique().scalar_one()
 

src/dstack/_internal/server/services/services/__init__.py

@@ -28,6 +28,7 @@
 from dstack._internal.server.services.gateways import (
     get_gateway_configuration,
     get_or_add_gateway_connection,
+    get_project_default_gateway_model,
     get_project_gateway_model_by_name,
 )
 from dstack._internal.server.services.logging import fmt
@@ -52,7 +53,9 @@ async def register_service(session: AsyncSession, run_model: RunModel, run_spec:
     elif run_spec.configuration.gateway == False:
         gateway = None
     else:
-        gateway = run_model.project.default_gateway
+        gateway = await get_project_default_gateway_model(
+            session=session, project=run_model.project
+        )
 
     if gateway is not None:
         service_spec = await _register_service_in_gateway(session, run_model, run_spec, gateway)

src/tests/_internal/server/routers/test_gateways.py

@@ -7,10 +7,6 @@
 from dstack._internal.core.errors import DstackError
 from dstack._internal.core.models.backends.base import BackendType
 from dstack._internal.core.models.users import GlobalRole, ProjectRole
-from dstack._internal.server.services.gateways import (
-    gateway_model_to_gateway,
-    get_project_default_gateway,
-)
 from dstack._internal.server.services.projects import add_project_member
 from dstack._internal.server.testing.common import (
     ComputeMockSpec,
@@ -291,32 +287,6 @@ async def test_create_gateway_missing_backend(
 
 
 class TestDefaultGateway:
-    @pytest.mark.asyncio
-    @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
-    async def test_get_default_gateway(self, test_db, session: AsyncSession, client: AsyncClient):
-        project = await create_project(session)
-        backend = await create_backend(session, project.id)
-        gateway = await create_gateway(session, project.id, backend.id)
-        async with session.begin():
-            project.default_gateway_id = gateway.id
-            session.add(project)
-
-        res = await get_project_default_gateway(session, project)
-        assert res is not None
-        assert res.dict() == gateway_model_to_gateway(gateway).dict()
-
-    @pytest.mark.asyncio
-    @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
-    async def test_default_gateway_is_missing(
-        self, test_db, session: AsyncSession, client: AsyncClient
-    ):
-        project = await create_project(session)
-        backend = await create_backend(session, project.id)
-        await create_gateway(session, project.id, backend.id)
-
-        res = await get_project_default_gateway(session, project)
-        assert res is None
-
     @pytest.mark.asyncio
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
     async def test_only_admin_can_set_default_gateway(