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

refactor: improve code readability and update model schema access in tool_usage.py #1852

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

refactor: improve code readability and update model schema access in tool_usage.py #1852

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79e428a
refactor: improve code readability and update model schema access in …
theCyberTech Jan 5, 2025
4712131
Merge branch 'main' into pydantic_fixup
theCyberTech Jan 5, 2025
df00876
Linting:
theCyberTech Jan 5, 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
19 changes: 16 additions & 3 deletions src/crewai/tools/tool_usage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
import agentops # type: ignore
except ImportError:
agentops = None
OPENAI_BIGGER_MODELS = ["gpt-4", "gpt-4o", "o1-preview", "o1-mini", "o1", "o3", "o3-mini"]
OPENAI_BIGGER_MODELS = [
"gpt-4",
"gpt-4o",
"o1-preview",
"o1-mini",
"o1",
"o3",
"o3-mini",
]


class ToolUsageErrorException(Exception):
Expand Down Expand Up @@ -104,7 +112,10 @@ def use(
self._printer.print(content=f"\n\n{error}\n", color="red")
return error

if isinstance(tool, CrewStructuredTool) and tool.name == self._i18n.tools("add_image")["name"]: # type: ignore
if (
isinstance(tool, CrewStructuredTool)
and tool.name == self._i18n.tools("add_image")["name"]
): # type: ignore
try:
result = self._use(tool_string=tool_string, tool=tool, calling=calling)
return result
Expand Down Expand Up @@ -169,7 +180,9 @@ def _use(

if calling.arguments:
try:
acceptable_args = tool.args_schema.model_json_schema()["properties"].keys() # type: ignore
acceptable_args = tool.args_schema.model_json_schema()[
"properties"
].keys() # type: ignore # Item "None" of "type[BaseModel] | None" has no attribute "schema"
arguments = {
k: v
for k, v in calling.arguments.items()
Expand Down
Loading