Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix watch init error

Tomas Valentaaf449d7f5d97
diff --git a/packages/js-sdk/src/envd/filesystem/filesystem_pb.ts b/packages/js-sdk/src/envd/filesystem/filesystem_pb.ts
index dc66dbe40..92848e36f 100644
--- a/packages/js-sdk/src/envd/filesystem/filesystem_pb.ts
+++ b/packages/js-sdk/src/envd/filesystem/filesystem_pb.ts
@@ -476,9 +476,21 @@ export class WatchDirRequest extends Message<WatchDirRequest> {
*/
export class WatchDirResponse extends Message<WatchDirResponse> {
/**
- * @generated from field: filesystem.FilesystemEvent event = 1;
+ * @generated from oneof filesystem.WatchDirResponse.event
*/
- event?: FilesystemEvent;
+ event: {
+ /**
+ * @generated from field: filesystem.WatchDirResponse.StartEvent start = 2;
+ */
+ value: WatchDirResponse_StartEvent;
+ case: "start";
+ } | {
+ /**
+ * @generated from field: filesystem.WatchDirResponse.FilesystemEvent filesystem = 1;
+ */
+ value: WatchDirResponse_FilesystemEvent;
+ case: "filesystem";
+ } | { case: undefined; value?: undefined } = { case: undefined };
constructor(data?: PartialMessage<WatchDirResponse>) {
super();
@@ -488,7 +500,8 @@ export class WatchDirResponse extends Message<WatchDirResponse> {
static readonly runtime: typeof proto3 = proto3;
static readonly typeName = "filesystem.WatchDirResponse";
static readonly fields: FieldList = proto3.util.newFieldList(() => [
- { no: 1, name: "event", kind: "message", T: FilesystemEvent },
+ { no: 2, name: "start", kind: "message", T: WatchDirResponse_StartEvent, oneof: "event" },
+ { no: 1, name: "filesystem", kind: "message", T: WatchDirResponse_FilesystemEvent, oneof: "event" },
]);
static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): WatchDirResponse {
@@ -509,9 +522,40 @@ export class WatchDirResponse extends Message<WatchDirResponse> {
}
/**
- * @generated from message filesystem.FilesystemEvent
+ * @generated from message filesystem.WatchDirResponse.StartEvent
*/
-export class FilesystemEvent extends Message<FilesystemEvent> {
+export class WatchDirResponse_StartEvent extends Message<WatchDirResponse_StartEvent> {
+ constructor(data?: PartialMessage<WatchDirResponse_StartEvent>) {
+ super();
+ proto3.util.initPartial(data, this);
+ }
+
+ static readonly runtime: typeof proto3 = proto3;
+ static readonly typeName = "filesystem.WatchDirResponse.StartEvent";
+ static readonly fields: FieldList = proto3.util.newFieldList(() => [
+ ]);
+
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): WatchDirResponse_StartEvent {
+ return new WatchDirResponse_StartEvent().fromBinary(bytes, options);
+ }
+
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): WatchDirResponse_StartEvent {
+ return new WatchDirResponse_StartEvent().fromJson(jsonValue, options);
+ }
+
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): WatchDirResponse_StartEvent {
+ return new WatchDirResponse_StartEvent().fromJsonString(jsonString, options);
+ }
+
+ static equals(a: WatchDirResponse_StartEvent | PlainMessage<WatchDirResponse_StartEvent> | undefined, b: WatchDirResponse_StartEvent | PlainMessage<WatchDirResponse_StartEvent> | undefined): boolean {
+ return proto3.util.equals(WatchDirResponse_StartEvent, a, b);
+ }
+}
+
+/**
+ * @generated from message filesystem.WatchDirResponse.FilesystemEvent
+ */
+export class WatchDirResponse_FilesystemEvent extends Message<WatchDirResponse_FilesystemEvent> {
/**
* @generated from field: string name = 1;
*/
@@ -522,32 +566,32 @@ export class FilesystemEvent extends Message<FilesystemEvent> {
*/
type = EventType.UNSPECIFIED;
- constructor(data?: PartialMessage<FilesystemEvent>) {
+ constructor(data?: PartialMessage<WatchDirResponse_FilesystemEvent>) {
super();
proto3.util.initPartial(data, this);
}
static readonly runtime: typeof proto3 = proto3;
- static readonly typeName = "filesystem.FilesystemEvent";
+ static readonly typeName = "filesystem.WatchDirResponse.FilesystemEvent";
static readonly fields: FieldList = proto3.util.newFieldList(() => [
{ no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 2, name: "type", kind: "enum", T: proto3.getEnumType(EventType) },
]);
- static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): FilesystemEvent {
- return new FilesystemEvent().fromBinary(bytes, options);
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): WatchDirResponse_FilesystemEvent {
+ return new WatchDirResponse_FilesystemEvent().fromBinary(bytes, options);
}
- static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): FilesystemEvent {
- return new FilesystemEvent().fromJson(jsonValue, options);
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): WatchDirResponse_FilesystemEvent {
+ return new WatchDirResponse_FilesystemEvent().fromJson(jsonValue, options);
}
- static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FilesystemEvent {
- return new FilesystemEvent().fromJsonString(jsonString, options);
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): WatchDirResponse_FilesystemEvent {
+ return new WatchDirResponse_FilesystemEvent().fromJsonString(jsonString, options);
}
- static equals(a: FilesystemEvent | PlainMessage<FilesystemEvent> | undefined, b: FilesystemEvent | PlainMessage<FilesystemEvent> | undefined): boolean {
- return proto3.util.equals(FilesystemEvent, a, b);
+ static equals(a: WatchDirResponse_FilesystemEvent | PlainMessage<WatchDirResponse_FilesystemEvent> | undefined, b: WatchDirResponse_FilesystemEvent | PlainMessage<WatchDirResponse_FilesystemEvent> | undefined): boolean {
+ return proto3.util.equals(WatchDirResponse_FilesystemEvent, a, b);
}
}
diff --git a/packages/js-sdk/src/index.ts b/packages/js-sdk/src/index.ts
index 8e73e1662..aac3447df 100644
--- a/packages/js-sdk/src/index.ts
+++ b/packages/js-sdk/src/index.ts
@@ -7,6 +7,7 @@ export type { components, paths } from './api'
export { ConnectionConfig, SandboxError } from './connectionConfig'
export type { ConnectionOpts, Username } from './connectionConfig'
+export { EventType } from './envd/filesystem/filesystem_pb'
export type { FilesystemEvent, WatchHandle } from './sandbox/filesystem/watchHandle'
export type {
EntryInfo,
diff --git a/packages/js-sdk/src/sandbox/filesystem/index.ts b/packages/js-sdk/src/sandbox/filesystem/index.ts
index 0199a6b63..121ffdc64 100644
--- a/packages/js-sdk/src/sandbox/filesystem/index.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts
@@ -9,7 +9,7 @@ import {
import { ConnectionConfig, defaultUsername, SandboxError, Username, ConnectionOpts, TimeoutError } from '../../connectionConfig'
import { EnvdApiClient } from '../../envd/api'
import { Filesystem as FilesystemService } from '../../envd/filesystem/filesystem_connect'
-import { FileType as FsFileType } from '../../envd/filesystem/filesystem_pb'
+import { FileType as FsFileType, WatchDirResponse } from '../../envd/filesystem/filesystem_pb'
import { WatchHandle, FilesystemEvent } from './watchHandle'
@@ -327,13 +327,31 @@ export class Filesystem {
timeoutMs: opts?.timeout ?? 60_000,
})
+ try {
+ const startEvent: WatchDirResponse = (await events[Symbol.asyncIterator]().next()).value
+
+ if (startEvent.event.case !== 'start') {
+ throw new Error('Expected start event')
+ }
+ } catch (err) {
+ if (err instanceof ConnectError) {
+ switch (err.code) {
+ case Code.InvalidArgument:
+ throw new InvalidUserError(err.message, username)
+ case Code.NotFound:
+ throw new InvalidPathError(err.message, path)
+ default:
+ throw new FilesystemError(err.message)
+ }
+ }
+ throw err
+ }
+
clearTimeout(reqTimeout)
return new WatchHandle(
() => controller.abort(),
events,
- path,
- username,
onEvent,
opts?.onExit,
)
diff --git a/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts b/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts
index 5b677afc2..b99f3ee24 100644
--- a/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts
@@ -1,15 +1,12 @@
import { PlainMessage } from '@bufbuild/protobuf'
-import { ConnectError, Code } from '@connectrpc/connect'
-import { FilesystemError, InvalidUserError, NotFoundError } from '.'
+import { ConnectError } from '@connectrpc/connect'
+import { FilesystemError } from '.'
import {
- FilesystemEvent as FsFilesystemEvent,
- EntryInfo as FsEntryInfo,
- WatchDirResponse,
+ WatchDirResponse, WatchDirResponse_FilesystemEvent,
} from '../../envd/filesystem/filesystem_pb'
-export type FilesystemEvent = PlainMessage<FsFilesystemEvent>
-export type EntryInfo = PlainMessage<FsEntryInfo>
+export type FilesystemEvent = PlainMessage<WatchDirResponse_FilesystemEvent>
export class WatchHandle {
private readonly _wait: Promise<void>
@@ -17,50 +14,50 @@ export class WatchHandle {
constructor(
private readonly handleStop: () => void,
private readonly events: AsyncIterable<WatchDirResponse>,
- private readonly path: string,
- private readonly username: string,
private readonly onEvent?: (event: FilesystemEvent) => void | Promise<void>,
private readonly onExit?: (err?: Error) => void | Promise<void>,
) {
this._wait = this.handleEvents()
}
- stop() {
+ async stop() {
this.handleStop()
- }
- async wait() {
await this._wait
}
- private async *[Symbol.asyncIterator]() {
+ private async* iterateEvents() {
try {
for await (const event of this.events) {
- if (event.event) {
- yield event.event
+ switch (event.event.case) {
+ case 'filesystem':
+ yield event.event
+ break
+ default:
+ throw new Error(`Unknown event type: ${event.event.case}`)
}
}
} catch (err) {
if (err instanceof ConnectError) {
switch (err.code) {
- case Code.InvalidArgument:
- throw new InvalidUserError(err.message, this.username)
- case Code.NotFound:
- throw new NotFoundError(err.message, this.path)
default:
throw new FilesystemError(err.message)
}
}
throw err
} finally {
- this.onExit?.()
this.stop()
}
}
private async handleEvents() {
- for await (const event of this) {
- this.onEvent?.(event)
+ try {
+ for await (const event of this.iterateEvents()) {
+ this.onEvent?.(event.value)
+ }
+ this.onExit?.()
+ } catch (err) {
+ this.onExit?.(err as Error)
}
}
}
diff --git a/packages/js-sdk/src/sandbox/process/index.ts b/packages/js-sdk/src/sandbox/process/index.ts
index 19d14a05e..22d04bbb4 100644
--- a/packages/js-sdk/src/sandbox/process/index.ts
+++ b/packages/js-sdk/src/sandbox/process/index.ts
@@ -3,6 +3,7 @@ import {
createPromiseClient,
PromiseClient,
Transport,
+ ConnectError,
} from '@connectrpc/connect'
import { Process as ProcessService } from '../../envd/process/process_connect'
@@ -147,41 +148,47 @@ export class Process {
}, requestTimeoutMs)
: undefined
- const events = this.rpc.start({
- user: {
- selector: {
- case: 'username',
- value: opts?.user || defaultUsername,
+ try {
+ const events = this.rpc.start({
+ user: {
+ selector: {
+ case: 'username',
+ value: opts?.user || defaultUsername,
+ },
},
- },
- process: {
- cmd: '/bin/bash',
- cwd: opts?.cwd,
- envs: opts?.envs,
- args: ['-l', '-c', cmd],
- },
- }, {
- signal: controller.signal,
- timeoutMs: opts?.timeout ?? 60_000,
- })
-
- const startEvent: StartResponse = (await events[Symbol.asyncIterator]().next()).value
+ process: {
+ cmd: '/bin/bash',
+ cwd: opts?.cwd,
+ envs: opts?.envs,
+ args: ['-l', '-c', cmd],
+ },
+ }, {
+ signal: controller.signal,
+ timeoutMs: opts?.timeout ?? 60_000,
+ })
- if (startEvent.event?.event.case !== 'start') {
- throw new Error('Expected start event')
- }
+ const startEvent: StartResponse = (await events[Symbol.asyncIterator]().next()).value
- clearTimeout(reqTimeout)
-
- const pid = startEvent.event.event.value.pid
+ if (startEvent.event?.event.case !== 'start') {
+ throw new Error('Expected start event')
+ }
- return new ProcessHandle(
- pid,
- () => controller.abort(),
- () => this.kill(pid),
- events,
- opts?.onStdout,
- opts?.onStderr,
- )
+ clearTimeout(reqTimeout)
+
+ const pid = startEvent.event.event.value.pid
+
+ return new ProcessHandle(
+ pid,
+ () => controller.abort(),
+ () => this.kill(pid),
+ events,
+ opts?.onStdout,
+ opts?.onStderr,
+ )
+ } catch (err) {
+ const connectErr = ConnectError.from(err)
+ console.log(connectErr)
+ throw err
+ }
}
}
diff --git a/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.py b/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.py
index a999d3af2..5d074fca6 100644
--- a/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.py
+++ b/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.py
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
from e2b.envd.permissions import permissions_pb2 as permissions_dot_permissions__pb2
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66ilesystem/filesystem.proto\x12\nfilesystem\x1a\x1dpermissions/permissions.proto\"K\n\x0eMakeDirRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"\x11\n\x0fMakeDirResponse\"J\n\rRemoveRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"\x10\n\x0eRemoveResponse\"H\n\x0bStatRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\";\n\x0cStatResponse\x12+\n\x05\x65ntry\x18\x01 \x01(\x0b\x32\x15.filesystem.EntryInfoR\x05\x65ntry\"I\n\tEntryInfo\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12(\n\x04type\x18\x02 \x01(\x0e\x32\x14.filesystem.FileTypeR\x04type\"K\n\x0eListDirRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"B\n\x0fListDirResponse\x12/\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x15.filesystem.EntryInfoR\x07\x65ntries\"L\n\x0fWatchDirRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"E\n\x10WatchDirResponse\x12\x31\n\x05\x65vent\x18\x01 \x01(\x0b\x32\x1b.filesystem.FilesystemEventR\x05\x65vent\"P\n\x0f\x46ilesystemEvent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12)\n\x04type\x18\x02 \x01(\x0e\x32\x15.filesystem.EventTypeR\x04type*R\n\x08\x46ileType\x12\x19\n\x15\x46ILE_TYPE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x46ILE_TYPE_FILE\x10\x01\x12\x17\n\x13\x46ILE_TYPE_DIRECTORY\x10\x02*\x98\x01\n\tEventType\x12\x1a\n\x16\x45VENT_TYPE_UNSPECIFIED\x10\x00\x12\x15\n\x11\x45VENT_TYPE_CREATE\x10\x01\x12\x14\n\x10\x45VENT_TYPE_WRITE\x10\x02\x12\x15\n\x11\x45VENT_TYPE_REMOVE\x10\x03\x12\x15\n\x11\x45VENT_TYPE_RENAME\x10\x04\x12\x14\n\x10\x45VENT_TYPE_CHMOD\x10\x05\x32\xd9\x02\n\nFilesystem\x12\x39\n\x04Stat\x12\x17.filesystem.StatRequest\x1a\x18.filesystem.StatResponse\x12\x42\n\x07MakeDir\x12\x1a.filesystem.MakeDirRequest\x1a\x1b.filesystem.MakeDirResponse\x12\x42\n\x07ListDir\x12\x1a.filesystem.ListDirRequest\x1a\x1b.filesystem.ListDirResponse\x12G\n\x08WatchDir\x12\x1b.filesystem.WatchDirRequest\x1a\x1c.filesystem.WatchDirResponse0\x01\x12?\n\x06Remove\x12\x19.filesystem.RemoveRequest\x1a\x1a.filesystem.RemoveResponseBi\n\x0e\x63om.filesystemB\x0f\x46ilesystemProtoP\x01\xa2\x02\x03\x46XX\xaa\x02\nFilesystem\xca\x02\nFilesystem\xe2\x02\x16\x46ilesystem\\GPBMetadata\xea\x02\nFilesystemb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66ilesystem/filesystem.proto\x12\nfilesystem\x1a\x1dpermissions/permissions.proto\"K\n\x0eMakeDirRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"\x11\n\x0fMakeDirResponse\"J\n\rRemoveRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"\x10\n\x0eRemoveResponse\"H\n\x0bStatRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\";\n\x0cStatResponse\x12+\n\x05\x65ntry\x18\x01 \x01(\x0b\x32\x15.filesystem.EntryInfoR\x05\x65ntry\"I\n\tEntryInfo\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12(\n\x04type\x18\x02 \x01(\x0e\x32\x14.filesystem.FileTypeR\x04type\"K\n\x0eListDirRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"B\n\x0fListDirResponse\x12/\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x15.filesystem.EntryInfoR\x07\x65ntries\"L\n\x0fWatchDirRequest\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12%\n\x04user\x18\x02 \x01(\x0b\x32\x11.permissions.UserR\x04user\"\x8c\x02\n\x10WatchDirResponse\x12?\n\x05start\x18\x02 \x01(\x0b\x32\'.filesystem.WatchDirResponse.StartEventH\x00R\x05start\x12N\n\nfilesystem\x18\x01 \x01(\x0b\x32,.filesystem.WatchDirResponse.FilesystemEventH\x00R\nfilesystem\x1a\x0c\n\nStartEvent\x1aP\n\x0f\x46ilesystemEvent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12)\n\x04type\x18\x02 \x01(\x0e\x32\x15.filesystem.EventTypeR\x04typeB\x07\n\x05\x65vent*R\n\x08\x46ileType\x12\x19\n\x15\x46ILE_TYPE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x46ILE_TYPE_FILE\x10\x01\x12\x17\n\x13\x46ILE_TYPE_DIRECTORY\x10\x02*\x98\x01\n\tEventType\x12\x1a\n\x16\x45VENT_TYPE_UNSPECIFIED\x10\x00\x12\x15\n\x11\x45VENT_TYPE_CREATE\x10\x01\x12\x14\n\x10\x45VENT_TYPE_WRITE\x10\x02\x12\x15\n\x11\x45VENT_TYPE_REMOVE\x10\x03\x12\x15\n\x11\x45VENT_TYPE_RENAME\x10\x04\x12\x14\n\x10\x45VENT_TYPE_CHMOD\x10\x05\x32\xd9\x02\n\nFilesystem\x12\x39\n\x04Stat\x12\x17.filesystem.StatRequest\x1a\x18.filesystem.StatResponse\x12\x42\n\x07MakeDir\x12\x1a.filesystem.MakeDirRequest\x1a\x1b.filesystem.MakeDirResponse\x12\x42\n\x07ListDir\x12\x1a.filesystem.ListDirRequest\x1a\x1b.filesystem.ListDirResponse\x12G\n\x08WatchDir\x12\x1b.filesystem.WatchDirRequest\x1a\x1c.filesystem.WatchDirResponse0\x01\x12?\n\x06Remove\x12\x19.filesystem.RemoveRequest\x1a\x1a.filesystem.RemoveResponseBi\n\x0e\x63om.filesystemB\x0f\x46ilesystemProtoP\x01\xa2\x02\x03\x46XX\xaa\x02\nFilesystem\xca\x02\nFilesystem\xe2\x02\x16\x46ilesystem\\GPBMetadata\xea\x02\nFilesystemb\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -23,10 +23,10 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'filesystem.filesystem_pb2',
if not _descriptor._USE_C_DESCRIPTORS:
_globals['DESCRIPTOR']._loaded_options = None
_globals['DESCRIPTOR']._serialized_options = b'\n\016com.filesystemB\017FilesystemProtoP\001\242\002\003FXX\252\002\nFilesystem\312\002\nFilesystem\342\002\026Filesystem\\GPBMetadata\352\002\nFilesystem'
- _globals['_FILETYPE']._serialized_start=850
- _globals['_FILETYPE']._serialized_end=932
- _globals['_EVENTTYPE']._serialized_start=935
- _globals['_EVENTTYPE']._serialized_end=1087
+ _globals['_FILETYPE']._serialized_start=968
+ _globals['_FILETYPE']._serialized_end=1050
+ _globals['_EVENTTYPE']._serialized_start=1053
+ _globals['_EVENTTYPE']._serialized_end=1205
_globals['_MAKEDIRREQUEST']._serialized_start=74
_globals['_MAKEDIRREQUEST']._serialized_end=149
_globals['_MAKEDIRRESPONSE']._serialized_start=151
@@ -47,10 +47,12 @@ if not _descriptor._USE_C_DESCRIPTORS:
_globals['_LISTDIRRESPONSE']._serialized_end=617
_globals['_WATCHDIRREQUEST']._serialized_start=619
_globals['_WATCHDIRREQUEST']._serialized_end=695
- _globals['_WATCHDIRRESPONSE']._serialized_start=697
- _globals['_WATCHDIRRESPONSE']._serialized_end=766
- _globals['_FILESYSTEMEVENT']._serialized_start=768
- _globals['_FILESYSTEMEVENT']._serialized_end=848
- _globals['_FILESYSTEM']._serialized_start=1090
- _globals['_FILESYSTEM']._serialized_end=1435
+ _globals['_WATCHDIRRESPONSE']._serialized_start=698
+ _globals['_WATCHDIRRESPONSE']._serialized_end=966
+ _globals['_WATCHDIRRESPONSE_STARTEVENT']._serialized_start=863
+ _globals['_WATCHDIRRESPONSE_STARTEVENT']._serialized_end=875
+ _globals['_WATCHDIRRESPONSE_FILESYSTEMEVENT']._serialized_start=877
+ _globals['_WATCHDIRRESPONSE_FILESYSTEMEVENT']._serialized_end=957
+ _globals['_FILESYSTEM']._serialized_start=1208
+ _globals['_FILESYSTEM']._serialized_end=1553
# @@protoc_insertion_point(module_scope)
diff --git a/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.pyi b/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.pyi
index 3dc1f2267..10d3e7c9e 100644
--- a/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.pyi
+++ b/packages/python-sdk/e2b/envd/filesystem/filesystem_pb2.pyi
@@ -100,15 +100,19 @@ class WatchDirRequest(_message.Message):
def __init__(self, path: _Optional[str] = ..., user: _Optional[_Union[_permissions_pb2.User, _Mapping]] = ...) -> None: ...
class WatchDirResponse(_message.Message):
- __slots__ = ("event",)
- EVENT_FIELD_NUMBER: _ClassVar[int]
- event: FilesystemEvent
- def __init__(self, event: _Optional[_Union[FilesystemEvent, _Mapping]] = ...) -> None: ...
-
-class FilesystemEvent(_message.Message):
- __slots__ = ("name", "type")
- NAME_FIELD_NUMBER: _ClassVar[int]
- TYPE_FIELD_NUMBER: _ClassVar[int]
- name: str
- type: EventType
- def __init__(self, name: _Optional[str] = ..., type: _Optional[_Union[EventType, str]] = ...) -> None: ...
+ __slots__ = ("start", "filesystem")
+ class StartEvent(_message.Message):
+ __slots__ = ()
+ def __init__(self) -> None: ...
+ class FilesystemEvent(_message.Message):
+ __slots__ = ("name", "type")
+ NAME_FIELD_NUMBER: _ClassVar[int]
+ TYPE_FIELD_NUMBER: _ClassVar[int]
+ name: str
+ type: EventType
+ def __init__(self, name: _Optional[str] = ..., type: _Optional[_Union[EventType, str]] = ...) -> None: ...
+ START_FIELD_NUMBER: _ClassVar[int]
+ FILESYSTEM_FIELD_NUMBER: _ClassVar[int]
+ start: WatchDirResponse.StartEvent
+ filesystem: WatchDirResponse.FilesystemEvent
+ def __init__(self, start: _Optional[_Union[WatchDirResponse.StartEvent, _Mapping]] = ..., filesystem: _Optional[_Union[WatchDirResponse.FilesystemEvent, _Mapping]] = ...) -> None: ...
diff --git a/packages/python-sdk/example.py b/packages/python-sdk/example.py
index f57c8366c..eb6d82e51 100644
--- a/packages/python-sdk/example.py
+++ b/packages/python-sdk/example.py
@@ -7,3 +7,4 @@ s = Sandbox()
input = io.StringIO("This goes into the read buffer.")
s.files.write("/tmp/test.txt", input)
+
diff --git a/spec/envd/filesystem/filesystem.proto b/spec/envd/filesystem/filesystem.proto
index a2abf7ffc..4e406e3b9 100644
--- a/spec/envd/filesystem/filesystem.proto
+++ b/spec/envd/filesystem/filesystem.proto
@@ -66,12 +66,17 @@ message WatchDirRequest {
}
message WatchDirResponse {
- FilesystemEvent event = 1;
-}
+ oneof event {
+ StartEvent start = 2;
+ FilesystemEvent filesystem = 1;
+ }
-message FilesystemEvent {
- string name = 1;
- EventType type = 2;
+ message StartEvent {}
+
+ message FilesystemEvent {
+ string name = 1;
+ EventType type = 2;
+ }
}
enum EventType {