Clean development code

Author: Bihan Rana

gateway/pyproject.toml

@@ -11,7 +11,7 @@ requires-python = ">=3.10"
 dynamic = ["version"]
 dependencies = [
     # release builds of dstack-gateway depend on a PyPI version of dstack instead
-    "dstack[gateway] @ git+https://github.com/Bihan/dstack.git@add_sglang_router_minimal_support",
+    "dstack[gateway] @ git+https://github.com/dstackai/dstack.git@master",
 ]
 
 [tool.setuptools.package-data]

src/dstack/_internal/core/backends/base/compute.py

@@ -982,12 +982,7 @@ def get_dstack_gateway_wheel(build: str) -> str:
         r.raise_for_status()
         build = r.text.strip()
         logger.debug("Found the latest gateway build: %s", build)
-    # return f"{base_url}/dstack_gateway-{build}-py3-none-any.whl"
-    # For testing
-    logger.debug(
-        "Using test gateway wheel: https://bihan-test-bucket.s3.eu-west-1.amazonaws.com/dstack_gateway-0.0.0-py3-none-any.whl"
-    )
-    return "https://bihan-test-bucket.s3.eu-west-1.amazonaws.com/dstack_gateway-0.0.0-py3-none-any.whl"
+    return f"{base_url}/dstack_gateway-{build}-py3-none-any.whl"
 
 
 def get_dstack_gateway_commands() -> List[str]:

src/dstack/_internal/core/models/gateways.py

@@ -44,7 +44,6 @@ class GatewayCertificate(CoreModel):
     ]
 
 
-# https://github.com/dstackai/dstack/blob/master/src/dstack/_internal/proxy/gateway/resources/nginx/service.jinja2
 class GatewayConfiguration(CoreModel):
     type: Literal["gateway"] = "gateway"
     name: Annotated[Optional[str], Field(description="The gateway name")] = None

src/dstack/_internal/proxy/gateway/routers/registry.py

@@ -13,10 +13,8 @@
 from dstack._internal.proxy.gateway.services.nginx import Nginx
 from dstack._internal.proxy.lib.deps import get_service_connection_pool
 from dstack._internal.proxy.lib.services.service_connection import ServiceConnectionPool
-from dstack._internal.utils.logging import get_logger
 
 router = APIRouter(prefix="/{project_name}")
-logger = get_logger(__name__)
 
 
 @router.post("/services/register")
@@ -27,7 +25,6 @@ async def register_service(
     nginx: Annotated[Nginx, Depends(get_nginx)],
     service_conn_pool: Annotated[ServiceConnectionPool, Depends(get_service_connection_pool)],
 ) -> OkResponse:
-    logger.debug(f"[SglangRouterTesting] Gateway API Reception Router: {body.router}")
     await registry_services.register_service(
         project_name=project_name.lower(),
         run_name=body.run_name.lower(),

src/dstack/_internal/proxy/gateway/services/nginx.py

@@ -82,17 +82,12 @@ def __init__(self, conf_dir: Path = Path("/etc/nginx/sites-enabled")) -> None:
     async def register(self, conf: SiteConfig, acme: ACMESettings) -> None:
         logger.debug("Registering %s domain %s", conf.type, conf.domain)
         conf_name = self.get_config_name(conf.domain)
-        logger.debug(f"[SglangRouterTesting] Register Conf object dict: {conf.dict()}")
         async with self._lock:
             if conf.https:
                 await run_async(self.run_certbot, conf.domain, acme)
             await run_async(self.write_conf, conf.render(), conf_name)
-            # Start sglang-router if router is sglang
             if hasattr(conf, "router") and conf.router == "sglang":
                 replicas = len(conf.replicas) if hasattr(conf, "replicas") and conf.replicas else 1
-                logger.debug(
-                    f"[SglangRouterTesting] Starting sglang-router with {replicas} replicas"
-                )
                 await run_async(self.write_sglang_workers_conf, conf)
                 await run_async(self.start_sglang_router, replicas)
 
@@ -106,7 +101,6 @@ async def unregister(self, domain: str) -> None:
         async with self._lock:
             await run_async(sudo_rm, conf_path)
             workers_conf_path = self._conf_dir / f"sglang-workers.{domain}.conf"
-            logger.debug(f"[SglangRouterTesting] Workers conf path: {workers_conf_path}")
             if workers_conf_path.exists():
                 await run_async(sudo_rm, workers_conf_path)
                 await run_async(self.stop_sglang_router)
@@ -122,26 +116,20 @@ def reload() -> None:
 
     @staticmethod
     def start_sglang_router(replicas: int) -> None:
-        """Start sglang-router service, killing existing one if running."""
         try:
-            # Kill existing sglang-router if running
             result = subprocess.run(
                 ["pgrep", "-f", "sglang::router"], capture_output=True, timeout=5
             )
             if result.returncode == 0:
-                logger.info("Killing existing sglang-router...")
+                logger.info("Stopping existing sglang-router...")
                 subprocess.run(["pkill", "-f", "sglang::router"], timeout=5)
-                # Wait a moment for the process to terminate
                 import time
 
                 time.sleep(1)
-
-            # Generate worker URLs based on replica count
             worker_urls = []
             for i in range(1, replicas + 1):
                 worker_urls.append(f"http://127.0.0.1:{10000 + i}")
 
-            # Start sglang-router with system-wide installation
             logger.info(f"Starting sglang-router with {replicas} replicas...")
             cmd = (
                 [

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

@@ -83,10 +83,6 @@ async def _register_service_in_gateway(
     gateway_configuration = get_gateway_configuration(gateway)
     service_https = _get_service_https(run_spec, gateway_configuration)
     router = gateway_configuration.router
-    logger.debug(f"[SglangRouterTesting] Configuration parsing: {router}")
-    logger.debug(
-        f"[SglangRouterTesting] Configuration parsing dict: {gateway_configuration.dict()}"
-    )
     service_protocol = "https" if service_https else "http"
 
     if service_https and gateway_configuration.certificate is None:
@@ -112,7 +108,6 @@ async def _register_service_in_gateway(
     conn = await get_or_add_gateway_connection(session, gateway.id)
     try:
         logger.debug("%s: registering service as %s", fmt(run_model), service_spec.url)
-        logger.debug(f"[SglangRouterTesting] Service Registration Router: {router}")
         async with conn.client() as client:
             await client.register_service(
                 project=run_model.project.name,