Fix import sorting in test file according to ruff standards

Co-Authored-By: Joe Moura <joao@crewai.com>

.github/workflows/linter.yml

@@ -5,29 +5,12 @@ on: [pull_request]
 jobs:
   lint:
     runs-on: ubuntu-latest
-    env:
-      TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
-      - name: Fetch Target Branch
-        run: git fetch origin $TARGET_BRANCH --depth=1
-
-      - name: Install Ruff
-        run: pip install ruff
-
-      - name: Get Changed Python Files
-        id: changed-files
+      - name: Install Requirements
         run: |
-          merge_base=$(git merge-base origin/"$TARGET_BRANCH" HEAD)
-          changed_files=$(git diff --name-only --diff-filter=ACMRTUB "$merge_base" | grep '\.py$' || true)
-          echo "files<<EOF" >> $GITHUB_OUTPUT
-          echo "$changed_files" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
+          pip install ruff
 
-      - name: Run Ruff on Changed Files
-        if: ${{ steps.changed-files.outputs.files != '' }}
-        run: |
-          echo "${{ steps.changed-files.outputs.files }}" | tr " " "\n" | xargs -I{} ruff check "{}"
+      - name: Run Ruff Linter
+        run: ruff check

.ruff.toml

@@ -2,3 +2,8 @@ exclude = [
     "templates",
     "__init__.py",
 ]
+
+[lint]
+select = [
+    "I", # isort rules
+]

docs/concepts/knowledge.mdx

@@ -700,11 +700,4 @@ recent_news = SpaceNewsKnowledgeSource(
     - Configure appropriate embedding models
     - Consider using local embedding providers for faster processing
   </Accordion>
-
-  <Accordion title="One Time Knowledge">
-    - With the typical file structure provided by CrewAI, knowledge sources are embedded every time the kickoff is triggered.
-    - If the knowledge sources are large, this leads to inefficiency and increased latency, as the same data is embedded each time.
-    - To resolve this, directly initialize the knowledge parameter instead of the knowledge_sources parameter.
-    - Link to the issue to get complete idea [Github Issue](https://github.com/crewAIInc/crewAI/issues/2755)
-  </Accordion>  
 </AccordionGroup>

src/crewai/agent.py

@@ -20,7 +20,6 @@ from crewai.tools.agent_tools.agent_tools import AgentTools
 from crewai.utilities import Converter, Prompts
 from crewai.utilities.agent_utils import (
     get_tool_names,
-    load_agent_from_repository,
     parse_tools,
     render_text_description_and_args,
 )
@@ -135,16 +134,6 @@ class Agent(BaseAgent):
         default=None,
         description="Knowledge search query for the agent dynamically generated by the agent.",
     )
-    from_repository: Optional[str] = Field(
-        default=None,
-        description="The Agent's role to be used from your repository.",
-    )
-
-    @model_validator(mode="before")
-    def validate_from_repository(cls, v):
-        if v is not None and (from_repository := v.get("from_repository")):
-            return load_agent_from_repository(from_repository) | v
-        return v
 
     @model_validator(mode="after")
     def post_init_setup(self):
@@ -184,6 +173,7 @@ class Agent(BaseAgent):
                         collection_name=self.role,
                         storage=self.knowledge_storage or None,
                     )
+                    self.knowledge.add_sources()
         except (TypeError, ValueError) as e:
             raise ValueError(f"Invalid Knowledge Configuration: {str(e)}")
 
@@ -327,6 +317,45 @@ class Agent(BaseAgent):
                         error=str(e),
                     ),
                 )
+        elif self.crew and hasattr(self.crew, "knowledge") and self.crew.knowledge:
+            crewai_event_bus.emit(
+                self,
+                event=KnowledgeRetrievalStartedEvent(
+                    agent=self,
+                ),
+            )
+            try:
+                self.knowledge_search_query = self._get_knowledge_search_query(
+                    task_prompt
+                )
+                if self.knowledge_search_query:
+                    knowledge_snippets = self.crew.query_knowledge(
+                        [self.knowledge_search_query], **knowledge_config
+                    )
+                    if knowledge_snippets:
+                        self.crew_knowledge_context = extract_knowledge_context(
+                            knowledge_snippets
+                        )
+                        if self.crew_knowledge_context:
+                            task_prompt += self.crew_knowledge_context
+
+                    crewai_event_bus.emit(
+                        self,
+                        event=KnowledgeRetrievalCompletedEvent(
+                            query=self.knowledge_search_query,
+                            agent=self,
+                            retrieved_knowledge=self.crew_knowledge_context or "",
+                        ),
+                    )
+            except Exception as e:
+                crewai_event_bus.emit(
+                    self,
+                    event=KnowledgeSearchQueryFailedEvent(
+                        query=self.knowledge_search_query or "",
+                        agent=self,
+                        error=str(e),
+                    ),
+                )
 
         tools = tools or self.tools or []
         self.create_agent_executor(tools=tools, task=task)

src/crewai/cli/authentication/token.py

@@ -5,5 +5,5 @@ def get_auth_token() -> str:
     """Get the authentication token."""
     access_token = TokenManager().get_token()
     if not access_token:
-        raise Exception("No token found, make sure you are logged in")
+        raise Exception()
     return access_token

src/crewai/cli/plus_api.py

@@ -14,7 +14,6 @@ class PlusAPI:
 
     TOOLS_RESOURCE = "/crewai_plus/api/v1/tools"
     CREWS_RESOURCE = "/crewai_plus/api/v1/crews"
-    AGENTS_RESOURCE = "/crewai_plus/api/v1/agents"
 
     def __init__(self, api_key: str) -> None:
         self.api_key = api_key
@@ -38,9 +37,6 @@ class PlusAPI:
     def get_tool(self, handle: str):
         return self._make_request("GET", f"{self.TOOLS_RESOURCE}/{handle}")
 
-    def get_agent(self, handle: str):
-        return self._make_request("GET", f"{self.AGENTS_RESOURCE}/{handle}")
-
     def publish_tool(
         self,
         handle: str,

src/crewai/llm.py

@@ -5,7 +5,8 @@ import sys
 import threading
 import warnings
 from collections import defaultdict
-from contextlib import contextmanager, redirect_stderr, redirect_stdout
+from contextlib import contextmanager
+from types import SimpleNamespace
 from typing import (
     Any,
     DefaultDict,
@@ -30,6 +31,7 @@ from crewai.utilities.events.llm_events import (
     LLMCallType,
     LLMStreamChunkEvent,
 )
+from crewai.utilities.events.tool_usage_events import ToolExecutionErrorEvent
 
 with warnings.catch_warnings():
     warnings.simplefilter("ignore", UserWarning)
@@ -43,9 +45,6 @@ with warnings.catch_warnings():
     from litellm.utils import supports_response_schema
 
 
-import io
-from typing import TextIO
-
 from crewai.llms.base_llm import BaseLLM
 from crewai.utilities.events import crewai_event_bus
 from crewai.utilities.exceptions.context_window_exceeding_exception import (
@@ -55,17 +54,12 @@ from crewai.utilities.exceptions.context_window_exceeding_exception import (
 load_dotenv()
 
 
-class FilteredStream(io.TextIOBase):
-    _lock = None
-
-    def __init__(self, original_stream: TextIO):
+class FilteredStream:
+    def __init__(self, original_stream):
         self._original_stream = original_stream
         self._lock = threading.Lock()
 
-    def write(self, s: str) -> int:
-        if not self._lock:
-            self._lock = threading.Lock()
-
+    def write(self, s) -> int:
         with self._lock:
             # Filter out extraneous messages from LiteLLM
             if (
@@ -220,11 +214,15 @@ def suppress_warnings():
         )
 
         # Redirect stdout and stderr
-        with (
-            redirect_stdout(FilteredStream(sys.stdout)),
-            redirect_stderr(FilteredStream(sys.stderr)),
-        ):
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = FilteredStream(old_stdout)
+        sys.stderr = FilteredStream(old_stderr)
+        try:
             yield
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
 
 
 class Delta(TypedDict):

src/crewai/utilities/agent_utils.py

@@ -16,7 +16,6 @@ from crewai.tools.base_tool import BaseTool
 from crewai.tools.structured_tool import CrewStructuredTool
 from crewai.tools.tool_types import ToolResult
 from crewai.utilities import I18N, Printer
-from crewai.utilities.errors import AgentRepositoryError
 from crewai.utilities.exceptions.context_window_exceeding_exception import (
     LLMContextLengthExceededException,
 )
@@ -429,36 +428,3 @@ def show_agent_logs(
             printer.print(
                 content=f"\033[95m## Final Answer:\033[00m \033[92m\n{formatted_answer.output}\033[00m\n\n"
             )
-
-
-def load_agent_from_repository(from_repository: str) -> Dict[str, Any]:
-    attributes: Dict[str, Any] = {}
-    if from_repository:
-        import importlib
-
-        from crewai.cli.authentication.token import get_auth_token
-        from crewai.cli.plus_api import PlusAPI
-
-        client = PlusAPI(api_key=get_auth_token())
-        response = client.get_agent(from_repository)
-        if response.status_code != 200:
-            raise AgentRepositoryError(
-                f"Agent {from_repository} could not be loaded: {response.text}"
-            )
-
-        agent = response.json()
-        for key, value in agent.items():
-            if key == "tools":
-                attributes[key] = []
-                for tool_name in value:
-                    try:
-                        module = importlib.import_module("crewai_tools")
-                        tool_class = getattr(module, tool_name)
-                        attributes[key].append(tool_class())
-                    except Exception as e:
-                        raise AgentRepositoryError(
-                            f"Tool {tool_name} could not be loaded: {e}"
-                        ) from e
-            else:
-                attributes[key] = value
-    return attributes

src/crewai/utilities/errors.py

@@ -1,5 +1,4 @@
 """Error message definitions for CrewAI database operations."""
-
 from typing import Optional
 
 
@@ -38,9 +37,3 @@ class DatabaseError:
             The formatted error message
         """
         return template.format(str(error))
-
-
-class AgentRepositoryError(Exception):
-    """Exception raised when an agent repository is not found."""
-
-    ...

tests/agent_test.py

@@ -2,7 +2,7 @@
 
 import os
 from unittest import mock
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -18,7 +18,6 @@ from crewai.tools import tool
 from crewai.tools.tool_calling import InstructorToolCalling
 from crewai.tools.tool_usage import ToolUsage
 from crewai.utilities import RPMController
-from crewai.utilities.errors import AgentRepositoryError
 from crewai.utilities.events import crewai_event_bus
 from crewai.utilities.events.tool_usage_events import ToolUsageFinishedEvent
 
@@ -309,7 +308,9 @@ def test_cache_hitting():
     def handle_tool_end(source, event):
         received_events.append(event)
 
-    with (patch.object(CacheHandler, "read") as read,):
+    with (
+        patch.object(CacheHandler, "read") as read,
+    ):
         read.return_value = "0"
         task = Task(
             description="What is 2 times 6? Ignore correctness and just return the result of the multiplication tool, you must use the tool.",
@@ -1039,7 +1040,7 @@ def test_agent_human_input():
             CrewAgentExecutor,
             "_invoke_loop",
             return_value=AgentFinish(output="Hello", thought="", text=""),
-        ),
+        ) as mock_invoke_loop,
     ):
         # Execute the task
         output = agent.execute_task(task)
@@ -2024,86 +2025,3 @@ def test_get_knowledge_search_query():
                 },
             ]
         )
-
-
-@pytest.fixture
-def mock_get_auth_token():
-    with patch(
-        "crewai.cli.authentication.token.get_auth_token", return_value="test_token"
-    ):
-        yield
-
-
-@patch("crewai.cli.plus_api.PlusAPI.get_agent")
-def test_agent_from_repository(mock_get_agent, mock_get_auth_token):
-    from crewai_tools import SerperDevTool
-
-    mock_get_response = MagicMock()
-    mock_get_response.status_code = 200
-    mock_get_response.json.return_value = {
-        "role": "test role",
-        "goal": "test goal",
-        "backstory": "test backstory",
-        "tools": ["SerperDevTool"],
-    }
-    mock_get_agent.return_value = mock_get_response
-    agent = Agent(from_repository="test_agent")
-
-    assert agent.role == "test role"
-    assert agent.goal == "test goal"
-    assert agent.backstory == "test backstory"
-    assert len(agent.tools) == 1
-    assert isinstance(agent.tools[0], SerperDevTool)
-
-
-@patch("crewai.cli.plus_api.PlusAPI.get_agent")
-def test_agent_from_repository_override_attributes(mock_get_agent, mock_get_auth_token):
-    from crewai_tools import SerperDevTool
-
-    mock_get_response = MagicMock()
-    mock_get_response.status_code = 200
-    mock_get_response.json.return_value = {
-        "role": "test role",
-        "goal": "test goal",
-        "backstory": "test backstory",
-        "tools": ["SerperDevTool"],
-    }
-    mock_get_agent.return_value = mock_get_response
-    agent = Agent(from_repository="test_agent", role="Custom Role")
-
-    assert agent.role == "Custom Role"
-    assert agent.goal == "test goal"
-    assert agent.backstory == "test backstory"
-    assert len(agent.tools) == 1
-    assert isinstance(agent.tools[0], SerperDevTool)
-
-
-@patch("crewai.cli.plus_api.PlusAPI.get_agent")
-def test_agent_from_repository_with_invalid_tools(mock_get_agent, mock_get_auth_token):
-    mock_get_response = MagicMock()
-    mock_get_response.status_code = 200
-    mock_get_response.json.return_value = {
-        "role": "test role",
-        "goal": "test goal",
-        "backstory": "test backstory",
-        "tools": ["DoesNotExist"],
-    }
-    mock_get_agent.return_value = mock_get_response
-    with pytest.raises(
-        AgentRepositoryError,
-        match="Tool DoesNotExist could not be loaded: module 'crewai_tools' has no attribute 'DoesNotExist'",
-    ):
-        Agent(from_repository="test_agent")
-
-
-@patch("crewai.cli.plus_api.PlusAPI.get_agent")
-def test_agent_from_repository_agent_not_found(mock_get_agent, mock_get_auth_token):
-    mock_get_response = MagicMock()
-    mock_get_response.status_code = 404
-    mock_get_response.text = "Agent not found"
-    mock_get_agent.return_value = mock_get_response
-    with pytest.raises(
-        AgentRepositoryError,
-        match="Agent NOT_FOUND could not be loaded: Agent not found",
-    ):
-        Agent(from_repository="NOT_FOUND")

tests/test_agent_without_knowledge_uses_crew_knowledge.py

@@ -0,0 +1,46 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from crewai import LLM, Agent, Crew, Process, Task
+from crewai.knowledge.knowledge import Knowledge
+from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
+
+
+def test_agent_without_knowledge_uses_crew_knowledge():
+    """Test that an agent without knowledge sources can use crew knowledge sources."""
+    content = "John is 30 years old and lives in San Francisco."
+    string_source = StringKnowledgeSource(content=content)
+
+    agent = Agent(
+        role="Information Agent",
+        goal="Provide information based on knowledge sources",
+        backstory="You have access to specific knowledge sources.",
+        llm=LLM(model="gpt-4o-mini"),
+    )
+
+    task = Task(
+        description="How old is John and where does he live?",
+        expected_output="John's age and location.",
+        agent=agent,
+    )
+
+    with patch('crewai.knowledge.knowledge.Knowledge.query', return_value=[{"context": content}]) as mock_query:
+        crew = Crew(
+            agents=[agent],
+            tasks=[task],
+            process=Process.sequential,
+            knowledge_sources=[string_source],
+        )
+        
+        agent.crew = crew
+        
+        with patch.object(Agent, '_get_knowledge_search_query', return_value="test query"):
+            with patch.object(Agent, '_execute_without_timeout', return_value="John is 30 years old and lives in San Francisco."):
+                result = agent.execute_task(task)
+                
+                assert mock_query.called
+                
+                assert hasattr(agent, 'crew_knowledge_context')
+                
+                assert "John" in result