mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-28 01:28:14 +00:00
refactor: improve code readability in environment tools
Refactored the file_search_tool.py, grep_tool.py, and list_dir_tool.py to enhance code readability. Changes include formatting list comprehensions for better clarity, adjusting error handling for consistency, and removing unnecessary imports. These improvements aim to streamline the codebase and maintain a clean structure for future development.
This commit is contained in:
@@ -91,7 +91,9 @@ Examples:
|
|||||||
matches = [m for m in matches if m.is_dir()]
|
matches = [m for m in matches if m.is_dir()]
|
||||||
|
|
||||||
# Filter out hidden files
|
# Filter out hidden files
|
||||||
matches = [m for m in matches if not any(part.startswith(".") for part in m.parts)]
|
matches = [
|
||||||
|
m for m in matches if not any(part.startswith(".") for part in m.parts)
|
||||||
|
]
|
||||||
|
|
||||||
# Sort alphabetically
|
# Sort alphabetically
|
||||||
matches.sort(key=lambda x: str(x).lower())
|
matches.sort(key=lambda x: str(x).lower())
|
||||||
|
|||||||
@@ -120,7 +120,8 @@ Examples:
|
|||||||
output = result.stdout
|
output = result.stdout
|
||||||
# Count actual match lines (not context lines)
|
# Count actual match lines (not context lines)
|
||||||
match_lines = [
|
match_lines = [
|
||||||
line for line in output.split("\n")
|
line
|
||||||
|
for line in output.split("\n")
|
||||||
if line and not line.startswith("--")
|
if line and not line.startswith("--")
|
||||||
]
|
]
|
||||||
match_count = len(match_lines)
|
match_count = len(match_lines)
|
||||||
@@ -129,18 +130,19 @@ Examples:
|
|||||||
header += "=" * 60 + "\n"
|
header += "=" * 60 + "\n"
|
||||||
return header + output
|
return header + output
|
||||||
|
|
||||||
elif result.returncode == 1:
|
if result.returncode == 1:
|
||||||
# No matches found (grep returns 1 for no matches)
|
# No matches found (grep returns 1 for no matches)
|
||||||
return f"No matches found for '{pattern}' in {path}"
|
return f"No matches found for '{pattern}' in {path}"
|
||||||
|
|
||||||
else:
|
# Error occurred
|
||||||
# Error occurred
|
error_msg = result.stderr.strip() if result.stderr else "Unknown error"
|
||||||
error_msg = result.stderr.strip() if result.stderr else "Unknown error"
|
return f"Error: {error_msg}"
|
||||||
return f"Error: {error_msg}"
|
|
||||||
|
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
return "Error: Search timed out (>30s). Try narrowing the search path."
|
return "Error: Search timed out (>30s). Try narrowing the search path."
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
return "Error: grep command not found. Ensure grep is installed on the system."
|
return (
|
||||||
|
"Error: grep command not found. Ensure grep is installed on the system."
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return f"Error during search: {e}"
|
return f"Error during search: {e}"
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
from crewai.experimental.environment_tools.base_environment_tool import (
|
from crewai.experimental.environment_tools.base_environment_tool import (
|
||||||
|
|||||||
Reference in New Issue
Block a user