Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add recursive directory watch #488

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Add recursive directory watch #488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift click to select a range
cbb8927
Add watch dir recursive option (missing python client regeneration)
dobrac Dec 2, 2024
fbdbddc
Update watch test file formatting
dobrac Dec 2, 2024
22a2894
Add python generated stubs
dobrac Dec 2, 2024
aaf7d4d
Improve watchDir jsSDK default value
dobrac Dec 2, 2024
981c024
Add recursive directory watching to the web documentation
dobrac Dec 2, 2024
378e633
Update documentation highlights
dobrac Dec 2, 2024
5fbb4de
Improve recursive watch tests and folders naming
dobrac Dec 2, 2024
262d80e
Regenerated python stubs with version 5.28.3
dobrac Dec 2, 2024
f847483
Test for recursive folder creation, add newline after code to docs
dobrac Dec 3, 2024
724e857
Run js tests cleanup using onTestFinished
dobrac Dec 3, 2024
af9b6dd
Add note to the recursive watch with rapid folder creation
dobrac Dec 19, 2024
8279c9d
Add recursive watch envd version check
dobrac Dec 19, 2024
e782f85
Add recursive watch envd version check python SDK, js SDK check
dobrac Dec 19, 2024
b5c8028
Cleanup tests only in debug
dobrac Dec 19, 2024
091ada1
JS SDK move version to object
dobrac Dec 19, 2024
9e21ff4
Fix parsing output when creating sandbox
jakubno Jan 13, 2025
f4369e1
Fix versions to match updated envd version
jakubno Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix versions to match updated envd version
  • Loading branch information
@jakubno
jakubno committed Jan 13, 2025
commit f4369e17613fbc439c3db99c355800787eba2dcf
1 change: 1 addition & 0 deletions packages/js-sdk/src/envd/versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1 @@
export const ENVD_VERSION_RECURSIVE_WATCH = '0.1.4'
3 changes: 2 additions & 1 deletion packages/js-sdk/src/sandbox/filesystem/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 24,7 @@ import { WatchHandle, FilesystemEvent } from './watchHandle'

import { compareVersions } from 'compare-versions'
import { TemplateError } from '../../errors'
import {ENVD_VERSION_RECURSIVE_WATCH} from '../../envd/versions'

/**
* Sandbox filesystem object information.
Expand Down Expand Up @@ -442,7 443,7 @@ export class Filesystem {
onEvent: (event: FilesystemEvent) => void | Promise<void>,
opts?: WatchOpts
): Promise<WatchHandle> {
if (opts?.recursive && this.envdApi.version && compareVersions(this.envdApi.version, '0.1.3') < 0) {
if (opts?.recursive && this.envdApi.version && compareVersions(this.envdApi.version, ENVD_VERSION_RECURSIVE_WATCH) < 0) {
throw new TemplateError(
'You need to update the template to use recursive watching. '
'You can do this by running `e2b template build` in the directory with the template.'
Expand Down
3 changes: 3 additions & 0 deletions packages/python-sdk/e2b/envd/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,3 @@
from packaging.version import Version

ENVD_VERSION_RECURSIVE_WATCH = Version("0.1.4")
7 changes: 6 additions & 1 deletion packages/python-sdk/e2b/sandbox_async/filesystem/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 14,7 @@
from e2b.envd.api import ENVD_API_FILES_ROUTE, ahandle_envd_api_exception
from e2b.envd.filesystem import filesystem_connect, filesystem_pb2
from e2b.envd.rpc import authentication_header, handle_rpc_exception
from e2b.envd.versions import ENVD_VERSION_RECURSIVE_WATCH
from e2b.exceptions import SandboxException, TemplateException
from e2b.sandbox.filesystem.filesystem import EntryInfo, map_file_type
from e2b.sandbox.filesystem.watch_handle import FilesystemEvent
Expand Down Expand Up @@ -361,7 362,11 @@ async def watch_dir(

:return: `AsyncWatchHandle` object for stopping watching directory
"""
if recursive and self._envd_version is not None and Version(self._envd_version) < Version("0.1.3"):
if (
recursive
and self._envd_version is not None
and Version(self._envd_version) < ENVD_VERSION_RECURSIVE_WATCH
):
raise TemplateException(
"You need to update the template to use recursive watching. "
"You can do this by running `e2b template build` in the directory with the template."
Expand Down
7 changes: 6 additions & 1 deletion packages/python-sdk/e2b/sandbox_sync/filesystem/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 6,7 @@
import httpx
from packaging.version import Version

from e2b.envd.versions import ENVD_VERSION_RECURSIVE_WATCH
from e2b.exceptions import TemplateException
from e2b.connection_config import (
ConnectionConfig,
Expand Down Expand Up @@ -353,7 354,11 @@ def watch_dir(

:return: `WatchHandle` object for stopping watching directory
"""
if recursive and self._envd_version is not None and Version(self._envd_version) < Version("0.1.3"):
if (
recursive
and self._envd_version is not None
and Version(self._envd_version) < ENVD_VERSION_RECURSIVE_WATCH
):
raise TemplateException(
"You need to update the template to use recursive watching. "
"You can do this by running `e2b template build` in the directory with the template."
Expand Down
Loading