rl-rock 1.3.7 → 1.3.9

package/dist/index.mjs

@@ -76,6 +76,7 @@ var ReadFileRequestSchema = z.object({
   errors: z.string().optional()
 });
 var UploadModeSchema = z.enum(["auto", "direct", "oss"]);
+var DownloadModeSchema = z.enum(["auto", "direct", "oss"]);
 var UploadRequestSchema = z.object({
   sourcePath: z.string(),
   targetPath: z.string(),
@@ -597,6 +598,9 @@ var envVars = {
   get ROCK_OSS_BUCKET_REGION() {
     return getEnv("ROCK_OSS_BUCKET_REGION");
   },
+  get ROCK_OSS_TIMEOUT() {
+    return parseInt(getEnv("ROCK_OSS_TIMEOUT", "300000"), 10);
+  },
   // Pip
   get ROCK_PIP_INDEX_URL() {
     return getEnv("ROCK_PIP_INDEX_URL", "https://pypi.org/simple/");
@@ -2291,9 +2295,12 @@ var Sandbox = class extends AbstractSandbox {
   async upload(request) {
     return this.uploadByPath(request.sourcePath, request.targetPath);
   }
-  async uploadByPath(sourcePath, targetPath, uploadMode = "auto") {
+  async uploadByPath(sourcePath, targetPath, options) {
     const url = `${this.url}/upload`;
     const headers = this.buildHeaders();
+    const uploadMode = options?.uploadMode ?? "auto";
+    const timeout = options?.timeout;
+    const onProgress = options?.onProgress;
     try {
       const fs = await import('fs/promises');
       try {
@@ -2306,7 +2313,7 @@ var Sandbox = class extends AbstractSandbox {
       const ossEnabled = envVars.ROCK_OSS_ENABLE;
       const ossThreshold = 1024 * 1024;
       if (uploadMode === "oss" || uploadMode === "auto" && ossEnabled && fileSize > ossThreshold) {
-        return this.uploadViaOss(sourcePath, targetPath);
+        return this.uploadViaOss(sourcePath, targetPath, timeout, onProgress);
       }
       const fileBuffer = await fs.readFile(sourcePath);
       const fileName = sourcePath.split("/").pop() ?? "file";
@@ -2355,9 +2362,61 @@ var Sandbox = class extends AbstractSandbox {
     }
   }
   /**
-   * Download file from sandbox via OSS
+   * Download file from sandbox
+   * @param remotePath - File path in sandbox
+   * @param localPath - Local file path
+   * @param downloadMode - Download mode: 'auto' (default), 'direct', or 'oss'
+   * @param timeout - Optional timeout in milliseconds for OSS mode
    */
-  async downloadFile(remotePath, localPath) {
+  async downloadFile(remotePath, localPath, options) {
+    const downloadMode = options?.downloadMode ?? "auto";
+    const timeout = options?.timeout;
+    const onProgress = options?.onProgress;
+    if (!remotePath || remotePath.trim() === "") {
+      return { success: false, message: "Remote path is required" };
+    }
+    const checkResult = await this.execute({ command: ["test", "-f", remotePath], timeout: 60 });
+    if (checkResult.exitCode !== 0) {
+      return { success: false, message: `Remote file does not exist: ${remotePath}` };
+    }
+    if (downloadMode === "direct") {
+      return this.downloadDirect(remotePath, localPath);
+    }
+    if (downloadMode === "oss") {
+      return this.downloadViaOss(remotePath, localPath, timeout, onProgress);
+    }
+    const sizeResult = await this.execute({ command: ["stat", "-c", "%s", remotePath], timeout: 60 });
+    if (sizeResult.exitCode !== 0) {
+      return this.downloadDirect(remotePath, localPath);
+    }
+    const fileSize = parseInt(sizeResult.stdout.trim(), 10);
+    const ossThreshold = 1024 * 1024;
+    const ossEnabled = envVars.ROCK_OSS_ENABLE;
+    if (ossEnabled && fileSize >= ossThreshold) {
+      return this.downloadViaOss(remotePath, localPath, timeout, onProgress);
+    }
+    return this.downloadDirect(remotePath, localPath);
+  }
+  /**
+   * Download file directly via readFile API
+   */
+  async downloadDirect(remotePath, localPath) {
+    try {
+      const fs = await import('fs/promises');
+      const path2 = await import('path');
+      const response = await this.readFile({ path: remotePath });
+      const parentDir = path2.dirname(localPath);
+      await fs.mkdir(parentDir, { recursive: true });
+      await fs.writeFile(localPath, response.content, "utf-8");
+      return { success: true, message: `Successfully downloaded ${remotePath} to ${localPath}` };
+    } catch (e) {
+      return { success: false, message: `Direct download failed: ${e}` };
+    }
+  }
+  /**
+   * Download file via OSS as intermediary
+   */
+  async downloadViaOss(remotePath, localPath, timeout, onProgress) {
     if (!envVars.ROCK_OSS_ENABLE) {
       return {
         success: false,
@@ -2365,15 +2424,8 @@ var Sandbox = class extends AbstractSandbox {
       };
     }
     try {
-      if (!remotePath || remotePath.trim() === "") {
-        return { success: false, message: "Remote path is required" };
-      }
-      const checkResult = await this.execute({ command: ["test", "-f", remotePath], timeout: 60 });
-      if (checkResult.exitCode !== 0) {
-        return { success: false, message: `Remote file does not exist: ${remotePath}` };
-      }
       if (this.ossBucket === null || this.isTokenExpired()) {
-        await this.setupOss();
+        await this.setupOss(timeout);
       }
       if (!this.ossBucket) {
         return { success: false, message: "Failed to setup OSS bucket" };
@@ -2392,23 +2444,33 @@ var Sandbox = class extends AbstractSandbox {
       if (uploadResult.exitCode !== 0) {
         return { success: false, message: `Sandbox to OSS upload failed: ${uploadResult.output}` };
       }
-      const result = await this.ossBucket.get(objectName, localPath);
+      const ossTimeout = timeout ?? envVars.ROCK_OSS_TIMEOUT;
+      const result = await this.ossBucket.get(objectName, localPath, {
+        timeout: ossTimeout,
+        progress: (p) => {
+          onProgress?.({
+            phase: "download-to-local",
+            percent: Math.round(p * 100)
+          });
+        }
+      });
       try {
         await this.ossBucket.delete(objectName);
       } catch {
       }
       return { success: true, message: `Successfully downloaded ${remotePath} to ${localPath}` };
     } catch (e) {
-      return { success: false, message: `Download failed: ${e}` };
+      return { success: false, message: `OSS download failed: ${e}` };
     }
   }
   /**
    * Upload file via OSS (internal method)
+   * @param timeout - Optional timeout in milliseconds
    */
-  async uploadViaOss(sourcePath, targetPath) {
+  async uploadViaOss(sourcePath, targetPath, timeout, onProgress) {
     try {
       if (this.ossBucket === null || this.isTokenExpired()) {
-        await this.setupOss();
+        await this.setupOss(timeout);
       }
       if (!this.ossBucket) {
         return { success: false, message: "Failed to setup OSS bucket" };
@@ -2416,8 +2478,39 @@ var Sandbox = class extends AbstractSandbox {
       const timestamp = Date.now();
       const fileName = sourcePath.split("/").pop() ?? "file";
       const objectName = `${timestamp}-${fileName}`;
-      await this.ossBucket.put(objectName, sourcePath);
+      const fs = await import('fs/promises');
+      const stats = await fs.stat(sourcePath);
+      const fileSize = stats.size;
+      const multipartThreshold = 1024 * 1024;
+      const ossTimeout = timeout ?? envVars.ROCK_OSS_TIMEOUT;
+      if (fileSize >= multipartThreshold) {
+        await this.ossBucket.multipartUpload(objectName, sourcePath, {
+          timeout: ossTimeout,
+          partSize: multipartThreshold,
+          // 1MB per part
+          progress: (p) => {
+            onProgress?.({
+              phase: "upload-to-oss",
+              percent: Math.round(p * 100)
+            });
+          }
+        });
+      } else {
+        await this.ossBucket.put(objectName, sourcePath, {
+          timeout: ossTimeout,
+          progress: (p) => {
+            onProgress?.({
+              phase: "upload-to-oss",
+              percent: Math.round(p * 100)
+            });
+          }
+        });
+      }
       const signedUrl = this.ossBucket.signatureUrl(objectName, { expires: 600 });
+      onProgress?.({
+        phase: "download-to-sandbox",
+        percent: -1
+      });
       const downloadCmd = `wget -c -O '${targetPath}' '${signedUrl}'`;
       await this.arun(downloadCmd, { mode: "nohup", waitTimeout: 600 });
       const checkResult = await this.execute({ command: ["test", "-f", targetPath], timeout: 60 });
@@ -2431,13 +2524,16 @@ var Sandbox = class extends AbstractSandbox {
   }
   /**
    * Setup OSS bucket with STS credentials
+   * @param timeout - Optional timeout in milliseconds (defaults to ROCK_OSS_TIMEOUT env var or 300000ms)
    */
-  async setupOss() {
+  async setupOss(timeout) {
     const credentials = await this.getOssStsCredentials();
     const OSS = (await import('ali-oss')).default;
+    const ossTimeout = timeout ?? envVars.ROCK_OSS_TIMEOUT;
     this.ossBucket = new OSS({
       secure: true,
       // Use HTTPS for OSS connections
+      timeout: ossTimeout,
       region: envVars.ROCK_OSS_BUCKET_REGION ?? "",
       accessKeyId: credentials.accessKeyId,
       accessKeySecret: credentials.accessKeySecret,
@@ -3398,6 +3494,6 @@ function getVersion() {
 }
 var VERSION = getVersion();
 
-export { Agent, AgentBashCommandSchema, AgentConfigSchema, BadRequestRockError, BashActionSchema, ChmodRequestSchema, ChmodResponseSchema, ChownRequestSchema, ChownResponseSchema, CloseResponseSchema, CloseSessionRequestSchema, CloseSessionResponseSchema, Codes, CommandResponseSchema, CommandRockError, CommandSchema, CreateBashSessionRequestSchema, CreateSessionResponseSchema, DefaultAgent, DefaultAgentConfigSchema, Deploy, DownloadFileResponseSchema, EnvHubClient, EnvHubClientConfigSchema, EnvHubError, ExecuteBashSessionResponseSchema, HttpUtils, InternalServerRockError, InvalidParameterRockException, IsAliveResponseSchema, LinuxFileSystem, LinuxRemoteUser, ModelClient, ModelService, ModelServiceConfigSchema, NODE_DEFAULT_VERSION, Network, NodeRuntimeEnv, NodeRuntimeEnvConfigSchema, ObservationSchema, OssCredentialsSchema, OssSetupResponseSchema, PID_PREFIX, PID_SUFFIX, Process, PythonRuntimeEnv, PythonRuntimeEnvConfigSchema, ReadFileRequestSchema, ReadFileResponseSchema, ReasonPhrases, RockAgentConfigSchema, RockEnv, RockEnvInfoSchema, RockException, RunMode, RuntimeEnv, RuntimeEnvConfigSchema, Sandbox, SandboxConfigSchema, SandboxGroup, SandboxGroupConfigSchema, SandboxResponseSchema, SandboxStatusResponseSchema, SpeedupType, UploadModeSchema, UploadRequestSchema, UploadResponseSchema, VERSION, WriteFileRequestSchema, WriteFileResponseSchema, arunWithRetry, createRockEnvInfo, createRuntimeEnvId, createSandboxConfig, createSandboxGroupConfig, deprecated, deprecatedClass, extractNohupPid as extractNohupPidFromSandbox, fromRockException, getDefaultPipIndexUrl, getEnv, getReasonPhrase, getRequiredEnv, isClientError, isCommandError, isEnvSet, isError, isNode, isServerError, isSuccess, make, raiseForCode, retryAsync, sleep, withRetry, withTimeLogging };
+export { Agent, AgentBashCommandSchema, AgentConfigSchema, BadRequestRockError, BashActionSchema, ChmodRequestSchema, ChmodResponseSchema, ChownRequestSchema, ChownResponseSchema, CloseResponseSchema, CloseSessionRequestSchema, CloseSessionResponseSchema, Codes, CommandResponseSchema, CommandRockError, CommandSchema, CreateBashSessionRequestSchema, CreateSessionResponseSchema, DefaultAgent, DefaultAgentConfigSchema, Deploy, DownloadFileResponseSchema, DownloadModeSchema, EnvHubClient, EnvHubClientConfigSchema, EnvHubError, ExecuteBashSessionResponseSchema, HttpUtils, InternalServerRockError, InvalidParameterRockException, IsAliveResponseSchema, LinuxFileSystem, LinuxRemoteUser, ModelClient, ModelService, ModelServiceConfigSchema, NODE_DEFAULT_VERSION, Network, NodeRuntimeEnv, NodeRuntimeEnvConfigSchema, ObservationSchema, OssCredentialsSchema, OssSetupResponseSchema, PID_PREFIX, PID_SUFFIX, Process, PythonRuntimeEnv, PythonRuntimeEnvConfigSchema, ReadFileRequestSchema, ReadFileResponseSchema, ReasonPhrases, RockAgentConfigSchema, RockEnv, RockEnvInfoSchema, RockException, RunMode, RuntimeEnv, RuntimeEnvConfigSchema, Sandbox, SandboxConfigSchema, SandboxGroup, SandboxGroupConfigSchema, SandboxResponseSchema, SandboxStatusResponseSchema, SpeedupType, UploadModeSchema, UploadRequestSchema, UploadResponseSchema, VERSION, WriteFileRequestSchema, WriteFileResponseSchema, arunWithRetry, createRockEnvInfo, createRuntimeEnvId, createSandboxConfig, createSandboxGroupConfig, deprecated, deprecatedClass, extractNohupPid as extractNohupPidFromSandbox, fromRockException, getDefaultPipIndexUrl, getEnv, getReasonPhrase, getRequiredEnv, isClientError, isCommandError, isEnvSet, isError, isNode, isServerError, isSuccess, make, raiseForCode, retryAsync, sleep, withRetry, withTimeLogging };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map