dstack 0.18.43__py3-none-any.whl → 0.19.0__py3-none-any.whl

dstack/api/server/_runs.py

@@ -1,36 +1,22 @@
 from datetime import datetime
-from typing import Any, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 from uuid import UUID
 
 from pydantic import parse_obj_as
 
-from dstack._internal.core.models.common import is_core_model_instance
-from dstack._internal.core.models.configurations import (
-    STRIP_PREFIX_DEFAULT,
-    DevEnvironmentConfiguration,
-    ServiceConfiguration,
-)
-from dstack._internal.core.models.pools import Instance
-from dstack._internal.core.models.profiles import Profile
 from dstack._internal.core.models.runs import (
     ApplyRunPlanInput,
-    PoolInstanceOffers,
-    Requirements,
     Run,
     RunPlan,
     RunSpec,
 )
-from dstack._internal.core.models.volumes import InstanceMountPoint
 from dstack._internal.server.schemas.runs import (
     ApplyRunPlanRequest,
-    CreateInstanceRequest,
     DeleteRunsRequest,
-    GetOffersRequest,
     GetRunPlanRequest,
     GetRunRequest,
     ListRunsRequest,
     StopRunsRequest,
-    SubmitRunRequest,
 )
 from dstack.api.server._group import APIClientGroup
 
@@ -62,8 +48,7 @@ class RunsAPIClient(APIClientGroup):
 
     def get(self, project_name: str, run_name: str) -> Run:
         body = GetRunRequest(run_name=run_name)
-        # dstack versions prior to 0.18.34 don't support id field, and we don't use it here either
-        json_body = body.json(exclude={"id"})
+        json_body = body.json()
         resp = self._request(f"/api/project/{project_name}/runs/get", body=json_body)
         return parse_obj_as(Run.__response__, resp.json())
 
@@ -89,14 +74,6 @@ class RunsAPIClient(APIClientGroup):
         )
         return parse_obj_as(Run.__response__, resp.json())
 
-    def submit(self, project_name: str, run_spec: RunSpec) -> Run:
-        body = SubmitRunRequest(run_spec=run_spec)
-        resp = self._request(
-            f"/api/project/{project_name}/runs/submit",
-            body=body.json(exclude=_get_run_spec_excludes(run_spec)),
-        )
-        return parse_obj_as(Run.__response__, resp.json())
-
     def stop(self, project_name: str, runs_names: List[str], abort: bool):
         body = StopRunsRequest(runs_names=runs_names, abort=abort)
         self._request(f"/api/project/{project_name}/runs/stop", body=body.json())
@@ -105,87 +82,35 @@ class RunsAPIClient(APIClientGroup):
         body = DeleteRunsRequest(runs_names=runs_names)
         self._request(f"/api/project/{project_name}/runs/delete", body=body.json())
 
-    # FIXME: get_offers and create_instance do not belong runs api
-
-    def get_offers(
-        self, project_name: str, profile: Profile, requirements: Requirements
-    ) -> PoolInstanceOffers:
-        body = GetOffersRequest(profile=profile, requirements=requirements)
-        resp = self._request(f"/api/project/{project_name}/runs/get_offers", body=body.json())
-        return parse_obj_as(PoolInstanceOffers.__response__, resp.json())
 
-    def create_instance(
-        self,
-        project_name: str,
-        profile: Profile,
-        requirements: Requirements,
-    ) -> Instance:
-        body = CreateInstanceRequest(profile=profile, requirements=requirements)
-        resp = self._request(f"/api/project/{project_name}/runs/create_instance", body=body.json())
-        return parse_obj_as(Instance.__response__, resp.json())
-
-
-def _get_apply_plan_excludes(plan: ApplyRunPlanInput) -> Optional[dict]:
+def _get_apply_plan_excludes(plan: ApplyRunPlanInput) -> Optional[Dict]:
+    """
+    Returns `plan` exclude mapping to exclude certain fields from the request.
+    Use this method to exclude new fields when they are not set to keep
+    clients backward-compatibility with older servers.
+    """
     run_spec_excludes = _get_run_spec_excludes(plan.run_spec)
     if run_spec_excludes is not None:
         return {"plan": run_spec_excludes}
     return None
 
 
-def _get_run_spec_excludes(run_spec: RunSpec) -> Optional[dict]:
+def _get_run_spec_excludes(run_spec: RunSpec) -> Optional[Dict]:
+    """
+    Returns `run_spec` exclude mapping to exclude certain fields from the request.
+    Use this method to exclude new fields when they are not set to keep
+    clients backward-compatibility with older servers.
+    """
     spec_excludes: dict[str, Any] = {}
     configuration_excludes: dict[str, Any] = {}
     profile_excludes: set[str] = set()
-    configuration = run_spec.configuration
-    profile = run_spec.profile
-
-    # client >= 0.18.18 / server <= 0.18.17 compatibility tweak
-    if not configuration.privileged:
-        configuration_excludes["privileged"] = True
-    # client >= 0.18.23 / server <= 0.18.22 compatibility tweak
-    if configuration.type == "service" and configuration.gateway is None:
-        configuration_excludes["gateway"] = True
-    # client >= 0.18.30 / server <= 0.18.29 compatibility tweak
-    if run_spec.configuration.user is None:
-        configuration_excludes["user"] = True
-    # client >= 0.18.30 / server <= 0.18.29 compatibility tweak
-    if configuration.reservation is None:
-        configuration_excludes["reservation"] = True
-    if profile is not None and profile.reservation is None:
-        profile_excludes.add("reservation")
-    if configuration.idle_duration is None:
-        configuration_excludes["idle_duration"] = True
-    if profile is not None and profile.idle_duration is None:
-        profile_excludes.add("idle_duration")
-    # client >= 0.18.38 / server <= 0.18.37 compatibility tweak
-    if configuration.stop_duration is None:
-        configuration_excludes["stop_duration"] = True
-    if profile is not None and profile.stop_duration is None:
-        profile_excludes.add("stop_duration")
-    # client >= 0.18.40 / server <= 0.18.39 compatibility tweak
-    if (
-        is_core_model_instance(configuration, ServiceConfiguration)
-        and configuration.strip_prefix == STRIP_PREFIX_DEFAULT
-    ):
-        configuration_excludes["strip_prefix"] = True
-    if configuration.single_branch is None:
-        configuration_excludes["single_branch"] = True
-    if all(
-        not is_core_model_instance(v, InstanceMountPoint) or not v.optional
-        for v in configuration.volumes
-    ):
-        configuration_excludes["volumes"] = {"__all__": {"optional"}}
-    # client >= 0.18.41 / server <= 0.18.40 compatibility tweak
-    if configuration.availability_zones is None:
-        configuration_excludes["availability_zones"] = True
-    if profile is not None and profile.availability_zones is None:
-        profile_excludes.add("availability_zones")
-    if (
-        is_core_model_instance(configuration, DevEnvironmentConfiguration)
-        and configuration.inactivity_duration is None
-    ):
-        configuration_excludes["inactivity_duration"] = True
-
+    # configuration = run_spec.configuration
+    # profile = run_spec.profile
+    # Fields can be excluded like this:
+    # if configuration.availability_zones is None:
+    #     configuration_excludes["availability_zones"] = True
+    # if profile is not None and profile.availability_zones is None:
+    #     profile_excludes.add("availability_zones")
     if configuration_excludes:
         spec_excludes["configuration"] = configuration_excludes
     if profile_excludes:

dstack/api/server/_volumes.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import Dict, List
 
 from pydantic import parse_obj_as
 
@@ -38,9 +38,14 @@ class VolumesAPIClient(APIClientGroup):
         self._request(f"/api/project/{project_name}/volumes/delete", body=body.json())
 
 
-def _get_volume_configuration_excludes(configuration: VolumeConfiguration) -> dict:
+def _get_volume_configuration_excludes(configuration: VolumeConfiguration) -> Dict:
+    """
+    Returns `configuration` exclude mapping to exclude certain fields from the request.
+    Use this method to exclude new fields when they are not set to keep
+    clients backward-compatibility with older servers.
+    """
     configuration_excludes = {}
-    # client >= 0.18.41 / server <= 0.18.40 compatibility tweak
-    if configuration.availability_zone is None:
-        configuration_excludes["availability_zone"] = True
+    # Fields can be excluded like this:
+    # if configuration.availability_zone is None:
+    #     configuration_excludes["availability_zone"] = True
     return {"configuration": configuration_excludes}

dstack/api/utils.py

@@ -2,6 +2,7 @@ from pathlib import Path
 from typing import Optional, Tuple
 
 import yaml
+from pydantic import ValidationError
 
 from dstack._internal.core.errors import ConfigurationError
 from dstack._internal.core.models.configurations import AnyRunConfiguration
@@ -96,6 +97,8 @@ def _load_profile_from_path(profiles_path: Path, profile_name: Optional[str]) ->
             config = ProfilesConfig.parse_obj(yaml.safe_load(f))
     except FileNotFoundError:
         return None
+    except ValidationError as e:
+        raise ConfigurationError(e)
 
     if profile_name is None:
         return config.default()

dstack/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.18.43"
+__version__ = "0.19.0"
 __is_release__ = True
 base_image = "0.7"

{dstack-0.18.43.dist-info → dstack-0.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dstack
-Version: 0.18.43
+Version: 0.19.0
 Summary: dstack is an open-source orchestration engine for running AI workloads on any cloud or on-premises.
 Home-page: https://dstack.ai
 Author: Andrey Cheptsov
@@ -60,6 +60,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "all"
 Requires-Dist: asyncpg; extra == "all"
 Requires-Dist: cachetools; extra == "all"
 Requires-Dist: python-json-logger>=3.1.0; extra == "all"
+Requires-Dist: prometheus-client; extra == "all"
 Requires-Dist: grpcio>=1.50; extra == "all"
 Requires-Dist: boto3; extra == "all"
 Requires-Dist: botocore; extra == "all"
@@ -100,6 +101,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "aws"
 Requires-Dist: asyncpg; extra == "aws"
 Requires-Dist: cachetools; extra == "aws"
 Requires-Dist: python-json-logger>=3.1.0; extra == "aws"
+Requires-Dist: prometheus-client; extra == "aws"
 Requires-Dist: grpcio>=1.50; extra == "aws"
 Requires-Dist: boto3; extra == "aws"
 Requires-Dist: botocore; extra == "aws"
@@ -124,6 +126,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "azure"
 Requires-Dist: asyncpg; extra == "azure"
 Requires-Dist: cachetools; extra == "azure"
 Requires-Dist: python-json-logger>=3.1.0; extra == "azure"
+Requires-Dist: prometheus-client; extra == "azure"
 Requires-Dist: grpcio>=1.50; extra == "azure"
 Requires-Dist: azure-identity>=1.12.0; extra == "azure"
 Requires-Dist: azure-mgmt-subscription>=3.1.1; extra == "azure"
@@ -152,6 +155,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "datacrunch"
 Requires-Dist: asyncpg; extra == "datacrunch"
 Requires-Dist: cachetools; extra == "datacrunch"
 Requires-Dist: python-json-logger>=3.1.0; extra == "datacrunch"
+Requires-Dist: prometheus-client; extra == "datacrunch"
 Requires-Dist: grpcio>=1.50; extra == "datacrunch"
 Requires-Dist: datacrunch; extra == "datacrunch"
 Provides-Extra: gateway
@@ -183,6 +187,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "gcp"
 Requires-Dist: asyncpg; extra == "gcp"
 Requires-Dist: cachetools; extra == "gcp"
 Requires-Dist: python-json-logger>=3.1.0; extra == "gcp"
+Requires-Dist: prometheus-client; extra == "gcp"
 Requires-Dist: grpcio>=1.50; extra == "gcp"
 Requires-Dist: google-auth>=2.3.0; extra == "gcp"
 Requires-Dist: google-cloud-storage>=2.0.0; extra == "gcp"
@@ -212,6 +217,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "kubernetes"
 Requires-Dist: asyncpg; extra == "kubernetes"
 Requires-Dist: cachetools; extra == "kubernetes"
 Requires-Dist: python-json-logger>=3.1.0; extra == "kubernetes"
+Requires-Dist: prometheus-client; extra == "kubernetes"
 Requires-Dist: grpcio>=1.50; extra == "kubernetes"
 Requires-Dist: kubernetes; extra == "kubernetes"
 Provides-Extra: lambda
@@ -235,6 +241,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "lambda"
 Requires-Dist: asyncpg; extra == "lambda"
 Requires-Dist: cachetools; extra == "lambda"
 Requires-Dist: python-json-logger>=3.1.0; extra == "lambda"
+Requires-Dist: prometheus-client; extra == "lambda"
 Requires-Dist: grpcio>=1.50; extra == "lambda"
 Requires-Dist: boto3; extra == "lambda"
 Requires-Dist: botocore; extra == "lambda"
@@ -259,6 +266,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "oci"
 Requires-Dist: asyncpg; extra == "oci"
 Requires-Dist: cachetools; extra == "oci"
 Requires-Dist: python-json-logger>=3.1.0; extra == "oci"
+Requires-Dist: prometheus-client; extra == "oci"
 Requires-Dist: grpcio>=1.50; extra == "oci"
 Requires-Dist: oci; extra == "oci"
 Provides-Extra: server
@@ -282,6 +290,7 @@ Requires-Dist: alembic-postgresql-enum; extra == "server"
 Requires-Dist: asyncpg; extra == "server"
 Requires-Dist: cachetools; extra == "server"
 Requires-Dist: python-json-logger>=3.1.0; extra == "server"
+Requires-Dist: prometheus-client; extra == "server"
 Requires-Dist: grpcio>=1.50; extra == "server"
 
 <div style="text-align: center;">