Merge branch 'main' into fix-knowledgestorage-default-instantiation

src/crewai/cli/templates/crew/crew.py

@@ -6,7 +6,7 @@ from crewai.project import CrewBase, agent, crew, task
 # https://docs.crewai.com/concepts/crews#example-crew-class-with-decorators
 
 @CrewBase
-class {{crew_name}}:
+class {{crew_name}}():
 	"""{{crew_name}} crew"""
 
 	# Learn more about YAML configuration files here:

src/crewai/cli/templates/crew/tools/custom_tool.py

@@ -1,4 +1,5 @@
 from crewai.tools import BaseTool
+from typing import Type
 from pydantic import BaseModel, Field
 
 
@@ -6,13 +7,12 @@ class MyCustomToolInput(BaseModel):
     """Input schema for MyCustomTool."""
     argument: str = Field(..., description="Description of the argument.")
 
-
 class MyCustomTool(BaseTool):
     name: str = "Name of my tool"
     description: str = (
         "Clear description for what this tool is useful for, your agent will need this information to use it."
     )
-    args_schema: type[BaseModel] = MyCustomToolInput
+    args_schema: Type[BaseModel] = MyCustomToolInput
 
     def _run(self, argument: str) -> str:
         # Implementation goes here

src/crewai/cli/templates/flow/crews/poem_crew/poem_crew.py

@@ -16,7 +16,7 @@ class PoemCrew:
     agents_config = "config/agents.yaml"
     tasks_config = "config/tasks.yaml"
 
-    # If you would like to add tools to your crew, you can learn more about it here:
+    # If you would lik to add tools to your crew, you can learn more about it here:
     # https://docs.crewai.com/concepts/agents#agent-tools
     @agent
     def poem_writer(self) -> Agent:

src/crewai/cli/templates/flow/tools/custom_tool.py

@@ -1,3 +1,5 @@
+from typing import Type
+
 from crewai.tools import BaseTool
 from pydantic import BaseModel, Field
 
@@ -13,7 +15,7 @@ class MyCustomTool(BaseTool):
     description: str = (
         "Clear description for what this tool is useful for, your agent will need this information to use it."
     )
-    args_schema: type[BaseModel] = MyCustomToolInput
+    args_schema: Type[BaseModel] = MyCustomToolInput
 
     def _run(self, argument: str) -> str:
         # Implementation goes here

src/crewai/knowledge/knowledge.py

@@ -14,13 +14,13 @@ class Knowledge(BaseModel):
     Knowledge is a collection of sources and setup for the vector store to save and query relevant context.
     Args:
         sources: List[BaseKnowledgeSource] = Field(default_factory=list)
-        storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
+        storage: Optional[KnowledgeStorage] = Field(default=None)
         embedder_config: Optional[Dict[str, Any]] = None
     """
 
     sources: List[BaseKnowledgeSource] = Field(default_factory=list)
     model_config = ConfigDict(arbitrary_types_allowed=True)
-    storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
+    storage: Optional[KnowledgeStorage] = Field(default=None)
     embedder_config: Optional[Dict[str, Any]] = None
     collection_name: Optional[str] = None
 

src/crewai/knowledge/source/base_file_knowledge_source.py

@@ -22,7 +22,7 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC):
         default_factory=list, description="The path to the file"
     )
     content: Dict[Path, str] = Field(init=False, default_factory=dict)
-    storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
+    storage: Optional[KnowledgeStorage] = Field(default=None)
     safe_file_paths: List[Path] = Field(default_factory=list)
 
     @field_validator("file_path", "file_paths", mode="before")
@@ -62,7 +62,10 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC):
 
     def _save_documents(self):
         """Save the documents to the storage."""
-        self.storage.save(self.chunks)
+        if self.storage:
+            self.storage.save(self.chunks)
+        else:
+            raise ValueError("No storage found to save documents.")
 
     def convert_to_path(self, path: Union[Path, str]) -> Path:
         """Convert a path to a Path object."""

src/crewai/knowledge/source/base_knowledge_source.py

@@ -16,7 +16,7 @@ class BaseKnowledgeSource(BaseModel, ABC):
     chunk_embeddings: List[np.ndarray] = Field(default_factory=list)
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
-    storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
+    storage: Optional[KnowledgeStorage] = Field(default=None)
     metadata: Dict[str, Any] = Field(default_factory=dict)  # Currently unused
     collection_name: Optional[str] = Field(default=None)
 
@@ -46,4 +46,7 @@ class BaseKnowledgeSource(BaseModel, ABC):
         Save the documents to the storage.
         This method should be called after the chunks and embeddings are generated.
         """
-        self.storage.save(self.chunks)
+        if self.storage:
+            self.storage.save(self.chunks)
+        else:
+            raise ValueError("No storage found to save documents.")

tests/test_project_formatting.py

@@ -1,64 +0,0 @@
-import os
-import shutil
-import subprocess
-import tempfile
-from pathlib import Path
-
-import pytest
-
-from crewai.cli.create_crew import create_crew
-
-
-@pytest.fixture
-def temp_dir():
-    """Create a temporary directory for testing."""
-    temp_dir = tempfile.mkdtemp()
-    yield temp_dir
-    shutil.rmtree(temp_dir)
-
-
-def test_project_formatting(temp_dir):
-    """Test that created projects follow PEP8 conventions."""
-    # Change to the temporary directory
-    original_dir = os.getcwd()
-    os.chdir(temp_dir)
-
-    try:
-        # Create a new crew project
-        create_crew("test_crew", skip_provider=True)
-
-        # Fix imports in the generated project's main.py file
-        main_py_path = Path(temp_dir) / "test_crew" / "src" / "test_crew" / "main.py"
-        
-        # Use ruff to fix the imports
-        subprocess.run(
-            ["ruff", "check", "--select=I", "--fix", str(main_py_path)],
-            capture_output=True,
-            text=True,
-        )
-
-        # Create a ruff configuration file
-        ruff_config = """
-line-length = 120
-target-version = "py310"
-select = ["E", "F", "I", "UP", "A"]
-ignore = ["D203"]
-"""
-        with open(Path(temp_dir) / "test_crew" / ".ruff.toml", "w") as f:
-            f.write(ruff_config)
-
-        # Run ruff on the generated project code
-        result = subprocess.run(
-            ["ruff", "check", "test_crew"],
-            capture_output=True,
-            text=True,
-        )
-
-        # Check that there are no linting errors
-        assert result.returncode == 0, f"Ruff found issues: {result.stdout}"
-        # If ruff reports "All checks passed!" or empty output, that's good
-        assert "All checks passed!" in result.stdout or not result.stdout.strip(), f"Ruff found issues: {result.stdout}"
-
-    finally:
-        # Change back to the original directory
-        os.chdir(original_dir)