Merge branch 'main' into brandon/general-cleanup

src/crewai/agent.py

@@ -16,7 +16,6 @@ from crewai.memory.contextual.contextual_memory import ContextualMemory
 from crewai.task import Task
 from crewai.tools import BaseTool
 from crewai.tools.agent_tools.agent_tools import AgentTools
-from crewai.tools.base_tool import Tool
 from crewai.utilities import Converter, Prompts
 from crewai.utilities.constants import TRAINED_AGENTS_DATA_FILE, TRAINING_DATA_FILE
 from crewai.utilities.converter import generate_model_description
@@ -146,7 +145,7 @@ class Agent(BaseAgent):
     def _set_knowledge(self):
         try:
             if self.knowledge_sources:
-                full_pattern = re.compile(r'[^a-zA-Z0-9\-_\r\n]|(\.\.)')
+                full_pattern = re.compile(r"[^a-zA-Z0-9\-_\r\n]|(\.\.)")
                 knowledge_agent_name = f"{re.sub(full_pattern, '_', self.role)}"
                 if isinstance(self.knowledge_sources, list) and all(
                     isinstance(k, BaseKnowledgeSource) for k in self.knowledge_sources

src/crewai/cli/reset_memories_command.py

@@ -3,11 +3,6 @@ import subprocess
 import click
 
 from crewai.cli.utils import get_crew
-from crewai.knowledge.storage.knowledge_storage import KnowledgeStorage
-from crewai.memory.entity.entity_memory import EntityMemory
-from crewai.memory.long_term.long_term_memory import LongTermMemory
-from crewai.memory.short_term.short_term_memory import ShortTermMemory
-from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
 
 
 def reset_memories_command(

src/crewai/crew.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 import re
-import sys
 import uuid
 import warnings
 from concurrent.futures import Future
@@ -440,7 +439,6 @@ class Crew(BaseModel):
                         )
         return self
 
-
     @property
     def key(self) -> str:
         source = [agent.key for agent in self.agents] + [

src/crewai/memory/entity/entity_memory.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Optional
 
 from pydantic import PrivateAttr
 

src/crewai/memory/memory.py

@@ -1,9 +1,7 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel
 
-from crewai.memory.storage.rag_storage import RAGStorage
-
 
 class Memory(BaseModel):
     """