Fix python optional symlink target

Author: jakubno

packages/python-sdk/e2b/sandbox_async/filesystem/filesystem.py

@@ -300,7 +300,12 @@ async def list(
                             owner=entry.owner,
                             group=entry.group,
                             modified_time=entry.modified_time.ToDatetime(),
-                            symlink_target=entry.symlink_target,
+                            # Optional, we can't directly access symlink_target otherwise if will be "" instead of None
+                            symlink_target=(
+                                entry.symlink_target
+                                if entry.HasField("symlink_target")
+                                else None
+                            ),
                         )
                     )
 
@@ -374,6 +379,11 @@ async def get_info(
                 owner=r.entry.owner,
                 group=r.entry.group,
                 modified_time=r.entry.modified_time.ToDatetime(),
+                symlink_target=(
+                    r.entry.symlink_target
+                    if r.entry.HasField("symlink_target")
+                    else None
+                ),
             )
         except Exception as e:
             raise handle_rpc_exception(e)
@@ -441,7 +451,12 @@ async def rename(
                 owner=r.entry.owner,
                 group=r.entry.group,
                 modified_time=r.entry.modified_time.ToDatetime(),
-                symlink_target=r.entry.symlink_target,
+                # Optional, we can't directly access symlink_target otherwise if will be "" instead of None
+                symlink_target=(
+                    r.entry.symlink_target
+                    if r.entry.HasField("symlink_target")
+                    else None
+                ),
             )
         except Exception as e:
             raise handle_rpc_exception(e)

packages/python-sdk/e2b/sandbox_sync/filesystem/filesystem.py

@@ -297,7 +297,12 @@ def list(
                             owner=entry.owner,
                             group=entry.group,
                             modified_time=entry.modified_time.ToDatetime(),
-                            symlink_target=entry.symlink_target,
+                            # Optional, we can't directly access symlink_target otherwise if will be "" instead of None
+                            symlink_target=(
+                                entry.symlink_target
+                                if entry.HasField("symlink_target")
+                                else None
+                            ),
                         )
                     )
 
@@ -370,7 +375,12 @@ def get_info(
                 owner=r.entry.owner,
                 group=r.entry.group,
                 modified_time=r.entry.modified_time.ToDatetime(),
-                symlink_target=r.entry.symlink_target,
+                # Optional, we can't directly access symlink_target otherwise if will be "" instead of None
+                symlink_target=(
+                    r.entry.symlink_target
+                    if r.entry.HasField("symlink_target")
+                    else None
+                ),
             )
         except Exception as e:
             raise handle_rpc_exception(e)
@@ -438,7 +448,12 @@ def rename(
                 owner=r.entry.owner,
                 group=r.entry.group,
                 modified_time=r.entry.modified_time.ToDatetime(),
-                symlink_target=r.entry.symlink_target,
+                # Optional, we can't directly access symlink_target otherwise if will be "" instead of None
+                symlink_target=(
+                    r.entry.symlink_target
+                    if r.entry.HasField("symlink_target")
+                    else None
+                ),
             )
         except Exception as e:
             raise handle_rpc_exception(e)

packages/python-sdk/tests/async/sandbox_async/files/test_info.py

@@ -41,7 +41,7 @@ async def test_get_info_of_directory(async_sandbox: AsyncSandbox):
     assert info.name == dirname
     assert info.type == FileType.DIR
     assert info.path == f"{current_path.stdout.strip()}/{dirname}"
-    assert info.size == 0
+    assert info.size > 0
     assert info.mode == 0o755
     assert info.permissions == "drwxr-xr-x"
     assert info.owner == "user"
@@ -59,19 +59,19 @@ async def test_get_info_of_nonexistent_directory(async_sandbox: AsyncSandbox):
 
 async def test_file_symlink(async_sandbox: AsyncSandbox):
     test_dir = "test-simlink-entry"
-    file_path = f"{test_dir}/test.txt"
+    file_name = "test.txt"
     content = "Hello, World!"
 
     await async_sandbox.files.make_dir(test_dir)
-    await async_sandbox.files.write(file_path, content)
+    await async_sandbox.files.write(f"{test_dir}/{file_name}", content)
 
-    symlink_path = f"{test_dir}/symlink_to_test.txt"
-    await async_sandbox.commands.run(f"ln -s {file_path} {symlink_path}")
+    symlink_name = "symlink_to_test.txt"
+    await async_sandbox.commands.run(f"ln -s {file_name} {symlink_name}", cwd=test_dir)
 
-    file = await async_sandbox.files.get_info(symlink_path)
+    file = await async_sandbox.files.get_info(f"{test_dir}/{symlink_name}")
 
     pwd = await async_sandbox.commands.run("pwd")
     assert file.type == FileType.FILE
-    assert file.symlink_target == f"{pwd.stdout.strip()}/{file_path}"
+    assert file.symlink_target == f"{pwd.stdout.strip()}/{file_name}"
 
     await async_sandbox.files.remove(test_dir)

packages/python-sdk/tests/sync/sandbox_sync/files/test_info.py

@@ -38,7 +38,7 @@ def test_get_info_of_directory(sandbox: Sandbox):
     assert info.name == dirname
     assert info.type == FileType.DIR
     assert info.path == f"{current_path.stdout.strip()}/{dirname}"
-    assert info.size == 0
+    assert info.size > 0
     assert info.mode == 0o755
     assert info.permissions == "drwxr-xr-x"
     assert info.owner == "user"
@@ -53,21 +53,21 @@ def test_get_info_of_nonexistent_directory(sandbox: Sandbox):
         sandbox.files.get_info(dirname)
 
 
-async def test_file_symlink(sandbox: Sandbox):
+def test_file_symlink(sandbox: Sandbox):
     test_dir = "test-simlink-entry"
-    file_path = f"{test_dir}/test.txt"
+    file_name = "test.txt"
     content = "Hello, World!"
 
     sandbox.files.make_dir(test_dir)
-    sandbox.files.write(file_path, content)
+    sandbox.files.write(f"{test_dir}/{file_name}", content)
 
-    symlink_path = f"{test_dir}/symlink_to_test.txt"
-    sandbox.commands.run(f"ln -s {file_path} {symlink_path}", cwd=test_dir)
+    symlink_name = "symlink_to_test.txt"
+    sandbox.commands.run(f"ln -s {file_name} {symlink_name}", cwd=test_dir)
 
-    file = sandbox.files.get_info(test_dir)
+    file = sandbox.files.get_info(f"{test_dir}/{symlink_name}")
 
-    pwd = sandbox.commands.run("pwd", cwd=test_dir)
+    pwd = sandbox.commands.run("pwd")
     assert file.type == FileType.FILE
-    assert file.symlink_target == f"{pwd.stdout.strip()}/{file_path}"
+    assert file.symlink_target == f"{pwd.stdout.strip()}/{file_name}"
 
     sandbox.files.remove(test_dir)