From 2eda5fdeed6f97b1e9c5bff4a124832f8e6c1f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moura?= Date: Thu, 26 Dec 2024 23:42:16 -0300 Subject: [PATCH] fixing linter --- src/crewai/memory/storage/mem0_storage.py | 3 +-- src/crewai/memory/storage/rag_storage.py | 1 - src/crewai/tools/agent_tools/add_image_tool.py | 2 +- src/crewai/tools/agent_tools/ask_question_tool.py | 3 +-- src/crewai/tools/agent_tools/base_agent_tools.py | 3 +-- src/crewai/tools/agent_tools/delegate_work_tool.py | 3 ++- src/crewai/tools/tool_usage.py | 2 +- .../utilities/evaluators/crew_evaluator_handler.py | 9 ++++----- src/crewai/utilities/evaluators/task_evaluator.py | 3 +-- tests/agent_test.py | 5 +---- tests/agents/agent_builder/base_agent_test.py | 3 +-- tests/agents/test_crew_agent_parser.py | 1 - tests/cli/authentication/test_auth_main.py | 1 - tests/cli/authentication/test_utils.py | 3 +-- tests/cli/cli_test.py | 1 - tests/cli/deploy/test_deploy_main.py | 3 +-- tests/cli/test_crew_test.py | 1 - tests/cli/test_git.py | 1 - tests/cli/test_utils.py | 1 - tests/cli/tools/test_main.py | 3 +-- tests/crew_test.py | 6 +++++- tests/flow_test.py | 1 - tests/llm_test.py | 1 - tests/memory/long_term_memory_test.py | 1 - tests/memory/short_term_memory_test.py | 1 - tests/project_test.py | 1 - tests/task_test.py | 5 ++--- tests/tools/agent_tools/agent_tools_test.py | 1 - tests/tools/test_structured_tool.py | 3 +-- tests/tools/test_tool_usage.py | 3 +-- .../utilities/evaluators/test_crew_evaluator_handler.py | 1 - tests/utilities/test_converter.py | 3 +-- tests/utilities/test_file_handler.py | 1 - tests/utilities/test_i18n.py | 1 - tests/utilities/test_planning_handler.py | 1 - 35 files changed, 27 insertions(+), 55 deletions(-) diff --git a/src/crewai/memory/storage/mem0_storage.py b/src/crewai/memory/storage/mem0_storage.py index e4e84fab4..a7023c212 100644 --- a/src/crewai/memory/storage/mem0_storage.py +++ b/src/crewai/memory/storage/mem0_storage.py @@ -1,9 +1,8 @@ import os from typing import Any, Dict, List -from mem0 import MemoryClient - from crewai.memory.storage.interface import Storage +from mem0 import MemoryClient class Mem0Storage(Storage): diff --git a/src/crewai/memory/storage/rag_storage.py b/src/crewai/memory/storage/rag_storage.py index fd4c77838..bcf4eb969 100644 --- a/src/crewai/memory/storage/rag_storage.py +++ b/src/crewai/memory/storage/rag_storage.py @@ -7,7 +7,6 @@ import uuid from typing import Any, Dict, List, Optional from chromadb.api import ClientAPI - from crewai.memory.storage.base_rag_storage import BaseRAGStorage from crewai.utilities import EmbeddingConfigurator from crewai.utilities.constants import MAX_FILE_NAME_LENGTH diff --git a/src/crewai/tools/agent_tools/add_image_tool.py b/src/crewai/tools/agent_tools/add_image_tool.py index ccde17c64..9bbb6f433 100644 --- a/src/crewai/tools/agent_tools/add_image_tool.py +++ b/src/crewai/tools/agent_tools/add_image_tool.py @@ -1,5 +1,5 @@ -from pydantic import BaseModel, Field from crewai.tools.base_tool import BaseTool +from pydantic import BaseModel, Field class AddImageToolSchema(BaseModel): diff --git a/src/crewai/tools/agent_tools/ask_question_tool.py b/src/crewai/tools/agent_tools/ask_question_tool.py index 9294770e5..5e3c5e87a 100644 --- a/src/crewai/tools/agent_tools/ask_question_tool.py +++ b/src/crewai/tools/agent_tools/ask_question_tool.py @@ -1,8 +1,7 @@ from typing import Optional -from pydantic import BaseModel, Field - from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool +from pydantic import BaseModel, Field class AskQuestionToolSchema(BaseModel): diff --git a/src/crewai/tools/agent_tools/base_agent_tools.py b/src/crewai/tools/agent_tools/base_agent_tools.py index ea63dd51e..edf3b41e2 100644 --- a/src/crewai/tools/agent_tools/base_agent_tools.py +++ b/src/crewai/tools/agent_tools/base_agent_tools.py @@ -1,11 +1,10 @@ from typing import Optional, Union -from pydantic import Field - from crewai.agents.agent_builder.base_agent import BaseAgent from crewai.task import Task from crewai.tools.base_tool import BaseTool from crewai.utilities import I18N +from pydantic import Field class BaseAgentTool(BaseTool): diff --git a/src/crewai/tools/agent_tools/delegate_work_tool.py b/src/crewai/tools/agent_tools/delegate_work_tool.py index 45f12772d..261f7991a 100644 --- a/src/crewai/tools/agent_tools/delegate_work_tool.py +++ b/src/crewai/tools/agent_tools/delegate_work_tool.py @@ -1,6 +1,7 @@ from typing import Optional -from pydantic import BaseModel, Field + from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool +from pydantic import BaseModel, Field class DelegateWorkToolSchema(BaseModel): diff --git a/src/crewai/tools/tool_usage.py b/src/crewai/tools/tool_usage.py index 44620164d..874e4eb9f 100644 --- a/src/crewai/tools/tool_usage.py +++ b/src/crewai/tools/tool_usage.py @@ -5,12 +5,12 @@ from difflib import SequenceMatcher from textwrap import dedent from typing import Any, List, Union -from crewai.tools.structured_tool import CrewStructuredTool import crewai.utilities.events as events from crewai.agents.tools_handler import ToolsHandler from crewai.task import Task from crewai.telemetry import Telemetry from crewai.tools import BaseTool +from crewai.tools.structured_tool import CrewStructuredTool from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling from crewai.tools.tool_usage_events import ToolUsageError, ToolUsageFinished from crewai.utilities import I18N, Converter, ConverterError, Printer diff --git a/src/crewai/utilities/evaluators/crew_evaluator_handler.py b/src/crewai/utilities/evaluators/crew_evaluator_handler.py index 3387d91b3..e251f76f2 100644 --- a/src/crewai/utilities/evaluators/crew_evaluator_handler.py +++ b/src/crewai/utilities/evaluators/crew_evaluator_handler.py @@ -1,14 +1,13 @@ from collections import defaultdict -from pydantic import BaseModel, Field -from rich.box import HEAVY_EDGE -from rich.console import Console -from rich.table import Table - from crewai.agent import Agent from crewai.task import Task from crewai.tasks.task_output import TaskOutput from crewai.telemetry import Telemetry +from pydantic import BaseModel, Field +from rich.box import HEAVY_EDGE +from rich.console import Console +from rich.table import Table class TaskEvaluationPydanticOutput(BaseModel): diff --git a/src/crewai/utilities/evaluators/task_evaluator.py b/src/crewai/utilities/evaluators/task_evaluator.py index f7d543ae4..917ca8920 100644 --- a/src/crewai/utilities/evaluators/task_evaluator.py +++ b/src/crewai/utilities/evaluators/task_evaluator.py @@ -1,9 +1,8 @@ from typing import List -from pydantic import BaseModel, Field - from crewai.utilities import Converter from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser +from pydantic import BaseModel, Field agentops = None try: diff --git a/tests/agent_test.py b/tests/agent_test.py index 6879a4519..f852dab69 100644 --- a/tests/agent_test.py +++ b/tests/agent_test.py @@ -5,7 +5,6 @@ from unittest import mock from unittest.mock import patch import pytest - from crewai import Agent, Crew, Task from crewai.agents.cache import CacheHandler from crewai.agents.crew_agent_executor import CrewAgentExecutor @@ -116,9 +115,8 @@ def test_custom_llm_temperature_preservation(): @pytest.mark.vcr(filter_headers=["authorization"]) def test_agent_execute_task(): - from langchain_openai import ChatOpenAI - from crewai import Task + from langchain_openai import ChatOpenAI agent = Agent( role="Math Tutor", @@ -862,7 +860,6 @@ def test_agent_function_calling_llm(): from unittest.mock import patch import instructor - from crewai.tools.tool_usage import ToolUsage with ( diff --git a/tests/agents/agent_builder/base_agent_test.py b/tests/agents/agent_builder/base_agent_test.py index 7c0c2f472..fcd5d58b6 100644 --- a/tests/agents/agent_builder/base_agent_test.py +++ b/tests/agents/agent_builder/base_agent_test.py @@ -1,10 +1,9 @@ import hashlib from typing import Any, List, Optional -from pydantic import BaseModel - from crewai.agents.agent_builder.base_agent import BaseAgent from crewai.tools.base_tool import BaseTool +from pydantic import BaseModel class TestAgent(BaseAgent): diff --git a/tests/agents/test_crew_agent_parser.py b/tests/agents/test_crew_agent_parser.py index 4b48e1552..86349be99 100644 --- a/tests/agents/test_crew_agent_parser.py +++ b/tests/agents/test_crew_agent_parser.py @@ -1,5 +1,4 @@ import pytest - from crewai.agents.crew_agent_executor import ( AgentAction, AgentFinish, diff --git a/tests/cli/authentication/test_auth_main.py b/tests/cli/authentication/test_auth_main.py index a0b4fa0d9..1ba5b827f 100644 --- a/tests/cli/authentication/test_auth_main.py +++ b/tests/cli/authentication/test_auth_main.py @@ -2,7 +2,6 @@ import unittest from unittest.mock import MagicMock, patch import requests - from crewai.cli.authentication.main import AuthenticationCommand diff --git a/tests/cli/authentication/test_utils.py b/tests/cli/authentication/test_utils.py index 6da48dcd0..d634780a8 100644 --- a/tests/cli/authentication/test_utils.py +++ b/tests/cli/authentication/test_utils.py @@ -3,9 +3,8 @@ import unittest from datetime import datetime, timedelta from unittest.mock import MagicMock, patch -from cryptography.fernet import Fernet - from crewai.cli.authentication.utils import TokenManager, validate_token +from cryptography.fernet import Fernet class TestValidateToken(unittest.TestCase): diff --git a/tests/cli/cli_test.py b/tests/cli/cli_test.py index 15ed81637..d8c734e6d 100644 --- a/tests/cli/cli_test.py +++ b/tests/cli/cli_test.py @@ -3,7 +3,6 @@ from unittest import mock import pytest from click.testing import CliRunner - from crewai.cli.cli import ( deploy_create, deploy_list, diff --git a/tests/cli/deploy/test_deploy_main.py b/tests/cli/deploy/test_deploy_main.py index ca89b2aa2..be9408739 100644 --- a/tests/cli/deploy/test_deploy_main.py +++ b/tests/cli/deploy/test_deploy_main.py @@ -5,10 +5,9 @@ from unittest.mock import MagicMock, Mock, patch import pytest import requests -from requests.exceptions import JSONDecodeError - from crewai.cli.deploy.main import DeployCommand from crewai.cli.utils import parse_toml +from requests.exceptions import JSONDecodeError class TestDeployCommand(unittest.TestCase): diff --git a/tests/cli/test_crew_test.py b/tests/cli/test_crew_test.py index 83bcd55cc..9c4b11f12 100644 --- a/tests/cli/test_crew_test.py +++ b/tests/cli/test_crew_test.py @@ -2,7 +2,6 @@ import subprocess from unittest import mock import pytest - from crewai.cli import evaluate_crew diff --git a/tests/cli/test_git.py b/tests/cli/test_git.py index ccf8f0539..b77106d3f 100644 --- a/tests/cli/test_git.py +++ b/tests/cli/test_git.py @@ -1,5 +1,4 @@ import pytest - from crewai.cli.git import Repository diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py index 0270b12fc..8e648ac13 100644 --- a/tests/cli/test_utils.py +++ b/tests/cli/test_utils.py @@ -3,7 +3,6 @@ import shutil import tempfile import pytest - from crewai.cli import utils diff --git a/tests/cli/tools/test_main.py b/tests/cli/tools/test_main.py index 10c29b920..69f46b421 100644 --- a/tests/cli/tools/test_main.py +++ b/tests/cli/tools/test_main.py @@ -7,9 +7,8 @@ from io import StringIO from unittest import mock from unittest.mock import MagicMock, patch -from pytest import raises - from crewai.cli.tools.main import ToolCommand +from pytest import raises @contextmanager diff --git a/tests/crew_test.py b/tests/crew_test.py index 1b60a1a31..aa4e6e19d 100644 --- a/tests/crew_test.py +++ b/tests/crew_test.py @@ -9,7 +9,6 @@ from unittest.mock import MagicMock, patch import instructor import pydantic_core import pytest - from crewai.agent import Agent from crewai.agents.cache import CacheHandler from crewai.crew import Crew @@ -417,6 +416,7 @@ def test_crew_with_delegating_agents(): @pytest.mark.vcr(filter_headers=["authorization"]) def test_crew_with_delegating_agents_should_not_override_task_tools(): from typing import Type + from crewai.tools import BaseTool from pydantic import BaseModel, Field @@ -471,6 +471,7 @@ def test_crew_with_delegating_agents_should_not_override_task_tools(): @pytest.mark.vcr(filter_headers=["authorization"]) def test_crew_with_delegating_agents_should_not_override_agent_tools(): from typing import Type + from crewai.tools import BaseTool from pydantic import BaseModel, Field @@ -527,6 +528,7 @@ def test_crew_with_delegating_agents_should_not_override_agent_tools(): @pytest.mark.vcr(filter_headers=["authorization"]) def test_task_tools_override_agent_tools(): from typing import Type + from crewai.tools import BaseTool from pydantic import BaseModel, Field @@ -585,6 +587,7 @@ def test_task_tools_override_agent_tools_with_allow_delegation(): Test that task tools override agent tools while preserving delegation tools when allow_delegation=True """ from typing import Type + from crewai.tools import BaseTool from pydantic import BaseModel, Field @@ -2884,6 +2887,7 @@ def test_task_tools_preserve_code_execution_tools(): Test that task tools don't override code execution tools when allow_code_execution=True """ from typing import Type + from crewai.tools import BaseTool from crewai_tools import CodeInterpreterTool from pydantic import BaseModel, Field diff --git a/tests/flow_test.py b/tests/flow_test.py index d52c459ce..c3b6275e5 100644 --- a/tests/flow_test.py +++ b/tests/flow_test.py @@ -3,7 +3,6 @@ import asyncio import pytest - from crewai.flow.flow import Flow, and_, listen, or_, router, start diff --git a/tests/llm_test.py b/tests/llm_test.py index e824d54c9..35758c523 100644 --- a/tests/llm_test.py +++ b/tests/llm_test.py @@ -1,5 +1,4 @@ import pytest - from crewai.agents.agent_builder.utilities.base_token_process import TokenProcess from crewai.llm import LLM from crewai.utilities.token_counter_callback import TokenCalcHandler diff --git a/tests/memory/long_term_memory_test.py b/tests/memory/long_term_memory_test.py index 3639054e3..27eb4cf2f 100644 --- a/tests/memory/long_term_memory_test.py +++ b/tests/memory/long_term_memory_test.py @@ -1,5 +1,4 @@ import pytest - from crewai.memory.long_term.long_term_memory import LongTermMemory from crewai.memory.long_term.long_term_memory_item import LongTermMemoryItem diff --git a/tests/memory/short_term_memory_test.py b/tests/memory/short_term_memory_test.py index 6cde2a044..a366de504 100644 --- a/tests/memory/short_term_memory_test.py +++ b/tests/memory/short_term_memory_test.py @@ -1,7 +1,6 @@ from unittest.mock import patch import pytest - from crewai.agent import Agent from crewai.crew import Crew from crewai.memory.short_term.short_term_memory import ShortTermMemory diff --git a/tests/project_test.py b/tests/project_test.py index 6c68f4993..ba8bcbef0 100644 --- a/tests/project_test.py +++ b/tests/project_test.py @@ -1,5 +1,4 @@ import pytest - from crewai.agent import Agent from crewai.crew import Crew from crewai.project import CrewBase, after_kickoff, agent, before_kickoff, crew, task diff --git a/tests/task_test.py b/tests/task_test.py index 40eb98e54..9ddce6ef9 100644 --- a/tests/task_test.py +++ b/tests/task_test.py @@ -6,13 +6,12 @@ import os from unittest.mock import MagicMock, patch import pytest -from pydantic import BaseModel -from pydantic_core import ValidationError - from crewai import Agent, Crew, Process, Task from crewai.tasks.conditional_task import ConditionalTask from crewai.tasks.task_output import TaskOutput from crewai.utilities.converter import Converter +from pydantic import BaseModel +from pydantic_core import ValidationError def test_task_tool_reflect_agent_tools(): diff --git a/tests/tools/agent_tools/agent_tools_test.py b/tests/tools/agent_tools/agent_tools_test.py index 9aea7b4bc..c55554798 100644 --- a/tests/tools/agent_tools/agent_tools_test.py +++ b/tests/tools/agent_tools/agent_tools_test.py @@ -1,7 +1,6 @@ """Test Agent creation and execution basic functionality.""" import pytest - from crewai.agent import Agent from crewai.tools.agent_tools.agent_tools import AgentTools diff --git a/tests/tools/test_structured_tool.py b/tests/tools/test_structured_tool.py index 32ebd805b..3bd39686a 100644 --- a/tests/tools/test_structured_tool.py +++ b/tests/tools/test_structured_tool.py @@ -1,9 +1,8 @@ from typing import Optional import pytest -from pydantic import BaseModel, Field - from crewai.tools.structured_tool import CrewStructuredTool +from pydantic import BaseModel, Field # Test fixtures diff --git a/tests/tools/test_tool_usage.py b/tests/tools/test_tool_usage.py index 05b9b23af..f9caf51d9 100644 --- a/tests/tools/test_tool_usage.py +++ b/tests/tools/test_tool_usage.py @@ -3,11 +3,10 @@ import random from unittest.mock import MagicMock import pytest -from pydantic import BaseModel, Field - from crewai import Agent, Task from crewai.tools import BaseTool from crewai.tools.tool_usage import ToolUsage +from pydantic import BaseModel, Field class RandomNumberToolInput(BaseModel): diff --git a/tests/utilities/evaluators/test_crew_evaluator_handler.py b/tests/utilities/evaluators/test_crew_evaluator_handler.py index 649c25998..6c92ffdbc 100644 --- a/tests/utilities/evaluators/test_crew_evaluator_handler.py +++ b/tests/utilities/evaluators/test_crew_evaluator_handler.py @@ -1,7 +1,6 @@ from unittest import mock import pytest - from crewai.agent import Agent from crewai.crew import Crew from crewai.task import Task diff --git a/tests/utilities/test_converter.py b/tests/utilities/test_converter.py index c63d6dba3..a8ed3befe 100644 --- a/tests/utilities/test_converter.py +++ b/tests/utilities/test_converter.py @@ -3,8 +3,6 @@ from typing import Dict, List, Optional from unittest.mock import MagicMock, Mock, patch import pytest -from pydantic import BaseModel - from crewai.llm import LLM from crewai.utilities.converter import ( Converter, @@ -18,6 +16,7 @@ from crewai.utilities.converter import ( validate_model, ) from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser +from pydantic import BaseModel # Sample Pydantic models for testing diff --git a/tests/utilities/test_file_handler.py b/tests/utilities/test_file_handler.py index 4a1038a9b..e7cf9f0e4 100644 --- a/tests/utilities/test_file_handler.py +++ b/tests/utilities/test_file_handler.py @@ -2,7 +2,6 @@ import os import unittest import pytest - from crewai.utilities.file_handler import PickleHandler diff --git a/tests/utilities/test_i18n.py b/tests/utilities/test_i18n.py index 8627b0bec..10c403edf 100644 --- a/tests/utilities/test_i18n.py +++ b/tests/utilities/test_i18n.py @@ -1,5 +1,4 @@ import pytest - from crewai.utilities.i18n import I18N diff --git a/tests/utilities/test_planning_handler.py b/tests/utilities/test_planning_handler.py index 85101606d..d7e2d4d8a 100644 --- a/tests/utilities/test_planning_handler.py +++ b/tests/utilities/test_planning_handler.py @@ -1,7 +1,6 @@ from unittest.mock import patch import pytest - from crewai.agent import Agent from crewai.task import Task from crewai.tasks.task_output import TaskOutput