diff --git a/src/crewai/memory/storage/mem0_storage.py b/src/crewai/memory/storage/mem0_storage.py index a7023c212..e4e84fab4 100644 --- a/src/crewai/memory/storage/mem0_storage.py +++ b/src/crewai/memory/storage/mem0_storage.py @@ -1,9 +1,10 @@ import os from typing import Any, Dict, List -from crewai.memory.storage.interface import Storage from mem0 import MemoryClient +from crewai.memory.storage.interface import Storage + class Mem0Storage(Storage): """ diff --git a/src/crewai/memory/storage/rag_storage.py b/src/crewai/memory/storage/rag_storage.py index bcf4eb969..fd4c77838 100644 --- a/src/crewai/memory/storage/rag_storage.py +++ b/src/crewai/memory/storage/rag_storage.py @@ -7,6 +7,7 @@ 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 83484fcd5..0ace62f85 100644 --- a/src/crewai/tools/agent_tools/add_image_tool.py +++ b/src/crewai/tools/agent_tools/add_image_tool.py @@ -1,8 +1,7 @@ from typing import Optional - +from pydantic import BaseModel, Field from crewai.tools.base_tool import BaseTool from crewai.utilities import I18N -from pydantic import BaseModel, Field i18n = I18N() diff --git a/src/crewai/tools/agent_tools/ask_question_tool.py b/src/crewai/tools/agent_tools/ask_question_tool.py index 5e3c5e87a..9294770e5 100644 --- a/src/crewai/tools/agent_tools/ask_question_tool.py +++ b/src/crewai/tools/agent_tools/ask_question_tool.py @@ -1,8 +1,9 @@ from typing import Optional -from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool from pydantic import BaseModel, Field +from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool + class AskQuestionToolSchema(BaseModel): question: str = Field(..., description="The question to ask") diff --git a/src/crewai/tools/agent_tools/base_agent_tools.py b/src/crewai/tools/agent_tools/base_agent_tools.py index edf3b41e2..ea63dd51e 100644 --- a/src/crewai/tools/agent_tools/base_agent_tools.py +++ b/src/crewai/tools/agent_tools/base_agent_tools.py @@ -1,10 +1,11 @@ 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 261f7991a..45f12772d 100644 --- a/src/crewai/tools/agent_tools/delegate_work_tool.py +++ b/src/crewai/tools/agent_tools/delegate_work_tool.py @@ -1,7 +1,6 @@ from typing import Optional - -from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool from pydantic import BaseModel, Field +from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool class DelegateWorkToolSchema(BaseModel): diff --git a/src/crewai/tools/tool_usage.py b/src/crewai/tools/tool_usage.py index 883d6f1ef..87162b7a1 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 e251f76f2..3387d91b3 100644 --- a/src/crewai/utilities/evaluators/crew_evaluator_handler.py +++ b/src/crewai/utilities/evaluators/crew_evaluator_handler.py @@ -1,13 +1,14 @@ 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 917ca8920..f7d543ae4 100644 --- a/src/crewai/utilities/evaluators/task_evaluator.py +++ b/src/crewai/utilities/evaluators/task_evaluator.py @@ -1,8 +1,9 @@ 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 f852dab69..6879a4519 100644 --- a/tests/agent_test.py +++ b/tests/agent_test.py @@ -5,6 +5,7 @@ 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 @@ -115,9 +116,10 @@ def test_custom_llm_temperature_preservation(): @pytest.mark.vcr(filter_headers=["authorization"]) def test_agent_execute_task(): - from crewai import Task from langchain_openai import ChatOpenAI + from crewai import Task + agent = Agent( role="Math Tutor", goal="Solve math problems accurately", @@ -860,6 +862,7 @@ 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 fcd5d58b6..7c0c2f472 100644 --- a/tests/agents/agent_builder/base_agent_test.py +++ b/tests/agents/agent_builder/base_agent_test.py @@ -1,9 +1,10 @@ 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 86349be99..4b48e1552 100644 --- a/tests/agents/test_crew_agent_parser.py +++ b/tests/agents/test_crew_agent_parser.py @@ -1,4 +1,5 @@ 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 1ba5b827f..a0b4fa0d9 100644 --- a/tests/cli/authentication/test_auth_main.py +++ b/tests/cli/authentication/test_auth_main.py @@ -2,6 +2,7 @@ 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 d634780a8..6da48dcd0 100644 --- a/tests/cli/authentication/test_utils.py +++ b/tests/cli/authentication/test_utils.py @@ -3,9 +3,10 @@ import unittest from datetime import datetime, timedelta from unittest.mock import MagicMock, patch -from crewai.cli.authentication.utils import TokenManager, validate_token from cryptography.fernet import Fernet +from crewai.cli.authentication.utils import TokenManager, validate_token + class TestValidateToken(unittest.TestCase): @patch("crewai.cli.authentication.utils.AsymmetricSignatureVerifier") diff --git a/tests/cli/cli_test.py b/tests/cli/cli_test.py index d8c734e6d..15ed81637 100644 --- a/tests/cli/cli_test.py +++ b/tests/cli/cli_test.py @@ -3,6 +3,7 @@ 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 be9408739..ca89b2aa2 100644 --- a/tests/cli/deploy/test_deploy_main.py +++ b/tests/cli/deploy/test_deploy_main.py @@ -5,9 +5,10 @@ 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 9c4b11f12..83bcd55cc 100644 --- a/tests/cli/test_crew_test.py +++ b/tests/cli/test_crew_test.py @@ -2,6 +2,7 @@ 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 b77106d3f..ccf8f0539 100644 --- a/tests/cli/test_git.py +++ b/tests/cli/test_git.py @@ -1,4 +1,5 @@ import pytest + from crewai.cli.git import Repository diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py index 8e648ac13..0270b12fc 100644 --- a/tests/cli/test_utils.py +++ b/tests/cli/test_utils.py @@ -3,6 +3,7 @@ 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 69f46b421..10c29b920 100644 --- a/tests/cli/tools/test_main.py +++ b/tests/cli/tools/test_main.py @@ -7,9 +7,10 @@ from io import StringIO from unittest import mock from unittest.mock import MagicMock, patch -from crewai.cli.tools.main import ToolCommand from pytest import raises +from crewai.cli.tools.main import ToolCommand + @contextmanager def in_temp_dir(): diff --git a/tests/crew_test.py b/tests/crew_test.py index aa4e6e19d..1b60a1a31 100644 --- a/tests/crew_test.py +++ b/tests/crew_test.py @@ -9,6 +9,7 @@ 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 @@ -416,7 +417,6 @@ 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,7 +471,6 @@ 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 @@ -528,7 +527,6 @@ 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 @@ -587,7 +585,6 @@ 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 @@ -2887,7 +2884,6 @@ 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 c3b6275e5..d52c459ce 100644 --- a/tests/flow_test.py +++ b/tests/flow_test.py @@ -3,6 +3,7 @@ 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 35758c523..e824d54c9 100644 --- a/tests/llm_test.py +++ b/tests/llm_test.py @@ -1,4 +1,5 @@ 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 27eb4cf2f..3639054e3 100644 --- a/tests/memory/long_term_memory_test.py +++ b/tests/memory/long_term_memory_test.py @@ -1,4 +1,5 @@ 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 a366de504..6cde2a044 100644 --- a/tests/memory/short_term_memory_test.py +++ b/tests/memory/short_term_memory_test.py @@ -1,6 +1,7 @@ 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 ba8bcbef0..6c68f4993 100644 --- a/tests/project_test.py +++ b/tests/project_test.py @@ -1,4 +1,5 @@ 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 9ddce6ef9..40eb98e54 100644 --- a/tests/task_test.py +++ b/tests/task_test.py @@ -6,12 +6,13 @@ 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 c55554798..9aea7b4bc 100644 --- a/tests/tools/agent_tools/agent_tools_test.py +++ b/tests/tools/agent_tools/agent_tools_test.py @@ -1,6 +1,7 @@ """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 3bd39686a..32ebd805b 100644 --- a/tests/tools/test_structured_tool.py +++ b/tests/tools/test_structured_tool.py @@ -1,9 +1,10 @@ from typing import Optional import pytest -from crewai.tools.structured_tool import CrewStructuredTool from pydantic import BaseModel, Field +from crewai.tools.structured_tool import CrewStructuredTool + # Test fixtures @pytest.fixture diff --git a/tests/tools/test_tool_usage.py b/tests/tools/test_tool_usage.py index f9caf51d9..05b9b23af 100644 --- a/tests/tools/test_tool_usage.py +++ b/tests/tools/test_tool_usage.py @@ -3,10 +3,11 @@ 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 6c92ffdbc..649c25998 100644 --- a/tests/utilities/evaluators/test_crew_evaluator_handler.py +++ b/tests/utilities/evaluators/test_crew_evaluator_handler.py @@ -1,6 +1,7 @@ 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 a8ed3befe..c63d6dba3 100644 --- a/tests/utilities/test_converter.py +++ b/tests/utilities/test_converter.py @@ -3,6 +3,8 @@ 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, @@ -16,7 +18,6 @@ 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 e7cf9f0e4..4a1038a9b 100644 --- a/tests/utilities/test_file_handler.py +++ b/tests/utilities/test_file_handler.py @@ -2,6 +2,7 @@ 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 10c403edf..8627b0bec 100644 --- a/tests/utilities/test_i18n.py +++ b/tests/utilities/test_i18n.py @@ -1,4 +1,5 @@ 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 d7e2d4d8a..85101606d 100644 --- a/tests/utilities/test_planning_handler.py +++ b/tests/utilities/test_planning_handler.py @@ -1,6 +1,7 @@ from unittest.mock import patch import pytest + from crewai.agent import Agent from crewai.task import Task from crewai.tasks.task_output import TaskOutput