Move server deps to dstack[server] extra (#2058)

* Move server deps to dstack[server] extra

* Move watchfiles to server deps

Author: r4victor

setup.py

@@ -42,35 +42,36 @@ def get_long_description():
     "rich-argparse",
     "tqdm",
     "simple-term-menu",
+    "pydantic>=1.10.10,<2.0.0",
+    "pydantic-duality>=1.2.4",
+    "websocket-client",
+    "python-multipart>=0.0.16",
+    "filelock",
+    "psutil",
+    "gpuhunt>=0.0.16,<0.1.0",
+]
+
+SERVER_DEPS = [
     "fastapi",
     "starlette>=0.26.0",
     "uvicorn",
-    "pydantic>=1.10.10,<2.0.0",
-    "pydantic-duality>=1.2.4",
+    "watchfiles",
     "sqlalchemy[asyncio]>=2.0.0",
     "sqlalchemy_utils>=0.40.0",
     "alembic>=1.10.2",
     "apscheduler<4",
     "aiosqlite",
-    "aiohttp",
-    "websocket-client",
-    "watchfiles",
-    "python-multipart>=0.0.16",
-    "filelock",
     "docker>=6.0.0",
     "python-dxf==12.1.0",
-    "cachetools",
-    "dnspython",
-    "grpcio>=1.50",  # indirect
-    "gpuhunt>=0.0.16,<0.1.0",
     "sentry-sdk[fastapi]",
-    "httpx",
-    "aiorwlock",
-    "python-json-logger",
     "alembic-postgresql-enum",
     "asyncpg",
+    "aiorwlock",
+    "cachetools",
+    "httpx",
+    "python-json-logger",
     "jinja2",
-    "psutil",
+    "grpcio>=1.50",  # indirect
 ]
 
 AWS_DEPS = [
@@ -105,7 +106,9 @@ def get_long_description():
 
 OCI_DEPS = ["oci"]
 
-ALL_DEPS = AWS_DEPS + AZURE_DEPS + GCP_DEPS + DATACRUNCH_DEPS + KUBERNETES_DEPS + OCI_DEPS
+ALL_DEPS = (
+    SERVER_DEPS + AWS_DEPS + AZURE_DEPS + GCP_DEPS + DATACRUNCH_DEPS + KUBERNETES_DEPS + OCI_DEPS
+)
 
 setup(
     name="dstack",
@@ -133,13 +136,14 @@ def get_long_description():
     install_requires=BASE_DEPS,
     extras_require={
         "all": ALL_DEPS,
-        "aws": AWS_DEPS,
-        "azure": AZURE_DEPS,
-        "datacrunch": DATACRUNCH_DEPS,
-        "gcp": GCP_DEPS,
-        "kubernetes": KUBERNETES_DEPS,
-        "lambda": LAMBDA_DEPS,
-        "oci": OCI_DEPS,
+        "server": SERVER_DEPS,
+        "aws": SERVER_DEPS + AWS_DEPS,
+        "azure": SERVER_DEPS + AZURE_DEPS,
+        "datacrunch": SERVER_DEPS + DATACRUNCH_DEPS,
+        "gcp": SERVER_DEPS + GCP_DEPS,
+        "kubernetes": SERVER_DEPS + KUBERNETES_DEPS,
+        "lambda": SERVER_DEPS + LAMBDA_DEPS,
+        "oci": SERVER_DEPS + OCI_DEPS,
     },
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",

src/dstack/_internal/cli/commands/server.py

@@ -1,10 +1,15 @@
 import os
 from argparse import Namespace
 
-import uvicorn
-
 from dstack import version
 from dstack._internal.cli.commands import BaseCommand
+from dstack._internal.core.errors import CLIError
+
+UVICORN_INSTALLED = True
+try:
+    import uvicorn
+except ImportError:
+    UVICORN_INSTALLED = False
 
 
 class ServerCommand(BaseCommand):
@@ -51,6 +56,12 @@ def _register(self):
     def _command(self, args: Namespace):
         super()._command(args)
 
+        if not UVICORN_INSTALLED:
+            raise CLIError(
+                "Failed to start dstack server due to missing server dependencies."
+                "\nInstall server dependencies with `pip install dstack[server]` or `pip install dstack[all]`."
+            )
+
         os.environ["DSTACK_SERVER_HOST"] = args.host
         os.environ["DSTACK_SERVER_PORT"] = str(args.port)
         os.environ["DSTACK_SERVER_LOG_LEVEL"] = args.log_level
@@ -62,6 +73,7 @@ def _command(self, args: Namespace):
             os.environ["DSTACK_SERVER_ADMIN_TOKEN"] = args.token
         uvicorn_log_level = os.getenv("DSTACK_SERVER_UVICORN_LOG_LEVEL", "ERROR").lower()
         reload_disabled = os.getenv("DSTACK_SERVER_RELOAD_DISABLED") is not None
+
         uvicorn.run(
             "dstack._internal.server.main:app",
             host=args.host,

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

@@ -239,7 +239,6 @@ def run_job(
             ssh_keys=[
                 SSHKey(public=project_ssh_public_key.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         if len(volumes) > 0:

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

@@ -197,7 +197,6 @@ def run_job(
             ssh_keys=[
                 SSHKey(public=project_ssh_public_key.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         return self.create_instance(instance_offer, instance_config)

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

@@ -61,7 +61,6 @@ def run_job(
             ssh_keys=[
                 SSHKey(public=project_ssh_public_key.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         return self.create_instance(instance_offer, instance_config)

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

@@ -156,7 +156,6 @@ def run_job(
             ssh_keys=[
                 SSHKey(public=project_ssh_public_key.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         return self.create_instance(instance_offer, instance_config)

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

@@ -367,7 +367,6 @@ def run_job(
             ssh_keys=[
                 SSHKey(public=project_ssh_public_key.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         if len(volumes) > 0:

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

@@ -113,7 +113,6 @@ def run_job(
                 ),
                 SSHKey(public=run.run_spec.ssh_key_pub.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         return self.create_instance(instance_offer, instance_config)

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

@@ -133,7 +133,6 @@ def run_job(
             ssh_keys=[
                 SSHKey(public=project_ssh_public_key.strip()),
             ],
-            job_docker_config=None,
             user=run.user,
         )
         return self.create_instance(instance_offer, instance_config)

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

@@ -93,7 +93,6 @@ def run_job(
             project_name=run.project_name,
             instance_name=get_instance_name(run, job),
             ssh_keys=[SSHKey(public=project_ssh_public_key.strip())],
-            job_docker_config=None,
             user=run.user,
         )
         return self.create_instance(instance_offer, instance_config)