dstack 0.19.25rc1__py3-none-any.whl → 0.19.26__py3-none-any.whl

dstack/api/server/__init__.py

@@ -27,9 +27,6 @@ from dstack.api.server._secrets import SecretsAPIClient
 from dstack.api.server._users import UsersAPIClient
 from dstack.api.server._volumes import VolumesAPIClient
 
-logger = get_logger(__name__)
-
-
 _MAX_RETRIES = 3
 _RETRY_INTERVAL = 1
 
@@ -66,6 +63,7 @@ class APIClient:
         client_api_version = os.getenv("DSTACK_CLIENT_API_VERSION", version.__version__)
         if client_api_version is not None:
             self._s.headers.update({"X-API-VERSION": client_api_version})
+        self._logger = get_logger(__name__)
 
     @property
     def base_url(self) -> str:
@@ -73,55 +71,55 @@ class APIClient:
 
     @property
     def users(self) -> UsersAPIClient:
-        return UsersAPIClient(self._request)
+        return UsersAPIClient(self._request, self._logger)
 
     @property
     def projects(self) -> ProjectsAPIClient:
-        return ProjectsAPIClient(self._request)
+        return ProjectsAPIClient(self._request, self._logger)
 
     @property
     def backends(self) -> BackendsAPIClient:
-        return BackendsAPIClient(self._request)
+        return BackendsAPIClient(self._request, self._logger)
 
     @property
     def fleets(self) -> FleetsAPIClient:
-        return FleetsAPIClient(self._request)
+        return FleetsAPIClient(self._request, self._logger)
 
     @property
     def repos(self) -> ReposAPIClient:
-        return ReposAPIClient(self._request)
+        return ReposAPIClient(self._request, self._logger)
 
     @property
     def runs(self) -> RunsAPIClient:
-        return RunsAPIClient(self._request)
+        return RunsAPIClient(self._request, self._logger)
 
     @property
     def gpus(self) -> GpusAPIClient:
-        return GpusAPIClient(self._request)
+        return GpusAPIClient(self._request, self._logger)
 
     @property
     def metrics(self) -> MetricsAPIClient:
-        return MetricsAPIClient(self._request)
+        return MetricsAPIClient(self._request, self._logger)
 
     @property
     def logs(self) -> LogsAPIClient:
-        return LogsAPIClient(self._request)
+        return LogsAPIClient(self._request, self._logger)
 
     @property
     def secrets(self) -> SecretsAPIClient:
-        return SecretsAPIClient(self._request)
+        return SecretsAPIClient(self._request, self._logger)
 
     @property
     def gateways(self) -> GatewaysAPIClient:
-        return GatewaysAPIClient(self._request)
+        return GatewaysAPIClient(self._request, self._logger)
 
     @property
     def volumes(self) -> VolumesAPIClient:
-        return VolumesAPIClient(self._request)
+        return VolumesAPIClient(self._request, self._logger)
 
     @property
     def files(self) -> FilesAPIClient:
-        return FilesAPIClient(self._request)
+        return FilesAPIClient(self._request, self._logger)
 
     def _request(
         self,
@@ -136,20 +134,20 @@ class APIClient:
             kwargs.setdefault("headers", {})["Content-Type"] = "application/json"
             kwargs["data"] = body
 
-        logger.debug("POST /%s", path)
+        self._logger.debug("POST /%s", path)
         for _ in range(_MAX_RETRIES):
             try:
                 # TODO: set adequate timeout here or everywhere the method is used
                 resp = self._s.request(method, f"{self._base_url}/{path}", **kwargs)
                 break
             except requests.exceptions.ConnectionError as e:
-                logger.debug("Could not connect to server: %s", e)
+                self._logger.debug("Could not connect to server: %s", e)
                 time.sleep(_RETRY_INTERVAL)
         else:
             raise ClientError(f"Failed to connect to dstack server {self._base_url}")
 
         if 400 <= resp.status_code < 600:
-            logger.debug(
+            self._logger.debug(
                 "Error requesting %s. Status: %s. Headers: %s. Body: %s",
                 resp.request.url,
                 resp.status_code,

dstack/api/server/_gpus.py

@@ -2,6 +2,7 @@ from typing import List, Optional
 
 from pydantic import parse_obj_as
 
+from dstack._internal.core.compatibility.gpus import get_list_gpus_excludes
 from dstack._internal.core.models.runs import RunSpec
 from dstack._internal.server.schemas.gpus import GpuGroup, ListGpusRequest, ListGpusResponse
 from dstack.api.server._group import APIClientGroup
@@ -17,6 +18,6 @@ class GpusAPIClient(APIClientGroup):
         body = ListGpusRequest(run_spec=run_spec, group_by=group_by)
         resp = self._request(
             f"/api/project/{project_name}/gpus/list",
-            body=body.json(),
+            body=body.json(exclude=get_list_gpus_excludes(body)),
         )
         return parse_obj_as(ListGpusResponse, resp.json()).gpus

dstack/api/server/_group.py

@@ -1,3 +1,4 @@
+from logging import Logger
 from typing import Optional
 
 import requests
@@ -12,10 +13,10 @@ class APIRequest(Protocol):
         raise_for_status: bool = True,
         method: str = "POST",
         **kwargs,
-    ) -> requests.Response:
-        pass
+    ) -> requests.Response: ...
 
 
 class APIClientGroup:
-    def __init__(self, _request: APIRequest):
+    def __init__(self, _request: APIRequest, _logger: Logger):
         self._request = _request
+        self._logger = _logger

dstack/api/server/_repos.py

@@ -2,7 +2,12 @@ from typing import BinaryIO, List, Optional
 
 from pydantic import parse_obj_as
 
-from dstack._internal.core.models.repos import AnyRepoInfo, RemoteRepoCreds, RepoHead
+from dstack._internal.core.models.repos import (
+    AnyRepoInfo,
+    RemoteRepoCreds,
+    RepoHead,
+    RepoHeadWithCreds,
+)
 from dstack._internal.server.schemas.repos import (
     DeleteReposRequest,
     GetRepoRequest,
@@ -16,11 +21,23 @@ class ReposAPIClient(APIClientGroup):
         resp = self._request(f"/api/project/{project_name}/repos/list")
         return parse_obj_as(List[RepoHead.__response__], resp.json())
 
-    def get(self, project_name: str, repo_id: str, include_creds: bool) -> RepoHead:
-        body = GetRepoRequest(repo_id=repo_id, include_creds=include_creds)
+    def get(
+        self, project_name: str, repo_id: str, include_creds: Optional[bool] = None
+    ) -> RepoHead:
+        if include_creds is not None:
+            self._logger.warning(
+                "`include_creds` argument is deprecated and has no effect, `get()` always returns"
+                " the repo without creds. Use `get_with_creds()` to get the repo with creds"
+            )
+        body = GetRepoRequest(repo_id=repo_id, include_creds=False)
         resp = self._request(f"/api/project/{project_name}/repos/get", body=body.json())
         return parse_obj_as(RepoHead.__response__, resp.json())
 
+    def get_with_creds(self, project_name: str, repo_id: str) -> RepoHeadWithCreds:
+        body = GetRepoRequest(repo_id=repo_id, include_creds=True)
+        resp = self._request(f"/api/project/{project_name}/repos/get", body=body.json())
+        return parse_obj_as(RepoHeadWithCreds.__response__, resp.json())
+
     def init(
         self,
         project_name: str,

dstack/plugins/builtin/rest_plugin/_plugin.py

@@ -86,6 +86,7 @@ class CustomApplyPolicy(ApplyPolicy):
         spec: ApplySpec,
         excludes: Optional[Dict] = None,
     ) -> ApplySpec:
+        spec_json = None
         try:
             spec_request = request_cls(user=user, project=project, spec=spec)
             spec_json = self._call_plugin_service(spec_request, endpoint, excludes)

dstack/version.py

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

{dstack-0.19.25rc1.dist-info → dstack-0.19.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dstack
-Version: 0.19.25rc1
+Version: 0.19.26
 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