From faac5f584e027fa52d00fb2058e8c4077c5f023e Mon Sep 17 00:00:00 2001
From: "Brandon Hancock (bhancock_ai)"
 <109994880+bhancockio@users.noreply.github.com>
Date: Fri, 7 Feb 2025 17:00:41 -0500
Subject: [PATCH] Brandon/general cleanup (#2059)

* clean up. fix type safety. address memory config docs

* improve manager

* Include fix for o1 models not supporting system messages

* more broad with o1

* address fix: Typo in expected_output string #2045

* drop prints

* drop prints

* wip

* wip

* fix failing memory tests

* Fix memory provider issue

* clean up short term memory

* revert ltm

* drop

* clean up linting issues

* more linting
---
 src/crewai/agent.py                       | 3 +--
 src/crewai/cli/reset_memories_command.py  | 5 -----
 src/crewai/crew.py                        | 2 --
 src/crewai/memory/entity/entity_memory.py | 2 +-
 src/crewai/memory/memory.py               | 4 +---
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/crewai/agent.py b/src/crewai/agent.py
index 2ab8228eb..4c1e3c393 100644
--- a/src/crewai/agent.py
+++ b/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
diff --git a/src/crewai/cli/reset_memories_command.py b/src/crewai/cli/reset_memories_command.py
index 4f7f1beb6..4870d6424 100644
--- a/src/crewai/cli/reset_memories_command.py
+++ b/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(
diff --git a/src/crewai/crew.py b/src/crewai/crew.py
index 85d7955fb..f36df2a03 100644
--- a/src/crewai/crew.py
+++ b/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] + [
diff --git a/src/crewai/memory/entity/entity_memory.py b/src/crewai/memory/entity/entity_memory.py
index 536da72e4..264b64103 100644
--- a/src/crewai/memory/entity/entity_memory.py
+++ b/src/crewai/memory/entity/entity_memory.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Optional
 
 from pydantic import PrivateAttr
 
diff --git a/src/crewai/memory/memory.py b/src/crewai/memory/memory.py
index 4387ebd64..9a362a512 100644
--- a/src/crewai/memory/memory.py
+++ b/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):
     """