dstack 0.19.26__py3-none-any.whl → 0.19.28__py3-none-any.whl

dstack/_internal/server/testing/common.py

@@ -28,6 +28,7 @@ from dstack._internal.core.models.configurations import (
 from dstack._internal.core.models.envs import Env
 from dstack._internal.core.models.fleets import (
     FleetConfiguration,
+    FleetNodesSpec,
     FleetSpec,
     FleetStatus,
     InstanceGroupPlacement,
@@ -60,7 +61,7 @@ from dstack._internal.core.models.profiles import (
 )
 from dstack._internal.core.models.repos.base import RepoType
 from dstack._internal.core.models.repos.local import LocalRunRepoData
-from dstack._internal.core.models.resources import CPUSpec, Memory, Range, ResourcesSpec
+from dstack._internal.core.models.resources import CPUSpec, Memory, ResourcesSpec
 from dstack._internal.core.models.runs import (
     JobProvisioningData,
     JobRuntimeData,
@@ -271,7 +272,7 @@ def get_run_spec(
         repo_id=repo_id,
         repo_data=LocalRunRepoData(repo_dir="/"),
         repo_code_hash=None,
-        working_dir=".",
+        working_dir=None,
         configuration_path=configuration_path,
         configuration=configuration or DevEnvironmentConfiguration(ide="vscode"),
         profile=profile,
@@ -284,6 +285,7 @@ async def create_run(
     project: ProjectModel,
     repo: RepoModel,
     user: UserModel,
+    fleet: Optional[FleetModel] = None,
     run_name: str = "test-run",
     status: RunStatus = RunStatus.SUBMITTED,
     termination_reason: Optional[RunTerminationReason] = None,
@@ -309,6 +311,7 @@ async def create_run(
         project_id=project.id,
         repo_id=repo.id,
         user_id=user.id,
+        fleet_id=fleet.id if fleet else None,
         submitted_at=submitted_at,
         run_name=run_name,
         status=status,
@@ -579,7 +582,7 @@ def get_fleet_spec(conf: Optional[FleetConfiguration] = None) -> FleetSpec:
 
 def get_fleet_configuration(
     name: str = "test-fleet",
-    nodes: Range[int] = Range(min=1, max=1),
+    nodes: FleetNodesSpec = FleetNodesSpec(min=1, target=1, max=1),
     placement: Optional[InstanceGroupPlacement] = None,
 ) -> FleetConfiguration:
     return FleetConfiguration(

dstack/_internal/utils/env.py

@@ -1,14 +1,88 @@
 import os
+from collections.abc import Mapping
+from enum import Enum
+from typing import Optional, TypeVar, Union, overload
 
+_Value = Union[str, int]
+_T = TypeVar("_T", bound=Enum)
 
-def get_bool(name: str, default: bool = False) -> bool:
-    try:
-        value = os.environ[name]
-    except KeyError:
-        return default
-    value = value.lower()
-    if value in ["0", "false", "off"]:
-        return False
-    if value in ["1", "true", "on"]:
-        return True
-    raise ValueError(f"Invalid bool value: {name}={value}")
+
+class Environ:
+    def __init__(self, environ: Mapping[str, str]):
+        self._environ = environ
+
+    @overload
+    def get_bool(self, name: str, *, default: None = None) -> Optional[bool]: ...
+
+    @overload
+    def get_bool(self, name: str, *, default: bool) -> bool: ...
+
+    def get_bool(self, name: str, *, default: Optional[bool] = None) -> Optional[bool]:
+        try:
+            raw_value = self._environ[name]
+        except KeyError:
+            return default
+        value = raw_value.lower()
+        if value in ["0", "false", "off"]:
+            return False
+        if value in ["1", "true", "on"]:
+            return True
+        raise ValueError(f"Invalid bool value: {name}={raw_value}")
+
+    @overload
+    def get_int(self, name: str, *, default: None = None) -> Optional[int]: ...
+
+    @overload
+    def get_int(self, name: str, *, default: int) -> int: ...
+
+    def get_int(self, name: str, *, default: Optional[int] = None) -> Optional[int]:
+        try:
+            raw_value = self._environ[name]
+        except KeyError:
+            return default
+        try:
+            return int(raw_value)
+        except ValueError as e:
+            raise ValueError(f"Invalid int value: {e}: {name}={raw_value}") from e
+
+    @overload
+    def get_enum(
+        self,
+        name: str,
+        enum_cls: type[_T],
+        *,
+        value_type: Optional[type[_Value]] = None,
+        default: None = None,
+    ) -> Optional[_T]: ...
+
+    @overload
+    def get_enum(
+        self,
+        name: str,
+        enum_cls: type[_T],
+        *,
+        value_type: Optional[type[_Value]] = None,
+        default: _T,
+    ) -> _T: ...
+
+    def get_enum(
+        self,
+        name: str,
+        enum_cls: type[_T],
+        *,
+        value_type: Optional[type[_Value]] = None,
+        default: Optional[_T] = None,
+    ) -> Optional[_T]:
+        try:
+            raw_value = self._environ[name]
+        except KeyError:
+            return default
+        try:
+            if value_type is not None:
+                raw_value = value_type(raw_value)
+            return enum_cls(raw_value)
+        except (ValueError, TypeError) as e:
+            raise ValueError(f"Invalid {enum_cls.__name__} value: {e}: {name}={raw_value}") from e
+
+
+environ = Environ(os.environ)

dstack/_internal/utils/path.py

@@ -1,6 +1,6 @@
 import os
 from dataclasses import dataclass
-from pathlib import Path, PurePath
+from pathlib import Path, PurePath, PurePosixPath
 from typing import Union
 
 PathLike = Union[str, os.PathLike]
@@ -48,3 +48,10 @@ def resolve_relative_path(path: PathLike) -> PurePath:
         return normalize_path(path)
     except ValueError:
         raise ValueError("Path is outside of the repo")
+
+
+def is_absolute_posix_path(path: PathLike) -> bool:
+    # Passing Windows path leads to undefined behavior
+    if str(path).startswith("~"):
+        return True
+    return PurePosixPath(path).is_absolute()

dstack/_internal/utils/ssh.py

@@ -50,6 +50,13 @@ def make_ssh_command_for_git(identity_file: PathLike) -> str:
     )
 
 
+def make_git_env(*, identity_file: Optional[PathLike] = None) -> dict[str, str]:
+    env: dict[str, str] = {"GIT_TERMINAL_PROMPT": "0"}
+    if identity_file is not None:
+        env["GIT_SSH_COMMAND"] = make_ssh_command_for_git(identity_file)
+    return env
+
+
 def try_ssh_key_passphrase(identity_file: PathLike, passphrase: str = "") -> bool:
     ssh_keygen = find_ssh_util("ssh-keygen")
     if ssh_keygen is None:

dstack/api/_public/repos.py

@@ -1,15 +1,21 @@
 from pathlib import Path
-from typing import Optional, Union
+from typing import Literal, Optional, Union, overload
 
 from git import InvalidGitRepositoryError
 
 from dstack._internal.core.errors import ConfigurationError, ResourceNotExistsError
-from dstack._internal.core.models.repos import LocalRepo, RemoteRepo
+from dstack._internal.core.models.repos import (
+    LocalRepo,
+    RemoteRepo,
+    RemoteRepoCreds,
+    RepoHead,
+    RepoHeadWithCreds,
+)
 from dstack._internal.core.models.repos.base import Repo, RepoType
 from dstack._internal.core.services.configs import ConfigManager
 from dstack._internal.core.services.repos import (
     InvalidRepoCredentialsError,
-    get_local_repo_credentials,
+    get_repo_creds_and_default_branch,
     load_repo,
 )
 from dstack._internal.utils.crypto import generate_rsa_key_pair
@@ -34,6 +40,7 @@ class RepoCollection:
         repo: Repo,
         git_identity_file: Optional[PathLike] = None,
         oauth_token: Optional[str] = None,
+        creds: Optional[RemoteRepoCreds] = None,
     ):
         """
         Initializes the repo and configures its credentials in the project.
@@ -65,12 +72,13 @@ class RepoCollection:
             repo: The repo to initialize.
             git_identity_file: The private SSH key path for accessing the remote repo.
             oauth_token: The GitHub OAuth token to access the remote repo.
+            creds: Optional prepared repo credentials. If specified, both `git_identity_file`
+                and `oauth_token` are ignored.
         """
-        creds = None
-        if isinstance(repo, RemoteRepo):
+        if creds is None and isinstance(repo, RemoteRepo):
             assert repo.repo_url is not None
             try:
-                creds = get_local_repo_credentials(
+                creds, _ = get_repo_creds_and_default_branch(
                     repo_url=repo.repo_url,
                     identity_file=git_identity_file,
                     oauth_token=oauth_token,
@@ -175,6 +183,33 @@ class RepoCollection:
         # TODO: add an API method with the same logic returning a bool value?
         return repo_head.repo_creds is not None
 
+    @overload
+    def get(self, repo_id: str, *, with_creds: Literal[False] = False) -> Optional[RepoHead]: ...
+
+    @overload
+    def get(self, repo_id: str, *, with_creds: Literal[True]) -> Optional[RepoHeadWithCreds]: ...
+
+    def get(
+        self, repo_id: str, *, with_creds: bool = False
+    ) -> Optional[Union[RepoHead, RepoHeadWithCreds]]:
+        """
+        Returns the repo by `repo_id`
+
+        Args:
+            repo_id: The repo ID.
+            with_creds: include repo credentials in the response.
+
+        Returns:
+            The repo or `None` if the repo is not found.
+        """
+        method = self._api_client.repos.get
+        if with_creds:
+            method = self._api_client.repos.get_with_creds
+        try:
+            return method(self._project, repo_id)
+        except ResourceNotExistsError:
+            return None
+
 
 def get_ssh_keypair(key_path: Optional[PathLike], dstack_key_path: Path) -> str:
     """Returns a path to the private key"""

dstack/api/_public/runs.py

@@ -433,6 +433,7 @@ class RunCollection:
         repo: Optional[Repo] = None,
         profile: Optional[Profile] = None,
         configuration_path: Optional[str] = None,
+        repo_dir: Optional[str] = None,
     ) -> RunPlan:
         """
         Get a run plan.
@@ -443,11 +444,17 @@ class RunCollection:
             repo (Union[LocalRepo, RemoteRepo, VirtualRepo, None]):
                 The repo to use for the run. Pass `None` if repo is not needed.
             profile: The profile to use for the run.
-            configuration_path: The path to the configuration file. Omit if the configuration is not loaded from a file.
+            configuration_path: The path to the configuration file. Omit if the configuration
+                is not loaded from a file.
+            repo_dir: The path of the cloned repo inside the run container. If not set,
+                defaults first to the `repos[0].path` property of the configuration (for remote
+                repos only), then to `/workflow`.
 
         Returns:
             Run plan.
         """
+        # XXX: not using the LEGACY_REPO_DIR const in the docstring above, as the docs generator,
+        # apparently, doesn't support f-strings (f"""...""").
         if repo is None:
             repo = VirtualRepo()
             repo_code_hash = None
@@ -455,11 +462,17 @@ class RunCollection:
             with _prepare_code_file(repo) as (_, repo_code_hash):
                 pass
 
+        if repo_dir is None and configuration.repos:
+            repo_dir = configuration.repos[0].path
+
         run_spec = RunSpec(
             run_name=configuration.name,
             repo_id=repo.repo_id,
             repo_data=repo.run_repo_data,
             repo_code_hash=repo_code_hash,
+            repo_dir=repo_dir,
+            # Server doesn't use this field since 0.19.27, but we still send it for compatibility
+            # with older servers
             working_dir=configuration.working_dir,
             configuration_path=configuration_path,
             configuration=configuration,

dstack/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.19.26"
+__version__ = "0.19.28"
 __is_release__ = True
 base_image = "0.10"
 base_image_ubuntu_version = "22.04"

{dstack-0.19.26.dist-info → dstack-0.19.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dstack
-Version: 0.19.26
+Version: 0.19.28
 Summary: dstack is an open-source orchestration engine for running AI workloads on any cloud or on-premises.
 Project-URL: Homepage, https://dstack.ai
 Project-URL: Source, https://github.com/dstackai/dstack
@@ -22,7 +22,7 @@ Requires-Dist: cryptography
 Requires-Dist: cursor
 Requires-Dist: filelock
 Requires-Dist: gitpython
-Requires-Dist: gpuhunt==0.1.7
+Requires-Dist: gpuhunt==0.1.8
 Requires-Dist: ignore-python>=0.2.0
 Requires-Dist: jsonschema
 Requires-Dist: orjson