Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
address PR comments
0diveda88d0c3464
diff --git a/packages/js-sdk/src/sandbox/filesystem/index.ts b/packages/js-sdk/src/sandbox/filesystem/index.tsindex 739bba8f5..030e8b804 100644--- a/packages/js-sdk/src/sandbox/filesystem/index.ts+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts@@ -1,15 +1,22 @@import { Code, ConnectError, createPromiseClient, PromiseClient, Transport } from '@connectrpc/connect'-import { ConnectionConfig, ConnectionOpts, defaultUsername, KEEPALIVE_PING_HEADER, KEEPALIVE_PING_INTERVAL_SEC, Username } from '../../connectionConfig'--import { handleEnvdApiError, handleWatchDirStartEvent } from '../../envd/api'+import {+ ConnectionConfig,+ ConnectionOpts,+ defaultUsername,+ KEEPALIVE_PING_HEADER,+ KEEPALIVE_PING_INTERVAL_SEC,+ Username,+} from '../../connectionConfig'++import { handleEnvdApiError } from '../../envd/api'import { authenticationHeader, handleRpcError } from '../../envd/rpc'import { EnvdApiClient } from '../../envd/api'import { Filesystem as FilesystemService } from '../../envd/filesystem/filesystem_connect'-import { FileType as FsFileType } from '../../envd/filesystem/filesystem_pb'+import { EntryInfo, FileType as FsFileType } from '../../envd/filesystem/filesystem_pb'-import { clearTimeout } from 'timers'import { FilesystemEvent, WatchHandle } from './watchHandle'+import { clearTimeout } from 'timers'export interface EntryInfo {name: string@@ -47,7 +54,11 @@ export class Filesystem {private readonly defaultWatchTimeout = 60_000 // 60 seconds- constructor(transport: Transport, private readonly envdApi: EnvdApiClient, private readonly connectionConfig: ConnectionConfig) {+ constructor(+ transport: Transport,+ private readonly envdApi: EnvdApiClient,+ private readonly connectionConfig: ConnectionConfig+ ) {this.rpc = createPromiseClient(FilesystemService, transport)}@@ -55,7 +66,10 @@ export class Filesystem {async read(path: string, opts?: FilesystemRequestOpts & { format: 'bytes' }): Promise<Uint8Array>async read(path: string, opts?: FilesystemRequestOpts & { format: 'blob' }): Promise<Blob>async read(path: string, opts?: FilesystemRequestOpts & { format: 'stream' }): Promise<ReadableStream<Uint8Array>>- async read(path: string, opts?: FilesystemRequestOpts & { format?: 'text' | 'stream' | 'bytes' | 'blob' }): Promise<unknown> {+ async read(+ path: string,+ opts?: FilesystemRequestOpts & { format?: 'text' | 'stream' | 'bytes' | 'blob' }+ ): Promise<unknown> {const format = opts?.format ?? 'text'const res = await this.envdApi.api.GET('/files', {@@ -82,30 +96,43 @@ export class Filesystem {}async write(path: string, data: WriteData, opts?: FilesystemRequestOpts): Promise<EntryInfo>- async write(files: { path: string, data: WriteData }[], opts?: FilesystemRequestOpts): Promise<EntryInfo[]>- async write(pathOrFiles: string | { path: string; data: WriteData }[], dataOrOpts?: WriteData | FilesystemRequestOpts, opts?: FilesystemRequestOpts): Promise<EntryInfo | EntryInfo[]> {- const { path, writeOpts, writeFiles } = typeof pathOrFiles === 'string'- ? { path: pathOrFiles, writeFiles: [{ data: dataOrOpts }], writeOpts: opts }- : { path: undefined, writeFiles: pathOrFiles, writeOpts: dataOrOpts }+ async write(files: { path: string; data: WriteData }[], opts?: FilesystemRequestOpts): Promise<EntryInfo[]>+ async write(+ pathOrFiles: string | { path: string; data: WriteData }[],+ dataOrOpts?: WriteData | FilesystemRequestOpts,+ opts?: FilesystemRequestOpts+ ): Promise<EntryInfo | EntryInfo[]> {+ if (typeof pathOrFiles === 'string' && Array.isArray(dataOrOpts)) {+ throw new Error('Cannot specify path with array of files')+ }++ const { path, writeOpts, writeFiles } =+ typeof pathOrFiles === 'string'+ ? { path: pathOrFiles, writeOpts: opts, writeFiles: [{ data: dataOrOpts }] }+ : { path: undefined, writeOpts: dataOrOpts, writeFiles: pathOrFiles }- const blobs = await Promise.all(writeFiles.map(f => new Response(f.data).blob()))+ const blobs = await Promise.all(+ (writeFiles as { path: string; data: WriteData }[]).map((f) => new Response(f.data).blob())+ )const res = await this.envdApi.api.POST('/files', {params: {query: {path,- username: writeOpts?.user || defaultUsername,+ username: (writeOpts as FilesystemRequestOpts)?.user || defaultUsername,},},bodySerializer() {return blobs.reduce((fd, blob, i) => {+ // Important: RFC 7578, Section 4.2 requires that if a filename is provided,+ // the directory path information must not be used.fd.append('file', blob, writeFiles[i].path)return fd}, new FormData())},body: {},- signal: this.connectionConfig.getSignal(writeOpts?.requestTimeoutMs),+ signal: this.connectionConfig.getSignal((writeOpts as FilesystemRequestOpts)?.requestTimeoutMs),})const err = await handleEnvdApiError(res)@@ -118,7 +145,7 @@ export class Filesystem {throw new Error('Expected to receive information about written file')}- return files.length === 1 ? files[0] : files+ return files.length === 1 && path ? (files[0] as EntryInfo) : (files as EntryInfo[])}async list(path: string, opts?: FilesystemRequestOpts): Promise<EntryInfo[]> {@@ -237,15 +264,19 @@ export class Filesystem {}}- async watch(path: string, onEvent: (event: FilesystemEvent) => void | Promise<void>, opts?: FilesystemRequestOpts & { timeout?: number; onExit?: (err?: Error) => void | Promise<void> }): Promise<WatchHandle> {+ async watch(+ path: string,+ onEvent: (event: FilesystemEvent) => void | Promise<void>,+ opts?: FilesystemRequestOpts & { timeout?: number; onExit?: (err?: Error) => void | Promise<void> }+ ): Promise<WatchHandle> {const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMsconst controller = new AbortController()const reqTimeout = requestTimeoutMs? setTimeout(() => {- controller.abort()- }, requestTimeoutMs)+ controller.abort()+ }, requestTimeoutMs): undefinedconst events = this.rpc.watchDir(diff --git a/packages/js-sdk/tests/sandbox/files/write.test.ts b/packages/js-sdk/tests/sandbox/files/write.test.tsindex 2e2649ac4..3e918cb26 100644--- a/packages/js-sdk/tests/sandbox/files/write.test.ts+++ b/packages/js-sdk/tests/sandbox/files/write.test.ts@@ -21,19 +21,49 @@ sandboxTest('write file', async ({ sandbox }) => {})sandboxTest('write multiple files', async ({ sandbox }) => {- let files: Array<{ data: WriteData; filename: string }> = []+ // Attempt to write with empty files array+ await sandbox.files+ .write([])+ .then((e) => {+ assert.isUndefined(e)+ })+ .catch((err) => {+ assert.instanceOf(err, Error)+ assert.include(err.message, 'Expected to receive information about written file')+ })++ // Attempt to write with patn and file array+ await sandbox.files+ .write('/path/to/file', [{ path: 'one_test_file.txt', data: 'This is a test file.' }])+ .then((e) => {+ assert.isUndefined(e)+ })+ .catch((err) => {+ assert.instanceOf(err, Error)+ assert.include(err.message, 'Cannot specify path with array of files')+ })++ // Attempt to write with one file in array+ const info = await sandbox.files.write([{ path: 'one_test_file.txt', data: 'This is a test file.' }])+ assert.isTrue(Array.isArray(info))+ assert.equal(info[0].name, 'one_test_file.txt')+ assert.equal(info[0].type, 'file')+ assert.equal(info[0].path, `/home/user/one_test_file.txt`)++ // Attempt to write with multiple files in array+ let files: Array<{ data: WriteData; path: string }> = []for (let i = 0; i < 10; i++) {- const filename = `multi_test_file${i}.txt`- onTestFinished(async () => await sandbox.files.remove(filename))+ const path = `multi_test_file${i}.txt`+ onTestFinished(async () => await sandbox.files.remove(path))files.push({- filename: `multi_test_file${i}.txt`,+ path: `multi_test_file${i}.txt`,data: `This is a test file ${i}.`,})}- const infos = await sandbox.files.write('', files)+ const infos = await sandbox.files.write(files)assert.isTrue(Array.isArray(infos))assert.equal((infos as EntryInfo[]).length, files.length)@@ -42,13 +72,13 @@ sandboxTest('write multiple files', async ({ sandbox }) => {const file = files[i]const info = infos[i] as EntryInfo- assert.equal(info.name, file.filename)+ assert.equal(info.name, file.path)assert.equal(info.type, 'file')- assert.equal(info.path, `/home/user/${file.filename}`)+ assert.equal(info.path, `/home/user/${file.path}`)- const exists = await sandbox.files.exists(file.filename)+ const exists = await sandbox.files.exists(file.path)assert.isTrue(exists)- const readContent = await sandbox.files.read(file.filename)+ const readContent = await sandbox.files.read(file.path)assert.equal(readContent, file.data)}})