Revert "fixing linter"

This reverts commit 2eda5fdeed.
This commit is contained in:
João Moura
2024-12-27 16:22:43 -03:00
parent 5bd4fdc3d0
commit 9a55b54977
35 changed files with 55 additions and 28 deletions

View File

@@ -1,9 +1,10 @@
import os import os
from typing import Any, Dict, List from typing import Any, Dict, List
from crewai.memory.storage.interface import Storage
from mem0 import MemoryClient from mem0 import MemoryClient
from crewai.memory.storage.interface import Storage
class Mem0Storage(Storage): class Mem0Storage(Storage):
""" """

View File

@@ -7,6 +7,7 @@ import uuid
from typing import Any, Dict, List, Optional from typing import Any, Dict, List, Optional
from chromadb.api import ClientAPI from chromadb.api import ClientAPI
from crewai.memory.storage.base_rag_storage import BaseRAGStorage from crewai.memory.storage.base_rag_storage import BaseRAGStorage
from crewai.utilities import EmbeddingConfigurator from crewai.utilities import EmbeddingConfigurator
from crewai.utilities.constants import MAX_FILE_NAME_LENGTH from crewai.utilities.constants import MAX_FILE_NAME_LENGTH

View File

@@ -1,8 +1,7 @@
from typing import Optional from typing import Optional
from pydantic import BaseModel, Field
from crewai.tools.base_tool import BaseTool from crewai.tools.base_tool import BaseTool
from crewai.utilities import I18N from crewai.utilities import I18N
from pydantic import BaseModel, Field
i18n = I18N() i18n = I18N()

View File

@@ -1,8 +1,9 @@
from typing import Optional from typing import Optional
from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
class AskQuestionToolSchema(BaseModel): class AskQuestionToolSchema(BaseModel):
question: str = Field(..., description="The question to ask") question: str = Field(..., description="The question to ask")

View File

@@ -1,10 +1,11 @@
from typing import Optional, Union from typing import Optional, Union
from pydantic import Field
from crewai.agents.agent_builder.base_agent import BaseAgent from crewai.agents.agent_builder.base_agent import BaseAgent
from crewai.task import Task from crewai.task import Task
from crewai.tools.base_tool import BaseTool from crewai.tools.base_tool import BaseTool
from crewai.utilities import I18N from crewai.utilities import I18N
from pydantic import Field
class BaseAgentTool(BaseTool): class BaseAgentTool(BaseTool):

View File

@@ -1,7 +1,6 @@
from typing import Optional from typing import Optional
from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
class DelegateWorkToolSchema(BaseModel): class DelegateWorkToolSchema(BaseModel):

View File

@@ -5,12 +5,12 @@ from difflib import SequenceMatcher
from textwrap import dedent from textwrap import dedent
from typing import Any, List, Union from typing import Any, List, Union
from crewai.tools.structured_tool import CrewStructuredTool
import crewai.utilities.events as events import crewai.utilities.events as events
from crewai.agents.tools_handler import ToolsHandler from crewai.agents.tools_handler import ToolsHandler
from crewai.task import Task from crewai.task import Task
from crewai.telemetry import Telemetry from crewai.telemetry import Telemetry
from crewai.tools import BaseTool from crewai.tools import BaseTool
from crewai.tools.structured_tool import CrewStructuredTool
from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
from crewai.tools.tool_usage_events import ToolUsageError, ToolUsageFinished from crewai.tools.tool_usage_events import ToolUsageError, ToolUsageFinished
from crewai.utilities import I18N, Converter, ConverterError, Printer from crewai.utilities import I18N, Converter, ConverterError, Printer

View File

@@ -1,13 +1,14 @@
from collections import defaultdict 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.agent import Agent
from crewai.task import Task from crewai.task import Task
from crewai.tasks.task_output import TaskOutput from crewai.tasks.task_output import TaskOutput
from crewai.telemetry import Telemetry 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): class TaskEvaluationPydanticOutput(BaseModel):

View File

@@ -1,8 +1,9 @@
from typing import List from typing import List
from pydantic import BaseModel, Field
from crewai.utilities import Converter from crewai.utilities import Converter
from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser
from pydantic import BaseModel, Field
agentops = None agentops = None
try: try:

View File

@@ -5,6 +5,7 @@ from unittest import mock
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from crewai import Agent, Crew, Task from crewai import Agent, Crew, Task
from crewai.agents.cache import CacheHandler from crewai.agents.cache import CacheHandler
from crewai.agents.crew_agent_executor import CrewAgentExecutor from crewai.agents.crew_agent_executor import CrewAgentExecutor
@@ -115,9 +116,10 @@ def test_custom_llm_temperature_preservation():
@pytest.mark.vcr(filter_headers=["authorization"]) @pytest.mark.vcr(filter_headers=["authorization"])
def test_agent_execute_task(): def test_agent_execute_task():
from crewai import Task
from langchain_openai import ChatOpenAI from langchain_openai import ChatOpenAI
from crewai import Task
agent = Agent( agent = Agent(
role="Math Tutor", role="Math Tutor",
goal="Solve math problems accurately", goal="Solve math problems accurately",
@@ -860,6 +862,7 @@ def test_agent_function_calling_llm():
from unittest.mock import patch from unittest.mock import patch
import instructor import instructor
from crewai.tools.tool_usage import ToolUsage from crewai.tools.tool_usage import ToolUsage
with ( with (

View File

@@ -1,9 +1,10 @@
import hashlib import hashlib
from typing import Any, List, Optional from typing import Any, List, Optional
from pydantic import BaseModel
from crewai.agents.agent_builder.base_agent import BaseAgent from crewai.agents.agent_builder.base_agent import BaseAgent
from crewai.tools.base_tool import BaseTool from crewai.tools.base_tool import BaseTool
from pydantic import BaseModel
class TestAgent(BaseAgent): class TestAgent(BaseAgent):

View File

@@ -1,4 +1,5 @@
import pytest import pytest
from crewai.agents.crew_agent_executor import ( from crewai.agents.crew_agent_executor import (
AgentAction, AgentAction,
AgentFinish, AgentFinish,

View File

@@ -2,6 +2,7 @@ import unittest
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
import requests import requests
from crewai.cli.authentication.main import AuthenticationCommand from crewai.cli.authentication.main import AuthenticationCommand

View File

@@ -3,9 +3,10 @@ import unittest
from datetime import datetime, timedelta from datetime import datetime, timedelta
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from crewai.cli.authentication.utils import TokenManager, validate_token
from cryptography.fernet import Fernet from cryptography.fernet import Fernet
from crewai.cli.authentication.utils import TokenManager, validate_token
class TestValidateToken(unittest.TestCase): class TestValidateToken(unittest.TestCase):
@patch("crewai.cli.authentication.utils.AsymmetricSignatureVerifier") @patch("crewai.cli.authentication.utils.AsymmetricSignatureVerifier")

View File

@@ -3,6 +3,7 @@ from unittest import mock
import pytest import pytest
from click.testing import CliRunner from click.testing import CliRunner
from crewai.cli.cli import ( from crewai.cli.cli import (
deploy_create, deploy_create,
deploy_list, deploy_list,

View File

@@ -5,9 +5,10 @@ from unittest.mock import MagicMock, Mock, patch
import pytest import pytest
import requests import requests
from requests.exceptions import JSONDecodeError
from crewai.cli.deploy.main import DeployCommand from crewai.cli.deploy.main import DeployCommand
from crewai.cli.utils import parse_toml from crewai.cli.utils import parse_toml
from requests.exceptions import JSONDecodeError
class TestDeployCommand(unittest.TestCase): class TestDeployCommand(unittest.TestCase):

View File

@@ -2,6 +2,7 @@ import subprocess
from unittest import mock from unittest import mock
import pytest import pytest
from crewai.cli import evaluate_crew from crewai.cli import evaluate_crew

View File

@@ -1,4 +1,5 @@
import pytest import pytest
from crewai.cli.git import Repository from crewai.cli.git import Repository

View File

@@ -3,6 +3,7 @@ import shutil
import tempfile import tempfile
import pytest import pytest
from crewai.cli import utils from crewai.cli import utils

View File

@@ -7,9 +7,10 @@ from io import StringIO
from unittest import mock from unittest import mock
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from crewai.cli.tools.main import ToolCommand
from pytest import raises from pytest import raises
from crewai.cli.tools.main import ToolCommand
@contextmanager @contextmanager
def in_temp_dir(): def in_temp_dir():

View File

@@ -9,6 +9,7 @@ from unittest.mock import MagicMock, patch
import instructor import instructor
import pydantic_core import pydantic_core
import pytest import pytest
from crewai.agent import Agent from crewai.agent import Agent
from crewai.agents.cache import CacheHandler from crewai.agents.cache import CacheHandler
from crewai.crew import Crew from crewai.crew import Crew
@@ -416,7 +417,6 @@ def test_crew_with_delegating_agents():
@pytest.mark.vcr(filter_headers=["authorization"]) @pytest.mark.vcr(filter_headers=["authorization"])
def test_crew_with_delegating_agents_should_not_override_task_tools(): def test_crew_with_delegating_agents_should_not_override_task_tools():
from typing import Type from typing import Type
from crewai.tools import BaseTool from crewai.tools import BaseTool
from pydantic import BaseModel, Field 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"]) @pytest.mark.vcr(filter_headers=["authorization"])
def test_crew_with_delegating_agents_should_not_override_agent_tools(): def test_crew_with_delegating_agents_should_not_override_agent_tools():
from typing import Type from typing import Type
from crewai.tools import BaseTool from crewai.tools import BaseTool
from pydantic import BaseModel, Field 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"]) @pytest.mark.vcr(filter_headers=["authorization"])
def test_task_tools_override_agent_tools(): def test_task_tools_override_agent_tools():
from typing import Type from typing import Type
from crewai.tools import BaseTool from crewai.tools import BaseTool
from pydantic import BaseModel, Field 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 Test that task tools override agent tools while preserving delegation tools when allow_delegation=True
""" """
from typing import Type from typing import Type
from crewai.tools import BaseTool from crewai.tools import BaseTool
from pydantic import BaseModel, Field 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 Test that task tools don't override code execution tools when allow_code_execution=True
""" """
from typing import Type from typing import Type
from crewai.tools import BaseTool from crewai.tools import BaseTool
from crewai_tools import CodeInterpreterTool from crewai_tools import CodeInterpreterTool
from pydantic import BaseModel, Field from pydantic import BaseModel, Field

View File

@@ -3,6 +3,7 @@
import asyncio import asyncio
import pytest import pytest
from crewai.flow.flow import Flow, and_, listen, or_, router, start from crewai.flow.flow import Flow, and_, listen, or_, router, start

View File

@@ -1,4 +1,5 @@
import pytest import pytest
from crewai.agents.agent_builder.utilities.base_token_process import TokenProcess from crewai.agents.agent_builder.utilities.base_token_process import TokenProcess
from crewai.llm import LLM from crewai.llm import LLM
from crewai.utilities.token_counter_callback import TokenCalcHandler from crewai.utilities.token_counter_callback import TokenCalcHandler

View File

@@ -1,4 +1,5 @@
import pytest import pytest
from crewai.memory.long_term.long_term_memory import LongTermMemory from crewai.memory.long_term.long_term_memory import LongTermMemory
from crewai.memory.long_term.long_term_memory_item import LongTermMemoryItem from crewai.memory.long_term.long_term_memory_item import LongTermMemoryItem

View File

@@ -1,6 +1,7 @@
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from crewai.agent import Agent from crewai.agent import Agent
from crewai.crew import Crew from crewai.crew import Crew
from crewai.memory.short_term.short_term_memory import ShortTermMemory from crewai.memory.short_term.short_term_memory import ShortTermMemory

View File

@@ -1,4 +1,5 @@
import pytest import pytest
from crewai.agent import Agent from crewai.agent import Agent
from crewai.crew import Crew from crewai.crew import Crew
from crewai.project import CrewBase, after_kickoff, agent, before_kickoff, crew, task from crewai.project import CrewBase, after_kickoff, agent, before_kickoff, crew, task

View File

@@ -6,12 +6,13 @@ import os
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
import pytest import pytest
from pydantic import BaseModel
from pydantic_core import ValidationError
from crewai import Agent, Crew, Process, Task from crewai import Agent, Crew, Process, Task
from crewai.tasks.conditional_task import ConditionalTask from crewai.tasks.conditional_task import ConditionalTask
from crewai.tasks.task_output import TaskOutput from crewai.tasks.task_output import TaskOutput
from crewai.utilities.converter import Converter from crewai.utilities.converter import Converter
from pydantic import BaseModel
from pydantic_core import ValidationError
def test_task_tool_reflect_agent_tools(): def test_task_tool_reflect_agent_tools():

View File

@@ -1,6 +1,7 @@
"""Test Agent creation and execution basic functionality.""" """Test Agent creation and execution basic functionality."""
import pytest import pytest
from crewai.agent import Agent from crewai.agent import Agent
from crewai.tools.agent_tools.agent_tools import AgentTools from crewai.tools.agent_tools.agent_tools import AgentTools

View File

@@ -1,9 +1,10 @@
from typing import Optional from typing import Optional
import pytest import pytest
from crewai.tools.structured_tool import CrewStructuredTool
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from crewai.tools.structured_tool import CrewStructuredTool
# Test fixtures # Test fixtures
@pytest.fixture @pytest.fixture

View File

@@ -3,10 +3,11 @@ import random
from unittest.mock import MagicMock from unittest.mock import MagicMock
import pytest import pytest
from pydantic import BaseModel, Field
from crewai import Agent, Task from crewai import Agent, Task
from crewai.tools import BaseTool from crewai.tools import BaseTool
from crewai.tools.tool_usage import ToolUsage from crewai.tools.tool_usage import ToolUsage
from pydantic import BaseModel, Field
class RandomNumberToolInput(BaseModel): class RandomNumberToolInput(BaseModel):

View File

@@ -1,6 +1,7 @@
from unittest import mock from unittest import mock
import pytest import pytest
from crewai.agent import Agent from crewai.agent import Agent
from crewai.crew import Crew from crewai.crew import Crew
from crewai.task import Task from crewai.task import Task

View File

@@ -3,6 +3,8 @@ from typing import Dict, List, Optional
from unittest.mock import MagicMock, Mock, patch from unittest.mock import MagicMock, Mock, patch
import pytest import pytest
from pydantic import BaseModel
from crewai.llm import LLM from crewai.llm import LLM
from crewai.utilities.converter import ( from crewai.utilities.converter import (
Converter, Converter,
@@ -16,7 +18,6 @@ from crewai.utilities.converter import (
validate_model, validate_model,
) )
from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser
from pydantic import BaseModel
# Sample Pydantic models for testing # Sample Pydantic models for testing

View File

@@ -2,6 +2,7 @@ import os
import unittest import unittest
import pytest import pytest
from crewai.utilities.file_handler import PickleHandler from crewai.utilities.file_handler import PickleHandler

View File

@@ -1,4 +1,5 @@
import pytest import pytest
from crewai.utilities.i18n import I18N from crewai.utilities.i18n import I18N

View File

@@ -1,6 +1,7 @@
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from crewai.agent import Agent from crewai.agent import Agent
from crewai.task import Task from crewai.task import Task
from crewai.tasks.task_output import TaskOutput from crewai.tasks.task_output import TaskOutput