Skip to content

Agent Zero AI framework

File browser fix directory listing (#613)

ehl0wr0ld935fae558831
diff --git a/python/api/get_work_dir_files.py b/python/api/get_work_dir_files.py
index 4f640e8aa..b9c5efbb4 100644
--- a/python/api/get_work_dir_files.py
+++ b/python/api/get_work_dir_files.py
@@ -24,6 +24,7 @@ class GetWorkDirFiles(ApiHandler):
return {"data": result}
+
async def get_files(path):
browser = FileBrowser()
- return browser.get_files(path)
\ No newline at end of file
+ return browser.get_files(path)
diff --git a/python/helpers/file_browser.py b/python/helpers/file_browser.py
index 11f587ab6..8340b2f62 100644
--- a/python/helpers/file_browser.py
+++ b/python/helpers/file_browser.py
@@ -1,16 +1,16 @@
import os
from pathlib import Path
import shutil
-import tempfile
import base64
-from typing import Dict, List, Tuple, Optional, Any
-import zipfile
+import subprocess
+from typing import Dict, List, Tuple, Any
from werkzeug.utils import secure_filename
from datetime import datetime
-from python.helpers import files, runtime
+from python.helpers import files
from python.helpers.print_style import PrintStyle
+
class FileBrowser:
ALLOWED_EXTENSIONS = {
'image': {'jpg', 'jpeg', 'png', 'bmp'},
@@ -27,7 +27,7 @@ class FileBrowser:
# base_dir = "/"
base_dir = "/"
self.base_dir = Path(base_dir)
-
+
def _check_file_size(self, file) -> bool:
try:
file.seek(0, os.SEEK_END)
@@ -37,7 +37,7 @@ class FileBrowser:
except (AttributeError, IOError):
return False
- def save_file_b64(self, current_path: str, filename:str, base64_content: str):
+ def save_file_b64(self, current_path: str, filename: str, base64_content: str):
try:
# Resolve the target directory path
target_file = (self.base_dir / current_path / filename).resolve()
@@ -57,15 +57,15 @@ class FileBrowser:
"""Save uploaded files and return successful and failed filenames"""
successful = []
failed = []
-
+
try:
# Resolve the target directory path
target_dir = (self.base_dir / current_path).resolve()
if not str(target_dir).startswith(str(self.base_dir)):
raise ValueError("Invalid target directory")
-
+
os.makedirs(target_dir, exist_ok=True)
-
+
for file in files:
try:
if file and self._is_allowed_file(file.filename, file):
@@ -79,13 +79,13 @@ class FileBrowser:
except Exception as e:
PrintStyle.error(f"Error saving file {file.filename}: {e}")
failed.append(file.filename)
-
+
return successful, failed
-
+
except Exception as e:
PrintStyle.error(f"Error in save_files: {e}")
return successful, failed
-
+
def delete_file(self, file_path: str) -> bool:
"""Delete a file or empty directory"""
try:
@@ -93,35 +93,141 @@ class FileBrowser:
full_path = (self.base_dir / file_path).resolve()
if not str(full_path).startswith(str(self.base_dir)):
raise ValueError("Invalid path")
-
+
if os.path.exists(full_path):
if os.path.isfile(full_path):
os.remove(full_path)
elif os.path.isdir(full_path):
shutil.rmtree(full_path)
return True
-
+
return False
-
+
except Exception as e:
PrintStyle.error(f"Error deleting {file_path}: {e}")
return False
def _is_allowed_file(self, filename: str, file) -> bool:
# allow any file to be uploaded in file browser
-
+
# if not filename:
# return False
# ext = self._get_file_extension(filename)
# all_allowed = set().union(*self.ALLOWED_EXTENSIONS.values())
# if ext not in all_allowed:
# return False
-
+
return True # Allow the file if it passes the checks
def _get_file_extension(self, filename: str) -> str:
return filename.rsplit('.', 1)[1].lower() if '.' in filename else ''
-
+
+ def _get_files_via_ls(self, full_path: Path) -> Tuple[List[Dict[str, Any]], List[Dict[str, Any]]]:
+ """Get files and folders using ls command for better error handling"""
+ files: List[Dict[str, Any]] = []
+ folders: List[Dict[str, Any]] = []
+
+ try:
+ # Use ls command to get directory listing
+ result = subprocess.run(
+ ['ls', '-la', str(full_path)],
+ capture_output=True,
+ text=True,
+ timeout=30
+ )
+
+ if result.returncode != 0:
+ PrintStyle.error(f"ls command failed: {result.stderr}")
+ return files, folders
+
+ # Parse ls output (skip first line which is "total X")
+ lines = result.stdout.strip().split('\n')
+ if len(lines) <= 1:
+ return files, folders
+
+ for line in lines[1:]: # Skip the "total" line
+ try:
+ # Skip current and parent directory entries
+ if line.endswith(' .') or line.endswith(' ..'):
+ continue
+
+ # Parse ls -la output format
+ parts = line.split()
+ if len(parts) < 9:
+ continue
+
+ # Check if this is a symlink (permissions start with 'l')
+ permissions = parts[0]
+ is_symlink = permissions.startswith('l')
+
+ if is_symlink:
+ # For symlinks, extract the name before the '->' arrow
+ full_name_part = ' '.join(parts[8:])
+ if ' -> ' in full_name_part:
+ filename = full_name_part.split(' -> ')[0]
+ symlink_target = full_name_part.split(' -> ')[1]
+ else:
+ filename = full_name_part
+ symlink_target = None
+ else:
+ filename = ' '.join(parts[8:]) # Handle filenames with spaces
+ symlink_target = None
+
+ if not filename:
+ continue
+
+ # Get full path for this entry
+ entry_path = full_path / filename
+
+ try:
+ stat_info = entry_path.stat()
+
+ entry_data: Dict[str, Any] = {
+ "name": filename,
+ "path": str(entry_path.relative_to(self.base_dir)),
+ "modified": datetime.fromtimestamp(stat_info.st_mtime).isoformat()
+ }
+
+ # Add symlink information if this is a symlink
+ if is_symlink and symlink_target:
+ entry_data["symlink_target"] = symlink_target
+ entry_data["is_symlink"] = True
+
+ if entry_path.is_file():
+ entry_data.update({
+ "type": self._get_file_type(filename),
+ "size": stat_info.st_size,
+ "is_dir": False
+ })
+ files.append(entry_data)
+ elif entry_path.is_dir():
+ entry_data.update({
+ "type": "folder",
+ "size": 0, # Directories show as 0 bytes
+ "is_dir": True
+ })
+ folders.append(entry_data)
+
+ except (OSError, PermissionError, FileNotFoundError) as e:
+ # Log error but continue with other files
+ PrintStyle.warning(f"No access to {filename}: {e}")
+ continue
+
+ if len(files) + len(folders) > 10000:
+ break
+
+ except Exception as e:
+ # Log error and continue with next line
+ PrintStyle.error(f"Error parsing ls line '{line}': {e}")
+ continue
+
+ except subprocess.TimeoutExpired:
+ PrintStyle.error("ls command timed out")
+ except Exception as e:
+ PrintStyle.error(f"Error running ls command: {e}")
+
+ return files, folders
+
def get_files(self, current_path: str = "") -> Dict:
try:
# Resolve the full path while preventing directory traversal
@@ -129,31 +235,8 @@ class FileBrowser:
if not str(full_path).startswith(str(self.base_dir)):
raise ValueError("Invalid path")
- files = []
- folders = []
-
- # List all entries in the current directory
- for entry in os.scandir(full_path):
- entry_data: Dict[str, Any] = {
- "name": entry.name,
- "path": str(Path(entry.path).relative_to(self.base_dir)),
- "modified": datetime.fromtimestamp(entry.stat().st_mtime).isoformat()
- }
-
- if entry.is_file():
- entry_data.update({
- "type": self._get_file_type(entry.name),
- "size": entry.stat().st_size,
- "is_dir": False
- })
- files.append(entry_data)
- else:
- entry_data.update({
- "type": "folder",
- "size": 0, # Directories show as 0 bytes
- "is_dir": True
- })
- folders.append(entry_data)
+ # Use ls command instead of os.scandir for better error handling
+ files, folders = self._get_files_via_ls(full_path)
# Combine folders and files, folders first
all_entries = folders + files
@@ -168,8 +251,8 @@ class FileBrowser:
# parent_path is empty only if we're already at root
if str(current_abs) != str(self.base_dir):
parent_path = str(Path(current_path).parent)
-
- except Exception as e:
+
+ except Exception:
parent_path = ""
return {
@@ -181,17 +264,17 @@ class FileBrowser:
except Exception as e:
PrintStyle.error(f"Error reading directory: {e}")
return {"entries": [], "current_path": "", "parent_path": ""}
-
+
def get_full_path(self, file_path: str, allow_dir: bool = False) -> str:
"""Get full file path if it exists and is within base_dir"""
- full_path = files.get_abs_path(self.base_dir,file_path)
+ full_path = files.get_abs_path(self.base_dir, file_path)
if not files.exists(full_path):
- raise ValueError(f"File {file_path} not found")
+ raise ValueError(f"File {file_path} not found")
return full_path
-
+
def _get_file_type(self, filename: str) -> str:
ext = self._get_file_extension(filename)
for file_type, extensions in self.ALLOWED_EXTENSIONS.items():
if ext in extensions:
return file_type
- return 'unknown'
\ No newline at end of file
+ return 'unknown'