Merge pull request #339 from Dstack-TEE/fix-sdks

sdks: set roofs_hash optional in TcbInfo & increase default timeout in Python SDK

Author: Leechael

sdk/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phala/dstack-sdk",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "dstack SDK",
   "main": "dist/node/index.js",
   "types": "dist/node/index.d.ts",

sdk/js/src/index.ts

@@ -49,7 +49,7 @@ export interface TcbInfo {
 }
 
 export type TcbInfoV03x = TcbInfo & {
-  rootfs_hash: string
+  rootfs_hash?: string
 }
 
 export type TcbInfoV05x = TcbInfo & {

sdk/js/src/send-rpc-request.ts

@@ -6,7 +6,7 @@ import http from 'http'
 import https from 'https'
 import net from 'net'
 
-export const __version__ = "0.5.0"
+export const __version__ = "0.5.6"
 
 
 export function send_rpc_request<T = any>(endpoint: string, path: string, payload: string, timeoutMs?: number): Promise<T> {

sdk/python/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "dstack-sdk"
-version = "0.5.1"
+version = "0.5.2"
 description = "dstack SDK for Python"
 authors = [
     {name = "Leechael Yim", email = "[email protected]"},

sdk/python/src/dstack_sdk/dstack_client.py

@@ -23,7 +23,7 @@
 
 logger = logging.getLogger("dstack_sdk")
 
-__version__ = "0.2.0"
+__version__ = "0.5.2"
 
 
 INIT_MR = "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
@@ -173,7 +173,7 @@ class TcbInfo(BaseModel):
 class TcbInfoV03x(TcbInfo):
     """TCB information for dstack OS version 0.3.x."""
 
-    rootfs_hash: str
+    rootfs_hash: Optional[str] = None
 
 
 class TcbInfoV05x(TcbInfo):
@@ -226,19 +226,27 @@ class BaseClient:
 class AsyncDstackClient(BaseClient):
     PATH_PREFIX = "/"
 
-    def __init__(self, endpoint: str | None = None, use_sync_http: bool = False):
+    def __init__(
+        self,
+        endpoint: str | None = None,
+        *,
+        use_sync_http: bool = False,
+        timeout: float = 3,
+    ):
         """Initialize async client with HTTP or Unix-socket transport.
 
         Args:
             endpoint: HTTP/HTTPS URL or Unix socket path
             use_sync_http: If True, use sync HTTP client internally
+            timeout: Timeout in seconds
 
         """
         endpoint = get_endpoint(endpoint)
         self.use_sync_http = use_sync_http
         self._client: Optional[httpx.AsyncClient] = None
         self._sync_client: Optional[httpx.Client] = None
         self._client_ref_count = 0
+        self._timeout = timeout
 
         if endpoint.startswith("http://") or endpoint.startswith("https://"):
             self.async_transport = httpx.AsyncHTTPTransport()
@@ -255,14 +263,18 @@ def __init__(self, endpoint: str | None = None, use_sync_http: bool = False):
     def _get_client(self) -> httpx.AsyncClient:
         if self._client is None:
             self._client = httpx.AsyncClient(
-                transport=self.async_transport, base_url=self.base_url, timeout=0.5
+                transport=self.async_transport,
+                base_url=self.base_url,
+                timeout=self._timeout,
             )
         return self._client
 
     def _get_sync_client(self) -> httpx.Client:
         if self._sync_client is None:
             self._sync_client = httpx.Client(
-                transport=self.sync_transport, base_url=self.base_url, timeout=0.5
+                transport=self.sync_transport,
+                base_url=self.base_url,
+                timeout=self._timeout,
             )
         return self._sync_client
 
@@ -392,13 +404,15 @@ async def is_reachable(self) -> bool:
 class DstackClient(BaseClient):
     PATH_PREFIX = "/"
 
-    def __init__(self, endpoint: str | None = None):
+    def __init__(self, endpoint: str | None = None, *, timeout: float = 3):
         """Initialize client with HTTP or Unix-socket transport.
 
         If a non-HTTP(S) endpoint is provided, it is treated as a Unix socket
         path and validated for existence.
         """
-        self.async_client = AsyncDstackClient(endpoint, use_sync_http=True)
+        self.async_client = AsyncDstackClient(
+            endpoint, use_sync_http=True, timeout=timeout
+        )
 
     @call_async
     def get_key(
@@ -463,7 +477,13 @@ class AsyncTappdClient(AsyncDstackClient):
     DEPRECATED: Use ``AsyncDstackClient`` instead.
     """
 
-    def __init__(self, endpoint: str | None = None, use_sync_http: bool = False):
+    def __init__(
+        self,
+        endpoint: str | None = None,
+        *,
+        use_sync_http: bool = False,
+        timeout: float = 3,
+    ):
         """Initialize deprecated async tappd client wrapper."""
         if not use_sync_http:
             # Already warned in TappdClient.__init__
@@ -472,7 +492,7 @@ def __init__(self, endpoint: str | None = None, use_sync_http: bool = False):
             )
 
         endpoint = get_tappd_endpoint(endpoint)
-        super().__init__(endpoint, use_sync_http=use_sync_http)
+        super().__init__(endpoint, use_sync_http=use_sync_http, timeout=timeout)
         # Set the correct path prefix for tappd
         self.PATH_PREFIX = "/prpc/Tappd."
 
@@ -542,13 +562,15 @@ class TappdClient(DstackClient):
     DEPRECATED: Use ``DstackClient`` instead.
     """
 
-    def __init__(self, endpoint: str | None = None):
+    def __init__(self, endpoint: str | None = None, timeout: float = 3):
         """Initialize deprecated tappd client wrapper."""
         emit_deprecation_warning(
             "TappdClient is deprecated, please use DstackClient instead"
         )
         endpoint = get_tappd_endpoint(endpoint)
-        self.async_client = AsyncTappdClient(endpoint, use_sync_http=True)
+        self.async_client = AsyncTappdClient(
+            endpoint, use_sync_http=True, timeout=timeout
+        )
 
     @call_async
     def derive_key(